fix: updates the status for orders #2955

shreyanshdwivedi · 2019-05-18T18:58:08Z

Fixes #2951

Short description of what this resolves:

Tickets that are unpaid are showing up as placed. Expected: Should show up as "Pending" and Expire after 3 days

Changes proposed in this pull request:

Updates the status of offline paid orders to Placed
Updates the status of online paid orders to Pending till payment is made.

Completed Order

Placed Order

Pending Order

Expired Order

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the Upstream development branch.
The acceptance, integration, unit tests and linter pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

shreyanshdwivedi · 2019-05-18T19:18:37Z

@uds5501 there will be a server side PR required just to make few changes -

update scheduler time constraint
ensure that placed order also gets similar completed_at updation, mailing and notification as it was getting earlier.

Edit: Will be pushing server side code in few minutes. Till then can you please verify if you are able to place orders with this changes.

app/controllers/orders/new.js

abhinavk96 · 2019-05-19T16:40:28Z

app/controllers/orders/new.js

        }
        await order.save()
          .then(order => {
-            if (order.status === 'placed') {
+            if (order.status === 'pending' || order.status === 'placed') {


@shreyanshdwivedi If the order status is placed, ergo it was an order via bank cheques or something, why would we ask t fill payment details?

@CosmicCoder96 I agree. It was present earlier. I'll update it :)

app/components/orders/order-summary.js

app/controllers/orders/new.js

shreyanshdwivedi · 2019-05-20T19:22:14Z

@CosmicCoder96 @pradeepgangwar I've updated the color scheme like we decided

Expired -> red
Placed -> blue
Completed -> green 
Pending -> orange

Please review
Edit: Screenshots are attached to PR description

shreyanshdwivedi · 2019-05-21T07:10:33Z

@CosmicCoder96 as corresponding server PR (fossasia/open-event-server#5926) is merged, can you please review this asap, otherwise the changes applied on server might break on local without these changes :)

abhinavk96

Also use ES6 getters insted of this.get

I don't see the colour schema change logic for making initializing state orders as yellow?
@shreyanshdwivedi

abhinavk96 · 2019-05-21T08:25:38Z

app/templates/components/orders/order-summary.hbs

      <div class="ui inverted mini statistic horizontal">
        <div class="value">
-          Success
+          {{#if (eq data.status 'completed')}}
+            Success


translation helpers.

abhinavk96 · 2019-05-21T08:25:44Z

app/templates/components/orders/order-summary.hbs

+          {{#if (eq data.status 'completed')}}
+            Success
+          {{else}}
+            Placed


translation helpers.

abhinavk96 · 2019-05-21T08:25:50Z

app/templates/components/orders/order-summary.hbs

      <div class="ui inverted mini statistic horizontal">
        <div class="value">
-          Placed
+          Pending


translation helpers.

shreyanshdwivedi · 2019-05-21T09:11:22Z

@CosmicCoder96 I've added missing translation helpers.
Initializing is just an intermediate status. Once the form is submitted, the status is updated to either Pending, Placed or Completed. Therefore the color isn't required for this status
Regarding ES6 getters, do you want me to update all the getters in all the file related to this PR itself, as I haven't added any?

abhinavk96

@shreyanshdwivedi

I've added missing translation helpers.
Initializing is just an intermediate status. Once the form is submitted, the status is updated to either Pending, Placed or Completed.

What if I start an order, the timer starts, and then I close the tab. Then I login back and go to my tickets. The order will have a status?

Also if you didn't add any new getters yourself then leave them be, they are already being refactored by a different PR.

shreyanshdwivedi · 2019-05-21T09:27:25Z

@CosmicCoder96 you're absolutely right. I just checked, the status is getting updated to initializing. Pushing the changes
Also, I've added 3 new getters. Should I update it or will it be covered in the refactoring PR?

abhinavk96 · 2019-05-21T09:28:33Z

Yeah please change only the new ones.

…

On Tue, 21 May 2019 at 5:27 PM, Shreyansh Dwivedi ***@***.***> wrote: @CosmicCoder96 <https://github.com/CosmicCoder96> you're absolutely right. I just checked, the status is getting updated to initializing. Pushing the changes Also, I've added 3 new getters. Should I update it or will it be covered in the refactoring PR? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2955?email_source=notifications&email_token=AEDUDRME4B6OVRQTXAH5JATPWO577A5CNFSM4HN24HFKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODV3KDWQ#issuecomment-494313946>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AEDUDRPYCNC3ZIISYJDDA7DPWO577ANCNFSM4HN24HFA> .

shreyanshdwivedi · 2019-05-21T09:38:49Z

@CosmicCoder96 I've pushed changes. BTW what I thought to be getters are not exactly getters. They all are something like - this.get('l10n').t(Pending Order -${order}). please review

abhinavk96

Fix merge conflicts.

abhinavk96 · 2019-05-22T02:44:27Z

app/routes/orders/view.js

@@ -3,7 +3,11 @@ import Route from '@ember/routing/route';
 export default Route.extend({
  titleToken(model) {
    var order = model.order.get('identifier');
-    return this.get('l10n').t(`Completed Order -${order}`);
+    if (model.order.status === 'completed') {
+      return this.get('l10n').t(`Completed Order -${order}`);


return this.l10n.t(...)

abhinavk96 · 2019-05-22T02:44:31Z

app/routes/orders/view.js

+    if (model.order.status === 'completed') {
+      return this.get('l10n').t(`Completed Order -${order}`);
+    } else if (model.order.status === 'placed') {
+      return this.get('l10n').t(`Placed Order -${order}`);


return this.l10n.t(...)

fixes route issues and few condition checks updates status of new orders changes to orders.view template for completed and placed orders Updates the color scheme of order status Adds missing translation helpers Update route and schema for initializing status use ES6 getters

shreyanshdwivedi · 2019-05-22T13:50:34Z

@CosmicCoder96 I've fixed the merge conflicts. Please review

shreyanshdwivedi · 2019-05-23T03:36:22Z

@pradeepgangwar @ritikamotwani please review

auto-label bot added the fix label May 18, 2019

uds5501 previously approved these changes May 18, 2019

View reviewed changes

pradeepgangwar suggested changes May 18, 2019

View reviewed changes

app/controllers/orders/new.js Show resolved Hide resolved

shreyanshdwivedi dismissed uds5501’s stale review via b6a8d96 May 18, 2019 21:03

fossasia deleted a comment May 18, 2019

shreyanshdwivedi changed the title ~~fix: updates the status for orders~~ [WIP] fix: updates the status for orders May 18, 2019

auto-label bot removed the fix label May 18, 2019

shreyanshdwivedi mentioned this pull request May 18, 2019

fix: update scheduler time constraint for pending tickets fossasia/open-event-server#5926

Merged

6 tasks

abhinavk96 suggested changes May 19, 2019

View reviewed changes

app/components/orders/order-summary.js Outdated Show resolved Hide resolved

abhinavk96 added the DO-NOT-MERGE label May 19, 2019

shreyanshdwivedi force-pushed the orderPage branch 2 times, most recently from 9f424df to 6887b74 Compare May 19, 2019 19:51

fossasia deleted a comment May 19, 2019

pradeepgangwar reviewed May 19, 2019

View reviewed changes

app/controllers/orders/new.js Show resolved Hide resolved

shreyanshdwivedi changed the title ~~[WIP] fix: updates the status for orders~~ fix: updates the status for orders May 19, 2019

auto-label bot added the fix label May 19, 2019

fossasia deleted a comment May 19, 2019

fossasia deleted a comment May 20, 2019

abhinavk96 approved these changes May 21, 2019

View reviewed changes

abhinavk96 suggested changes May 21, 2019

View reviewed changes

fossasia deleted a comment May 21, 2019

abhinavk96 reviewed May 21, 2019

View reviewed changes

fossasia deleted a comment May 21, 2019

abhinavk96 approved these changes May 22, 2019

View reviewed changes

abhinavk96 suggested changes May 22, 2019

View reviewed changes

shreyanshdwivedi force-pushed the orderPage branch from d307a0d to 18ca97d Compare May 22, 2019 13:02

shreyanshdwivedi force-pushed the orderPage branch from 18ca97d to a1934f6 Compare May 22, 2019 13:05

abhinavk96 approved these changes May 23, 2019

View reviewed changes

Merge branch 'development' into orderPage

16aa0c8

abhinavk96 merged commit e06fc4e into fossasia:development May 23, 2019

shreyanshdwivedi deleted the orderPage branch May 25, 2019 23:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: updates the status for orders #2955

fix: updates the status for orders #2955

shreyanshdwivedi commented May 18, 2019 •

edited

Loading

shreyanshdwivedi commented May 18, 2019 •

edited

Loading

abhinavk96 May 19, 2019

shreyanshdwivedi May 19, 2019

shreyanshdwivedi commented May 20, 2019 •

edited

Loading

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

abhinavk96 May 21, 2019

abhinavk96 May 21, 2019

abhinavk96 May 21, 2019

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

shreyanshdwivedi commented May 21, 2019

abhinavk96 commented May 21, 2019 via email

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

abhinavk96 May 22, 2019

abhinavk96 May 22, 2019

shreyanshdwivedi commented May 22, 2019

shreyanshdwivedi commented May 23, 2019

fix: updates the status for orders #2955

fix: updates the status for orders #2955

Conversation

shreyanshdwivedi commented May 18, 2019 • edited Loading

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

shreyanshdwivedi commented May 18, 2019 • edited Loading

abhinavk96 May 19, 2019

Choose a reason for hiding this comment

shreyanshdwivedi May 19, 2019

Choose a reason for hiding this comment

shreyanshdwivedi commented May 20, 2019 • edited Loading

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

Choose a reason for hiding this comment

abhinavk96 May 21, 2019

Choose a reason for hiding this comment

abhinavk96 May 21, 2019

Choose a reason for hiding this comment

abhinavk96 May 21, 2019

Choose a reason for hiding this comment

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

Choose a reason for hiding this comment

shreyanshdwivedi commented May 21, 2019

abhinavk96 commented May 21, 2019 via email

shreyanshdwivedi commented May 21, 2019

abhinavk96 left a comment

Choose a reason for hiding this comment

abhinavk96 May 22, 2019

Choose a reason for hiding this comment

abhinavk96 May 22, 2019

Choose a reason for hiding this comment

shreyanshdwivedi commented May 22, 2019

shreyanshdwivedi commented May 23, 2019

shreyanshdwivedi commented May 18, 2019 •

edited

Loading

shreyanshdwivedi commented May 18, 2019 •

edited

Loading

shreyanshdwivedi commented May 20, 2019 •

edited

Loading