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

23651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
4d6c4f850f Remove pointless callbacks in CheckoutController 
These exact same checks are already made in #load_order (and #order_invalid_for_checkout?), which is called before these other two (later) callbacks.
 2022-01-14 19:41:08 +00:00
Matt-Yorkley
77d89ec7d0 Extract and standardise use of #order_completion_route 2022-01-14 19:41:08 +00:00
Matt-Yorkley
4c1fc2b326 Standardise use of #order_completion_reset 2022-01-14 19:41:08 +00:00
Matt-Yorkley
124b63fad0 Remove unused flash assignment 2022-01-14 19:41:08 +00:00
Matt-Yorkley
01bd77e437 Remove duplicate translation key 2022-01-14 19:41:08 +00:00
Matt-Yorkley
e58b1b1094 Tidy up before and after callbacks 2022-01-14 19:41:08 +00:00
Matt-Yorkley
9b6d4da8d5 Pull related lines into OrderCompletion#order_completion_reset 2022-01-14 19:41:08 +00:00
Matt-Yorkley
02995530e2 Pull apart OrderCompletionReset service 2022-01-14 19:41:08 +00:00
Matt-Yorkley
67b8a55273 Separate OrderCompletionReset from Checkout::PostCheckoutActions and don't pass controller objects to Checkout::PostCheckoutActions 
We need to separate some of these bits to make them easier to call in different contexts. Also there's some weird stuff happening here with the controller being passed in to the service, and it seems like a code smell to me...
 2022-01-14 19:41:08 +00:00
Matt-Yorkley
ad60f2392a Delete unused return statement 2022-01-14 19:41:08 +00:00
Matt-Yorkley
06eb98bdf4 Extract #valid_order_line_items? 2022-01-14 19:41:08 +00:00
Transifex-Openfoodnetwork
3daaa9d50b Updating translations for config/locales/es.yml 2022-01-15 05:45:15 +11:00
Matt-Yorkley
c5c5738382 Merge pull request #8706 from openfoodfoundation/mkllnk-pr-template 
Change instructions to move release notes to the title of a new pull request
 2022-01-14 13:57:28 +00:00
Matt-Yorkley
2d746a5f30 Merge pull request #8723 from cillian/remove-unused-js-from-general-settings-edit 
Remove unused code for currency select menu which no longer exists
 2022-01-14 13:54:45 +00:00
Cillian O'Ruanaidh
22a48de033 Remove unused code for currency select menu which no longer exists 
This removes inline JavaScript for #8699. This code was for the old currency select menu which was removed in 4839b7bd63
 2022-01-14 12:33:30 +00:00
Cillian O'Ruanaidh
bc33df6659 Remove unused inline JavaScript from products/_form.html.haml 
For #8699. This code, which was introduced in 1309d80f65, does not appear to be used. The CSS at https://github.com/openfoodfoundation/openfoodnetwork/blob/master/app/webpacker/css/admin/sections/products.scss#L6 is used instead.
 2022-01-14 12:07:33 +00:00
Matt-Yorkley
534354a177 Add data migration 2022-01-14 11:23:41 +00:00
Transifex-Openfoodnetwork
93ecc894c6 Updating translations for config/locales/de_DE.yml 2022-01-14 07:09:03 +11:00
Transifex-Openfoodnetwork
f374186b8d Updating translations for config/locales/fr_CA.yml 2022-01-14 05:20:05 +11:00
Transifex-Openfoodnetwork
883e137a43 Updating translations for config/locales/en_CA.yml 2022-01-14 04:27:24 +11:00
Transifex-Openfoodnetwork
d89bfd30c9 Updating translations for config/locales/en_CA.yml 2022-01-14 03:57:37 +11:00
Matt-Yorkley
1d4803c31a Whitelist valid step param values 2022-01-13 13:55:33 +00:00
Matt-Yorkley
b850fd6fda Add controller spec for split checkout 2022-01-13 13:55:33 +00:00
Matt-Yorkley
f378a9a0cb Merge pull request #8715 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.11 
Bump karma from 6.3.10 to 6.3.11
 2022-01-13 13:25:04 +00:00
Transifex-Openfoodnetwork
646bd05973 Updating translations for config/locales/en_FR.yml 2022-01-13 23:00:00 +11:00
Transifex-Openfoodnetwork
2cc1b6a2f8 Updating translations for config/locales/fr.yml 2022-01-13 22:43:21 +11:00
dependabot[bot]
a869388759 Bump karma from 6.3.10 to 6.3.11 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.10 to 6.3.11.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.10...v6.3.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 10:51:41 +00:00
Matt-Yorkley
7366aeb333 Merge pull request #8718 from openfoodfoundation/revert-8709-dependabot/npm_and_yarn/webpack-dev-server-4.7.3 
Revert "Bump webpack-dev-server from 3.11.2 to 4.7.3"
 2022-01-13 10:48:19 +00:00
Matt-Yorkley
6e7fdd75ff Revert "Bump webpack-dev-server from 3.11.2 to 4.7.3" 2022-01-13 10:47:58 +00:00
Jean-Baptiste Bellet
f78ff3fc3b Improve display when label is long 
(ie. longer than the available screen width)
 2022-01-13 11:05:44 +01:00
Maikel
72edd9fa36 Merge pull request #8690 from apricot12/8489-Mising-stripe-translations 
Add translations for all stripe decline codes
 2022-01-13 16:30:24 +11:00
Maikel
de1d7f31a6 Merge pull request #8709 from openfoodfoundation/dependabot/npm_and_yarn/webpack-dev-server-4.7.3 
Bump webpack-dev-server from 3.11.2 to 4.7.3
 2022-01-13 16:26:03 +11:00
Maikel
50a94931d4 Merge pull request #8645 from Matt-Yorkley/initialization-deprecations 
Initialization deprecations
 2022-01-13 16:06:56 +11:00
dependabot[bot]
8eadb0af8a Bump webpack-dev-server from 3.11.2 to 4.7.3 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.11.2 to 4.7.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.2...v4.7.3)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 05:03:49 +00:00
Maikel
696bbdc2e2 Merge pull request #8649 from Matt-Yorkley/deprecation-fixes 
Deprecation fixes
 2022-01-13 15:59:47 +11:00
Maikel
7bac200b88 Merge pull request #8687 from openfoodfoundation/dependabot/npm_and_yarn/shortcut-buttons-flatpickr-0.4.0 
Bump shortcut-buttons-flatpickr from 0.3.1 to 0.4.0
 2022-01-13 15:57:26 +11:00
Maikel
9d9441a85f Merge pull request #8714 from openfoodfoundation/dependabot/npm_and_yarn/follow-redirects-1.14.7 
Bump follow-redirects from 1.13.0 to 1.14.7
 2022-01-13 15:56:23 +11:00
Maikel
84b83da167 Merge pull request #8710 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.12 
Bump @storybook/addon-docs from 6.4.9 to 6.4.12
 2022-01-13 15:55:04 +11:00
Maikel
5257361df8 Merge pull request #8651 from Matt-Yorkley/custom-errors 
Remove custom errors gem
 2022-01-13 15:54:50 +11:00
dependabot[bot]
a6887bea0b Bump @storybook/addon-docs from 6.4.9 to 6.4.12 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.9 to 6.4.12.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.12/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.12/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-13 04:34:20 +00:00
dependabot[bot]
c34570f398 Bump follow-redirects from 1.13.0 to 1.14.7 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 04:24:47 +00:00
Maikel
b9b78443a0 Merge pull request #8711 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.12 
Bump @storybook/addon-controls from 6.4.9 to 6.4.12
 2022-01-13 15:24:21 +11:00
Maikel
f973f62e49 Merge pull request #8708 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.12 
Bump @storybook/server from 6.4.9 to 6.4.12
 2022-01-13 15:23:34 +11:00
Matt-Yorkley
f8efff9a4e Don't show terms of service unless required 2022-01-12 22:17:22 +00:00
Matt-Yorkley
18cdf98aa1 Set terms and conditions accepted when completing checkout 2022-01-12 22:17:22 +00:00
Matt-Yorkley
f2c506a292 Update and extract summary_step? check 2022-01-12 22:17:22 +00:00
Filipe
7709e86d41 Merge pull request #8676 from jibees/8668-split-checkout-as-guest 
Handle checkout as guest feature on split checkout
 2022-01-12 20:22:01 +00:00
Filipe
cc0de4618c Merge pull request #8692 from jibees/8691-make-first-name-and-last-name-fields-mandatory 
Validate the presence of first/last name if there is no company
 2022-01-12 19:48:35 +00:00
Matt-Yorkley
58d3ad412a Rename method for clarity 2022-01-12 17:52:10 +00:00
Matt-Yorkley
cb5dd6eed9 Move T&C checks to service 2022-01-12 17:52:10 +00:00