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
23,229 Commits 18 Branches 452 Tags
2e857834659d02ca9dc09caebee9d26dd28af7c0
Commit Graph

23229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
2e85783465 Merge pull request #8731 from Matt-Yorkley/split-checkout-default-addresses 
Split checkout: default address saving
 2022-01-19 17:43:51 +00:00
Filipe
7444e2d2f3 Merge pull request #8741 from Matt-Yorkley/guest-checkout-login 
Fix split checkout guest user login
 2022-01-19 16:43:24 +00:00
Filipe
baa3f64839 Merge pull request #8751 from openfoodfoundation/dependabot/bundler/rails-i18n-7.0.1 
Bump rails-i18n from 6.0.0 to 7.0.1
 2022-01-19 15:49:06 +00:00
Matt-Yorkley
2b960a04c6 Move Order callback entirely into service 2022-01-19 13:40:33 +00:00
Matt-Yorkley
8a944e3e78 Tidy up Order#save_default_addresses 2022-01-19 13:40:33 +00:00
Matt-Yorkley
8f37aa71f2 Save default addresses when requested during checkout 2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8 Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c 
Split checkout T&Cs
 2022-01-19 13:39:15 +00:00
Matt-Yorkley
21ed136e00 Enable opening login modal via broadcasted DOM Event 2022-01-19 13:14:10 +00:00
Matt-Yorkley
8ce27bed86 Move guest checkout handling to the frontend 2022-01-19 13:14:10 +00:00
Matt-Yorkley
27c7b16b03 Merge pull request #8748 from openfoodfoundation/dependabot/bundler/ddtrace-0.54.1 
Bump ddtrace from 0.53.0 to 0.54.1
 2022-01-19 09:50:10 +00:00
Maikel
a5b0324f76 Merge pull request #8750 from openfoodfoundation/dependabot/bundler/activerecord-import-1.3.0 
Bump activerecord-import from 1.2.0 to 1.3.0
 2022-01-19 15:13:41 +11:00
Maikel
31341537ff Merge pull request #8749 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.13.2 
Bump rubocop-rails from 2.12.4 to 2.13.2
 2022-01-19 15:12:07 +11:00
Maikel
88be980456 Merge pull request #8746 from openfoodfoundation/dependabot/bundler/stripe-5.42.0 
Bump stripe from 5.39.0 to 5.42.0
 2022-01-19 15:08:24 +11:00
Maikel
273d41fcd8 Merge pull request #8745 from openfoodfoundation/dependabot/bundler/listen-3.7.1 
Bump listen from 3.7.0 to 3.7.1
 2022-01-19 15:07:02 +11:00
Matt-Yorkley
a6408007db Merge pull request #8683 from filipefurtad0/add_specs_split_checkout_1 
Adds additional test coverage on step 1
 2022-01-18 21:12:27 +00:00
filipefurtad0
9ef8e86e59 Removes xpath within blocks on spec file 2022-01-18 18:09:14 +00:00
filipefurtad0
f250f6dc53 Updates mandatory field error count after merging #8691 2022-01-18 15:12:15 +00:00
filipefurtad0
63ae159091 Changes assertion from URL to page content on spec file 2022-01-18 15:10:31 +00:00
filipefurtad0
3b6bb1c9a8 Removes within blocks; replaces field names by ids 2022-01-18 14:39:24 +00:00
filipefurtad0
ee601bb357 Uses reload to fetch bill/ship address ids 2022-01-18 14:39:24 +00:00
filipefurtad0
25244725e9 Changes assertion from URL to page content 2022-01-18 14:39:24 +00:00
filipefurtad0
ab2d92ab8f Applies helper change on spec file 2022-01-18 14:39:24 +00:00
filipefurtad0
22d9da9edc Changes helper name 2022-01-18 14:39:24 +00:00
filipefurtad0
ec4ec66051 Corrects rubocop offense 2022-01-18 14:39:24 +00:00
filipefurtad0
f3e0799205 Adds DB validation for same ship and bill addresses 2022-01-18 14:39:24 +00:00
filipefurtad0
3ad8e2df4f Adds coverage on mandatory fields - details/billing/shipping 2022-01-18 14:39:24 +00:00
filipefurtad0
0da2d6e469 Adds coverage for required fields - address shipping 2022-01-18 14:39:24 +00:00
filipefurtad0
01f870b818 Adds coverage on ship_address_same_as_billing option 2022-01-18 14:39:24 +00:00
Matt-Yorkley
e1849e5fb6 Merge pull request #8752 from openfoodfoundation/dependabot/bundler/bugsnag-6.24.1 
Bump bugsnag from 6.24.0 to 6.24.1
 2022-01-18 12:09:51 +00:00
jibees
8a3c188f31 Merge pull request #8753 from openfoodfoundation/dependabot/bundler/sidekiq-6.3.1 
Bump sidekiq from 6.2.2 to 6.3.1
 2022-01-18 12:17:20 +01:00
Matt-Yorkley
1f31aed56d Merge pull request #8754 from Matt-Yorkley/json 
Bump json gem back up to 2.6.1
 2022-01-18 10:29:26 +00:00
dependabot[bot]
6884da4f50 Bump sidekiq from 6.2.2 to 6.3.1 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.2 to 6.3.1.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.2...v6.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:26:09 +00:00
dependabot[bot]
e9dda6cd96 Bump bugsnag from 6.24.0 to 6.24.1 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.24.0 to 6.24.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.24.0...v6.24.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:25:40 +00:00
dependabot[bot]
cfd8f81b3a Bump rails-i18n from 6.0.0 to 7.0.1 
Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 6.0.0 to 7.0.1.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits)

---
updated-dependencies:
- dependency-name: rails-i18n
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:24:56 +00:00
Matt-Yorkley
383d938d7c Bump json back up to 2.6.1 2022-01-18 10:24:43 +00:00
dependabot[bot]
c0e63d8299 Bump activerecord-import from 1.2.0 to 1.3.0 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.2.0...v1.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:24:29 +00:00
dependabot[bot]
661d678910 Bump rubocop-rails from 2.12.4 to 2.13.2 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.12.4 to 2.13.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.12.4...v2.13.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:23:59 +00:00
dependabot[bot]
0c2c853e8e Bump ddtrace from 0.53.0 to 0.54.1 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.53.0 to 0.54.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.53.0...v0.54.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:23:17 +00:00
dependabot[bot]
64ecc5757f Bump stripe from 5.39.0 to 5.42.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.39.0 to 5.42.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.39.0...v5.42.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:21:54 +00:00
dependabot[bot]
9ac5a1d379 Bump listen from 3.7.0 to 3.7.1 
Bumps [listen](https://github.com/guard/listen) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.7.0...v3.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 10:21:14 +00:00
Matt-Yorkley
1fda316d4c Merge pull request #8740 from Matt-Yorkley/rails-bump 
Update Rails from 6.1.4.1 to 6.1.4.4
 2022-01-18 10:19:24 +00:00
Matt-Yorkley
eb12648538 Merge pull request #8742 from openfoodfoundation/dependabot/npm_and_yarn/browserslist-4.19.1 
Bump browserslist from 4.16.3 to 4.19.1
 2022-01-18 09:57:12 +00:00
jibees
fdba942c7e Merge pull request #8734 from mkllnk/dependencies 
Restrict Dependabot to update only the lockfiles
 2022-01-18 10:39:29 +01:00
Matt-Yorkley
7c2b3cdf51 Fix param whitelisting 
Co-authored-by: Maikel <maikel@email.org.au>
 2022-01-18 09:14:55 +00:00
Maikel
7fb227710f Merge pull request #8728 from shen-sat/6056-improve-auto-test-coverage-on-order-customer-details 
[6045] Add test for hiding billing address form and adding new customer on o…
 2022-01-18 11:46:11 +11:00
dependabot[bot]
98a8036c7b Bump browserslist from 4.16.3 to 4.19.1 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.19.1.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.3...4.19.1)

---
updated-dependencies:
- dependency-name: browserslist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 00:42:43 +00:00
Maikel
1ad43964c1 Merge pull request #8737 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.13 
Bump @storybook/addon-docs from 6.4.12 to 6.4.13
 2022-01-18 11:31:58 +11:00
dependabot[bot]
de7860fd91 Bump @storybook/addon-docs from 6.4.12 to 6.4.13 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.12 to 6.4.13.
- [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.4.13/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>
 2022-01-18 00:16:49 +00:00
Maikel
ac0c8e8419 Merge pull request #8736 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.13 
Bump @storybook/addon-controls from 6.4.12 to 6.4.13
 2022-01-18 11:09:18 +11:00
dependabot[bot]
8d14b4d1fe Bump @storybook/addon-controls from 6.4.12 to 6.4.13 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.12 to 6.4.13.
- [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.4.13/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>
 2022-01-18 00:05:06 +00:00