raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 21 Branches 450 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

2174 Commits

Author SHA1 Message Date
Maikel Linke
4872855471 Update DFC context to newest version 
The new DFC Connector is based on the new DFC context which changed all
URLs of all data types.

There's also a better way to access semantic properties now.
 2023-07-27 15:38:36 +10:00
Jean-Baptiste Bellet
a094a89c09 Mark "Inventory (on hand)" report as deprecated 
Co-Authored-By: Maikel <maikel@email.org.au>, @dacook
 2023-07-21 09:27:07 +02:00
Jean-Baptiste Bellet
28fe479f53 Unhide on_demand & on_hand columns by default 
+ update specs as well
 2023-07-21 09:27:07 +02:00
Gaetan Craig-Riou
f9afc0ba96 Fix rubocop warning 2023-07-21 14:51:40 +10:00
Gaetan Craig-Riou
2fff77b2ee Report, add filtering by product for line items 2023-07-21 14:51:40 +10:00
Jean-Baptiste Bellet
1cf647e04b Avoid line-break by wrapping into nowrap element 2023-07-17 14:00:48 +02:00
Konrad
bddc10626b Merge pull request #11148 from cillian/fix-duplicate-rows-in-customer-addresses-report 
Don't return duplicate rows in the customer addresses report
 2023-07-13 20:32:01 +02:00
Filipe
9e0aa1854f Merge pull request #11159 from abdellani/remove-split-checkout-from-feature_toggle 
Remove split checkout from feature toggle
 2023-07-13 17:20:18 +01:00
Filipe
60c75097d3 Merge pull request #11145 from mkllnk/dfc-create-response 
DFC API return SuppliedProduct after creation
 2023-07-13 16:15:22 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
David Cook
17da66b72a Update contents of variable directly 
Also, it makes the line shorter, allowing us to use one-line if syntax :)
 2023-07-07 14:22:36 +10:00
Matt-Yorkley
42a3087cdb Remove :available_on attribute from Product class 2023-07-06 14:36:35 +01:00
Mohamed ABDELLANI
a89451e667 remove splitcheckout from feature toggle list 2023-07-05 14:53:40 +01:00
Matt-Yorkley
ad6d0c1c73 Add nil safety in reports for zero priced orders with no payment method 2023-07-04 13:13:05 +01:00
Maikel Linke
4a562d0e7f Add workaround for updated DFC v1.8 URLs 
Once the DFC Connector was updated we can all use the new URLs. But for
now we have the old ones and add some compatibility to the old ones.
 2023-07-03 16:05:18 +10:00
Cillian O'Ruanaidh
bf44284237 Don't return duplicate rows in the customer addresses report 2023-06-30 17:10:44 +01:00
Maikel
014fb69d4b Merge pull request #10964 from macanudo527/fix_linelength_bundle1 
Fix Layout/LineLength - Bundle 1
 2023-06-26 12:10:39 +10:00
Cillian O'Ruanaidh
40b0bfb433 Add an OFN UID column to the Users & Enterprises report 2023-06-25 19:01:42 +02:00
Maikel
e065910d2d Merge pull request #10939 from Matt-Yorkley/master-variants 
Remove master variants
 2023-06-23 13:42:58 +10:00
Neal Chambers
1e4034534c Fix Layout/LineLength 2023-06-23 09:08:04 +09:00
Filipe
bca7813320 Merge pull request #10323 from abdellani/enterprise-fee-w-tax-by-order 
Enterprise fee w tax by order
 2023-06-22 23:25:11 +01:00
Maikel Linke
1adfb5463a Import DFC measures 2023-06-19 16:19:40 +10:00
Maikel Linke
949019a277 Map has* predicates to Connector attributes 2023-06-19 16:19:40 +10:00
Maikel Linke
bfd084d9b6 Import graphs including anonymous objects 2023-06-19 16:18:58 +10:00
Maikel Linke
3c6f90dbb3 Import from IO objects for convenience, efficiency 
The Connector exports to a String but Rails' `request.body` is an IO
object. Since the used JSON-LD parser needs an IO object anyway and it
can lower the memory usage we take IO objects as well and handle
in-memory Strings only when given.
 2023-06-19 16:18:58 +10:00
Maikel Linke
f5f8c349e1 Resolve DFC Connector objects when importing graph 2023-06-19 16:18:51 +10:00
Maikel Linke
12d56d725b Import properties which contains lists 
Not just single values.
 2023-06-19 16:18:51 +10:00
Maikel Linke
2abad60511 Import DFC graphs with multiple objects 2023-06-19 16:18:42 +10:00
Maikel Linke
15dd38d6c6 Import simple data from DFC 2023-06-19 16:16:18 +10:00
Mohamed ABDELLANI
d059680f4b remove white label from feature toggle 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fff0b1e577 Update lib/open_food_network/feature_toggle.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d86173c509 add feature toggle 
seperate the invoice templates that rely on presenters from the old ones.
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
ae24b2d688 Update ScopeVariantsForSearch logic to match both product and variant SKUs 2023-06-16 21:26:28 +01:00
Matt-Yorkley
0f253bb2a0 Blank out product SKU when cloning a product 
This was effectively being done before for the product's sku (stored on the master variant) via the #duplicate_variant method, but now it needs to be done explicitly on the product in #duplicate_product
 2023-06-16 21:26:28 +01:00
Matt-Yorkley
1daab8994d Remove is_master and not_master scopes 2023-06-16 21:23:44 +01:00
Matt-Yorkley
1e36043a2e Set unit_value to true when cloning a product 
This value doesn't get persisted, but it's presence is validated. The product's duplicated variants store the actual :unit_value attribute
 2023-06-16 21:23:44 +01:00
Matt-Yorkley
3ef7d2c9ff Remove master variant from product 2023-06-16 21:23:44 +01:00
Matt-Yorkley
7dc1091bc2 Migrate product image from master variant to product 2023-06-16 21:23:44 +01:00
Mohamed ABDELLANI
68503e4e8b remove useless variable 2023-06-16 06:54:11 +01:00
Mohamed ABDELLANI
c21a35a9fc fix typo on lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_order.rb 2023-06-16 06:38:15 +01:00
Mohamed ABDELLANI
c8c3e65498 Update lib/reporting/reports/list.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
3e61830b40 optimize total_excl_tax & enterprise_fee_adjustemnt_ids 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
542811b9ad implement filtering by entreprise fee owner 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
9d53d775a6 add filtering by fee name 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
e9367b1f86 add enterprise fees with tax report by order 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
a120329aa6 rename EnterpriseFeeSummary::Base to EnterpriseFeeSummary::FeeSummary 2023-06-16 06:35:01 +01:00
Maikel
989a88e252 Merge pull request #10848 from mkllnk/totals-report 
Fix error on summarising total_units in Order Cycle Supplier Totals report
 2023-06-14 13:59:48 +10:00
Maikel Linke
6803e0a8f9 Fix error on summarising total_units 2023-06-09 09:55:33 +10:00
Neal Chambers
b04879604a Rewrite Ternary Expression to Prevent Layout/LineLength 2023-06-08 15:20:04 +10:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00