raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,842 Commits 17 Branches 456 Tags
52a36f33bc28684eebcbed76277884939631a653
Commit Graph

30842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Cook
1c0ebfe61e Add comment 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
95e7900585 test print invoice button under ACTIONS 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
13b366e7ff list send invoice and print invoice under actions even when the invoice feature is enabled 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
a9719a798f fix order mailer tests 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
f047deaf12 load the latest invoice when user tries to print an order 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
3f4eab2a0a update the invoice renderer to check if the feature is enable for individual user 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
dce096a56e check if invoices feature is enabled for the current user before showing invoices tab 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
614c8a5060 update order mailer to check if invoices feature is enabled for the current user 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
adecf64cf3 update bulk invoice job to check if the invoices feature is enabled for the current user 2023-10-08 21:47:17 +02:00
Mohamed ABDELLANI
bd2a1b3e22 check if invoices feature is enabled for the current user before printing a single invoice 2023-10-08 21:47:17 +02:00
Konrad
944925eb06 Merge pull request #11603 from murjax/prevent-customer-edit-shipped-9235 
Prevent customers from editing shipped orders
 2023-10-08 21:42:18 +02:00
Konrad
0a36f7983f Merge pull request #11623 from ccozkan/issue-11607-timeshift-in-customers-report 
Fix occurring time shift in customers report results
 2023-10-08 19:02:02 +02:00
Çağrı Özkan
877ea12645 Call in_time_zone on boundary parameters 2023-10-08 17:44:24 +02:00
Konrad
eb9c8bd678 Merge pull request #11618 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.0.7 
chore(deps): bump trix from 2.0.6 to 2.0.7
 2023-10-08 17:34:41 +02:00
Konrad
ef855e8887 Merge pull request #11619 from ccozkan/issue-11611 
Add ability to customers report to filter with open ended boundaries
 2023-10-08 16:28:52 +02:00
dependabot[bot]
ebfacea17b chore(deps): bump stripe from 9.3.0 to 9.4.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 9.3.0 to 9.4.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/v9.3.0...v9.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-06 12:25:38 +00:00
Rachel Arnould
abfd316b3d Merge pull request #11565 from dacook/buu-editing-part4-11059 
[BUU] Inline error messages and validation
 2023-10-06 14:23:58 +02:00
David Cook
117085aeba Transform weight before validation 
I guess validates_length_from_database also validates numbers. That's not a bad thing.
So now it's being validated, we should validate the transformed value that will be saved to the database.
 2023-10-06 14:15:07 +02:00
David Cook
9a9be8dacd Validate length of variant fields 2023-10-06 14:15:07 +02:00
David Cook
875d083a1d There's a gem for that [add gem] 2023-10-06 14:15:07 +02:00
David Cook
3ec6386e1c Validate length of some product fields 
We know if the values are too long, so let's provide a useful message rather than generating an unhandled database error.
This code seems rather repetetive, it would be good to use a shared module. I wonder if there's a gem for that.

Note that the existing /products/*/edit screen doesn't even handle validation errors yet, but that's something for another day..
 2023-10-06 14:15:07 +02:00
David Cook
fee126d6e1 Style form error messages 
With an icon, and sentence case (upcase_first is similar to humanize, but simpler (https://dev.to/junko911/rails-helper-methods-to-change-the-form-of-strings-1h9c#upcase-first))
 2023-10-06 14:15:07 +02:00
David Cook
3b19a19776 Show inline errors for product fields 
The form helper () doesn't work for this case, but it seems we can call it directly like this instead. I'd like to fix the helper, but got stuck this time.
 2023-10-06 14:15:07 +02:00
David Cook
5e478b8a76 Vertically align non-input content in table rows 2023-10-06 14:15:07 +02:00
David Cook
836f5a1fb3 Remove unused withError class 
It added specificity but had no use.
I reviewed a couple of screens to make sure:
  - /admin/orders/Rx/customer
  - /admin/properties/new

I have to confess I don't know how Spree::Admin::BaseHelper is included, or where it's used.

Best viewed with whitespace ignored.
 2023-10-06 14:15:07 +02:00
dependabot[bot]
734e80880b chore(deps-dev): bump bullet from 7.0.7 to 7.1.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 7.0.7 to 7.1.0.
- [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/7.0.7...7.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-06 09:23:35 +00:00
dependabot[bot]
0adf44e525 chore(deps): bump awesome_nested_set from 3.5.0 to 3.6.0 
Bumps [awesome_nested_set](https://github.com/collectiveidea/awesome_nested_set) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/collectiveidea/awesome_nested_set/releases)
- [Changelog](https://github.com/collectiveidea/awesome_nested_set/blob/master/CHANGELOG)
- [Commits](https://github.com/collectiveidea/awesome_nested_set/compare/v3.5.0...v3.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-06 09:16:36 +00:00
David Cook
9e04dc36d1 Merge pull request #11629 from mkllnk/tag-release 
Add script to create patch release tags
 2023-10-06 15:16:45 +11:00
Maikel Linke
74a8b1e721 Add script to create patch release tags 2023-10-06 13:58:37 +11:00
Neal Chambers
085d0f27f7 Move Timestamp Generation into its own Method 2023-10-06 11:19:31 +09:00
Neal Chambers
aaa42ce410 Add Filtering for Optional Relationships 2023-10-06 11:06:54 +09:00
Neal Chambers
3c51b48225 Fix Formatting and Bugs 2023-10-06 11:06:54 +09:00
Neal Chambers
6d22ec5605 Improve Migration Timestamping 2023-10-06 11:06:54 +09:00
Neal Chambers
2b4bf185d6 Replace Duplicate Model Detection with Column Specific Foreign Key Check 2023-10-06 11:06:54 +09:00
Neal Chambers
f02da9f59e Update schema.rb with new Foreign Keys 2023-10-06 11:06:54 +09:00
Neal Chambers
f1c61fa3aa Add Option to Write Migrations to Disk 2023-10-06 11:06:54 +09:00
Neal Chambers
fd8e94cb50 Update Migrations to Include Commented-Out Orphaned Record Query 2023-10-06 11:06:54 +09:00
Neal Chambers
2d6784b88d Allow Full Modulized Class Name to be Used for TODOs 2023-10-06 11:06:54 +09:00
Neal Chambers
d4c363ac39 Reduce Cyclomatic Complexity 2023-10-06 11:06:54 +09:00
Neal Chambers
099b2f455f Remove Unified Orphaned Records SQLs 2023-10-06 11:06:54 +09:00
Neal Chambers
9df42f596c Add SQL to Migration Files 2023-10-06 11:06:54 +09:00
Neal Chambers
7ec1f69e2a Create Foreign Key TODO 2023-10-06 11:06:54 +09:00