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
16d6e1f935
Remove unused error translation
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
e7ece294cc
Better error for VineVoucherValidatorService
...
Co-authored-by: David Cook <david@redcliffs.net >
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
b42cba8c37
Add vine_voucher factory
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
afb336d789
Add spec for fire event "capture_and_complete_order"
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
724d5a2ca0
Add spec for creating a payment from admin page
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
cf13dc2ff6
Add system spec when completing order with VINE voucher
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
4906c19c8e
Checkout Summary, remove shared example
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
c89b4fb86b
Add system spec fot adding VINE voucher to order
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
0f9b933117
Add extra column to Voucher
...
They are used to store additional informations for VINE vouchers
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
Rachel Arnould
479eacc956
Merge pull request #12964 from chahmedejaz/task/12890-add-data-to-dfc-affiliate-sales-endpoint
...
Add cities and countries to DFC affiliate sales data endpoint
2024-11-28 10:46:20 +01:00
Neal Chambers
e7213dba68
Revise README
2024-11-28 08:39:51 +09:00
Neal Chambers
078e191d26
Sync Docker Container to the Host
2024-11-28 08:39:51 +09:00
Neal Chambers
b554eda7c7
Add Windows Docker Commands to README
2024-11-28 08:39:51 +09:00
Neal Chambers
477447ad92
Rewrite Powershell Scripts for Alternative Dockerfile
2024-11-28 08:39:51 +09:00
Neal Chambers
039399ee37
Simplify Docker Build
2024-11-28 08:39:51 +09:00
Neal Chambers
d36438037a
Revise Docker README
2024-11-28 08:39:51 +09:00
Neal Chambers
5b58f7b20e
Add Dockerfile back in
2024-11-28 08:39:51 +09:00
Neal Chambers
02e2214caa
Revert "Remove bundle exec from docker commands"
...
This reverts commit 2d193a689406cf826e241314acd661fd87a6ae37.
2024-11-28 08:39:51 +09:00
Neal Chambers
0ec8d13641
Optimize Dockerfile
2024-11-28 08:39:51 +09:00
Neal Chambers
151fc7bf85
Revise docker scripts to use optional dockfiles
2024-11-28 08:39:51 +09:00
Neal Chambers
15c920c911
Refactor Alpine Dockerfile
2024-11-28 08:39:51 +09:00
Neal Chambers
b4aaa0fae1
Add Helpful Docker Commands
2024-11-28 08:39:51 +09:00
Neal Chambers
efe0a2a701
Add Redis Test URL for Spree Preferences
2024-11-28 08:39:51 +09:00
