raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,697 Commits 18 Branches 452 Tags
514b8fa6ab71a000e145904c3d5d6f34f4da66f8
Commit Graph

28697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
514b8fa6ab Import DFC unit labels like bunch and jar 2023-08-31 16:27:55 +10:00
Maikel Linke
427d806b13 Remove ambiguous unit "cup" 
The DFC doesn't actually specify which cup it means. I don't expect
anyone providing "cup" as unit to measure their produce and expect it to
calculate as a regular volume. It can just be seen as items.
 2023-08-31 16:11:50 +10:00
Maikel Linke
50f7177a38 Use existing service to label weight&volume units 
We still have the scale stored in two places but in our current system
that's part of a unit's "id".

If the DFC adds that value to its standard then we can use it for lookup
and don't need to repeat it.

* https://github.com/datafoodconsortium/taxonomies/issues/7
 2023-08-31 09:48:24 +10:00
Maikel Linke
8114430248 Refactor DFC unit mapping for easier reading 
I also updated the comments.
 2023-08-28 17:13:04 +10:00
Maikel Linke
f96ab7c432 Import DFC bundle units like dozen or 6 pack 2023-08-28 17:13:04 +10:00
Maikel Linke
f096783098 Import all metric DFC units 2023-08-28 17:13:04 +10:00
Maikel Linke
43346e2671 Import imperial DFC units 2023-08-28 17:13:04 +10:00
Maikel Linke
9ddf536fa3 Import DFC milligram 2023-08-28 17:13:04 +10:00
Maikel Linke
5a8d95c443 Import DFC kilogram 2023-08-28 17:13:04 +10:00
Maikel Linke
996f3bb235 Spec current quantity unit conversion 2023-08-28 17:13:04 +10:00
Maikel Linke
96b79bce2d Encapsulate DFC-OFN data model bridge 
Re-uses existing code and takes knowledge out of the controller.
 2023-08-28 17:13:04 +10:00
Maikel Linke
9ab75e086a Use DFC Connector for SuppliedProduct update 2023-08-28 17:13:04 +10:00
Maikel Linke
faa112c3ae Spec DFC SuppliedProduct#update with new Prototype 
I observed new data from the DFC Prototype. It now uses the DFC 1.8
ontology with the hasQuantity object.

It now also uses PUT requests for updates because PATCH is not as well
supported. Rails doesn't care though.

I couldn't observe a request for the CatalogItem yet because the
Prototype failed to send it.
 2023-08-28 17:13:04 +10:00
Maikel
cf8d5a584e Merge pull request #11455 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.1.1 
chore(deps-dev): bump jasmine-core from 5.1.0 to 5.1.1
 2023-08-28 11:51:36 +10:00
Maikel
7e44c75456 Merge pull request #11453 from dacook/buu-labels 
Buu labels
 2023-08-28 11:50:35 +10:00
Maikel
86842847ad Merge pull request #11452 from dacook/flaky-spec-products_v3-11328 
[Flaky] spec/system/admin/products_v3/products_spec.rb
 2023-08-28 11:45:12 +10:00
Maikel
dd79761186 Merge pull request #11448 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.134.0 
chore(deps): bump aws-sdk-s3 from 1.133.0 to 1.134.0
 2023-08-28 11:43:31 +10:00
Maikel
0b869f2abe Merge pull request #11451 from mkllnk/flaky-voucher-specs 
De-flake voucher specs by checking success
 2023-08-28 11:16:43 +10:00
dependabot[bot]
00ea2e5b07 chore(deps-dev): bump jasmine-core from 5.1.0 to 5.1.1 
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v5.1.0...v5.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-25 09:09:08 +00:00
David Cook
7d6ba2d31f Clean up unneeded override 2023-08-25 17:23:05 +10:00
David Cook
451513ad04 Markup labels as.. labels 
This means you can click on the label name to select the field, and accessibility software can read the label name.  I was motivated to do this so that we could update the spec to use label text rather than IDs. But it seems we can't do that with tom-select.

I've updated the styles for all form labels (in admin_style_v3 toggle) to match the design.
 2023-08-25 17:19:46 +10:00
David Cook
4d79cdb0ea Ensure records are created before visiting the page 
'let!' is executed in the same way as 'before', so it matters which order they are defined in.

For contexts with a single example, I just put it straight into the example.
 2023-08-25 16:09:52 +10:00
David Cook
4f9651f5c9 Wait for pagination message to update 
Hopefully this fixes openfoodfoundation/openfoodnetwork#11328
 2023-08-25 14:52:50 +10:00
Maikel Linke
1a95476634 Combine some voucher system specs to save time 
It also simplifies the spec code a bit not having a shared example.
 2023-08-25 13:56:41 +10:00
Maikel Linke
233171a9ce De-flake voucher specs by checking success 
Vouchers are applied via a reflex and we need to check for success
before trying to navigate further. The new helper does this in a
consistent way.
 2023-08-25 13:56:41 +10:00
Maikel Linke
4be38ba8da Remove redundant system spec 
System specs are expensive. And this spec just looked for the visibility
of certain elements while other tests actually use them and therefore
verify their function much more thoroughly.
 2023-08-25 13:56:41 +10:00
Maikel
7414b5cbc9 Merge pull request #11397 from rioug/11331-add-required-field-dcf-enterprise 
Add required enterprise fields to DFC API
 2023-08-25 11:44:49 +10:00
Maikel
56f4eca79e Update engines/dfc_provider/app/controllers/dfc_provider/addresses_controller.rb 
Fix type in comment

Co-authored-by: David Cook <david@redcliffs.net>
 2023-08-25 11:31:00 +10:00
Maikel
a7e2d23e3b Merge pull request #11449 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.6.0 
chore(deps-dev): bump knapsack_pro from 5.4.1 to 5.6.0
 2023-08-25 10:50:32 +10:00
David Cook
aea0a629ee Merge pull request #11425 from macanudo527/fix_rails_activerecordoverride 
Fix Rails/ActiveRecordOverride
 2023-08-25 09:22:05 +10:00
dependabot[bot]
5b25fa80a2 chore(deps-dev): bump knapsack_pro from 5.4.1 to 5.6.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.4.1 to 5.6.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.4.1...v5.6.0)

---
updated-dependencies:
- dependency-name: knapsack_pro
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-24 23:01:05 +00:00
dependabot[bot]
61109259e4 chore(deps): bump aws-sdk-s3 from 1.133.0 to 1.134.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.133.0 to 1.134.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-24 23:00:22 +00:00
Maikel
54e8df7c88 Merge pull request #11443 from openfoodfoundation/dependabot/bundler/ffaker-2.22.0 
chore(deps): bump ffaker from 2.21.0 to 2.22.0
 2023-08-25 08:56:34 +10:00
Maikel
0441453469 Merge pull request #11439 from mkllnk/unflake-customer-report-spec 
Report customers in deterministic order
 2023-08-25 08:54:21 +10:00
Neal Chambers
2bfa51cbb1 Fix Rails/ActiveRecordOverride 2023-08-25 08:51:27 +10:00
filipefurtad0
a39c465692 Update all locales with the latest Transifex translations v4.4.9 2023-08-24 21:36:53 +01:00
Filipe
cc3b7c68ae Merge pull request #11208 from dacook/buu-editing-11059 
[BUU] Change name of my products 🚧
 2023-08-24 21:19:52 +01:00
Filipe
10bc2a3ee6 Merge pull request #11430 from abdellani/fix-updating-invoices-data 
fix order invoice generator must update the latest invoice
 2023-08-24 20:58:37 +01:00
dependabot[bot]
221eea227f chore(deps): bump ffaker from 2.21.0 to 2.22.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.21.0...v2.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-24 09:58:42 +00:00
Filipe
020276a248 Merge pull request #11418 from macanudo527/fix_rubocop_7 
Fix Rails and Style Autocorrect Rubocop Errors
 2023-08-24 10:29:45 +01:00
Filipe
c5e1444613 Merge pull request #11206 from macanudo527/fix_class_length 
Add Form Object to Schedules Controller
 2023-08-24 09:28:50 +01:00
Konrad
c90b244a96 Merge pull request #11415 from abdellani/snail-when-setting-unit-value-to-0 
fix Snail when setting "0" in the unit value field
 2023-08-24 10:04:26 +02:00
Konrad
6ec022b731 Merge pull request #11391 from rioug/11362-fix-error-creating-percentage-voucher 
[Vouchers] fix error when creating a percentage voucher
 2023-08-24 09:09:30 +02:00
Maikel Linke
1c3574ce79 Include address in DFC Enterprise endpoint 2023-08-24 16:51:36 +10:00
Maikel Linke
20b09b5352 Add DFC Address API endpoint 2023-08-24 16:20:13 +10:00
Gaetan Craig-Riou
a8d15154a2 Link address to enterprise 
+ spec
 2023-08-24 15:55:15 +10:00
Gaetan Craig-Riou
86bb77ab9f Add AddressBuilder 
It will let us include address in the various DFC API endpoint
 2023-08-24 15:55:15 +10:00
Gaetan Craig-Riou
f5fb760128 Update Enterprise request spec 
Check all the attributes supported by the DFC connector
 2023-08-24 15:55:14 +10:00
Maikel Linke
244b9abd21 Spec with given data included in examples 
And use in-memory data where possible to speed up specs.
 2023-08-24 15:55:14 +10:00
Maikel Linke
5d05c3c0f1 DRY DFC enterprise spec 2023-08-24 15:55:14 +10:00