Fix checkout order total and payment fees calculation #12880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Although the change fix the issue in the back office scenario, it has the side effect of getting the order total out of sync. Updating a payment adjustment need to be followed by udpating the order total and payment amount to keep everything in sync.
The order updater did not take into account payment fees on pending payment.
Previous iteration did not actually check the payment fee had been updated. It also checks the order total get correctly updated. Spec is passing, so fixing the order updater also fix this bug : openfoodfoundation#12512
Check if payment actually have an adjustment before trying to update it
The future is now ! :D
mkllnk
approved these changes
Oct 1, 2024
rioug
commented
Oct 1, 2024
Comment on lines
314
to
354
| context "when updating cart after summary step" do | ||
| let(:order) { | ||
| create(:order_ready_for_payment, distributor:) | ||
| } | ||
| let!(:payment_with_fee) { | ||
| create( | ||
| :payment_method, | ||
| distributors: [distributor], | ||
| name: "Payment with Fee", description: "Payment with fee", | ||
| calculator: Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) | ||
| ) | ||
| } | ||
|
|
||
| it "calculated the correct order total" do | ||
| visit checkout_step_path(:payment) | ||
| expect(page).to have_checked_field "Payment with Fee" | ||
|
|
||
| click_button "Next - Order summary" | ||
| expect(page).to have_title "Checkout Summary - Open Food Network" | ||
|
|
||
| # Back to the shop | ||
| click_link "Shopping @ #{distributor.name}" | ||
| expect(page).to have_content(distributor.name) | ||
|
|
||
| # Add item to cart | ||
| within_variant(order.line_items.first.variant) do | ||
| click_button increase_quantity_symbol | ||
| end | ||
| wait_for_cart | ||
|
|
||
| # Checkout | ||
| toggle_cart | ||
| click_link "Checkout" | ||
|
|
||
| # Check summary page total | ||
| expect(page).to have_title "Checkout Summary - Open Food Network" | ||
| expect(page).to have_selector("#order_total", text: 22.00) | ||
| expect(order.reload.payments.first.amount).to eql(22.00) | ||
| end | ||
| end | ||
|
|
There was a problem hiding this comment.
@mkllnk I was wondering if we actually need to keep this spec ? this is covered by the unit test on the order updater
There was a problem hiding this comment.
Good point. Let's remove it then.
It's covered by unit test of order updater
dacook
added
the
bug-s2
dacook
approved these changes
Oct 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What? Why?
The order updater wasn't updating payment fee when an order was updated after payment had already been added.This resulted in the order total being wrong on the checkout summary page. The fee was getting updated once the order was finalised but it wasn't added to the payment amount, this resulted in customer owing money when they paid with Stripe, the owed money being the missing payment fee.
Because of the fix introduced by fixing #12512, the payment fees was actually correct on the summary page.
To fix this, I made sure that payment fees are recalculated if the order has a pending payment, and then update the order total and payment total accordingly.
What should we test?
Testing #5574 :
In the back end :
In the front end
With a Stripe payment method:
Use the same scenario as above
Testing #12512
In the back office:
Release notes
Changelog Category (reviewers may add a label for the release notes):
The title of the pull request will be included in the release notes.
Dependencies
Documentation updates