raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,082 Commits 18 Branches 452 Tags
67b8a5527306649d3154efd7e05ebfcb3a2ff7f2
Commit Graph

23082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
0143adb8e0 Merge pull request #8518 from pacodelaluna/fix-webpacker-container-configuration 
Fix Webpacker container configuration
 2022-01-12 14:35:00 +00:00
dependabot[bot]
a474e19448 Bump @storybook/addon-controls from 6.4.9 to 6.4.12 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) 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/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-12 09:07:12 +00:00
dependabot[bot]
6352929dc1 Bump @storybook/server from 6.4.9 to 6.4.12 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) 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/app/server)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-12 09:05:53 +00:00
Maikel
165d121aab Merge pull request #8650 from Matt-Yorkley/rubocop-skips-validations 
Allow methods which skip callbacks in Rubocop
 2022-01-12 13:06:46 +11:00
Maikel
71fe167092 Move release notes to the title of the PR 
Github can generate release notes from titles automatically. That's much easier than us copying the text from each pull request.

Also changed:

- Converted instructions for the issue number to a comment to make pasting the issue number easier.
- More detail for testing instructions. Many people don't fill them out correctly.
- Formatting of comments for better readability.
 2022-01-12 12:55:12 +11:00
Matt-Yorkley
80342e258b Update all locales with the latest Transifex translations 2022-01-11 20:34:55 +00:00
Filipe
d66dac4ccb Merge pull request #8621 from apricot12/Unit-value-shop-front 
Update units when variant unit name is edited
 2022-01-11 17:41:20 +00:00
Filipe
4978c95e75 Merge pull request #8467 from SarvarKh/validate-social-links 
Fix the issue with 'at' in enterprise twitter and instagram
 2022-01-11 12:53:11 +00:00
Filipe
f2b14beea9 Merge pull request #8541 from jibees/8506-improve-shiped-email 
Improve shipped email design
 2022-01-11 11:36:32 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name 
Enable sorting orders by order full name
 2022-01-11 11:27:36 +00:00
Jean-Baptiste Bellet
6e62985e19 update tests as there are now 2 more mandatory fields 
First name and last name
 2022-01-11 10:30:45 +01:00
Jean-Baptiste Bellet
1a270af82b Test the presence of the firstname and the lastname if company is not present 
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-01-11 10:30:45 +01:00
Maikel
3480c5d931 Merge pull request #8654 from Matt-Yorkley/rails-defaults 
Apply recommended framework defaults
 2022-01-11 16:12:27 +11:00
Nihal M. Kelanthodika
000c59ffa7 Add translations for all stripe decline codes 2022-01-10 20:47:47 +05:30
jibees
cc1e3912ad Merge pull request #8685 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.10 
Bump karma from 6.3.9 to 6.3.10
 2022-01-10 15:23:29 +01:00
dependabot[bot]
346ec9ef1d Bump karma from 6.3.9 to 6.3.10 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.9 to 6.3.10.
- [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.9...v6.3.10)

---
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-10 12:14:59 +00:00
Matt-Yorkley
fd4a18a838 Merge pull request #8680 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.7 
Bump jest from 27.4.6 to 27.4.7
 2022-01-10 12:11:12 +00:00
dependabot[bot]
8d46a185d6 Bump shortcut-buttons-flatpickr from 0.3.1 to 0.4.0 
Bumps [shortcut-buttons-flatpickr](https://github.com/jcsmorais/shortcut-buttons-flatpickr) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/jcsmorais/shortcut-buttons-flatpickr/releases)
- [Commits](https://github.com/jcsmorais/shortcut-buttons-flatpickr/compare/0.3.1...0.4.0)

---
updated-dependencies:
- dependency-name: shortcut-buttons-flatpickr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 09:10:22 +00:00
Jean-Baptiste Bellet
36db396fe5 Do not redirect if user is logged in 2022-01-10 10:02:08 +01:00
Jean-Baptiste Bellet
573798e4a4 Handle visit /checkout/details in both case: authorized or not 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
9a74934f79 Do not redirect to /guest if step is specified 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
b6e8862401 Update test for guest checkout when distributor doesn't allow 2022-01-10 09:40:16 +01:00
Jean-Baptiste Bellet
6be2fbb0b9 Specify allow_guest_orders attribute 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
b1524aa0bd Guard clause: redirect to /guest when POST 
When there is no connected user, and when the distributor doesn't allow guest orders, redirect on POST method
 2022-01-10 09:39:46 +01:00
Jean-Baptiste Bellet
a36d03a7ab Update test as well ; guest checkout when distributor allow 2022-01-10 09:39:46 +01:00