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
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
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
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
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
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
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
Gaetan Craig-Riou
8e46c0f897
Apply changes from https://github.com/openfoodfoundation/openfoodnetwork/pull/13016
2024-12-11 10:04:57 +11:00
Maikel Linke
4be4c7622b
Clean up Haml
2024-12-10 15:32:09 +11:00
Ahmed Ejaz
626a269cf8
13007: only show business name when all customers have one
2024-12-10 05:34:32 +05:00
Ahmed Ejaz
302336ab02
13007: add business name in order cycle report email
2024-12-10 05:34:27 +05:00
Filipe
7ca5927411
Merge pull request #12996 from chahmedejaz/bugfix/12993-fix-order-cycle-report-text-version
...
Order cycle mail reports to producers display different data in html and txt versions
2024-12-09 16:32:46 -06:00
Ahmed Ejaz
42940f4729
12993: add total tax incl.
2024-12-08 01:05:21 +05:00
Ahmed Ejaz
f2da3bb11c
12993: html sanitize city and zip
2024-12-08 01:05:02 +05:00
Ahmed Ejaz
f8003b00db
12993: translate tax incl and qty
2024-12-08 01:03:38 +05:00
Maikel
de938f6f10
Merge pull request #12949 from rioug/12859-use-VINE-voucher
...
[City OFN Voucher] A shopper can use a VINE voucher
2024-12-03 14:04:44 +11:00
Ahmed Ejaz
4c6c1eedb1
12993: use html safe strings wherever required
2024-12-02 18:23:24 +05:00
Ahmed Ejaz
bbdee7c0f3
12993: add included tax in text report
2024-12-02 18:04:18 +05:00
Ahmed Ejaz
11959515b8
12993: update the condition to display details
2024-12-02 18:04:17 +05:00
drummer83
53d2166579
Make Connected Apps links available in Transifex
2024-12-01 23:55:26 +01:00
Manuel Gonçalves
d95bb7736a
Fixed the logic and moved the code to a helper file
2024-12-01 20:43:31 +00:00
Manuel Gonçalves
7d5bb4a6fa
Added the :selected option with the default tax category
2024-12-01 15:13:49 +00:00
Filipe
58d174fad9
Merge pull request #12969 from chahmedejaz/task/12919-remove-empty-option-from-unit-scale-dropdown
...
[Products] Empty option on unit scale dropdown
2024-11-28 09:31:42 -06:00
Gaetan Craig-Riou
d413a142c9
Update various voucher related file to use the new Vouchers::Vine
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
7726c7d129
Per review, rename not_vine scope to local
...
- use IS DISTINCT FROM instead of two conditions
- added spec for scope
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
d4d995851f
Display voucher section if connected to VINE
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
6251814152
Hide VINE voucher from admin voucher page
2024-11-28 13:35:01 +01:00
saunmanoj888
87d7f73ba9
Hide search filters when no product is present
2024-11-22 00:15:08 +05:30
Ryan Murphy
bab7756017
Remove product SKU from product pages and report
2024-11-20 19:12:29 -05:00
Ahmed Ejaz
77f9c6587c
fix specs
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
add973f1ff
12776: add new line
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
7cb28fd064
12776: add supplier report
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
bafb881c46
12919: add unit scale prompt
2024-11-10 14:57:45 +05:00
Maikel Linke
2b8487cc6d
Parse given datetime for reports properly
2024-10-17 15:08:02 +11:00
Maikel Linke
ea8e925077
Show default date range to user in date picker
2024-10-17 13:16:12 +11:00
Maikel Linke
a13e5ced3d
Select default dates for Packing report, too
2024-10-17 13:16:12 +11:00
Maikel Linke
aa7fffa5a2
Filter reports by last 3 months by default
...
The values are not shown on the screen and the user doesn't know which
default dates are applied but the filtering works.
2024-10-17 13:16:12 +11:00
