raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,809 Commits 16 Branches 456 Tags
1d472d0dec6f3ac1cec1b4e016534cba99536314
Commit Graph

21809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
1d472d0dec Add Rack Middleware for transitioning existing sessions 
This checks if the current request has been submitted using the old session key (_session_id) and transparently migrates the session id to a new session cookie with the new settings and the new key (_ofn_session_id).
 2021-08-22 15:57:43 +01:00
Matt-Yorkley
e6ac57ac3a Migrate session cookies to new setup 
Currently sessions set on (www.openfoodnetwork.xxx) are not usable on the bare domain (openfoonetwork.xxx). When transitioning from one to the other, the user's session is completely lost.

This change means sessions on subdomains (including www) will be transferable.
 2021-08-22 15:53:41 +01:00
Matt-Yorkley
697a073330 Merge pull request #8060 from Matt-Yorkley/script-split 
Maps and AMS conditional loading
 2021-08-21 16:35:46 +02:00
Andy Brett
68311f8fa4 Merge pull request #8073 from openfoodfoundation/dependabot/bundler/pagy-4.10.2 
Bump pagy from 4.10.1 to 4.10.2
 2021-08-18 09:47:37 -07:00
dependabot[bot]
828e06b271 Bump pagy from 4.10.1 to 4.10.2 
Bumps [pagy](https://github.com/ddnexus/pagy) from 4.10.1 to 4.10.2.
- [Release notes](https://github.com/ddnexus/pagy/releases)
- [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ddnexus/pagy/compare/4.10.1...4.10.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-18 09:01:48 +00:00
Andy Brett
f783926deb Merge pull request #8063 from openfoodfoundation/dependabot/bundler/bullet-6.1.5 
Bump bullet from 6.1.4 to 6.1.5
 2021-08-17 10:30:00 -07:00
Andy Brett
28c1ba1ad4 Merge pull request #8062 from openfoodfoundation/dependabot/bundler/ffaker-2.19.0 
Bump ffaker from 2.18.0 to 2.19.0
 2021-08-17 10:29:18 -07:00
Andy Brett
dd84e428e3 Merge pull request #8031 from openfoodfoundation/dependabot/bundler/stripe-5.38.0 
Bump stripe from 5.37.0 to 5.38.0
 2021-08-17 08:41:03 -07:00
dependabot[bot]
79d45513a5 Bump bullet from 6.1.4 to 6.1.5 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...6.1.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-17 09:03:46 +00:00
dependabot[bot]
099a4e682d Bump ffaker from 2.18.0 to 2.19.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.18.0...v2.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-17 09:02:15 +00:00
jibees
1ab7cb517f Merge pull request #8058 from Matt-Yorkley/n-plus-ones 
Fix some N+1s
 2021-08-17 10:02:20 +02:00
Matt-Yorkley
63dc188d5e Merge pull request #8032 from Matt-Yorkley/order-confirm 
Split checkout backend
 2021-08-16 23:12:06 +02:00
Andy Brett
36cbe7b2ce Merge pull request #8041 from openfoodfoundation/dependabot/npm_and_yarn/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7
 2021-08-16 12:59:43 -07:00
Andy Brett
ea848f51e7 Merge pull request #8043 from openfoodfoundation/dependabot/bundler/rubocop-1.19.0 
Bump rubocop from 1.18.4 to 1.19.0
 2021-08-16 12:58:21 -07:00
Andy Brett
f575cba75c Merge pull request #8042 from openfoodfoundation/dependabot/bundler/view_component-2.38.0 
Bump view_component from 2.37.0 to 2.38.0
 2021-08-16 12:57:57 -07:00
Matt-Yorkley
7f7ba35c01 Merge pull request #8052 from openfoodfoundation/dependabot/bundler/rspec-rails-5.0.2 
Bump rspec-rails from 5.0.1 to 5.0.2
 2021-08-16 18:09:06 +02:00
dependabot[bot]
ec818e3571 Bump rspec-rails from 5.0.1 to 5.0.2 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.1...v5.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-16 14:58:21 +00:00
Matt-Yorkley
08123c7ea9 Merge pull request #8014 from openfoodfoundation/dependabot/bundler/puma-5.4.0 
Bump puma from 5.3.2 to 5.4.0
 2021-08-16 16:57:04 +02:00
Matt-Yorkley
744bd9d1be Only load Google Maps JS where it's actually needed 2021-08-16 15:31:00 +01:00
Matt-Yorkley
28bf71e77e Fix N+1 in CachedEnterpriseSerializer 2021-08-16 14:58:52 +01:00
Matt-Yorkley
20a3940605 Fix N+1 in #items_bought_by_user 2021-08-16 14:58:52 +01:00
Matt-Yorkley
a98e4417c0 Only inject taxons and properties AMS data in pages where it's actually needed 2021-08-16 13:22:06 +01:00
Matt-Yorkley
b94c586bc5 Merge pull request #7992 from jibees/7959-populate-hub-for-packing-report 
Add appropriate distributors and suppliers to the packing report
 2021-08-14 12:38:35 +02:00
dependabot[bot]
a48e6f6c1b Bump stripe from 5.37.0 to 5.38.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.37.0 to 5.38.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/v5.37.0...v5.38.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-14 08:47:42 +00:00
Matt-Yorkley
5c4a225180 Merge pull request #8026 from Matt-Yorkley/angular-update 
Angular version bump
 2021-08-14 10:46:24 +02:00
Andy Brett
b20382ed56 Merge pull request #8022 from openfoodfoundation/dependabot/bundler/ddtrace-0.52.0 
Bump ddtrace from 0.51.1 to 0.52.0
 2021-08-13 14:58:06 -07:00
Matt-Yorkley
2b555691a4 Update all locales with the latest Transifex translations v4.0.1 2021-08-13 20:15:00 +01:00
dependabot[bot]
48750f7cb8 Bump rubocop from 1.18.4 to 1.19.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.4 to 1.19.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.18.4...v1.19.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 09:03:53 +00:00
dependabot[bot]
5f1b5b679d Bump view_component from 2.37.0 to 2.38.0 
Bumps [view_component](https://github.com/github/view_component) from 2.37.0 to 2.38.0.
- [Release notes](https://github.com/github/view_component/releases)
- [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/github/view_component/compare/v2.37.0...v2.38.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 09:02:44 +00:00
dependabot[bot]
8955d1bba0 Bump path-parse from 1.0.6 to 1.0.7 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 01:10:41 +00:00
Matt-Yorkley
fb6ee65865 Remove more (currently) unused code 2021-08-12 17:24:20 +01:00
Matt-Yorkley
d1b22dfff3 Merge pull request #8024 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.7 
Bump @storybook/addon-docs from 6.3.6 to 6.3.7
 2021-08-12 18:22:27 +02:00
dependabot[bot]
fda068fe83 Bump @storybook/addon-docs from 6.3.6 to 6.3.7 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.6 to 6.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.7/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-12 12:46:33 +00:00
Matt-Yorkley
39fb6b6f9b Merge pull request #8025 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.7 
Bump @storybook/addon-controls from 6.3.6 to 6.3.7
 2021-08-12 14:43:26 +02:00
dependabot[bot]
7b795c1da9 Bump @storybook/addon-controls from 6.3.6 to 6.3.7 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.6 to 6.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.7/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-12 12:34:06 +00:00
Matt-Yorkley
0030bd1464 Merge pull request #8030 from openfoodfoundation/dependabot/bundler/bugsnag-6.22.1 
Bump bugsnag from 6.21.0 to 6.22.1
 2021-08-12 14:29:26 +02:00
Matt-Yorkley
9e26a39660 Merge pull request #8023 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.7 
Bump @storybook/server from 6.3.6 to 6.3.7
 2021-08-12 14:28:16 +02:00
Matt-Yorkley
ad0cc85991 Merge pull request #8021 from openfoodfoundation/dependabot/bundler/view_component-2.37.0 
Bump view_component from 2.36.0 to 2.37.0
 2021-08-12 14:27:54 +02:00
Matt-Yorkley
ba3d4c0c82 Merge pull request #8018 from openfoodfoundation/dependabot/bundler/view_component_storybook-0.10.1 
Bump view_component_storybook from 0.9.0 to 0.10.1
 2021-08-12 14:27:07 +02:00
Matt-Yorkley
d31ab5b104 Merge pull request #8012 from openfoodfoundation/dependabot/bundler/knapsack-4.0.0 
Bump knapsack from 3.1.0 to 4.0.0
 2021-08-12 14:26:27 +02:00
Matt-Yorkley
30295c4390 Merge pull request #8013 from openfoodfoundation/dependabot/bundler/webmock-3.14.0 
Bump webmock from 3.13.0 to 3.14.0
 2021-08-12 14:26:10 +02:00
Matt-Yorkley
1d074c2151 Extract callbacks to a concern 2021-08-12 13:06:50 +01:00
Matt-Yorkley
1147c5b2ca Update saved address loading 2021-08-12 12:53:45 +01:00
Matt-Yorkley
026e51081c Clear invalid payments 
When going back and changing the payment option, the previous payment gets invalidated.
 2021-08-12 12:53:45 +01:00
Matt-Yorkley
98ae82147c Avoid using Angular in shipping and payment method display 2021-08-12 12:53:45 +01:00
Matt-Yorkley
41c62b97d5 Use flash.now unless redirecting 2021-08-12 12:53:45 +01:00
Matt-Yorkley
dbefd95b5e Improve order workflow shipping method selection 2021-08-12 12:53:45 +01:00
Matt-Yorkley
5fb3943634 Validate payment object exists before advancing from payment to confirmation 2021-08-12 12:53:45 +01:00
Matt-Yorkley
6c885f0f42 Declare validations together 2021-08-12 12:53:45 +01:00
Matt-Yorkley
5d9c4315d8 Remove dead code 2021-08-12 12:53:45 +01:00