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
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
63a1b390e2
Merge pull request #12885 from mkllnk/stock-cleanup
...
Remove use of unnecessary backorderable default column
2024-10-02 16:24:08 +10:00
Gaetan Craig-Riou
1a30cf6495
Hide VINE token
2024-10-02 16:19:03 +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
Gaetan Craig-Riou
6eb5986c68
Merge pull request #12884 from mkllnk/oc-index
...
Add database index to order cycle dates
2024-10-02 16:01:50 +10:00
Maikel Linke
4d9f396f40
Ignore unused column spree_stock_locations.backorderable_default
2024-10-02 15:16:05 +10:00
Maikel Linke
ac3730096f
Update specs to assume backorderable default
2024-10-02 15:13:00 +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 Linke
8e7e5fc20f
Add database index to order cycle dates
2024-10-02 12:05:13 +10:00
Gaetan Craig-Riou
aa5feb6605
Remove system spec
...
It's covered by unit test of order updater
2024-10-02 09:33:02 +10:00
Maikel
3c613f80a3
Merge pull request #12875 from macanudo527/docker/upgrade_to_dockerv2
...
Use Dockerv2
2024-10-02 08:53:24 +10:00
Gaetan Craig-Riou
83b6f58100
Merge pull request #12881 from mkllnk/card-payment-spec
...
Fix date dependent spec
2024-10-01 13:30:49 +10:00
Maikel Linke
17c32ae09a
Spec change more clearly
2024-10-01 13:16:16 +10:00
Maikel Linke
0474c591de
Fix date-dependent spec
2024-10-01 13:14:09 +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
b2b6847882
Fix test data
...
The future is now ! :D
2024-10-01 10:38:33 +10:00
Gaetan Craig-Riou
d01d312b4f
Fix updating pending payment
...
Check if payment actually have an adjustment before trying to update it
2024-10-01 10:22:47 +10:00
Gaetan Craig-Riou
a74cf97083
Fix spec when adding a product with transaction fee
...
Previous iteration did not actually check the payment fee had been
updated. It also checks the order total get correctly updated.
Spec is passing, so fixing the order updater also fix this bug
: https://github.com/openfoodfoundation/openfoodnetwork/issues/12512
2024-10-01 09:49:44 +10:00
Gaetan Craig-Riou
03dbd54b25
Fix order updater to update payment fees
...
The order updater did not take into account payment fees on pending
payment.
2024-09-30 16:15:59 +10:00
Gaetan Craig-Riou
fafd86a2db
Revert change made in https://github.com/openfoodfoundation/openfoodnetwork/pull/12538
...
Although the change fix the issue in the back office scenario, it has
the side effect of getting the order total out of sync. Updating a
payment adjustment need to be followed by udpating the order total and
payment amount to keep everything in sync.
2024-09-30 16:04:44 +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
filipefurtad0
3015beab99
Update all locales with the latest Transifex translations
2024-09-27 18:02:50 -06: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
Filipe
48993232d1
Merge pull request #12833 from dacook/page-titles
...
[admin] Update page titles
2024-09-27 16:59:43 -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
Sigmund Petersen
8c71760556
Merge pull request #12784 from wandji20/wb-OFN-12774
...
Make OC edit warning modal cancel button redirect user to OC list [OFN-12774]
2024-09-27 10:42:54 +02: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
