Subs: prevent fees from displaying in email when subscription order cannot be fulfilled #2122
Conversation
| @@ -147,8 +147,10 @@ | |||
| allow(job).to receive(:unavailable_stock_lines_for) { order.line_items } | |||
| end | |||
|
|
|||
| it "does not place the order, sends an empty_order email" do | |||
| it "does not place the order, clears, all adjustments, and sends an empty_order email" do | |||
| expect(order.adjustments).to_not be_empty | |||
There was a problem hiding this comment.
I wonder if we really need to add this one. Our only expectation is the one you added below. What happens before is not that relevant IMO.
There was a problem hiding this comment.
Sure, I'm happy to remove it.
There was a problem hiding this comment.
@sauloperez please approve if you are happy
oeoeaio
force-pushed
the
subs-unplaced-fees
branch
from
9f7882b to
eacf005
Compare
mkllnk
force-pushed
the
subs-unplaced-fees
branch
from
eacf005 to
5e32b8e
Compare
|
Staged on https://staging1.openfood.com.au/. |
|
@myriamboure I'm surprised this didn't get picked up for testing last night. Do I need to notify people? I'm working Tuesday to Friday now and the next two Mondays as well. I hope to stage something every working day. But do we have testers every day? I'm happy to continue this conversation in Slack. |
|
Oups @mkllnk actually @RachL and I are in Barcelona working with the Coopdevs team and spent the whole day on product chain inception, we will finish that tomorrow. We can try to do some testing in the day though to take advantage of you being able to stage every working day this week, we'll see but this week is a bit special because of colocating French and Catalunya team working on bigger picture inceptions first deep dive ;) |
|
Testing Notes
https://docs.google.com/document/d/10AjV6FRGhsjLo4OtR3vQ8qKJrJPHnpTDVYtXi2ZSmbQ/edit# |
oeoeaio
force-pushed
the
subs-unplaced-fees
branch
from
82f7e2f to
936cbcd
Compare
|
Put that back in code review as it seems @oeoeaio already fixed the issue after Sally tested. |
|
Ah, Rob had actually staged it already for testing. I just tried to put it back into testing after reviewing it, but my Zenhub stopped working. :-( |
This prevents shipping and payment fees from being displayed in the notification email
mkllnk
force-pushed
the
subs-unplaced-fees
branch
from
936cbcd to
6a71aaf
Compare
|
@myriamboure This is staged on https://staging1.openfood.com.au/ again. |
|
Testing notes: https://docs.google.com/document/d/10AjV6FRGhsjLo4OtR3vQ8qKJrJPHnpTDVYtXi2ZSmbQ/edit?usp=sharing It seems the bug is solved BUT I have the impression that a new one has been introduced, I'm not sure if that's connected to this one or not. When I create a new subscription, in the "subscription dashboard" "items" column, the total is not consistent with subtotal and I'm not able to understand how it is calculated (see red lines in testing notes.) Can you have a look @oeoeaio or @sstead and tell if it's connected to that PR or if we need to open a new issue? |
|
HI @myriamboure, Not sure about the issue you found. Definitely troubling that the different between the subtotal and the total is not itemised. I will attempt to replicate and drill down into the issue. |
|
Ok, so the issue that @myriamboure picked up is unrelated to this PR, I have addressed it in #2346. This can go through as long as no other issues are found. |
|
@myriamboure do you agree on merging this as per @oeoeaio's comment? |
|
I guess so @sauloperez I didn't retest but if the bug I found was not connected and is addressed somewhere else anyway this should be good to go! |
What? Why?
When none of the items requested in a subscription are available when an order cycle opens, the customer is sent a notification email to let them know that an order could not be placed. Despite the fact that the email says that the order was not processed, some fees were still showing in the order summary shown in the email. This PR should resolve that issue.
What should we test?
Notification emails for customers indicating a failure to place an order due to insufficient stock should not show fees of any sort.
Release notes
Feature is yet to be released so this does not require its own release notes.