David Cook
f55cdcdd34
Ensure pages have contextual navigation
...
It would be good to know if it breaks!
I didn't think it worth updating every single settings specs to test for this...
But I've tested on the 'general settings' page because this is the default page when clicking on 'Configuration'.
2025-02-12 15:01:54 +11:00
David Cook
4ee35fc1ab
Move select2 images to asset pipeline
...
png sprites? That was a flashback..
2025-02-03 17:45:30 +11:00
David Cook
177445521c
Move most images to asset pipeline
...
Webpacker still needs to know about them in order to build links.
2025-02-03 17:44:13 +11:00
Filipe
32c4b4557b
Merge pull request #13086 from rioug/fix-tax-rate-refund
...
Remove tax rate refund code path
2025-01-30 21:54:30 -06:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Gaetan Craig-Riou
d4a060c6a2
Fix Zone system spec
2025-01-27 11:01:07 +11:00
Gaetan Craig-Riou
f7998f6570
Fix zone new form to allow adding state or country
2025-01-27 11:01:07 +11:00
Konrad
01036e6321
Merge pull request #13087 from mkllnk/stock-location
...
Remove class Spree::StockLocation
2025-01-25 12:41:37 +01:00
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
Maikel Linke
d49cea5e3d
Use admin flag instead of user role
2025-01-22 14:59:49 +11:00
Maikel Linke
187a78b78d
Remove stock location from add-variant JS
2025-01-22 11:58:15 +11:00
Maikel Linke
87d20877ad
Remove Shipment#stock_location
2025-01-22 11:20:05 +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
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
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
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
kernal053
45a4b33920
Ensure existing format 'Voucher: Code' on edit cart page. Handle rubocop warning
2025-01-07 09:17:24 +05:30
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
98adefbd67
Add 'Voucher:' before voucher code on edit cart page. Add spec correspondigly
2025-01-04 14:26:02 +05:30
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
a7140d1f60
Use only admin role, on demand
...
We are now creating the role on demand which removes the need for
seeding it as well.
2024-12-19 09:02:04 +11: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
