2788 [Subscriptions] Fix address issues when syncing subscriptions and orders #3589

kristinalim · 2019-03-07T20:39:14Z

Fix shipping and billing address issues when syncing subscriptions and orders.

What? Why?

This fixes remaining issues in #2788, related to how changes to subscriptions' bill address, ship address, and shipping method are carried over to the orders.

This PR includes changes in PR #3560, and cherry-picks commits for v1 in #3605, so should not be merged until those have been approved and merged to their respective base branches.

It turned out that many spec assertions were passing only by accident in v1. See more info here: #3605 The specs had to be fixed in v1 so we could make sure to preserve the behaviour in v2. The fix specific to v2 is only in these commits:

What should we test?

Create a subscription with no end date for an open OC. Set pickup as the shipping method, but set billing details that is different from the shipping details.
"Edit" the subscription order generated. This will create the order. The order ship address should be: bill address name and phone number, and shop address.
Edit the subscription bill address. This should affect the bill and ship address of the order.
Change the order bill address.
Edit the subscription bill address again. This should not affect the order bill and ship address.
Change back order bill address to be the same as subscription bill address.
Switch subscription to delivery.
Edit the subscription bill address again. Check that the order bill address is updated.
Change the order bill address.
Edit the subscription bill address again. The order bill addresses should not be updated.

Dependencies

luisramos0 · 2019-03-08T10:05:56Z

app/models/order_updater.rb

-      shipping_method = shipment.shipping_method
-      next if shipping_method.require_ship_address
+    return if order.shipment.andand.shipping_method.blank?
+    return if order.shipment.shipping_method.require_ship_address


I was just discussing the use of andand in another PR with @mkllnk
maybe:

return if order.shipment.blank? return if order.shipment.shipping_method.blank? return if order.shipment.shipping_method.require_ship_address

or simply?

return if order.shipment.andand.shipping_method.andand.require_ship_address

Or we implement the law of Demeter and then write:

return if order.require_ship_address?

😄

kristinalim · 2019-03-22T20:28:59Z

I've rebased this upon #3640 which already includes the changes in #3560 and #3605. So now, this is blocked only by #3640. When that is merged into 2-0-stable, this should be rebased again.

luisramos0 · 2019-03-26T10:44:31Z

fyi #3640 has been merged

kristinalim · 2019-03-27T18:48:11Z

Rebased and green, @luisramos0. Thanks.

luisramos0

nice 💪

I think update_associations_for can be simplified.

luisramos0 · 2019-03-27T22:49:35Z

app/services/order_syncer.rb

+    unless pickup_to_delivery && order.shipment.present?
+      order.updater.__send__(:shipping_address_from_distributor)
+    end
+


this is a bit brain damaging, isnt it? :-)

I didnt manage to improve it much but I think this looks a bit easier to follow:

pickup_to_delivery = force_ship_address_required?(order) if !pickup_to_delivery || order.shipment.present? update_ship_address_for(order) if (ship_address.changes.keys & relevant_address_attrs).any? end if !pickup_to_delivery || order.shipment.blank? order.updater.__send__(:shipping_address_from_distributor) end

I'd extract this block above including the comment to a separate method, maybe into update_ship_address_for.

I see that making this method public would mean touching another class but I think it's worth it.

this is a bit brain damaging, isnt it? :-)

Yes, I had a difficult time following code paths for this. 😓

Thanks @luisramos0 and @mkllnk. I agree with your suggestions and have appended the commits. 🙂

mkllnk

I'm pretty happy with this PR. I would like to know your opinion about public vs private before I approve though.

mkllnk · 2019-03-29T08:00:46Z

app/models/order_updater.rb


-      order.ship_address = order.distributor.address
-    end
+    order.ship_address = order.__send__(:address_from_distributor)


Shouldn't we make that method public if we use it?

yeah, address_from_distributor is also a candidate for a nice little service that could also help below in shipping_address_from_distributor

I've made this method public as well. 🙂

mkllnk · 2019-03-29T08:16:18Z

app/services/order_syncer.rb

+    unless pickup_to_delivery && order.shipment.present?
+      order.updater.__send__(:shipping_address_from_distributor)
+    end
+


I see that making this method public would mean touching another class but I think it's worth it.

luisramos0

super!

mkllnk

Nice!

luisramos0 · 2019-04-05T13:58:22Z

I think this is the last subs v2 PR and it closes #2786 as well, correct @kristinalim ?

RachL · 2019-04-05T17:24:24Z

@kristinalim so far in my tests my order bill address never gets updated when I edit the subscription bill address.
I'm using enterprise 2 and I'm logged in as super admin all along on AU staging.

Maybe I don't look at the right place?

For instance:

"Edit" the subscription order generated. This will create the order. The order ship address should be: bill address name and phone number, and shop address.

What do you mean by This will create the order ? I used the order cycle closing time in order to create the order.

Also where do you exactly see the order ship/bill address?

I went to the "customer details" of the edit order submenu. But I guess it should show up some place else but I couldn't find where.... the invoice is showing the shipping address of my customer... Sorry if this is obvious :(

luisramos0 · 2019-04-10T20:52:44Z

I am unstaging this one from AUS to put the new test data there. this one can go next.

luisramos0 · 2019-04-13T20:01:11Z

this is now back to aus staging.

This still achieves a logic issue before the Spree upgrade, where switching from pick-up to delivery affects whether simultaneous changes to shipping address are ignored or not. This behaviour can be fixed in a separate PR.

The way that the bill contact details and distributor address are set for pickup orders has changed. At this point, after before_save_hook is called, the bill contact details have already been set as well.

This method has become only a small part of the logic for updating the order's ship address. This no longer follows the method naming convention within OrderSyncer where update_*_for describes almost the complete logic for updating the association. This is renamed in preparation for extraction of the complete update logic for ship_address. The new method will be named update_ship_address_for.

kristinalim · 2019-05-01T18:12:09Z

Apologies, my comment on this is really late.

This will create the order.

@RachL Immediately after creating a subscription, there are "orders" (proxy orders) listed under the subscription, but the real orders are not actually created until a background task that generates these is run.

I checked just now and see that this is actually only 5 minutes (I don't have this running automatically in my local machine), so you can just wait 5 minutes too. If you don't want to wait, clicking the link to "edit the order" would create the order. The order needs to exist for the rest of the testing steps.

Also where do you exactly see the order ship/bill address?

I went to the "customer details" of the edit order submenu. But I guess it should show up some place else but I couldn't find where....

This screen recording shows where the subscription order's addresses should show up, @RachL. Are we looking at different places?

I went through all the testing steps in my dev server and don't see a problem. I will also check the data you are using @RachL. Thank you!

RachL · 2019-05-02T16:40:42Z

@kristinalim thank you for the tip! I didn't know the shortcut, but I was looking at the right place. It didn't worked last time, maybe something with staging it because now I could see each step more clearly!

However 2 things that did not worked:

Edit the subscription bill address. This should affect the bill and ship address of the order. this only affected the bill address. Not the shipping address. Why should it update the ship address as well?
The email title was not updated but I know there is a PR somewhere for this
There is a translation key also missing here (but maybe not due to this PR?):

Updated testing notes:
https://docs.google.com/document/d/1DNbA0L2dLpmYLZrEkQx9GKI044bAgEcZDsFweYpUXPo/edit#

kristinalim · 2019-05-03T11:22:29Z

Edit the subscription bill address. This should affect the bill and ship address of the order. this only affected the bill address. Not the shipping address. Why should it update the ship address as well?

Sorry, my bad, Rachel! I was actually editing the non-address part of the subscription billing details (not address) here. So if you edit the subscription's billing name or phone number, it should be copied over to the orders' billing and shipping details. The address part would not be copied to the orders' shipping details because the order is pickup and would still use the hub's address.

RachL · 2019-05-03T16:08:52Z

Thank you @kristinalim as #3782 is created I'm moving this PR foward!

kristinalim self-assigned this Mar 7, 2019

kristinalim force-pushed the fix/2788-ship_address_changed branch from 9933b7b to 23cf072 Compare March 7, 2019 21:16

luisramos0 reviewed Mar 8, 2019

View reviewed changes

kristinalim force-pushed the fix/2788-ship_address_changed branch 3 times, most recently from d96b302 to 3fc8e70 Compare March 13, 2019 06:09

kristinalim force-pushed the fix/2788-ship_address_changed branch 4 times, most recently from 63da6da to eb1961c Compare March 22, 2019 20:02

kristinalim mentioned this pull request Mar 22, 2019

[Spree Upgrade] Merging master into 2-0-stable (3rd run in Mar2019) #3640

Merged

kristinalim changed the title ~~2788 [BLOCKED] [Subscriptions] Fix address issues when syncing subscriptions and orders~~ 2788 [Subscriptions] Fix address issues when syncing subscriptions and orders Mar 22, 2019

kristinalim mentioned this pull request Mar 25, 2019

[Spree Upgrade] Fix specs related to Subscriptions (pending specs) #2786

Closed

kristinalim force-pushed the fix/2788-ship_address_changed branch from 98f133f to b956b4e Compare March 27, 2019 16:35

luisramos0 approved these changes Mar 27, 2019

View reviewed changes

mkllnk reviewed Mar 29, 2019

View reviewed changes

luisramos0 approved these changes Mar 29, 2019

View reviewed changes

mkllnk approved these changes Apr 2, 2019

View reviewed changes

RachL added pr-staged-fr staging.coopcircuits.fr and removed pr-staged-fr staging.coopcircuits.fr labels Apr 4, 2019

RachL self-assigned this Apr 4, 2019

RachL added the pr-staged-fr staging.coopcircuits.fr label Apr 4, 2019

luisramos0 added pr-staged-au staging.openfoodnetwork.org.au and removed pr-staged-fr staging.coopcircuits.fr labels Apr 4, 2019

luisramos0 mentioned this pull request Apr 5, 2019

[Spree Upgrade] WIP Phase 2 - Subscriptions - all specs uncommented #3317

Closed

luisramos0 removed the pr-staged-au staging.openfoodnetwork.org.au label Apr 10, 2019

luisramos0 added the pr-staged-au staging.openfoodnetwork.org.au label Apr 13, 2019

kristinalim added 10 commits May 1, 2019 07:16

Fix order shipment references in OrderUpdater

bdf4132

Uncomment and update OrderSyncer failing specs

78aa9da

This still achieves a logic issue before the Spree upgrade, where switching from pick-up to delivery affects whether simultaneous changes to shipping address are ignored or not. This behaviour can be fixed in a separate PR.

Update check for pickup address manipulation

46d63f4

The way that the bill contact details and distributor address are set for pickup orders has changed. At this point, after before_save_hook is called, the bill contact details have already been set as well.

Remove ignore for OrderSyncer spec file

b4b2493

Uncomment passing specs for SubscriptionPlacementJob

71f379a

Improve readability of conditions in OrderSyncer

6952f4e

Extract method OrderSyncer#update_ship_address_for

0933d53

Make OrderUpdater#shipping_address_from_distributor public

92dc43d

Make Order#address_from_distributor public

1972606

kristinalim force-pushed the fix/2788-ship_address_changed branch from 5e8bdaa to 1972606 Compare April 30, 2019 23:18

RachL removed the pr-staged-au staging.openfoodnetwork.org.au label May 2, 2019

Merge branch '2-0-stable' into fix/2788-ship_address_changed

4a9570b

luisramos0 added the pr-staged-au staging.openfoodnetwork.org.au label May 2, 2019

kristinalim mentioned this pull request May 3, 2019

Missing translation when subscription update would not cascade to order in open OC #3782

Closed

RachL removed the pr-staged-au staging.openfoodnetwork.org.au label May 3, 2019

kristinalim mentioned this pull request May 3, 2019

3782 Fix missing translation in subscription update modal #3783

Merged

luisramos0 merged commit 4afa0cd into openfoodfoundation:2-0-stable May 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2788 [Subscriptions] Fix address issues when syncing subscriptions and orders #3589

2788 [Subscriptions] Fix address issues when syncing subscriptions and orders #3589

kristinalim commented Mar 7, 2019 •

edited

Loading

luisramos0 Mar 8, 2019

mkllnk Mar 11, 2019

kristinalim commented Mar 22, 2019

luisramos0 commented Mar 26, 2019

kristinalim commented Mar 27, 2019

luisramos0 left a comment

luisramos0 Mar 27, 2019

luisramos0 Mar 27, 2019

mkllnk Mar 29, 2019

kristinalim Mar 29, 2019

mkllnk left a comment

mkllnk Mar 29, 2019

luisramos0 Mar 29, 2019

kristinalim Mar 29, 2019

mkllnk Mar 29, 2019

luisramos0 left a comment

mkllnk left a comment

luisramos0 commented Apr 5, 2019

RachL commented Apr 5, 2019

luisramos0 commented Apr 10, 2019

luisramos0 commented Apr 13, 2019

kristinalim commented May 1, 2019

RachL commented May 2, 2019

kristinalim commented May 3, 2019

RachL commented May 3, 2019

2788 [Subscriptions] Fix address issues when syncing subscriptions and orders #3589

2788 [Subscriptions] Fix address issues when syncing subscriptions and orders #3589

Conversation

kristinalim commented Mar 7, 2019 • edited Loading

What? Why?

What should we test?

Dependencies

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kristinalim commented Mar 22, 2019

luisramos0 commented Mar 26, 2019

kristinalim commented Mar 27, 2019

luisramos0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkllnk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luisramos0 left a comment

Choose a reason for hiding this comment

mkllnk left a comment

Choose a reason for hiding this comment

luisramos0 commented Apr 5, 2019

RachL commented Apr 5, 2019

luisramos0 commented Apr 10, 2019

luisramos0 commented Apr 13, 2019

kristinalim commented May 1, 2019

RachL commented May 2, 2019

kristinalim commented May 3, 2019

RachL commented May 3, 2019

kristinalim commented Mar 7, 2019 •

edited

Loading