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
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
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
Ahmed Ejaz
3e031ab735
13026: reset variant unit name if unit is not items
2024-12-11 03:14:11 +05: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
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
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
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
Maikel Linke
c4c95d472e
Use defined DFC orders states
2024-11-29 16:16:42 +11:00
Filipe
355c9686e3
Merge pull request #12963 from murjax/map-network-check-8230
...
Show alert if map cannot load
2024-11-28 12:26:22 -06: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
Filipe
d90c4f6aed
Merge pull request #12995 from chahmedejaz/bugfix/12968-product-import-update
...
Impossible to update product sold by weight with product import
2024-11-28 08:38:58 -06:00
Gaetan Craig-Riou
f5b9ca361c
Use the voucher adjustment amount for redeeming
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
1e6fbadd8b
Fix Vine::VoucherRedeemerService to handle exceptions
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
d102652c03
Fix Vine::VoucherValidatorService to handle exceptions
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
1b50217242
Re worked the Vine::ApiService to raise exception on error
...
Log Client and Server error, and re raise exception for the caller
to handle
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
73819a4638
Fix unique validator for vouche code
...
Paranoia doesn't support unique validation including deleted records:
https://github.com/rubysherpas/paranoia/pull/333
We use a custom validator, ScopedUniquenessValidator to avoid the issue
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
9ab2a3ae3d
Per review, fix a some minor issues
2024-11-28 13:35:01 +01: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
48ad7ed8a0
Add voucher used by multiple enterprise and recycle code scenario
...
Plus optimise code with `find_or_initialize_by` as suggested in review
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
a2c4c44eea
Move Vine voucher to Vouchers::Vine
...
A Vine voucher is really a specific type of FlatRate voucher but because
a Vine voucher can be used by mutiple enterprise, it can be considered
different enough to warrant it's own class.
It still share a lot of the behaviour of a FlatRate voucher, so to avoid
duplication, all the shared functionality have been moved to a
Vouchers::FlatRatable concern.
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
d7313ffec9
Per review, improve Vine::VoucherValidatorService
...
plus specs
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
12cf62c2ff
Refactor, add OrderManagement::Order::Updater#update_voucher
...
Move the logic to update a voucher and associated order to
`OrderManagement`
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
0569b30e0d
Refactor Vine related services
...
Move them under Vine module to keep the code nicely organised
2024-11-28 13:35:01 +01:00
