raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,783 Commits 18 Branches 453 Tags
6dc09889331c8feb4d182e47cb636e04e9a6e285
Commit Graph

30783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
cyrillefr
261cb2d81b Requested changes: trimming number of examples 
- to improve speed of testing
 2024-03-14 10:55:09 +01:00
dependabot[bot]
f59c43b8e9 chore(deps): bump aws-sdk-s3 from 1.143.1 to 1.144.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.143.1 to 1.144.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-14 09:19:04 +00:00
Gaetan Craig-Riou
29dad44f9f Update all locales with the latest Transifex translations v4.4.34 2024-03-14 10:03:59 +11:00
David Cook
c4a8bf2490 Merge pull request #12254 from mkllnk/dfc-create-variant 
Add spree_product_uri to SuppliedProduct
 2024-03-14 10:02:01 +11:00
Maikel
82c444b8d8 Merge pull request #12266 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.143.1 
chore(deps): bump aws-sdk-s3 from 1.143.0 to 1.143.1
 2024-03-14 08:19:28 +11:00
Maikel
d7fca66433 Merge pull request #12265 from openfoodfoundation/dependabot/bundler/rails-i18n-7.0.9 
chore(deps): bump rails-i18n from 7.0.8 to 7.0.9
 2024-03-14 08:18:52 +11:00
cyrillefr
43d13253e7 Add tests to the search product feature 2024-03-13 10:54:06 +01:00
dependabot[bot]
84551068ee chore(deps): bump aws-sdk-s3 from 1.143.0 to 1.143.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.143.0 to 1.143.1.
- [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-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-13 09:19:46 +00:00
dependabot[bot]
163c45d301 chore(deps): bump rails-i18n from 7.0.8 to 7.0.9 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.8 to 7.0.9.
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/compare/v7.0.8...v7.0.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-13 09:18:26 +00:00
Maikel
63a1931ce8 Merge pull request #12249 from mkllnk/test-users 
Set known default password for sample users
 2024-03-13 15:41:30 +11:00
David Cook
98457b2fff Merge pull request #12248 from mkllnk/rubocop-precommit 
Add dev script to run rubocop on changed files
 2024-03-13 14:59:29 +11:00
Gaetan Craig-Riou
e072823071 Merge pull request #12259 from openfoodfoundation/dependabot/bundler/rubocop-1.62.1 
chore(deps-dev): bump rubocop from 1.60.2 to 1.62.1
 2024-03-13 09:09:48 +11:00
Maikel
d253effc29 Fix typo in spec description 
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com>
 2024-03-12 16:32:01 +11:00
Maikel
331894017a Merge pull request #12252 from filipefurtad0/bump_stripe_10.11.0 
Bumps Stripe from 10.10.0 to 10.11.0
 2024-03-12 13:55:13 +11:00
Maikel Linke
1674d8ab5c Simplify DFC product controller 2024-03-12 13:11:31 +11:00
Maikel Linke
85a47e61fd Create variants only for own products 2024-03-12 13:11:31 +11:00
Gaetan Craig-Riou
a4b7a8f95d Spec creating variant via DFC API 2024-03-12 12:43:10 +11:00
Gaetan Craig-Riou
462c763cd1 Add spree_product_uri to SuppliedProduct 
Also update SuppliedProductBuilder and specs
 2024-03-12 12:43:10 +11:00
Gaetan Craig-Riou
4f77ad40a3 Update recording with new filtering 2024-03-12 12:17:21 +11:00
Gaetan Craig-Riou
a33eb80f56 Fix filtering of sensible data 
* Hide Stripe Client User Agent header, it contains the hostname of
the machine generating the cassettes
* Hide client_secret
 2024-03-12 12:17:15 +11:00
Maikel
fb8c86a9a7 Merge pull request #12251 from openfoodfoundation/dependabot/bundler/i18n-1.14.4 
chore(deps): bump i18n from 1.14.3 to 1.14.4
 2024-03-12 11:49:15 +11:00
dependabot[bot]
b53be15fda chore(deps-dev): bump rubocop from 1.60.2 to 1.62.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.2 to 1.62.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.60.2...v1.62.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-11 23:47:51 +00:00
Gaetan Craig-Riou
f755aff23c Merge pull request #12225 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.24.0 
chore(deps-dev): bump rubocop-rails from 2.23.1 to 2.24.0
 2024-03-12 10:45:02 +11:00
Gaetan Craig-Riou
ff52a66e75 Merge pull request #12250 from mkllnk/not-to-not 
Enforce RSpec expect(..).not_to over to_not
 2024-03-12 10:35:16 +11:00
Rachel Arnould
7caaeffe80 Merge pull request #12206 from cyrillefr/Invoices-Several-tax-rates-are-showing-up-on-the-invoice-for-the-same-product 
Fix incorrect results for multiple tax rates in report
 2024-03-11 10:31:09 +01:00
cyrillefr
7d99197dde Requested changes: original fix moved up in code 
- instead of selecting out unapplied tax rates in the total tax
    method, did it in the query_result instead. Reverted the
    total_excl_tax method to its initial state.
  - spec and logic of testing affected also.
 2024-03-11 10:13:46 +01:00
cyrillefr
62739c0458 Requested changes in spec 
- use of new service instead of manually advancing an order
 2024-03-11 10:13:46 +01:00
cyrillefr
7fdf1a110d Fix incorrect results for multiple tax rates in report 
- total_excl_tax would sum amounts and taxes without
    knowledge if taxes rates were really applied or not
  - spec shows use case described in issue 12066
 2024-03-11 10:13:46 +01:00
filipefurtad0
07a43fecdf Update all locales with the latest Transifex translations v4.4.33 2024-03-08 11:48:31 +00:00
dependabot[bot]
2cac8471fc chore(deps-dev): bump rubocop-rails from 2.23.1 to 2.24.0 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.23.1...v2.24.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-08 00:41:31 +00:00
Maikel
b27e0b5339 Merge pull request #12228 from openfoodfoundation/dependabot/bundler/json-jwt-1.16.6 
chore(deps): bump json-jwt from 1.16.5 to 1.16.6
 2024-03-08 11:39:43 +11:00
Maikel
61f29a4ebf Merge pull request #12226 from openfoodfoundation/dependabot/bundler/rubocop-rspec-2.27.1 
chore(deps-dev): bump rubocop-rspec from 2.27.0 to 2.27.1
 2024-03-08 11:39:06 +11:00
Filipe
9abaf90907 Merge pull request #12233 from dacook/buu/unit-scale-basic-12005 
[BUU] Unit Scale - basic implementation
 2024-03-07 17:20:45 +00:00
Filipe
de9446f5f3 Merge pull request #12167 from mkllnk/haml-up 
Update Haml syntax and gem to version 6
 2024-03-07 15:36:29 +00:00
filipefurtad0
5653d542f6 Hides sensitive data 2024-03-07 15:15:18 +00:00
filipefurtad0
7f3953882d Update Stripe API recordings for new version 2024-03-07 14:49:11 +00:00
filipefurtad0
f126b8b316 Update Stripe API recordings for new version 2024-03-07 14:41:40 +00:00
filipefurtad0
7849f30f46 Update Stripe API recordings for new version 2024-03-07 14:20:16 +00:00
Rachel Arnould
cd9bef4f7b Merge pull request #12172 from abdellani/12067-fix-invoice-render-multiple-tax-rates 
fix invoice render multiple tax rates
 2024-03-07 10:53:52 +01:00