Gaetan Craig-Riou
d7ae91c23e
Per review, specify the actual expected value
2025-01-20 16:21:19 +11:00
Gaetan Craig-Riou
17e7f7d26d
Small linting fix
2025-01-20 16:16:00 +11:00
Gaetan Craig-Riou
c71ae35685
Fix payment_total calculation
...
For payment that complete during the checkout (Paypal, Stripe) the
amount was recorded twice against `order.payment_total`. This is because
the `payment_total` gets updated in an afer_save Payment callback when a
payment is completed, and then once more when we process payment in
`Spree::Order#process_each_payment`.
This is an existing issue on master, but it was hidden by the
`update_shipping_fees!` callback, it trigerred an update of the order's
total, which then updated `order.payment_total` with the correct value.
Now that we removed the callback, the bug showed up.
Note, I updated the stripe specs for consistency even though they are
currently disabled.
2025-01-20 16:07:32 +11:00
Gaetan Craig-Riou
1afa7fe5c0
Per review, small improvment
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
a8d1d0c591
Update spec to properly update line items on an order
...
User Order::Contents#update_item to update line item on an order, it
ensures the order is properly updated
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
9e7e40a5a8
Update spec to properly test shipping fee update
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
f9bd720341
Add spec for #update_shipping_fees!
...
And update related specs
2025-01-15 15:44:24 -06:00
Gaetan Craig-Riou
20df5c23e8
Remove before save callback to update shipping fees
...
It should be handled in the controller, it's currently handled in
`Spree::OrderContents#remove`. As long as we don't manually remove line
item from an order we should be good.
Currently it gets trigerred each time the order is saved, which seems to
happen mutiple time when we finalize an order. It's a bit useless to
recalculated the fees over and over
Context, it was added here : 217eda8362
2025-01-15 15:44:24 -06:00
David Cook
244e0524c7
Re-instate check for external_billing_id
2025-01-13 16:54:17 +01:00
François Turbelin
96c7c828c1
Fix specs
2025-01-13 16:54:17 +01:00
François Turbelin
9c153c6083
Improve specs
2025-01-13 16:54:17 +01:00
François Turbelin
3ef5b41282
Remove Admin Only tab logic
2025-01-13 16:54:17 +01:00
François Turbelin
983e3e717b
Revert "Fix spec"
...
This reverts commit b40e8a1ff9072721c468a7c012e1e4a9d47e3957.
2025-01-13 16:54:17 +01:00
François Turbelin
f9f5d0eb51
Revert "Do explicit save in specs when switching tabs"
...
This reverts commit 3230159dceeb1485b0c6ec2422ea282b39431e0c.
2025-01-13 16:54:17 +01:00
François Turbelin
0b0b6a04e1
Do explicit save in specs when switching tabs
2025-01-13 16:54:17 +01:00
François Turbelin
d6faa23fc2
Fix spec
2025-01-13 16:54:17 +01:00
François Turbelin
3c7c02da2f
Repair specs
2025-01-13 16:54:17 +01:00
François Turbelin
6ae3c8b102
Add external_billing_id field on revenues_by_hub report
2025-01-13 16:54:17 +01:00
François Turbelin
e37881837b
Add unit tests for admin entreprises changes
2025-01-13 16:54:17 +01:00
Maikel
e2bc86faa9
Merge pull request #12491 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.25.0
...
chore(deps-dev): bump rubocop-rails from 2.24.1 to 2.28.0
2025-01-10 13:03:25 +11:00
Maikel Linke
b8c5b24c17
Fix flaky admin order spec
...
We were trying to assert values in the database withou waiting for he
update to finish. First expecting the changed values on the screen
ensures that Capybara waits for the action to finish. Then we can check
the database.
2025-01-10 09:54:50 +11:00
Maikel Linke
f8788d358e
UNSAFE style Rails/RootPathnameMethods
2025-01-10 09:14:34 +11:00
Maikel Linke
c1198c8e1f
UNSAFE Style Rails/CompactBlank
2025-01-10 09:14:34 +11:00
Maikel
5f486bd611
Merge pull request #13036 from chahmedejaz/bugfix/13024-dfc-catalog-syncs-for-blank-cart
...
Fix DFC catalog syncs for blank cart
2025-01-08 12:53:19 +11:00
Maikel
1df3a6bb66
Merge pull request #13049 from mkllnk/dfc-wholesale-stock
...
Calculate stock from DFC wholesale variants
2025-01-08 12:32:44 +11:00
Konrad
8e0c0392d9
Merge pull request #12991 from murjax/remove-sku-11973
...
Remove product SKU from product pages and report
2025-01-07 21:14:39 +01:00
Konrad
428eb465c0
Merge pull request #13009 from MrBowmanXD/dev
...
Added the :selected option with the default tax category #12989
2025-01-07 20:04:28 +01:00
Maikel Linke
ddaeff7c53
Use DfcCatalog in offer broker
2025-01-07 11:03:34 +11:00
David Cook
a89d65cfc7
Merge pull request #13057 from mkllnk/remove-local-storage
...
Remove local storage
2025-01-06 11:45:27 +11:00
Gaetan Craig-Riou
ab57618e59
Merge pull request #13044 from mkllnk/dfc-store-order-links-only
...
Remove old, replaced backorder lookup
2025-01-06 10:11:34 +11:00
kernal053
bad32e226e
Fix label for other adjustments and add spec correspodingly
2025-01-02 16:29:48 +01:00
Maikel Linke
be98544537
Remove unused AngularJS service KeyValueMapStore
2025-01-02 15:19:55 +11:00
David Cook
7f3b1c0d7a
Merge pull request #13029 from mkllnk/flaky-order-cycle-spec
...
Add timepicker helper with added expectation to reduce flakiness
2025-01-02 13:45:28 +11:00
Filipe
5fdd0e5d42
Merge pull request #12954 from rioug/fix-shipment-not-updated
...
Ensure shipment gets updated when an order is updated
2024-12-26 15:56:12 -06:00
Filipe
e2e2285f81
Merge pull request #13027 from chahmedejaz/bugfix/13026-reset-variant-unit-name
...
Changing a variant unit scale from items to weight/volume does not remove variant unit name
2024-12-19 18:27:39 -06:00
Maikel Linke
c1f8d3035a
Sleep after selecting time for stability
2024-12-20 11:15:49 +11:00
Maikel Linke
f74492190d
Select time like the user does
...
It makes it easier to understand. It didn't improve stability.
2024-12-20 11:15:49 +11:00
Maikel Linke
874c464088
Tidy one spec example
2024-12-20 11:15:49 +11:00
Maikel Linke
72376da98f
Assess stability without retry
2024-12-19 16:29:33 +11:00
Maikel Linke
a30f764a22
Add timepicker helper with added expectation
2024-12-19 16:29:33 +11:00
Maikel Linke
60b62d41d6
Remove old, replaced backorder lookup
2024-12-17 13:48:03 +11:00
David Cook
e689844a0f
Merge pull request #13033 from mkllnk/dfc-pricing
...
DFC Orders: Calculate wholesale price for imported retail variants
2024-12-16 15:37:30 +11:00
Gaetan Craig-Riou
ad7ba3e680
Use the correct spanish translation for Unit Scale
2024-12-16 11:25:23 +11:00
Filipe
9bfac66412
Merge pull request #13012 from chahmedejaz/task/13007-customer-code-in-order-cycle-email
...
Add customer code to notify producer emails when enabled
2024-12-13 10:50:02 -06:00
Maikel Linke
13e008e91e
Calculate wholesale price for imported retail variants
2024-12-12 16:08:45 +11:00
Maikel Linke
d5c3e94b24
OfferBroker needs only catalog URL, no other URLs
2024-12-12 15:45:42 +11:00
Maikel Linke
9b965f657c
Use OIDC account factory
2024-12-12 15:22:35 +11:00
Ahmed Ejaz
b6eca58798
13024: fix dfc catalog sync for blank cart
2024-12-12 04:28:15 +05:00
Maikel Linke
bf41658d32
Fix nil error when amending backorder
2024-12-11 12:40:46 +11:00
Maikel Linke
fcbaefb2c8
Update each backorder only once in bulk cancel
2024-12-11 12:40:46 +11:00