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
Gaetan Craig-Riou
9f3da1af4f
Reddeem VINE voucher when firing "capture_and_complete_order"o
...
'Spree::Payment#capture_and_complete!' will try to complete the order,
so we want to redeem any VINE voucher associated with the order first.
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
92c4cb9b7f
Redeem VINE voucher when creating a new payment
...
Creating a new payment will try to complete the order, so we want to
redeem any VINE voucher associated with the order first
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
Gaetan Craig-Riou
129ccc33f8
CheckoutController, add VINE voucher redemption
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
9399c7e129
Add VineVoucherRedeemerService
...
It handles redeeming a voucher
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
c17eddd69b
Add Voucher#vine?
...
And small refactor
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
b30096317c
VineApiService, add voucher_redemptions
...
It is used to redeem a voucher
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
3a367ceb6e
Handle adding a VINE voucher to an order
...
Plus specs
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
f9fb7bf399
Add VineVoucherValidatorService and spec
...
It handles validating and creating vine voucher
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
7cbe77668a
VineApiService, add voucher_validation
...
It is used to validate a voucher using the given short code
2024-11-28 13:35:01 +01:00
Ahmed Ejaz
60ace5d3ff
12982: add hu locale config for flatpickr
2024-11-28 03:18:34 +05:00
Ahmed Ejaz
1dec3debe1
12982: update close guard condition
...
- Execute the close method only when the current context modal is opened
2024-11-28 03:12:11 +05:00
Ahmed Ejaz
711f37bce1
13002: fix the search-controller error
...
- productForm is not accessible on the orders page
- putting the check to do the scrollIntoView only if the productForm is available
2024-11-27 17:49:21 +05:00
Filipe
a493d70f5c
Merge pull request #12950 from macanudo527/unlock_bigdecimal
...
Fix rounding issues by upgrading decimal maths library
2024-11-25 19:18:19 -06:00
Ahmed Ejaz
3a3d729dcb
12968: fix product import update
2024-11-25 16:36:13 +05:00
Ahmed Ejaz
283706114e
12968: update condition to match variant with unit scale
2024-11-25 16:36:13 +05:00
Filipe
0f4ca50d0e
Merge pull request #12962 from bouaik/Scroll-to-top-when-using-pagination
...
Scroll to top when using pagination
2024-11-22 15:13:38 -06:00
Maikel Linke
9f859f420d
Remove unnecessary error creation
2024-11-21 15:58:56 +11:00
