raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +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
Neal Chambers
7c9bc58a4b Add nullify to orders relationship, instead of manually nullifying 2023-10-06 10:58:49 +09:00
Neal Chambers
921347f0f2 Update .rubocop_todo.yml 2023-10-06 10:58:49 +09:00
Neal Chambers
7f8ac94933 Fix Rails/HasManyOrHasOneDependent with nil 2023-10-06 10:58:49 +09:00
Neal Chambers
019b54ea95 Fix Rails/HasManyOrHasOneDependent with delete_all 2023-10-06 10:58:49 +09:00
Neal Chambers
070d2cb855 Fix stock_movements relation in variant 2023-10-06 10:58:49 +09:00
Neal Chambers
825342914d Fix Rails/HasManyOrHasOneDependent with nullify 2023-10-06 10:58:49 +09:00
Neal Chambers
b76fb10d46 Fix Rails/HasManyOrHasOneDependent with Destroy 2023-10-06 10:58:49 +09:00
Neal Chambers
53f5d63e4a Delete Rails/HasManyOrHasOneDependent TODOs 2023-10-06 10:58:49 +09:00
Maikel Linke
ff60dacebd Update all locales with the latest Transifex translations v4.4.14 2023-10-06 11:23:43 +11:00
David Cook
3f27fb69b3 Merge pull request #11625 from aisayo/patch-1 
Update README.md
 2023-10-05 09:52:03 +11:00
David Cook
ee13d1072c Merge pull request #11624 from filipefurtad0/make_seed_data_enteprise_visible 
[dev ENV only] Adds attribute to enterprise factory
 2023-10-05 09:10:23 +11:00
aisayo
97f315b363 Update README.md 
Outdated instructions
 2023-10-04 15:34:37 -04:00
filipefurtad0
0e699e9cee Adds attribute to enterprise factory 
so that sample data rake task creates visible enterprises by default
 2023-10-04 18:00:36 +01:00
lauriejefferson
0cda8d7d4c removed paid styling and added currency formatter to payment_total 2023-10-04 09:30:05 -04:00
Sigmund Petersen
4e8cd330b3 Merge pull request #11571 from dacook/buu-editing-fixups 
[BUU] editing fixups
 2023-10-04 13:48:31 +02:00
David Cook
6f43165006 Show generic error message when StimulusReflex fails 
I decided not to invest the time to figure out how to test this..

The messages should have the same effect as the 500 error, but not technically a 500 because it's not handling a HTTP response. The documentation seems to state this covers server-side errors only (not network errors for example). I couldn't find any way to handle network errors with action cable.
 2023-10-04 13:40:36 +02:00
David Cook
6d35b1ac71 Fix bulk form input styles 
'header' fields are meant to be bold, and the field backgrounds are meant to match the cell background colour.
 2023-10-04 13:40:36 +02:00
David Cook
cd63ab63d8 Refactor form code 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-10-04 13:40:36 +02:00
David Cook
ed207e3df6 DRY up code 2023-10-04 13:40:36 +02:00
David Cook
4467758a9f Apply code suggestion 
Co-authored-by: Jean-Baptiste Bellet <jb.bellet@gmail.com>
 2023-10-04 13:40:36 +02:00
David Cook
136b370de1 Merge pull request #11621 from openfoodfoundation/dependabot/bundler/valid_email2-5.1.0 
chore(deps): bump valid_email2 from 5.0.5 to 5.1.0
 2023-10-04 15:33:26 +11:00
David Cook
7ffe318352 Merge pull request #11616 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.5 
chore(deps): bump sidekiq from 7.1.4 to 7.1.5
 2023-10-04 15:21:03 +11:00
dependabot[bot]
2b2bb6d46b chore(deps): bump valid_email2 from 5.0.5 to 5.1.0 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.0.5 to 5.1.0.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.0.5...v5.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-04 03:50:57 +00:00
dependabot[bot]
34829ea53e chore(deps): bump devise-i18n from 1.11.0 to 1.12.0 
Bumps [devise-i18n](https://github.com/tigrish/devise-i18n) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/tigrish/devise-i18n/releases)
- [Changelog](https://github.com/tigrish/devise-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tigrish/devise-i18n/compare/v1.11.0...v1.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-04 03:49:24 +00:00
David Cook
057a9f73ed Merge pull request #11605 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.21.2 
chore(deps-dev): bump rubocop-rails from 2.21.1 to 2.21.2
 2023-10-04 14:49:03 +11:00
Maikel
05b30a72e5 Merge pull request #11604 from openfoodfoundation/dependabot/bundler/valid_email2-5.0.5 
chore(deps): bump valid_email2 from 5.0.3 to 5.0.5
 2023-10-04 14:45:45 +11:00
Maikel
2ac2b30b14 Merge pull request #11588 from filipefurtad0/split_subscription_spec 
Splits bottleneck system/admin/subscriptions_spec.rb
 2023-10-04 13:33:20 +11:00
Çağrı Özkan
f93fcd347b Rubocop fix 2023-10-04 02:00:21 +03:00
Çağrı Özkan
a5a13761a8 Filter with open ended boundaries upon missing params 2023-10-04 01:05:41 +03:00
Ryan Murphy
4db6570039 9235: Prevent customers from editing shipped orders 2023-10-03 08:36:57 -04:00
dependabot[bot]
f4fce6e69c chore(deps): bump trix from 2.0.6 to 2.0.7 
Bumps [trix](https://github.com/basecamp/trix) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.6...v2.0.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-03 09:52:21 +00:00
filipefurtad0
14caf3b25c Moves helper into support folder 
Wraps SubscripionHelper module around definitions
 2023-10-03 09:49:26 +01:00
filipefurtad0
181ddcefbc Updates rubocop_todo file 
Removes local untracked files
 2023-10-03 09:49:26 +01:00
filipefurtad0
bc73d09438 Declares enable_subscriptions separately 2023-10-03 09:49:26 +01:00
filipefurtad0
96432ebec2 Splits files into new folder 
Creates helper file for existing methods
 2023-10-03 09:49:26 +01:00
filipefurtad0
8bc2feda23 Asserts for subscription instructions and tab 2023-10-03 09:49:26 +01:00
filipefurtad0
b554308f10 Sets correct context 2023-10-03 09:49:26 +01:00
dependabot[bot]
db3cdd95a3 chore(deps): bump sidekiq from 7.1.4 to 7.1.5 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.4 to 7.1.5.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.4...v7.1.5)

---
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-03 05:28:17 +00:00
David Cook
2558855ad5 Merge pull request #11595 from openfoodfoundation/dependabot/bundler/rubocop-1.56.4 
chore(deps-dev): bump rubocop from 1.56.3 to 1.56.4
 2023-10-03 16:26:21 +11:00
dependabot[bot]
372defe20f chore(deps-dev): bump rubocop-rails from 2.21.1 to 2.21.2 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.1 to 2.21.2.
- [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.21.1...v2.21.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 09:18:16 +00:00
dependabot[bot]
0cd87a7bbf chore(deps): bump valid_email2 from 5.0.3 to 5.0.5 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.0.3 to 5.0.5.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.0.3...v5.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-02 09:06:58 +00:00
Maikel
b122c93055 Merge pull request #11586 from macanudo527/fix_stylehash_11 
Fix Style/HashSyntax 12/13
 2023-10-02 16:25:21 +11:00
Maikel Linke
fec6caf576 Remove unnecessary Rubocop disable 2023-10-02 16:18:51 +11:00
Gaetan Craig-Riou
7f2c1feaf8 Fix rubocop warning 2023-10-02 15:58:13 +11:00
Gaetan Craig-Riou
1a66f3d94f Fix system spec to take into account discounted tax 2023-10-02 15:58:13 +11:00
Gaetan Craig-Riou
8d639c14cb Add a fake adjustment voucher tax on admin order page 
When tax are included in price, voucher tax is stored in the voucher
adjustment and not as its own adjustment. So we add a "fake adjustment"
for display purposes.
 2023-10-02 15:58:12 +11:00
Gaetan Craig-Riou
8254bd9625 Take into account voucher tax part when displaying tax included in price 2023-10-02 15:58:12 +11:00
Maikel
350ca3b778 Merge pull request #11479 from filipefurtad0/split_split_checkout 
Splits checkout files
 2023-10-02 12:01:20 +11:00
Konrad
8150a8b04a Merge pull request #11579 from macanudo527/remove_delegate_belongs_to 
Remove Deprecated delegate_belongs_to
 2023-10-01 13:19:22 +02:00
Konrad
11ea4d93a9 Merge pull request #11584 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.0.6 
chore(deps): bump trix from 2.0.5 to 2.0.6
 2023-10-01 12:49:32 +02:00