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
Gaetan Craig-Riou
781fcf21b9
Merge pull request #12910 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.4.0
...
Bump jasmine-core from 5.3.0 to 5.4.0
2024-10-15 10:22:30 +11:00
Gaetan Craig-Riou
56d2642191
Merge pull request #12889 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.6
...
Bump trix from 2.1.5 to 2.1.6
2024-10-15 10:20:43 +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
dependabot[bot]
fb5740b38b
Bump trix from 2.1.5 to 2.1.6
...
Bumps [trix](https://github.com/basecamp/trix ) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/basecamp/trix/releases )
- [Commits](https://github.com/basecamp/trix/compare/v2.1.5...v2.1.6 )
---
updated-dependencies:
- dependency-name: trix
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-10-14 09:40:36 +00:00
dependabot[bot]
db14080a7f
Bump jasmine-core from 5.3.0 to 5.4.0
...
Bumps [jasmine-core](https://github.com/jasmine/jasmine ) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/jasmine/jasmine/releases )
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md )
- [Commits](https://github.com/jasmine/jasmine/compare/v5.3.0...v5.4.0 )
---
updated-dependencies:
- dependency-name: jasmine-core
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-10-14 09:27:08 +00: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
52c1491b15
Merge pull request #12906 from mkllnk/dfc-stock-import
...
Fail gracefully on DFC product import errors
2024-10-11 13:50:09 +11:00
Maikel Linke
95ff0d8d4a
Fail gracefully on DFC product import errors
2024-10-11 12:10:23 +11:00
Maikel Linke
7d2d14320f
Spec that connector update fixed bug
2024-10-11 09:54:29 +11:00
Maikel
7d1551ed04
Merge pull request #12904 from mkllnk/dfc-connector
...
Bump DFC connector from 1.0.0.pre.alpha.12 to 1.0.0.pre.alpha.13
2024-10-11 09:52:45 +11:00
Maikel Linke
3e71459346
Update API doc
2024-10-11 09:15:42 +11:00
Maikel Linke
ce2c80283c
Bump datafoodconsortium-connector from 1.0.0.pre.alpha.12 to 1.0.0.pre.alpha.13
...
Changed
- Use nil as default value for all types except arrays.
2024-10-11 09:12:40 +11:00
Maikel Linke
2be3f7b86d
Update all locales with the latest Transifex translations
2024-10-10 17:08:38 +11:00
Maikel
2d975c5534
Merge pull request #12899 from mkllnk/dfc-stock-check
...
DFC Orders update for pilot 1 and 2
2024-10-10 17:06:18 +11:00
Maikel Linke
86c91143b7
Update more variant data on import
2024-10-10 16:59:04 +11:00
Maikel Linke
cde757efbd
Split growing class
2024-10-10 16:58:01 +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
bda506528f
Fix import of zero-weight products
...
We don't allow variants to have zero weight or volume. But a DFC import
in production showed that some catalogs list products with zero weight.
Despite the products having a weight, it's simpler to treat these as
items.
2024-10-10 14:08:02 +11:00
Maikel Linke
e429cb7198
Style growing class
2024-10-10 14:06:42 +11:00
Maikel Linke
a838ef4a21
DRY DFC product import
2024-10-10 14:04:54 +11:00
Maikel Linke
f0b6403c1d
Fix locally flaky spec around date filters
...
This spec would fail on Australian systems early in the morning or in
other timezones accordingly.
2024-10-10 09:58:01 +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
Gaetan Craig-Riou
08308ba08e
Fix spec checking if VINE api is set up
...
The condition for checking the error now match a real scenario
2024-10-08 16:15: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
10c3c53aad
Fix translation per review.
2024-10-07 11:23:22 +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
filipefurtad0
b7c34ced26
Update all locales with the latest Transifex translations
2024-10-05 22:35:38 +01: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
86238cc0ee
Update all locales with the latest Transifex translations
2024-10-04 17:10:58 +10: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
11f3bbc566
Remove leftover recording
2024-10-03 13:28:17 +10:00
Maikel Linke
e5ee398f26
Re-use default stock location in specs
2024-10-03 08:24:16 +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
