Filipe
5d360730c7
Merge pull request #13023 from rioug/12907-fix-checkout-shipping-fee
...
[Checkout] Shipping fees update, remove order callback
2025-01-23 18:50:31 -06:00
Konrad
0b8807146e
Merge pull request #13058 from mkllnk/currency-config
...
Remove unused app config options
2025-01-22 11:27:12 +01:00
Maikel
c258bee44d
Merge pull request #13065 from mkllnk/dfc-amend-nothing
...
Admin updates can trigger new backorders until the order cycle is closed
2025-01-22 16:32:23 +11:00
Maikel Linke
917e0ff01a
Remove unnecessary storage of currency
2025-01-21 20:11:05 +01:00
Maikel Linke
ed926e9e26
Remove unnecessary storage of checkout zone
2025-01-21 20:11:05 +01:00
Maikel
229ee7028c
Merge pull request #13064 from mkllnk/negative-stock
...
Don't show stock for on-demand inventory items
2025-01-21 11:05:50 +11:00
Gaetan Craig-Riou
fcd366cc06
Fix spec
...
Payment needs to be linked to the order, in order for the payment
callback to update `order.payment_total`
2025-01-21 10:52:32 +11:00
Gaetan Craig-Riou
0ca164a354
Fix spec
...
Use a completed payment, instead of trying to complete a payment
2025-01-21 10:51:08 +11:00
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
Filipe
a472f3e4f5
Merge pull request #13068 from vishaldeepak/variant-with-tax
...
New variants should inherit tax category in UI
2025-01-17 10:57:22 -06:00
Filipe
ace3bfa2a5
Merge pull request #13061 from kernal053/add-voucher-label-to-edit-cart-page
...
Add 'Voucher:' before voucher code on edit cart page
2025-01-16 22:51:57 -06:00
Maikel Linke
06d9d96f54
Fix error on removed product from catalog
2025-01-17 12:21:28 +11:00
Filipe
3c1dd10219
Merge pull request #13047 from mkllnk/spree-roles
...
Clarify that our only user role is "admin" and simplify code
2025-01-16 18:06:49 -06: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
Maikel Linke
c9eed4f5b8
Trigger new backorder only when user checks out
...
When an admin creates an order, then AmendBackorderJob is called which
can also trigger a new backorder if needed.
This means that we are not creating backorders via subscriptions any
more. It has never been requested and we can bring that back if needed.
2025-01-15 15:52:57 +11: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
Vishal Deepak
1586c8ef28
New varaints should inherit tax category in UI
2025-01-10 13:30:18 +05:30
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 Linke
884206b4ed
Place new backorder when there's none to amend
2025-01-09 13:28:09 +11:00
Maikel Linke
2297b650f8
Skip amending backorder if there's none
2025-01-09 12:10:07 +11:00
Maikel Linke
a3ec3e74ae
Hide stock level of on-demand inventory items
...
We changed to tracking stock of on-demand items to be able to place
backorders. This is mostly hidden in the app but was still visible on
the inventory page. Now we are hiding that here, too.
2025-01-09 10:06:04 +11:00
Maikel Linke
0805501445
Format spec data with less indent
2025-01-09 10:06:04 +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
kernal053
45a4b33920
Ensure existing format 'Voucher: Code' on edit cart page. Handle rubocop warning
2025-01-07 09:17:24 +05:30
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
98adefbd67
Add 'Voucher:' before voucher code on edit cart page. Add spec correspondigly
2025-01-04 14:26:02 +05:30
