raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,799 Commits 18 Branches 453 Tags
ee2a6bf2e6025eaf2ca5b63dcafebacd52fdbdf4
Commit Graph

2583 Commits

Author SHA1 Message Date
Maikel
697f430156 Merge pull request #12992 from mkllnk/errors 
Add simpler Alert.raise interface to notify Bugsnag
 2024-12-03 13:29:11 +11:00
Maikel Linke
0d8df5d2a8 Replace Bugsnag calls with Alert.raise 2024-11-21 15:58:55 +11:00
Maikel Linke
a8fb6492f4 Lookup backorder for updates with saved link 2024-11-19 15:53:59 +11:00
Maikel Linke
4610141ed8 Add shortcut to order's exchange 2024-11-19 15:53:59 +11:00
Maikel Linke
1ce0b25bb0 Switch SemanticLink to use new association 
And ActiveRecord magic does the rest when used correctly.
 2024-11-19 15:53:58 +11:00
Ahmed Ejaz
654263a823 add systems spec 2024-11-15 11:09:56 +01:00
Maikel Linke
271475893d Remove unused stock aggregation 2024-11-01 16:46:35 +11:00
Filipe
0d97f992b9 Merge pull request #12943 from mkllnk/sanitise 
Sanitise HTML attributes in the database
 2024-10-31 17:32:56 -06:00
David Cook
3756e368c8 Merge pull request #12921 from rioug/12908-error-when-tax-refund 
Add Bugsnag notification if we reach tax rate refund code
 2024-10-30 14:51:40 +11:00
Maikel Linke
e0638b1765 Amend backorder after cancellations 
The new job class blends code from the BackorderJob and the
CompleteBackorderJob for the specific case of adjusting quantities after
an order has been cancelled.

I would like to write a more general class which can be used for any
order amendmends but this was the quickest solution to cater for
currently running pilots.
 2024-10-24 17:08:50 +11:00
Maikel Linke
d2e5087668 Remove redundant HTML sanitisation 
We don't need to run the sanitiser each time we read an attribute. It's
a waste of time.
 2024-10-24 08:47:11 +11:00
Gaetan Craig-Riou
3f22e8cca7 Fix Bugsnag payload data 2024-10-21 11:13:42 +11:00
Konrad
a023443c75 Merge pull request #12880 from rioug/5574-fix-checkout-order-total-calc 
Fix checkout order total and payment fees calculation
 2024-10-16 21:16:34 +02:00
Gaetan Craig-Riou
f024aff45d Add Bugsnag notification if we reach tax rate refund code 
The original Spree code allow for a tax adjustment to be considered a
refund in a specific scenario:
- instance is using inclusive tax
- instance that applies different tax rate in different tax zones

This scenario should not happen with how our instances are configured
More info: https://github.com/openfoodfoundation/openfoodnetwork/pull/6565#discussion_r566535431
 2024-10-16 11:37:21 +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
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
2a671d491d Remove commented out code 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
dbca2e2b56 Add all columns moved to variant to ignored_columns 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
25171413ef Update Spree::Price parsing to match LocalizedNumber.parse 
Spree::Price parsing was returning 0.0 when given a an empty string as
price, resulting in a variant being valid even if no price was given. It
only happened if `Spree::LocalizedNumber` wasn't used.
Spree::LocalizedNumber` return nil if given a blank number.
 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
324a4ff591 Backport fix for hungarian instance 2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
1ad7123a9d Fix Spree::LineItem 2024-10-14 14:56:47 +11:00
Gaetan Craig-Riou
d0fe1585d7 Move variant unit attributes to variant 2 
Update Spree::Product and spec
 2024-10-14 14:56:46 +11:00
Gaetan Craig-Riou
f58a3a859f Move variant unit attributes to variant 1 
Update Spree::Variant model and spec
 2024-10-14 14:56:46 +11: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
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
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
Maikel Linke
9f43244312 Import on-demand stock setting in DFC import 2024-09-25 10:55:41 +10:00
Maikel Linke
95e620a78b Add lookup of variants by semantic id 2024-09-25 10:55:40 +10:00
Maikel Linke
260e4f7b00 Create BackorderJob to place wholesale orders 2024-09-25 10:55:39 +10:00
Filipe
83ab9594f6 Merge pull request #12854 from chahmedejaz/task/11200-conditionally-hide-producer-column 
[BUU2] Hide producer column when there's only one producer in the admin account
 2024-09-19 15:42:15 -06:00
Filipe
562a24524b Merge pull request #12848 from rioug/12770-product-preview 
Product preview
 2024-09-19 15:20:18 -06:00
David Cook
a9ad6a2851 Grant product managers ability to create reports 
We missed this in c31416c, oops.
 2024-09-17 13:08:49 +10:00
Gaetan Craig-Riou
a25937321a Remove ability of any admin user to see all product 
And fix related spec
 2024-09-17 11:46:55 +10:00
Ahmed Ejaz
1580d539df 11200: coniditonally hide producer column 2024-09-11 00:56:52 +05:00
Filipe
98eabc9d0f Merge pull request #12826 from chahmedejaz/bugfix/12815-fix-inconsistent-unit-values 
Fix Inconsistent Behavior When Editing Products to mg Units in Hungarian Locale
 2024-08-29 17:47:44 -06:00
David Cook
54252f5444 Add comment 2024-08-29 09:42:59 +10:00
Ahmed Ejaz
7b6b0dbb78 12815: use en formatting for unit value conversion 2024-08-29 03:36:46 +05:00
wandji20
d61acd2cc1 Unify error messages and display on new product form [OFN-12744] 2024-08-23 09:57:37 +01:00
Maikel
7f09044ae1 Merge pull request #12755 from johansenja/optimise-shops-page6 
Optimise shops page: Enable injected enterprise data to be scoped to specific enterprise ids
 2024-08-23 09:26:22 +10:00
Maikel
e9c7e1778c Merge pull request #12782 from mkllnk/reports 
Add fallback report loading in case websockets fail
 2024-08-23 09:23:42 +10:00
Joseph Johansen
4718fdb0be Optimise Spree::Taxon.supplied_taxons 2024-08-22 17:41:00 +02:00
Joseph Johansen
b73e529bfc Scope injected enterprise properties to specific enterprises 2024-08-22 17:41:00 +02:00
Konrad
0bbc3d2758 Merge pull request #12766 from mkllnk/magick-dep 
Remove direct dependency on MiniMagick
 2024-08-18 18:39:48 +02:00
Maikel Linke
c31416c536 Separate showing and rendering report 2024-08-16 14:37:57 +10:00
Maikel Linke
f21aca234c Remove direct dependency on MiniMagick 
We still depend on it as long as we set it as image processor but now we
can switch to another image processor without changing the code around
error handling.

We now rescue from unknown errors during image processing which should
make the app more robust.
 2024-08-13 15:25:58 +10:00
wandji20
1e71db9315 Remove permalinmk from taxons [OFN-11636] 2024-08-12 18:47:16 +01:00