raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,359 Commits 16 Branches 456 Tags
66fcbe3fa0dcffe00e44f2c006f2188c19353a58
Commit Graph

30359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
a55587b765 Merge pull request #12059 from openfoodfoundation/dependabot/bundler/stripe-10.6.0 
Bump stripe from 10.5.0 to 10.6.0
 2024-01-22 10:29:31 +11:00
Maikel Linke
e25464b38a Re-record stripe API requests 2024-01-22 10:21:15 +11:00
Maikel
1f5541d2fb Merge pull request #12064 from dacook/bump-prettier-v4 
Bump prettier and pretty-quick
 2024-01-22 10:15:30 +11:00
Gaetan Craig-Riou
96a010033d Fix admin view to use dfc_id 
This was missed in a previous refactor
 2024-01-22 10:12:39 +11:00
Maikel Linke
28e17aff68 Fix DFC context in spec to resolve product types 
The `dfc-b:hasType` value can only be parsed as object id if the context
contains:

```
    "dfc-b:hasType":{
      "@type":"@id"
    },
```

The standard context includes this and it's easier to use. Now that the
URIs of product types are correctly resolved, we don't need to
substitute the URI manually.

Also dropped an old unneeded spec for backwards compatibility.
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
35da321e15 Fix skos parser to not replace Product type URI by dfc-pt 
The given productType.rdf file doesn't give us any context for `dfc-pt`,
so there was no reason to do that.
We still need to do some substitution in the importer, as some times
we are given `dfc-pt` as input data.
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
2aa0ab15b9 Simplify traversing of Product Types 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
9607739e16 Per review, store product type instead of path 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
c1e7aa6daa Small improvment for Importer 
Doesn't try to load skos concept if we are not dealing with an object
that doesn't refers to a skos concept
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
c40ccb8e86 Refactor, move product type matching to DfcProductTypeFactory 
It keeps SuppliedProductBuilder and move all the matching logic to its
own class
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
d8b56d5c16 Per review, match on the product type URI instead of name part 2 
For import this time
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
8013fac5b8 Per review, match on the product type URI instead of name 
Fox export only
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
162fd4bef5 update documentation 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
25a820fe12 Allow updating of product type 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
a35e896a98 Add taxon to request spec 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
47cea0af6b Add matching DFC product type to taxon when importing product 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
e917b26e91 Support non "underscore" name for dfc_name 
Ie: you can now use "Soft drink" instead of "soft_drink", case is also
ignored
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
476f3b8a28 Fix DFC importer to support Product types 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
2be1aea64c SKOS parser, user shorten version for product types URI 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
a2cb1f4c37 Update swagger documentation 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
4d52e169e2 Update taxon to not be a top concept product type 
This is to test the product type matching is working properly
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
42e2141d05 Match product taxon with DFC Product type 
It relies on having dfc_name populated on the given taxon.
Matching is as follow:
 - parse the DFC product types and store in PRODUCT_TYPES if needed
 - match the dfc_name against PRODUCT_TYPES
 - call the method returned on the DFC connector
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
8014aa4c2f Update test to check for Product Type 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
403386ea09 Add basic match on the root level Product Types 
Currently anything but the leaf level is modelled as a
DataFoodConsortium::Connector::SKOSInstance, which isn't supported
by the connector as "hasType" for a product. The lead level is modelled
by DataFoodConsortium::Connector::SKOSConcept which is supported by
connector. On top of is `#narrowers`, `#broaders`and `#prefLabels`
aren't set making it very difficult to travers the Product Type tree.
 2024-01-22 10:12:32 +11:00
Gaetan Craig-Riou
652c7a563c Add dfc_name field on Spree::Taxons 
This will let us map OFN product taxons to DFC product types
 2024-01-22 10:02:10 +11:00
Gaetan Craig-Riou
83beafc564 Add missing translation on taxon admin form 2024-01-22 10:02:10 +11:00
dependabot[bot]
acb6a866db Bump stripe from 10.5.0 to 10.6.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 10.5.0 to 10.6.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v10.5.0...v10.6.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 10:41:53 +00:00
Filipe
487a7b2257 Merge pull request #12058 from openfoodfoundation/dependabot/bundler/stripe-10.5.0 
Filter out Stripe client_id
 2024-01-19 10:36:34 +00:00
David Cook
40166bf3e8 Update spec/support/vcr_setup.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2024-01-19 09:55:39 +11:00
David Cook
df82db9a95 Fix Layout/LineLength 2024-01-19 09:24:30 +11:00
David Cook
bb19151705 Merge pull request #12035 from filipefurtad0/remove_default_selection_pr_template 
Removes default selection for User facing changes
 2024-01-19 09:21:15 +11:00
Maikel
0b8ac17354 Merge pull request #12060 from openfoodfoundation/dependabot/bundler/roo-2.10.1 
Bump roo from 2.10.0 to 2.10.1
 2024-01-19 09:06:56 +11:00
David Cook
efc4fce7de Bump pretty-quick to v4.0.0 2024-01-19 09:03:21 +11:00
David Cook
9a5e9817a8 Bump prettier to v3.2.4 
It's supported by the latest version of pretty-quick now.
 2024-01-19 09:02:41 +11:00
Ahmed Ejaz
ff48825241 11768: fix the amount with voucher 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
3a8e4d203a 11768: replace order_id with order 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
cb9c2963af 11768: add roundoff 
- Fix lint issues
 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
a3592cb14a 11768: add specs 
- For applied_voucher_rate method in order
 2024-01-19 01:52:24 +05:00
Ahmed Ejaz
38b7616b1a 11768: apply voucher 2024-01-19 01:52:18 +05:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
dependabot[bot]
7983988fde Bump roo from 2.10.0 to 2.10.1 
Bumps [roo](https://github.com/roo-rb/roo) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/roo-rb/roo/releases)
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roo-rb/roo/compare/v2.10.0...v2.10.1)

---
updated-dependencies:
- dependency-name: roo
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-18 09:44:22 +00:00
cyrillefr
ca4aa645f7 Delete now ununsed stimulus controller toggle_button_disabled 
- also delete one comment about replacing this controller with another
 2024-01-18 10:10:49 +01:00
David Cook
6e522cb055 Filter out Stripe client_id 2024-01-18 12:47:02 +11:00
Maikel
08ca85250a Merge pull request #12018 from openfoodfoundation/dependabot/bundler/stripe-10.5.0 
Bump stripe from 10.3.0 to 10.5.0
 2024-01-18 12:41:17 +11:00
Maikel
1458f81bf8 Merge pull request #12049 from openfoodfoundation/dependabot/bundler/bullet-7.1.6 
Bump bullet from 7.1.5 to 7.1.6
 2024-01-18 12:33:16 +11:00
Maikel
a0e538d2df Merge pull request #12053 from openfoodfoundation/dependabot/npm_and_yarn/pretty-quick-3.3.1 
Bump pretty-quick from 3.1.3 to 3.3.1
 2024-01-18 12:32:29 +11:00
David Cook
ccf0e78b91 Refactor 
It's not as beautiful as I hoped, but it enforces the rule. Am I going too far? Probably.
 2024-01-18 12:26:21 +11:00
dependabot[bot]
0e0ad26699 Bump bullet from 7.1.5 to 7.1.6 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.5 to 7.1.6.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.5...7.1.6)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-18 01:22:51 +00:00
Maikel
8be7935169 Merge pull request #12054 from openfoodfoundation/dependabot/bundler/bugsnag-6.26.2 
Bump bugsnag from 6.26.1 to 6.26.2
 2024-01-18 12:21:40 +11:00
David Cook
a2436e9a1a Rename hidden keys 
If they follow a rule, it reduces indirection and makes it easier to manage, I reckon.
 2024-01-18 12:14:07 +11:00