raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,157 Commits 16 Branches 456 Tags
ccf3d5873a0d1406f29a11e9e01bf789e36f45f0
Commit Graph

31157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelly
ccf3d5873a style fix - remove type 2024-04-25 12:24:19 -04:00
Kelly
6b5be213a3 changed location - now in requests folder 2024-04-25 12:10:32 -04:00
Kelly
eda97ef3f7 fixed path 2024-04-23 22:18:45 -04:00
kellyzhangg
00742f6f0b Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test 2024-04-23 22:15:58 -04:00
Kelly
64a1fd9270 removed changes to routes.rb 2024-04-23 22:15:43 -04:00
Maikel
f083e851c0 Merge pull request #12408 from filipefurtad0/stripe_registered_customer 
[VCR/Stripe] Tests payment intents for offline payments
 2024-04-24 10:14:28 +10:00
Kelly
c64519ae2f rewrote payments_controller_spec to be of request spec format 2024-04-23 12:02:32 -04:00
filipefurtad0
85e3d5d858 Tests payment intents for offline payments 
Moves let variables outside shared examples block

Re-records cassettes
 2024-04-23 12:24:00 +01:00
kellyzhangg
d875ea044d Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test 2024-04-23 02:41:19 -04:00
Gaetan Craig-Riou
8d166ed3e1 Merge pull request #12407 from cyrillefr/RedundantPresenceValidationOnBelongs_part_I 
Fix RedundantPresenceValidationOnBelongs on some files
 2024-04-23 10:29:48 +10:00
cyrillefr
9ae064a24f Fix RedundantPresenceValidationOnBelongs on some files 
- presence: true is redundant since Rails 5.0 BUT applies
   with new default config of
   belongs_to_required_by_default to true
   Lots of files with belongs_to_required_by_default = false
   (backward compatibility)
   So: deleting this setting implies to adding optional: true
 - added 'NOT NULL' constraints so model constraints match
   with contraints on DB tables.
 - updated the todo
 2024-04-22 17:36:47 +02:00
David Cook
4a3f4136df Merge pull request #12393 from mkllnk/lint-rubocop 
Test all files with Rubocop, not just added code in the diff
 2024-04-22 15:07:54 +10:00
Konrad
8e7f4ff908 Merge pull request #12333 from chahmedejaz/bugfix/12294-wrong-tax-category-display 
[BUU] Fix Wrong Tax Category Display
 2024-04-20 11:42:05 +02:00
Rachel Arnould
2090bc1b47 Merge pull request #12361 from dacook/buu/add-turbo 
[BUU] Add Turbo for dynamic page loading
 2024-04-19 11:44:17 +02:00
David Cook
38a4bfe98b Update all locales with the latest Transifex translations v4.4.40 2024-04-18 16:54:16 +10:00
David Cook
5b043574a2 Merge pull request #12384 from mkllnk/mail-config 
Don't pass invalid auth method "None" to net-smtp
 2024-04-18 16:51:51 +10:00
David Cook
e59237ef19 Merge pull request #12382 from mkllnk/dependabot-config 
Allow Dependabot to open as many PRs as it likes
 2024-04-18 11:06:05 +10:00
David Cook
053a88d252 Merge pull request #12363 from cyrillefr/FixRailsWhereExistsOffenses 
Fix Rails/WhereExists rubocop offenses
 2024-04-18 10:55:04 +10:00
Maikel
e7856d86f4 Merge pull request #12397 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.147.0 
chore(deps): bump aws-sdk-s3 from 1.146.1 to 1.147.0
 2024-04-18 09:08:24 +10:00
Maikel
09ece4b35e Merge pull request #12396 from openfoodfoundation/dependabot/bundler/stripe-11.1.0 
chore(deps): bump stripe from 11.0.0 to 11.1.0
 2024-04-18 08:56:59 +10:00
Maikel Linke
c4e92e7d8f Update Stripe API recordings for new version 2024-04-18 08:42:18 +10:00
Maikel
142fe542c0 Merge pull request #12370 from filipefurtad0/regression_spec_ship_order_button 
Adds regression spec as shared example, for order edit subsections
 2024-04-18 08:31:37 +10:00
filipefurtad0
574297343f Sets pending examples for order edit page subsections 2024-04-17 14:27:56 +01:00
dependabot[bot]
302cde6f4e chore(deps): bump aws-sdk-s3 from 1.146.1 to 1.147.0 
---
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-04-17 09:43:41 +00:00
dependabot[bot]
5a2f791d58 chore(deps): bump stripe from 11.0.0 to 11.1.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 11.0.0 to 11.1.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/v11.0.0...v11.1.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-04-17 09:43:21 +00:00
cyrillefr
456905e69f Fix Rails/WhereExists rubocop offenses 
- after discussion, dev team decided not to follow
- this particular rule, but rather to enforce the where().exists? rule
  instead.
- cf. https://github.com/openfoodfoundation/openfoodnetwork/pull/12363
 2024-04-17 10:37:18 +02:00
David Cook
a2255e62d4 Revert "Use POST for action that creates data," 
I'm not happy about it, but we need it to be a standard link to make it work. I assume it's because BulkFormController.preventLeavingChangedForm() isn't smart enough.

This reverts commit 91f0a80189.
 2024-04-17 17:36:05 +10:00
David Cook
11541c9270 Disable turbo for those links 
Now we can warn that "Changes that you made might not be saved"
 2024-04-17 17:35:17 +10:00
David Cook
8f9d8b5fb8 Revert "Prevent frame navigations when form is changed" 
It was too hacky and had issues. Let's just disable Turbo for those links for now.

This reverts commit 1d1169b478.
 2024-04-17 17:26:49 +10:00
David Cook
91f0a80189 Use POST for action that creates data, 
duh.

Turbo cleverly pre-fetches GET requests to save loading time. But that resulted in dozens of unwanted clones.
Attack of the clones!!!

I checked: even though this route predates the new products screen, it wasn't being used anywhere else. The old products screen uses the API instead.
 2024-04-17 15:18:13 +10:00
David Cook
1d1169b478 Prevent frame navigations when form is changed 
This is a hacky hack, filling a gap in Turbo.
 2024-04-17 15:17:59 +10:00
David Cook
06f67488a9 Open links outside of frame by default 
This page is big enough and it's hard to see how everything works. So links work like links by default (eg edit and clone). Other links and forms are special, and will reload only the frame: this is now explicit in the code.
 2024-04-17 15:17:59 +10:00
David Cook
acc72514de Fix spec 2024-04-17 15:17:59 +10:00
David Cook
1abb068a00 Enable morphing? 
I can't really prove if this is working, but it seems to be rendering slightly faster.
 2024-04-17 15:17:59 +10:00
David Cook
508ebab75b Add loading spinner to turbo frame 
That was surprisingly easy. Note that it's still shared with SR.

It hides a bit early though: when the web response returns, but before the DOM has been rendered. Something to optimise in the future.
 2024-04-17 15:17:59 +10:00
David Cook
6c9a47854a Submit forms with Turbo Frame 
Now the filters, pagination and product forms submit and load within the frame, and work perfectly, yay!

It's still building the whole page on the server.. I think we need Turbo Streams if we want to send back just a partial.
 2024-04-17 15:17:59 +10:00
David Cook
9d6ef2f730 Avoid style issues with Turbo 
But the filter dropdowns still get duplicated. So weird..
 2024-04-17 15:17:59 +10:00
David Cook
f17b0d176b Enable Turbo Drive on products page 
Forms now load without a full page rebuild.
This is not really faster, but a bit smoother because it avoids a full page render in the browser. The default Turbo loading indicator is shown (blue line at top).

But the bulk_update form breaks... hmm
On to the next level!
 2024-04-17 15:17:59 +10:00
David Cook
72ce3a01a9 Ensure search terms and filters are retained when saving 2024-04-17 15:17:59 +10:00
Maikel Linke
eb791bed27 Test all files with Rubocop, not just added code in the diff 2024-04-17 09:44:43 +10:00
Maikel
b624965883 Merge pull request #12387 from openfoodfoundation/dependabot/bundler/redis-5.2.0 
chore(deps): bump redis from 5.1.0 to 5.2.0
 2024-04-17 09:06:23 +10:00
Maikel
f5b6a14aba Merge pull request #12386 from openfoodfoundation/dependabot/bundler/rubocop-1.63.2 
chore(deps-dev): bump rubocop from 1.63.1 to 1.63.2
 2024-04-17 09:05:02 +10:00
Maikel
a27999f224 Merge pull request #12385 from openfoodfoundation/dependabot/bundler/rspec-sql-0.0.2 
chore(deps-dev): bump rspec-sql from 0.0.1 to 0.0.2
 2024-04-17 08:24:03 +10:00
kellyzhangg
adad631efa Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test 2024-04-16 15:34:21 -04:00
Kelly
954125b7f6 style improvements after running rubocop 2024-04-16 15:30:21 -04:00
Kelly
1ad544820c completed payments_controller_spec testing 2024-04-16 15:21:49 -04:00
Kelly
7d814e739d added objects necessary for testing - user, order, payment 2024-04-16 15:09:21 -04:00
Kelly
d163080115 added test for if user isn't logged in for payments_controller 2024-04-16 14:52:17 -04:00
Konrad
31c1eee593 Merge pull request #11958 from filipefurtad0/adds_missing_keys_from_i18n_tasks_output 
Adds missing keys from i18n tasks output
 2024-04-16 13:14:29 +02:00
dependabot[bot]
ef3a41203d chore(deps): bump redis from 5.1.0 to 5.2.0 
Bumps [redis](https://github.com/redis/redis-rb) from 5.1.0 to 5.2.0.
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v5.1.0...v5.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-16 09:58:51 +00:00