raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,976 Commits 18 Branches 452 Tags
34fdcface264bd31a6d3af33d4f0c98513c3bb42
Commit Graph

3668 Commits

Author SHA1 Message Date
Maikel
229ee7028c Merge pull request #13064 from mkllnk/negative-stock 
Don't show stock for on-demand inventory items
 2025-01-21 11:05:50 +11:00
Filipe
3c1dd10219 Merge pull request #13047 from mkllnk/spree-roles 
Clarify that our only user role is "admin" and simplify code
 2025-01-16 18:06:49 -06:00
Maikel Linke
a3ec3e74ae Hide stock level of on-demand inventory items 
We changed to tracking stock of on-demand items to be able to place
backorders. This is mostly hidden in the app but was still visible on
the inventory page. Now we are hiding that here, too.
 2025-01-09 10:06:04 +11:00
Maikel
5f486bd611 Merge pull request #13036 from chahmedejaz/bugfix/13024-dfc-catalog-syncs-for-blank-cart 
Fix DFC catalog syncs for blank cart
 2025-01-08 12:53:19 +11:00
Maikel
1df3a6bb66 Merge pull request #13049 from mkllnk/dfc-wholesale-stock 
Calculate stock from DFC wholesale variants
 2025-01-08 12:32:44 +11:00
Konrad
428eb465c0 Merge pull request #13009 from MrBowmanXD/dev 
Added the :selected option with the default tax category #12989
 2025-01-07 20:04:28 +01:00
Maikel Linke
faad7fa95c Move wholesale calculation for re-use 2025-01-07 11:03:36 +11:00
Maikel Linke
ddaeff7c53 Use DfcCatalog in offer broker 2025-01-07 11:03:34 +11:00
Maikel Linke
ef08ae49fe DRY DFC catalog logic for re-use 2025-01-07 10:49:37 +11:00
Maikel Linke
54f83b45c8 Replace has_spree_role? with simpler admin? 
We have only one role, so let's get rid of the unneeded method.

Now we are in a better place to get rid of Spree::Role and replace it
with a simple boolean.
 2024-12-19 09:19:01 +11:00
Maikel Linke
a7140d1f60 Use only admin role, on demand 
We are now creating the role on demand which removes the need for
seeding it as well.
 2024-12-19 09:02:04 +11:00
Maikel Linke
13e008e91e Calculate wholesale price for imported retail variants 2024-12-12 16:08:45 +11:00
Maikel Linke
e47a57fa3c DRY with offer broker we'll need anyway 2024-12-12 15:48:42 +11:00
Ahmed Ejaz
b6eca58798 13024: fix dfc catalog sync for blank cart 2024-12-12 04:28:15 +05:00
Maikel Linke
88837b55b9 Amend backorder also when resuming order 2024-12-11 12:40:46 +11:00
Maikel Linke
9c0a15f431 Amend backorders on admin update orders 2024-12-11 12:40:46 +11:00
Maikel Linke
9ca1b48d2e Move backorder amendment out of order callback 
Triggering it for each order is inefficient when we cancel them in bulk.
The callback doesn't allow us to optimise this.
 2024-12-11 12:40:46 +11: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
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
Manuel Gonçalves
d95bb7736a Fixed the logic and moved the code to a helper file 2024-12-01 20:43:31 +00:00
Gaetan Craig-Riou
d102652c03 Fix Vine::VoucherValidatorService to handle exceptions 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
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
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
129ccc33f8 CheckoutController, add VINE voucher redemption 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
Maikel Linke
6a8cc410d2 Replace broken order data 
Bugsnag expects a string as value, not an ActiveRecord object. The
result was just "filtered" data, not showing any of the order's
attributes.

Since wanting to share the order data seems a common pattern, I added a
convenience method for it.
 2024-11-21 15:58:55 +11:00
Maikel Linke
61e7c1db07 Replace obsolete ErrorLogger 2024-11-21 15:58:55 +11:00
Maikel Linke
0d8df5d2a8 Replace Bugsnag calls with Alert.raise 2024-11-21 15:58:55 +11:00
Maikel Linke
1b4efd2164 Revert "Notify bugsnag on 404 errors" 
This reverts commit 2eec3d625a.

We started tracking 404 errors out of interest without an actual problem
to solve. Now we face rate-limiting in our Bugsnag account. And we
didn't use these 404 reports in the two years this code was active. We
don't even act on all 500 errors. So while our resources are so
constrained, let's keep our focus on the severe errors and user reports
and ignore the rest. 404 errors are mostly generated by vulnerability
scanners.
 2024-11-21 15:28:19 +11:00
Gaetan Craig-Riou
2f9200b68b Per review, use a better name 2024-11-11 14:03:10 +11:00
Gaetan Craig-Riou
eb66244b74 Fix Bugsnag call to notify 
Make sure we add metadata as expected:
https://docs.bugsnag.com/platforms/ruby/rails/reporting-handled-errors/#add_metadata
 2024-11-06 14:01:48 +11:00
Gaetan Craig-Riou
b461d499ad Merge pull request #12914 from mkllnk/remove-stock-location-from-return-authorization 
Remove StockLocation from ReturnAuthorization
 2024-10-16 10:26:09 +11:00
Filipe
97b6289263 Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant 
[Product Refactor] Move variant unit sizes to variant
 2024-10-15 19:58:45 +01:00
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
Gaetan Craig-Riou
3bb2232bc1 Remove non updatable check when updating a product 
After the product redactor it only checked for the "description" on
product, which is actually skipped when doing an update.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
9db417319d Improve variant related validation when creating product 
I disabled Metrics/AbcSize for ensure_standard_variant as I don't think
that's hard to understand the code. And utimately it will be removed
once product actually becomes optional.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
218d07c90d Fix product import controller 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ad6971121 Fix Bulk product edit system spec after rebase 2024-10-14 15:01:18 +11: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
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:

 * 1d074c2151
 * 06eb98bdf4

But the first commit duplicated the method while the second moved the
original declaration.
 2024-10-08 16:57:36 +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