raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,609 Commits 18 Branches 453 Tags
f5fb76012873b304bac8ec798764f5a370fcc36b
Commit Graph

28609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gaetan Craig-Riou
18565f4a85 Add all the enterpise attributes supported by DFC connector 2023-08-24 15:55:14 +10:00
David Cook
3c617a51e0 Merge pull request #11433 from openfoodfoundation/dependabot/bundler/mime-types-3.5.1 
chore(deps): bump mime-types from 3.5.0 to 3.5.1
 2023-08-24 15:11:09 +10:00
David Cook
a96b712eb2 Merge pull request #11432 from openfoodfoundation/dependabot/bundler/activerecord-import-1.5.0 
chore(deps): bump activerecord-import from 1.4.1 to 1.5.0
 2023-08-24 15:10:02 +10:00
David Cook
4a877fe019 Merge pull request #11426 from mkllnk/style-has-many 
Allow has_and_belongs_to_many to reduce code
 2023-08-24 15:03:17 +10:00
dependabot[bot]
f0dce7765c chore(deps): bump activerecord-import from 1.4.1 to 1.5.0 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.4.1 to 1.5.0.
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.4.1...v1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-24 02:54:17 +00:00
Maikel
79211bd856 Merge pull request #11438 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.133.0 
chore(deps): bump aws-sdk-s3 from 1.132.1 to 1.133.0
 2023-08-24 12:52:39 +10:00
Maikel
fba55fe9fd Merge pull request #11437 from openfoodfoundation/dependabot/bundler/rails-7.0.7.2 
chore(deps): bump rails from 7.0.7 to 7.0.7.2
 2023-08-24 12:51:08 +10:00
Maikel
d6572d9fde Merge pull request #11434 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.4.1 
chore(deps-dev): bump knapsack_pro from 5.3.5 to 5.4.1
 2023-08-24 12:46:33 +10:00
Filipe
1021fd94b5 Merge pull request #11419 from openfoodfoundation/dependabot/bundler/stripe-9.0.0 
chore(deps): bump stripe from 8.6.0 to 9.0.0
 2023-08-23 17:35:29 +01:00
dependabot[bot]
cd9bf6a62e chore(deps): bump stripe from 8.6.0 to 9.0.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 8.6.0 to 9.0.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/v8.6.0...v9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-23 11:42:43 +01:00
dependabot[bot]
ea46d15ad4 chore(deps): bump aws-sdk-s3 from 1.132.1 to 1.133.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.132.1 to 1.133.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-23 02:28:35 +00:00
dependabot[bot]
752d77110d chore(deps): bump rails from 7.0.7 to 7.0.7.2 
Bumps [rails](https://github.com/rails/rails) from 7.0.7 to 7.0.7.2.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v7.0.7...v7.0.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-23 02:28:07 +00:00
Maikel
57c44ffc72 Merge pull request #11429 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.4.2 
chore(deps): bump newrelic_rpm from 9.4.1 to 9.4.2
 2023-08-23 12:24:53 +10:00
Maikel
9bfb59d45f Merge pull request #11428 from openfoodfoundation/dependabot/bundler/rubocop-1.56.1 
chore(deps-dev): bump rubocop from 1.56.0 to 1.56.1
 2023-08-23 12:23:43 +10:00
Konrad
3aca33b8a6 Merge pull request #11230 from macanudo527/fix_products_controller 
Add Query Object to Product Model to Fix Metrics/ClassLength
 2023-08-22 11:38:09 +02:00
dependabot[bot]
067ddb7bcd chore(deps-dev): bump knapsack_pro from 5.3.5 to 5.4.1 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.3.5 to 5.4.1.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.3.5...v5.4.1)

---
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-22 09:04:55 +00:00
dependabot[bot]
238249e8ec chore(deps): bump mime-types from 3.5.0 to 3.5.1 
Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.5.0 to 3.5.1.
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/main/History.md)
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.5.0...v3.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-22 09:03:13 +00:00
David Cook
e37a499125 Merge pull request #11383 from jibees/11274-buu-as-a-single-producer-i-should-not-be-able-to-see-the-producer-dropdown 
🚧 Products V3: Do not display "Producers" selector if only one is possible
 2023-08-22 11:33:12 +10:00
Maikel Linke
31d87ca087 Show producer filter only when multiple options 
Also introducing a view spec here because the code was incorrectly
refactored before. The execution of the view spec takes only 100ms
which is much faster than a system spec.
 2023-08-22 10:00:06 +10:00
Jean-Baptiste Bellet
6582a875c6 Do not display "Producers" selector if only one is possible 
Fix #11274

Co-Authored-By: David Cook <david@redcliffs.net>
 2023-08-22 10:00:06 +10:00
David Cook
71b297b5b5 Merge pull request #11417 from jibees/11410-go-back-to-top-after-selecting-a-page-in-pagination 
🚧 BUU: Once products are loaded, scroll higher, ie. just above filters
 2023-08-22 09:20:31 +10:00
Konrad
391d06130d Merge pull request #11395 from duleorlovic/google-map-region 
Add Google map region parameter
 2023-08-21 18:14:56 +02:00
dependabot[bot]
397f365fe6 chore(deps): bump newrelic_rpm from 9.4.1 to 9.4.2 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.4.1 to 9.4.2.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.4.1...9.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-21 09:28:35 +00:00
dependabot[bot]
c97b5b3693 chore(deps-dev): bump rubocop from 1.56.0 to 1.56.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.0 to 1.56.1.
- [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.0...v1.56.1)

---
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-21 09:27:48 +00:00
Maikel
af73720157 Merge pull request #11423 from openfoodfoundation/dependabot/bundler/puma-6.3.1 
chore(deps): bump puma from 6.3.0 to 6.3.1
 2023-08-21 14:04:20 +10:00
Maikel Linke
ff18270898 Allow has_and_belongs_to_many to reduce code 
The Rails/HasAndBelongsToMany rule wants model classes for all
many-to-many relationship tables in the database. But our team thinks
that it's useful to declare has_and_belongs_to_many relationships which
don't require an additional model.
 2023-08-21 10:12:33 +10:00
Neal Chambers
0b6b750706 Clarify Product Scope Query Spec 2023-08-20 13:01:34 +09:00
Neal Chambers
fc47c57603 Add helper method to products controller and Use query object 2023-08-20 13:00:39 +09:00
Neal Chambers
9e82ab8a0f Remove query scopes from product model 2023-08-20 13:00:39 +09:00
Neal Chambers
c125c42a6d Add Tests for Product Scope Query 2023-08-20 13:00:39 +09:00
Neal Chambers
a867f7c543 Add Product Scope Query 2023-08-20 13:00:36 +09:00
Konrad
241239ac68 Merge pull request #11379 from dacook/respond_to-not_found 
Respond to all formats for "not found" error
 2023-08-18 18:47:09 +02:00
Konrad
0dc8996701 Merge pull request #11295 from Matt-Yorkley/scope-error 
Remove product display_as cell
 2023-08-18 18:16:16 +02:00
Konrad
df7d42a420 Merge pull request #11352 from abdellani/remove-dead-code-bulk-invoice 
Remove dead code related to bulk invoice printing
 2023-08-18 18:14:01 +02:00
Matt-Yorkley
2b9b79c828 Remove product display_as cell 
This was attempting to reference the master variant, which is now gone. Fixes an Angular scope error.
 2023-08-18 17:38:36 +02:00
Konrad
f3b09508ff Merge pull request #11347 from abdellani/fix-edit-order-button 
fix cancel order button
 2023-08-18 17:07:42 +02:00
Konrad
d8bc479a70 Merge pull request #11387 from jibees/10957-missing-translation-invalid-url 
Admin, White Label: add translation for invalid URL in white label context
 2023-08-18 15:59:39 +02:00
dependabot[bot]
fcb3a74b64 chore(deps): bump puma from 6.3.0 to 6.3.1 
Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-18 09:10:32 +00:00
Jean-Baptiste Bellet
2abfa623f0 Once products start loading, scroll higher, ie. just above filters 
can see the loading spinner then
 2023-08-18 10:20:10 +02:00
jibees
5395bc56f8 Merge pull request #11416 from jibees/11197-buu-no-results-page-and-number-of-results-tweaks 
🚧 BUU: No results page and number of results tweaks
 2023-08-18 10:14:09 +02:00
Jean-Baptiste Bellet
06fccd8618 Totally hide input above its container 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
47115a0daf Change default label for searched products 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
721baa4d3f Increase button size 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
117c373985 Add "remove-sign" icon before text in disruptive button 2023-08-18 09:46:57 +02:00
Jean-Baptiste Bellet
d27b2084ed Do not underline text when it's a button 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
e4479e7935 Increase button height when no result 2023-08-18 09:46:56 +02:00
Jean-Baptiste Bellet
f5e7738c78 Introduce relaxed, regular and condensed button for specify height 2023-08-18 09:46:56 +02:00