raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,803 Commits 18 Branches 453 Tags
db77d1591c154e56cded25e6cb6fcac5b640bd97
Commit Graph

9838 Commits

Author SHA1 Message Date
Maikel Linke
db77d1591c Add test examples to DFC API documentation 
In other API specs, you provide example values in the schema. So the
specs contain examples which can be used for the documentation. But
instead of defining example data separately, we can use the generated
data by the specs. This way we document real output and don't have to
double up on documentation.

Note that we don't have schema definitions for the DFC API yet. And it
wouldn't make sense to replicate the DFC Ontology manually in JSON
Schema for this purpose. The DFC Connector ensures already that we
comply with the ontology. But I hope that we can use a tool at some
point to generate JSON Schema from the DFC Ontology which would add more
detail to the Swagger docs, I think.
 2023-06-28 13:50:54 +10:00
Maikel Linke
8368a6ccc9 Announce the new DFC endpoint 
We need to declare in each spec file for which endpoint the spec is
because it was just choosing the first declared one by default. The
first one was v1 and now it's dfc-v1.7.
 2023-06-28 13:50:54 +10:00
Filipe
748cdaaa52 Merge pull request #10963 from jibees/10956-orders-page-uncaught-error-missing-target-element-tooltip-for-tooltip-controller 
Admin, Orders list: add tooltip on Edit action icon + capitalize tooltip (instead of uppercasing)
 2023-06-27 09:58:34 +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
Maikel
a7915b8089 Merge pull request #10849 from mkllnk/report-cable 
Show "loading" screen for background reports and display when ready
 2023-06-26 10:25:48 +10:00
Cillian O'Ruanaidh
8ab077bed8 Create enterprise inside :it block because it's only needed there so far 2023-06-25 19:01:42 +02:00
Cillian O'Ruanaidh
1984a1feeb Use more readable click_button helper instead of find and click in users_and_enterprises_spec.rb 2023-06-25 19:01:42 +02: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
Jean-Baptiste Bellet
7ce3c3f447 Overide a text-transform: uppercase to capitalize 
Inherit comes from `app/webpacker/css/admin/components/buttons.scss`
 2023-06-22 14:15:43 +02:00
Jean-Baptiste Bellet
91d24ba8ab Add Edit tooptip for action icon in orders table 2023-06-22 14:15:43 +02: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
27c1fd0d30 test invoice model 2023-06-18 21:03:13 +02:00
Matt-Yorkley
a44f24ad43 Remove prefixes from invoice data representation so it conforms to the same interface as order 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0ed7599267 extract methods related to invoices from the order model to the OrderInvoiceComparator 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
61d58df56f fix linter issues 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fa14dc370b implement the invoice data generator 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d9efd10ac0 update attributes relevant for the comparaison 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0fbf88190e Generate invoice model 
There are three main components:
1. The invoice model
2. order serializers: serialize the order for the invoice
3. data presenters: the object that will be use to access the order's serialize data
 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
be72bbebb9 Remove master images data migration tests 2023-06-16 21:23:44 +01:00
Matt-Yorkley
fbd09869bb Remove is_master from variant serializer 2023-06-16 21:23:44 +01:00
Matt-Yorkley
1daab8994d Remove is_master and not_master scopes 2023-06-16 21:23:44 +01:00
Matt-Yorkley
0703bb4583 Remove unused is_master references in tests 2023-06-16 21:23:44 +01:00
Matt-Yorkley
8247dce2dc Improve validation feedback on new variant page and add test coverage 2023-06-16 21:23:44 +01:00
Matt-Yorkley
618900767f Fix flaky spec: use milliseconds in cache service and remove sleep 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
21cba0aa13 Migrate first master variant image to product image 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
Matt-Yorkley
6b9b5ea347 Stop storing unit_value and unit_description on master variant 2023-06-16 21:21:40 +01:00
Matt-Yorkley
1b06c20197 Stop using master variant as a potential store for prices 2023-06-16 21:21:40 +01:00
Matt-Yorkley
80a0138b48 Update old specs that rely on master variant instead of real variants 2023-06-16 21:21:40 +01:00
Mohamed ABDELLANI
65bc8e23c1 move update instructions to let blocks 2023-06-16 06:50:45 +01:00
Mohamed ABDELLANI
2b79258fdc renamed: spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order.rb -> spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order_spec.rb 2023-06-16 06:39:38 +01:00
Mohamed ABDELLANI
2cfa435b54 Update spec/system/admin/reports/enterprise_summary_fees/enterprise_summary_fee_with_tax_report_by_order.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
e9671e4e1f test 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
d192024786 Merge pull request #11019 from filipefurtad0/flaky_cache_spec 
Clears cache around examples
 2023-06-16 11:12:24 +10:00
Matt-Yorkley
7068df5d4b Merge pull request #10804 from Matt-Yorkley/public-images 
Update ActiveStorage image processing
 2023-06-15 15:49:11 +01:00
filipefurtad0
598f69f42f Clears cache around examples 
for specs testing cache
 2023-06-15 11:28:01 +01:00