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
5db8cb452e
Leverage Rails' caching when checking for admin
...
The privileges of a user should never change within a request
life cycle. The `spree_roles` association is very small, between 0 and 2
items are quickly searched in memory without the need of additional
database queries.
From memory, I've seen a lot of spree_roles queries in log files per
request. This should reduce it to one.
2024-12-19 10:12:31 +11:00
Maikel Linke
54f83b45c8
Replace has_spree_role? with simpler admin?
...
We have only one role, so let's get rid of the unneeded method.
Now we are in a better place to get rid of Spree::Role and replace it
with a simple boolean.
2024-12-19 09:19:01 +11: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
Maikel Linke
fa82f80ab9
Use plain static value for spree_roles
2024-12-19 08:50:10 +11: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
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
e47a57fa3c
DRY with offer broker we'll need anyway
2024-12-12 15:48:42 +11:00
Maikel Linke
d5c3e94b24
OfferBroker needs only catalog URL, no other URLs
2024-12-12 15:45:42 +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
88837b55b9
Amend backorder also when resuming order
2024-12-11 12:40:46 +11:00
Maikel Linke
9c0a15f431
Amend backorders on admin update orders
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
Maikel Linke
9ca1b48d2e
Move backorder amendment out of order callback
...
Triggering it for each order is inefficient when we cancel them in bulk.
The callback doesn't allow us to optimise this.
2024-12-11 12:40:46 +11:00
Maikel Linke
7d7253cf0e
Re-use BackorderUpdater to complete backorder
2024-12-11 12:40:46 +11:00
Maikel Linke
4fa4eb1b4e
Move backorder update code to re-usable class
2024-12-11 12:40:46 +11:00
Maikel Linke
d16cd8c84e
Amend backorder completely
...
Update every single order line to reflect local orders and stock levels.
New cases supported:
* Add lines for orders created by an admin.
* Create backorder line after increase of local line item quantity.
* Adjust local stock after variant has been removed from order cycle.
2024-12-11 12:40:46 +11:00
Gaetan Craig-Riou
8e46c0f897
Apply changes from https://github.com/openfoodfoundation/openfoodnetwork/pull/13016
2024-12-11 10:04:57 +11:00
Ahmed Ejaz
3e031ab735
13026: reset variant unit name if unit is not items
2024-12-11 03:14:11 +05:00
Maikel Linke
4be4c7622b
Clean up Haml
2024-12-10 15:32:09 +11:00
Ahmed Ejaz
241a6d8128
13007: fix specs
2024-12-10 05:34:33 +05: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
Filipe
521b72a6c9
Merge pull request #13004 from chahmedejaz/bugfix/12982-unable-to-close-confirmation-modals
...
[Orders Page] Fix Confirmation modals do not auto-close
2024-12-07 10:33:56 -06:00
Ahmed Ejaz
f3a30f94db
12973: fix error rendering on UI
...
- The caught errors do not get rendered to the UI because of incorrect rendering methods
2024-12-05 16:18:21 -06:00
Ahmed Ejaz
16cae2dbcc
12973: fix error raised in variant creation
...
- if the sheet doesn't have the units present, then the variant is not saved due to model validation
- After that, while assigning on_hand value, error is raised that the variant is not created first
- Now this commit makes sure that the variant is created before implementing above logic
2024-12-05 16:18:21 -06:00
Gaetan Craig-Riou
4a6e4d4c6d
Ensure shipment is updated when using update_or_create
...
`Spree::OrderContents#update_or_create` is used to update the cart when
on the /shop page. If you start an order and proceed to the "Order
summary" step, and then decide to update your order by using the shop
link next to the cart, such update wouldn't update the shipment.
This result in the order page in the backoffice displaying the wrong data,
and more importantly, in the stock not being updated.
So now we ensure shipment will be updated, which result in the checkout
flow being restarted, thus making sure the shipment is updated.
2024-12-04 16:30:45 +11:00
Maikel
4c71ea3866
Merge pull request #12994 from mkllnk/dfc-update-voc
...
Add new DFC vocabulary for order states
2024-12-04 12:57:03 +11:00
Manuel Gonçalves
3199118bae
Removed the :selected attribute when the tax category is not required (like original version)
2024-12-03 08:54:35 +00: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
Maikel
697f430156
Merge pull request #12992 from mkllnk/errors
...
Add simpler Alert.raise interface to notify Bugsnag
2024-12-03 13:29:11 +11:00
Maikel Linke
c41c15b895
Fix missed Alert call with order object
2024-12-03 13:02:08 +11:00
