Maikel Linke
a64aea4b9c
Remove StockLocation from ReturnAuthorization
...
We have only one default location and don't need it associated to
anything.
2024-10-15 13:36:57 +11:00
Rachel Arnould
f54552f939
Merge pull request #12886 from rioug/12855-VINE-connected-app
...
[Citi OFN Voucher] Add VINE connected app
2024-10-14 15:32:09 +02:00
Konrad
7211b0d64a
Merge pull request #12897 from rioug/12891-product-preview-fix-price
...
[Product Preview] Fix price currency display
2024-10-12 18:14:01 +02:00
Maikel Linke
95ff0d8d4a
Fail gracefully on DFC product import errors
2024-10-11 12:10:23 +11:00
Maikel Linke
260e7ba817
Update products when importing them multiple times
...
Instead of creating a new variant every time.
2024-10-10 16:57:58 +11:00
Maikel Linke
a838ef4a21
DRY DFC product import
2024-10-10 14:04:54 +11:00
Maikel Linke
71ca292c92
Synchronise stock with DFC catalog during checkout
...
This will delay the checkout request by a few seconds if there's stock
to sync. But we minimise the chance of missing reduced stock from orders
on another platform.
We still have a gap between the checkout and placing a backorder. In
that time we can't guarantee enough stock. But let's tackle that after
the pilot.
2024-10-09 14:47:07 +11:00
Gaetan Craig-Riou
5b8e0d734f
Use Spree::Money to display prices
...
This is to ensure the correct currency and currency configuration is
applied.
2024-10-09 11:02:24 +11:00
Maikel Linke
adf0340153
Remove duplicate method
...
The method `CheckoutCallbacks#valid_order_line_items?` was a duplicate
of `OrderStockCheck#valid_order_line_items?`.
Apparently, it had been extracted twice:
* 1d074c215106eb98bdf4
2024-10-08 16:57:36 +11:00
Maikel Linke
664f324db6
Sync stock of multiple linked catalogs
...
And the logic becomes a bit simpler.
2024-10-08 16:37:35 +11:00
Maikel Linke
c609107379
Avoid race condition between checkout and stock sync
2024-10-08 16:03:10 +11:00
Gaetan Craig-Riou
df67b53971
Re add VINE_API_URL env variable
...
And add error handling if the variable is not set
2024-10-08 13:26:57 +11:00
Maikel
6f2c5b5f7f
Merge pull request #12888 from mkllnk/dfc-stock
...
[DFC Orders] Backorder stock controlled products
2024-10-08 10:57:59 +11:00
Gaetan Craig-Riou
a3d8ae693d
Add encryption for ConnectedApps::Vine#data
...
Added layer of security, we encrypt the API key and related secret.
It requires setting up some encryption keys that can be generated wiht
`bin/rails db:encryption:init`
2024-10-07 15:09:58 +11:00
Gaetan Craig-Riou
b14a1e72f3
Handle api secret
...
The VINE Api require a secret and an API key to be used. The secret is
used to sign the request. The secret is linked to the API key so we need
to store it along side the key.
2024-10-07 15:09:58 +11:00
Gaetan Craig-Riou
224738e0a1
Per review, clean up code
2024-10-07 15:09:51 +11:00
Gaetan Craig-Riou
e5b7f89b32
Merge pull request #12887 from mkllnk/stock-cleanup2
...
Remove unneeded StockLocation code
2024-10-07 09:40:46 +11:00
Rachel Arnould
f5baa42bfc
Merge pull request #12860 from chahmedejaz/bugfix/12852-fix-select2-choices-fixed-height
...
[BUU] Fix Display ordering in shopfront field to allow re-ordering of the sequence
2024-10-04 16:59:54 +02:00
Maikel Linke
61aa02b3c3
Sync stock with DFC catalog after cart update
2024-10-04 16:25:17 +10:00
Maikel Linke
4b2099625c
Clarify method action with name
...
Thanks, David.
2024-10-04 14:34:17 +10:00
Maikel Linke
f8bd0a1cc7
Adjust backorder for stock controlled items
...
We aggregate quantities over the whole order cycle to account for
cancelations and order adjustments by admins.
2024-10-03 15:58:53 +10:00
Maikel Linke
09de223c93
Backorder stock controlled products
2024-10-03 13:30:16 +10:00
Maikel Linke
74c80c9fff
Prepare BackorderJob for stock controlled items
...
We want to trigger the backordering for any linked product now. So let's
do that check early and then select the variants in the background.
It means less data passed to the job and less space for race conditions.
2024-10-03 13:28:20 +10:00
Maikel Linke
99c098f567
Ignore StockLocation#active, it's always active
2024-10-03 08:24:16 +10:00
Maikel Linke
4b1d7d8a41
Remove dead permission to access StockLocation
...
We don't have any UI to edit stock locations. So this ability is unused.
2024-10-03 08:24:15 +10:00
Maikel Linke
1e3c18f3f6
Remove unneeded method StockLocation#propagate_variant
2024-10-03 08:24:15 +10:00
Gaetan Craig-Riou
22428fc78d
ConnectedApps controller, handle ConnectedApps::Vine
...
Add logiv to connect and disconnect VINE API plus spec
2024-10-02 16:44:27 +10:00
Gaetan Craig-Riou
f980cb45f6
Add logic for ConnectedApps::Vine#connect and disconnect
2024-10-02 16:44:27 +10:00
Gaetan Craig-Riou
097c6dee2f
Add VineApiService and specs
...
It handles connection to the VINE API
2024-10-02 16:44:21 +10:00
Gaetan Craig-Riou
f7708d69a7
Add VineJwtService
...
Generate a JWT token to be used to connect to the VINE api
2024-10-02 16:16:28 +10:00
Maikel Linke
4d9f396f40
Ignore unused column spree_stock_locations.backorderable_default
2024-10-02 15:16:05 +10:00
Maikel Linke
662467a1a4
Use database default value for stock_items.backorderable
2024-10-02 15:09:44 +10:00
Maikel Linke
af07358914
Assume on-demand is false by default
...
We have only one stock location and that has the default set to false.
Now we can simplify code.
The mentioned Bugsnag notification has not been found. The stock item is
always present in this case but it doesn't hurt to guard against it with
`&.`.
2024-10-02 15:06:48 +10:00
Maikel
196956140e
Merge pull request #12856 from mkllnk/dfc-order
...
Place backorders for linked products via DFC integration
2024-10-01 10:51:00 +10:00
Gaetan Craig-Riou
91f2ca9286
Merge pull request #12734 from cillian/replace-text-angular-with-trix
...
Replace text angular editor with trix editor in About Us and Shopfront message fields
2024-09-30 09:40:48 +10:00
Filipe
da0660c119
Merge pull request #12857 from chahmedejaz/task/12626-add-clone-failure-explaination
...
[BUU] Fix No explanation why cloning failed
2024-09-27 17:58:31 -06:00
Filipe
852dd41f89
Merge pull request #12836 from wandji20/wb-OFN-11600
...
Add browser unsaved changes modal when navigating from order summary page [OFN-11600]
2024-09-27 17:41:04 -06:00
wandji20
0002b2e019
Clean up hardcoded values and improve readability
2024-09-27 16:52:55 -06:00
wandji20
84a2e6c24d
Add browser unsaved changes modal when navigation form order sumary page [OFN-11600]
2024-09-27 16:52:55 -06:00
David Cook
be4e0a259e
Specify alternate html_title
...
Because the page title has extra content.
2024-09-27 15:48:28 -06:00
David Cook
c362e8dd0d
Use page titles in HTML head
...
This is much more meaningful than the controller name, and is helpful for browser tab history.
2024-09-27 15:48:28 -06:00
Ahmed Ejaz
1550ca5da0
fix the choice drag issue
...
- disabled width on select2-search-choice-close so that it doesn't cover whole option
2024-09-27 16:57:35 +05:00
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
wandji20
37ab832b86
Remove window unload event listener from edit order cycle cancel link
2024-09-27 10:02:49 +02:00
wandji20
a11873559b
Make OC edit warning modal cancel button redirect user to OC list [OFN-12774]
2024-09-27 10:02:49 +02:00
Maikel Linke
51b3770188
Keep failed backorder job in dead set
...
From Sidekiq's view, the job is successful when we rescue an error and
it will discard it. But we want the option to inspect the job and retry
it. Failing jobs are also reported to Bugsnag automatically.
I didn't specify `retry: false` because that discards the job as well.
But `retry: 0` should sent it straight to the dead set. No automatic
retries but it's treated like a failed job.
2024-09-26 14:32:55 +10:00
Maikel Linke
989a6d57e0
Notify user of failed backorder completion
2024-09-26 14:32:55 +10:00
Maikel Linke
495634b60c
Send error notification to owner
2024-09-26 14:32:55 +10:00
Maikel Linke
49fd1dc4a6
Report backorder errors instead of failing checkout
2024-09-26 14:32:55 +10:00
Maikel Linke
e31e45b875
Place backorders in the background
2024-09-26 14:32:55 +10:00
