raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pauloparakleto
eb7e65a707 chore(GETTING_STARTED.md): remove mention to RVM 2024-03-20 10:33:08 -03:00
Anthony Musyoki
25e3f30f97 Fix Rubocop Rails issue: Rails/FindEach 2024-03-20 15:34:30 +03:00
Konrad
214f7ec23c Merge pull request #12229 from cyrillefr/Decreasing-the-quantity-of-an-item-does-not-update-enterprise-fees-per-item 
[BO Orders] Update Entreprise fees when decreasing quantity
 2024-03-20 11:53:06 +01:00
Maikel
b679a20f23 Merge pull request #12285 from dacook/comments 
Add placeholder file with comments
 2024-03-20 14:26:48 +11:00
Gaetan Craig-Riou
eb2213bd10 Merge pull request #12287 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.146.0 
chore(deps): bump aws-sdk-s3 from 1.145.0 to 1.146.0
 2024-03-20 09:57:55 +11:00
Gaetan Craig-Riou
b07bf9989a Merge pull request #12288 from openfoodfoundation/dependabot/bundler/rspec-rails-6.1.2 
chore(deps-dev): bump rspec-rails from 6.1.1 to 6.1.2
 2024-03-20 09:57:12 +11:00
Pauloparakleto
13f387e0a4 chore(README.md): change the order the instalation guide appears. Make clear ruby and node versions must be checked bebore running the script 2024-03-19 16:17:27 -03:00
dependabot[bot]
fc24a830a5 chore(deps-dev): bump rspec-rails from 6.1.1 to 6.1.2 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.1 to 6.1.2.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.1...v6.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-19 09:35:00 +00:00
dependabot[bot]
dd86222391 chore(deps): bump aws-sdk-s3 from 1.145.0 to 1.146.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.145.0 to 1.146.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>
 2024-03-19 09:34:23 +00:00
David Cook
794f92d9f5 Add placeholder file with comments 
I was surprised to find there's a channel defined by our app code, because it's not defined in the standard place.
 2024-03-19 15:06:23 +11:00
David Cook
e061dbb86b Merge pull request #12284 from mkllnk/logo-size-for-dfc 
Limit enterprise image sizes on DFC API
 2024-03-19 14:51:24 +11:00
Maikel Linke
526069dbb3 Limit enterprise image sizes on DFC API 
Uploaded images can be several MB in size. While offering the big size
would enable other apps to resize it and store the image size they need,
we have only one app using it in practice and it's using the image
directly. It's much simpler and if a default size will work for others
in the future then why not just serve that.

We can revise this in the future. There is a DFC discussion about
publishing several sizes which I started:
https://github.com/datafoodconsortium/ontology/discussions/77#discussioncomment-8228094
 2024-03-19 12:26:23 +11:00
David Cook
acb53a6ddc Merge pull request #12273 from mkllnk/rubocop 
Rubocop
 2024-03-19 10:14:01 +11:00
Gaetan Craig-Riou
b623ecab26 Merge pull request #12275 from openfoodfoundation/dependabot/bundler/stripe-10.12.0 
chore(deps): bump stripe from 10.11.0 to 10.12.0
 2024-03-19 10:05:43 +11:00
Gaetan Craig-Riou
476825251d Merge pull request #12279 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.145.0 
chore(deps): bump aws-sdk-s3 from 1.144.0 to 1.145.0
 2024-03-19 09:41:43 +11:00
Gaetan Craig-Riou
0d17230dd2 Merge pull request #12278 from openfoodfoundation/dependabot/bundler/shoulda-matchers-6.2.0 
chore(deps-dev): bump shoulda-matchers from 6.1.0 to 6.2.0
 2024-03-19 09:35:00 +11:00
Gaetan Craig-Riou
73eeaaabc2 Update Stripe API recordings for new version 2024-03-19 09:33:07 +11:00
dependabot[bot]
cad1140b18 chore(deps): bump stripe from 10.11.0 to 10.12.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 10.11.0 to 10.12.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.11.0...v10.12.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-03-19 09:33:07 +11:00
Konrad
67a5aa6877 Merge pull request #12207 from abdellani/11673-update-invoice-generate-route 
fix route to Admin#order#invoice#generate
 2024-03-18 19:18:00 +01:00
dependabot[bot]
c4fa936f15 chore(deps): bump aws-sdk-s3 from 1.144.0 to 1.145.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.144.0 to 1.145.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>
 2024-03-18 09:37:59 +00:00
dependabot[bot]
ad7d19a0be chore(deps-dev): bump shoulda-matchers from 6.1.0 to 6.2.0 
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v6.1.0...v6.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-18 09:36:35 +00:00
David Cook
69df56ae76 Merge pull request #12247 from dacook/buu/broadcast-queue-12020 
[BUU] Enqueue actions to perform at end of reflex
 2024-03-18 11:38:21 +11:00
David Cook
63549b3dca Add comment 
I still don't know why the morph method doesn't work in this context..
 2024-03-18 11:17:15 +11:00
David Cook
8a84e0084f Enqueue cable_ready actions to perform at end of reflex 
I think this resolves [this discussion](https://github.com/openfoodfoundation/openfoodnetwork/pull/11163#discussion_r1260531844)

I guess we just didn't know [how it works](https://docs.stimulusreflex.com/guide/cableready.html#order-of-operations) before..
 2024-03-18 11:16:38 +11:00
Gaetan Craig-Riou
6dc0988933 Merge pull request #12276 from openfoodfoundation/dependabot/bundler/activerecord-import-1.6.0 
chore(deps): bump activerecord-import from 1.5.1 to 1.6.0
 2024-03-18 11:11:35 +11:00
Gaetan Craig-Riou
e2a53b57d4 Merge pull request #12272 from openfoodfoundation/dependabot/npm_and_yarn/follow-redirects-1.15.6 
chore(deps): bump follow-redirects from 1.15.4 to 1.15.6
 2024-03-18 11:09:14 +11:00
Gaetan Craig-Riou
3c3f65c271 Merge pull request #12256 from feruzoripov/services/group 
Group `Order && OrderCycle` related services
 2024-03-18 11:07:22 +11:00
Feruz Oripov
bdcb0856af Fix failed specs 2024-03-16 19:23:17 +05:00
Feruz Oripov
778ed46d50 cops 2024-03-16 19:14:18 +05:00
Feruz Oripov
9d919938f3 Group Order && OrderCycle related services and specs 2024-03-16 19:07:08 +05:00
dependabot[bot]
8858ed86ac chore(deps): bump activerecord-import from 1.5.1 to 1.6.0 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.5.1 to 1.6.0.
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.5.1...v1.6.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>
 2024-03-15 10:05:17 +00:00
Maikel Linke
8efc215a14 Include product submenu on product import confirmation 2024-03-15 16:46:41 +11:00
Maikel Linke
d2d2db8489 Assign random product category on import if missing 
Failing in this case may be desired in some circumstances but most of
the time we want compatibility and easy interoperability even when not
all data matches.
 2024-03-15 16:46:41 +11:00
Maikel Linke
3af7fa7521 Offer nice select box for enterprise id 2024-03-15 16:46:41 +11:00
Maikel Linke
b5c47b099e Store semantic link when importing DFC products 2024-03-15 16:46:41 +11:00
Maikel Linke
d47d3eba8f Add SemanticLink model for variants 
We want to link variants/products to external DFC SuppliedProducts to
trigger supplier orders when local stock is exhausted. This is the first
step to enable the link.
 2024-03-15 16:46:41 +11:00
Maikel Linke
2e101c5fe6 Refresh OIDC token and try again 
Access tokens are only valid for half an hour. So if requesting a DFC
API fails, it's likely due to an expired token and we refresh it.
 2024-03-15 16:46:41 +11:00
Maikel Linke
1c09b5d16c Move DFC API request logic to service object 
I'm planning to add more to it.
 2024-03-15 16:46:41 +11:00
Maikel Linke
d6da52929f Allow local DFC import in development 2024-03-15 16:46:41 +11:00
Maikel Linke
30e8f9eb28 Importing products from DFC catalog 
Technical demonstration of a complete product export-import roundtrip
which we could now do between OFN instances.
 2024-03-15 16:46:41 +11:00
Maikel Linke
7abe455899 Exclude false Style/RedundantLineContinuation file 
The current Rubocop version flags good code as bad. Regenerating the
todo file added it there and when the issue is fixed it will disappear
from our generated todo list as well.
 2024-03-15 12:52:09 +11:00
Maikel Linke
931ee2f9d2 Style Style/RedundantLineContinuation 2024-03-15 12:40:00 +11:00
Maikel Linke
477336c660 Style RSpec/NotToNot 2024-03-15 12:17:48 +11:00
Maikel Linke
96ccea3691 Add controller to handle import of DFC products 
It's not doing anything yet, but this is the basic setup.
 2024-03-15 11:40:10 +11:00
dependabot[bot]
c6a83588fe chore(deps): bump follow-redirects from 1.15.4 to 1.15.6 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-14 23:38:41 +00:00
Maikel
fcef8e8d7d Merge pull request #12269 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.144.0 
chore(deps): bump aws-sdk-s3 from 1.143.1 to 1.144.0
 2024-03-15 10:38:11 +11:00
Maikel
696559200f Merge pull request #12267 from cyrillefr/BUU-Improve-Product-Search-Keywords 
Add tests to the search product feature
 2024-03-15 10:36:07 +11:00
Mohamed ABDELLANI
c497b37452 set variant_processor to mini_magick 
Seem like the default variant processor become vips.

https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/8280341472/job/22656656944?pr=12209
https://github.com/rails/rails/issues/44211

The comment on the source code doesn't seem to be updated
4bb7323341/activestorage/app/models/active_storage/variant.rb (L11)
 2024-03-15 00:00:05 +01:00
Konrad
acc52cc45f Merge pull request #11918 from abdellani/11896-prevent_bulk_printing_sending_when_ABN_not_set 
Bulk printing/sending should show warning if ABN is required but not set.
 2024-03-14 13:33:41 +01:00
Mohamed ABDELLANI
38b832cec2 fix route to admin#order#invoice#generate 2024-03-14 13:00:10 +01:00