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
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
François Turbelin
e946b50515
Isolate into an Admin Only section
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
a007fdaab8
Revert "Put back permalink fields on primary details panel"
...
This reverts commit d90ca538fb5b02e942842f1f9c1f44232f44027d.
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
1e3f86625f
Revert "Add spinner"
...
This reverts commit 16506c44fa8aee0a588c01a253b78b023a8f3a39.
2025-01-13 16:54:17 +01:00
François Turbelin
9cd3bbf46f
Revert "Use params value only if present"
...
This reverts commit 5cd50b1c1ff66398f470d51fdafacf26663a2730.
2025-01-13 16:54:17 +01:00
François Turbelin
0f77d1bad5
Use params value only if present
2025-01-13 16:54:17 +01:00
François Turbelin
cd38e02cac
Add spinner
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
9dc364979a
Put back permalink fields on primary details panel
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
657df9eb8f
Repair field placeholder translation
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
57c237c72d
Move admin_only tab upper
2025-01-13 16:54:17 +01:00
François Turbelin
6030d7e05b
Handle the async action for entreprises sells field changes
2025-01-13 16:54:17 +01:00
François Turbelin
14334b02bf
Add new field on enterprise admin form
2025-01-13 16:54:17 +01:00
Maikel Linke
c1198c8e1f
UNSAFE Style Rails/CompactBlank
2025-01-10 09:14:34 +11:00
Maikel Linke
49ec9a3136
Style Rails/WhereRange
2025-01-10 08:43:58 +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
Rachel Arnould
1147976069
Merge pull request #13011 from drummer83/ConnApps
...
Make Connected Apps links available in Transifex
2025-01-07 15:31:46 +01:00
Maikel Linke
21195c5750
Calculate stock from wholesale products
2025-01-07 11:03:36 +11:00
Maikel Linke
faad7fa95c
Move wholesale calculation for re-use
2025-01-07 11:03:36 +11:00
Maikel Linke
ddaeff7c53
Use DfcCatalog in offer broker
2025-01-07 11:03:34 +11:00
Maikel Linke
ef08ae49fe
DRY DFC catalog logic for re-use
2025-01-07 10:49:37 +11:00
Konrad
7e3baabd23
Merge pull request #12983 from saunmanoj888/12957-hide-search-filter-for-no-products
...
Back Office Product List - Hide search field and filters when there are no products in list
2025-01-07 00:16:59 +01: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
Cillian O'Ruanaidh
ce38c1a3d5
Remove unused :ofn-scroll-to angular directive
2025-01-03 14:31:21 +01:00
Cillian O'Ruanaidh
6923349de6
Remove unused :integer angular directive
2025-01-03 14:31:21 +01:00
Cillian O'Ruanaidh
1fb987f0bd
Remove unused :disable-scroll angular directive
2025-01-03 14:31:21 +01:00
Cillian O'Ruanaidh
0b389b8ff4
Remove unused :render-svg angular directive
2025-01-03 14:31:21 +01:00
kernal053
bad32e226e
Fix label for other adjustments and add spec correspodingly
2025-01-02 16:29:48 +01:00
kernal053
65abda2a38
add voucher label & correspoding code with translation for order confirmation mailer
2025-01-02 16:29:48 +01:00
kernal053
f99f2c81ac
Add 'Voucher:' before voucher code on order confirmation emails
2025-01-02 16:29:48 +01:00
Maikel Linke
558d4debdb
Remove unused AngularJS local storage
2025-01-02 15:40:13 +11:00
Maikel Linke
8f761fc438
Remove unused localStorageService clearing
2025-01-02 15:23:43 +11:00
Maikel Linke
be98544537
Remove unused AngularJS service KeyValueMapStore
2025-01-02 15:19:55 +11:00
David Cook
deee451b88
Merge pull request #12867 from dacook/turbo-error-messages
...
Alert user when error requesting a report
2025-01-02 11:28:10 +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
a7dfa36883
Typo: we sync catalogs, not categories
2024-12-18 13:01:23 +11:00
Maikel Linke
60b62d41d6
Remove old, replaced backorder lookup
2024-12-17 13:48:03 +11:00
David Cook
a3a79686db
Don't catch other 4xx errors
2024-12-17 11:16:56 +11:00
David Cook
0616827419
Catch errors and alert the user
...
I'm not sure why, but Turbo was swallowing the unauthorized error, so I thought we should alert the user to help with debugging.
Same with network error, it gave no feedback before.
I think this is testable in theory, but I haven't invested the time on it.
2024-12-17 10:37:28 +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
