raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,254 Commits 21 Branches 450 Tags
45db61be53c047cbdaaf2aa4bbdfbb6aefb35bbe
Commit Graph

29254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
45db61be53 Merge pull request #11655 from openfoodfoundation/dependabot/bundler/devise-4.9.3 
chore(deps): bump devise from 4.9.2 to 4.9.3
 2023-10-13 08:30:08 +11:00
Maikel
604cc10c3f Merge pull request #11654 from openfoodfoundation/dependabot/bundler/rubocop-1.57.0 
chore(deps-dev): bump rubocop from 1.56.4 to 1.57.0
 2023-10-13 08:29:29 +11:00
Konrad
cc8898e074 Merge pull request #11219 from abdellani/fix-tax-rates-rendering-when-invoice-enabled 
fix Viewing an invoice with the instance's invoice setting set to alternative model leads to an error 500
 2023-10-12 17:47:27 +02:00
Konrad
26fa85d89b Merge pull request #11651 from HillaryOkello/master 
Display ordered lists uniform with unordered lists in Trix editor
 2023-10-12 17:00:43 +02:00
Konrad
f87186373c Merge pull request #11647 from dacook/image-validation 
Only validate image when changed
 2023-10-12 15:42:22 +02:00
Maikel Linke
45dd5cc40a Style/SingleLineDoEndBlock: Prefer multiline do...end block 2023-10-12 10:10:42 +11:00
dependabot[bot]
4b38817aff chore(deps-dev): bump rubocop from 1.56.4 to 1.57.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.4 to 1.57.0.
- [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.4...v1.57.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 22:55:03 +00:00
Maikel
17c1ccc509 Merge pull request #11653 from openfoodfoundation/dependabot/bundler/paranoia-2.6.3 
chore(deps): bump paranoia from 2.6.2 to 2.6.3
 2023-10-12 09:52:39 +11:00
Maikel
e3e7031a91 Merge pull request #11649 from openfoodfoundation/dependabot/bundler/rswag-specs-2.11.0 
chore(deps-dev): bump rswag-specs from 2.10.1 to 2.11.0
 2023-10-12 09:51:41 +11:00
Maikel
5526006add Merge pull request #11652 from openfoodfoundation/dependabot/bundler/responders-3.1.1 
chore(deps): bump responders from 3.1.0 to 3.1.1
 2023-10-12 09:27:56 +11:00
dependabot[bot]
1efff07953 chore(deps): bump devise from 4.9.2 to 4.9.3 
Bumps [devise](https://github.com/heartcombo/devise) from 4.9.2 to 4.9.3.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.2...v4.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 22:18:53 +00:00
dependabot[bot]
a8b4e9b070 chore(deps-dev): bump rswag-specs from 2.10.1 to 2.11.0 
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.10.1...2.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 22:12:51 +00:00
Maikel
903bf8a725 Merge pull request #11650 from openfoodfoundation/dependabot/bundler/rswag-api-2.11.0 
chore(deps): bump rswag-api from 2.10.1 to 2.11.0
 2023-10-12 09:11:17 +11:00
dependabot[bot]
b8b6641a05 chore(deps): bump paranoia from 2.6.2 to 2.6.3 
Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/rubysherpas/paranoia/releases)
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md)
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.6.2...v2.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 22:07:31 +00:00
dependabot[bot]
0d3a1417d6 chore(deps): bump responders from 3.1.0 to 3.1.1 
Bumps [responders](https://github.com/heartcombo/responders) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/heartcombo/responders/releases)
- [Changelog](https://github.com/heartcombo/responders/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/responders/compare/v3.1.0...v3.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 22:06:10 +00:00
Maikel
c047a2c70c Merge pull request #11648 from openfoodfoundation/dependabot/bundler/rswag-ui-2.11.0 
chore(deps): bump rswag-ui from 2.10.1 to 2.11.0
 2023-10-12 09:03:14 +11:00
Konrad
047360e839 Merge pull request #11646 from dacook/buu-products-menu 
Show only the new products page in the menu
 2023-10-11 21:31:38 +02:00
HillaryOkello
d8e5f7ae4c Remove padding-top for the ordered lists 2023-10-11 15:55:52 +03:00
Mohamed ABDELLANI
1c2aa1c370 fix linter issue 2023-10-11 11:00:37 +01:00
Mohamed ABDELLANI
c750602b52 remove duplicated code 2023-10-11 10:38:45 +01:00
dependabot[bot]
54d3b39b2e chore(deps): bump rswag-api from 2.10.1 to 2.11.0 
Bumps [rswag-api](https://github.com/rswag/rswag) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.10.1...2.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 09:27:01 +00:00
dependabot[bot]
61bfde4e80 chore(deps): bump rswag-ui from 2.10.1 to 2.11.0 
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.10.1...2.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 09:24:44 +00:00
Mohamed ABDELLANI
7cb200e21e fix linting errors 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
4a74396bcc add 'app/models/invoice/data_presenter.rb' to Metrics/ClassLength:Exclude 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
9950dd90f7 fix display_checkout_taxes_hash 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
7eabb9a170 move include ::ActionView::Helpers::NumberHelper to Invoice::DataPresenter::Base 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
aa4798d35c add adjustables to the list of objects to serialize when creating an invoice 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
fc519da83b update the invoice system tests to run with invoice feature (enabled/disabled) 2023-10-11 09:27:16 +01:00
Mohamed ABDELLANI
d40338bed5 add adjustment originators to the order serialization 
for some helpers like display_checkout_taxes_hash, it's needed to access the tax rates through the adjument's originator.
The adjustment's originator will store the minimal details: id, type and amount
 2023-10-11 09:26:50 +01:00
Mohamed ABDELLANI
a2b06fa200 fix cloning all_eligible_adjustments array on DataPresenter#checkout_adjustments 2023-10-11 09:26:50 +01:00
Mohamed ABDELLANI
b027387bee add :originator_type to Invoice::AdjustmentSerializer 2023-10-11 09:26:50 +01:00
Mohamed ABDELLANI
68a6fb132a implement display_adjustment_tax_rates helper on the adjustment presenter 
For every adjustment a list of tax rates will be created using TaxRateFinder.tax_rates_of.
This will prevent running the queries to find the tax rates during the invoice generation.
 2023-10-11 09:26:50 +01:00
Mohamed ABDELLANI
33826631a3 reimplement the display_line_item_tax_rates helper on the line item presenter 
1. reimplment the helper on the LintItem presenter
2. add the tax rate associated to the line items to the list of objects to serialize during the order serialization.
3. implement a presenter for the introducer tax rates.
 2023-10-11 09:26:49 +01:00
Maikel
7fe7176e5d Merge pull request #11641 from dacook/release-template 
Update feature toggle title
 2023-10-11 16:56:56 +11:00
David Cook
472cd9b55c Merge pull request #11639 from openfoodfoundation/dependabot/bundler/bullet-7.1.1 
chore(deps-dev): bump bullet from 7.1.0 to 7.1.1
 2023-10-11 14:14:27 +11:00
David Cook
32b2e572b3 Merge pull request #11643 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.6 
chore(deps): bump sidekiq from 7.1.5 to 7.1.6
 2023-10-11 14:01:13 +11:00
dependabot[bot]
ca2d175650 chore(deps-dev): bump bullet from 7.1.0 to 7.1.1 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.1.0 to 7.1.1.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.1.0...7.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-11 02:52:50 +00:00
David Cook
64ba01a55c Merge pull request #11637 from mkllnk/spec-report-order 
Test customer report filtering without sorting
 2023-10-11 13:49:25 +11:00
David Cook
69b2386c52 Merge pull request #11631 from openfoodfoundation/dependabot/bundler/awesome_nested_set-3.6.0 
chore(deps): bump awesome_nested_set from 3.5.0 to 3.6.0
 2023-10-11 13:47:55 +11:00
David Cook
fd6bd72e7a Merge pull request #11630 from openfoodfoundation/dependabot/bundler/stripe-9.4.0 
chore(deps): bump stripe from 9.3.0 to 9.4.0
 2023-10-11 13:46:49 +11:00
David Cook
b42cf9735f Only validate an image if it has been changed 
Best viewed with whitespace ignored.
 2023-10-11 10:12:52 +11:00
David Cook
31b5be73f9 Add spec 2023-10-11 10:12:52 +11:00
David Cook
99205e435c Show only the new products page in the menu 
When the feature toggle is enabled, we don't want to see the old products page. It's a bit broken and causes confusion. But we still want to be able to access it by the URL for now.
 2023-10-10 22:09:26 +11:00
Konrad
0bd4fe315c Merge pull request #11620 from openfoodfoundation/dependabot/bundler/devise-i18n-1.12.0 
chore(deps): bump devise-i18n from 1.11.0 to 1.12.0
 2023-10-10 12:36:42 +02:00
dependabot[bot]
f57d139909 chore(deps): bump sidekiq from 7.1.5 to 7.1.6 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.5 to 7.1.6.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.5...v7.1.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-10 10:05:08 +00:00
David Cook
3d821722e1 Update feature toggle title 
[skip ci] because this isn't covered (and doesn't need to be).
 2023-10-10 16:30:49 +11:00
Maikel Linke
228f69f13e Test customer report filtering without sorting 
The report doesn't seem to sort. So the specs don't expect that either
now. These specs were flaky before, depending on the random order in the
database query result.
 2023-10-09 12:05:24 +11:00
Maikel
90c25d604b Merge pull request #11441 from macanudo527/fix_rails_HasManyOrHasOneDependent 
Fix Rails/HasManyOrHasOneDependent
 2023-10-09 11:44:23 +11:00
Maikel
b8f15ca52f Merge pull request #11632 from openfoodfoundation/dependabot/bundler/bullet-7.1.0 
chore(deps-dev): bump bullet from 7.0.7 to 7.1.0
 2023-10-09 10:56:00 +11:00
Konrad
6cfc20fcaa Merge pull request #11345 from abdellani/support-enabling-invoices-to-individual-users 
Support enabling invoices to individual users
 2023-10-08 22:22:33 +02:00