Commit Graph

34725 Commits

Author SHA1 Message Date
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
filipefurtad0
6bc8a1a850 Uncomments pluralize test 2023-08-30 22:57:46 +01:00
Maikel Linke
0da1b27795 Simplify code with association #supplied_variants
Rails makes it so easy.
2023-08-30 15:55:10 +10:00
Maikel Linke
01e1dc137e Simplify access of an enterprise's variants 2023-08-30 15:47:03 +10:00
Maikel
dea96fd3ab Merge pull request #11469 from openfoodfoundation/dependabot/bundler/rubocop-1.56.2
chore(deps-dev): bump rubocop from 1.56.1 to 1.56.2
2023-08-30 12:14:36 +10:00
Konrad
077bb41412 Merge pull request #11348 from abdellani/fix-non-empty-orders-in-cart-state-not-appearing
fix Non-empty orders in the cart state do not appear in orders page
2023-08-29 15:33:49 +02:00
David Cook
ff3802fe69 Merge pull request #11457 from filipefurtad0/renames_knapsack_nodes
Renames Knapsack nodes
2023-08-29 21:04:43 +10:00
dependabot[bot]
091544583f chore(deps-dev): bump rubocop from 1.56.1 to 1.56.2
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.1 to 1.56.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.56.1...v1.56.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-29 09:38:31 +00:00
David Cook
78585afc9c Fix format 2023-08-29 16:00:26 +10:00
filipefurtad0
0d1f3f82fd Balances build time
Two nodes were removed from models and three engines; these were and added to system_consumer and system_admin, respectively
2023-08-28 10:28:14 +01:00
filipefurtad0
3a6ca38432 Renames Knapsack nodes 2023-08-28 10:28:14 +01:00
Filipe
67fdc56270 Merge pull request #11427 from mkllnk/release-template
Generate all release note categories with labels
2023-08-28 10:04:57 +01: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
Maikel Linke
200729f198 Show incomplete orders when sorting by name
An inner join with the billing address was hiding some orders when
sorting by billing address name. Telling Rails that those fields are
referenced triggers an outer left join including orders without billing
address.

But when the Bulk Order Management page sorts by `bill_address_lastname`
then Ransack does most of the magic, except that we need to override the
select in combination with distinct results.
2023-08-25 16:15:11 +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
Maikel Linke
d8da808901 Resolve pending spec, reported issue is fixed 2023-08-25 15:48:31 +10:00
David Cook
ccafdc4494 Remove redundant code
bill_address is already joined in this query.
The class variable isn't needed outside this scope.

Arguably I think the condition on the select isn't needed; it wouldn't hurt to always select spree_addresses. But I'll try to avoid changing too much..
2023-08-25 15:48:31 +10:00
Mohamed ABDELLANI
04312b05c6 add orders without billing address to SearchOrders#fetch_orders' results 2023-08-25 15:48:31 +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
Maikel Linke
467d72dc31 Test voucher UI with most common feature toggle
People want to test vouchers mainly on a per-enterprise basis.
Replicating this in the system spec makes sure that we are testing the
conditionals in views.
2023-08-25 10:19:17 +10:00
Maikel Linke
e12cf2aa4c Simplify feature check for multiple actors at once
I think that it's a valid case to check a feature toggle against the
user and an enterprise. You may want to check with only one user first,
then activate it for a whole enterprise and lastly activate the feature
globally.
2023-08-25 10:19:17 +10:00
Maikel Linke
0cc450e815 Allow Vouchers feature per enterprise
I also kept the per-user check to be backwards-compatible. Some
instances have that enabled already. And for early testing, you may want
to test with only one user first before all customer see it.
2023-08-25 10:19:17 +10:00
Maikel Linke
02edd829b9 Allow to admin vouchers if you know the URL
The generic FeatureToggleConstraint in routing knows about the current
user but not about the enterprise to edit. We could create a new custom
constraint for routing but it's much easier to handle permissions in the
controller. Let's keep routes simple.
2023-08-25 10:19:17 +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