Matt-Yorkley
0c369b618d
Remove code that guesses what the tax rate might be
...
🎉
2021-07-09 21:49:35 +01:00
Matt-Yorkley
65eb33ad9e
Only update totals and states in AdjustmentsController
...
Avoids unnecessary updating of all other adjustments
2021-07-09 21:49:35 +01:00
Matt-Yorkley
e8d610f9df
Remove dead code AdjustmentsController#enable_updates
2021-07-09 21:49:35 +01:00
Andy Brett
718f9c4af8
Merge pull request #7848 from jibees/7842-locale-management-on-user_passwords-controller
...
Handle lang management on user passwords controller
2021-07-09 08:55:09 -07:00
Matt-Yorkley
db7c397345
Merge pull request #7906 from openfoodfoundation/transifex
...
Transifex
2021-07-09 16:53:44 +02:00
Transifex-Openfoodnetwork
e19a407a39
Updating translations for config/locales/ru.yml
2021-07-09 23:31:56 +10:00
Transifex-Openfoodnetwork
3c104158db
Updating translations for config/locales/ru.yml
2021-07-09 23:28:55 +10:00
Transifex-Openfoodnetwork
d9e0a6a04f
Updating translations for config/locales/fr.yml
2021-07-09 23:28:44 +10:00
Transifex-Openfoodnetwork
99f127148e
Updating translations for config/locales/ru.yml
2021-07-09 23:26:43 +10:00
Transifex-Openfoodnetwork
cce6ba65dd
Updating translations for config/locales/fr.yml
2021-07-09 23:25:43 +10:00
Transifex-Openfoodnetwork
bb6162059d
Updating translations for config/locales/en_FR.yml
2021-07-09 23:25:34 +10:00
Matt-Yorkley
e6d9545c30
Use :incomplete scope when voiding payments that can't be processed due to stock changes
2021-07-09 13:31:00 +01:00
Transifex-Openfoodnetwork
4162215582
Updating translations for config/locales/fr.yml
2021-07-09 22:30:01 +10:00
Matt-Yorkley
2b8b690892
Tidy up :valid scope in Spree::Payment
2021-07-09 13:28:38 +01:00
Matt-Yorkley
b4a9a6fea5
Add :incomplete scope in Spree::Payment
2021-07-09 13:28:19 +01:00
Transifex-Openfoodnetwork
cf66d96746
Updating translations for config/locales/en_FR.yml
2021-07-09 22:27:37 +10:00
Transifex-Openfoodnetwork
c82db9716c
Updating translations for config/locales/fr.yml
2021-07-09 22:26:57 +10:00
Matt-Yorkley
b1db06a3c6
Allow payments in requires_authorization state to be voided
2021-07-09 13:24:37 +01:00
Matt-Yorkley
a199f80ed4
Add test for insufficient stock behavior after Stripe redirect
2021-07-09 13:14:43 +01:00
Matt-Yorkley
2cd6b05aba
Use Order::Contents service in test setup
2021-07-09 13:14:43 +01:00
Matt-Yorkley
9bcf0d5b38
Handle Stripe payments when checkout fails due to stock issues
...
This can occur when stock is reduced after the user is redirected to Stripe and before they are redirected back. The stock is insufficient, the order is not complete, the user is bounced back to the cart, but a *pending* Stripe payment is left on the order.
2021-07-09 13:13:20 +01:00
Matt-Yorkley
9795734dc8
Merge pull request #7903 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.4
...
Bump @storybook/addon-controls from 6.3.3 to 6.3.4
2021-07-09 12:41:48 +02:00
Matt-Yorkley
e5242bab49
Merge pull request #7902 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.4
...
Bump @storybook/server from 6.3.3 to 6.3.4
2021-07-09 12:41:30 +02:00
Matt-Yorkley
d4052a0e62
Merge pull request #7893 from guidoDutra/1861-add-shopfront-sort-placeholder-translations
...
Add translations to shopfront sorting placeholders
2021-07-09 12:37:40 +02:00
dependabot[bot]
b5b4f6df82
Bump @storybook/addon-controls from 6.3.3 to 6.3.4
...
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls ) from 6.3.3 to 6.3.4.
- [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.4/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-07-09 09:07:59 +00:00
dependabot[bot]
d89ae67c4d
Bump @storybook/server from 6.3.3 to 6.3.4
...
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server ) from 6.3.3 to 6.3.4.
- [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.4/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 >
2021-07-09 09:05:47 +00:00
jibees
a225a4e440
Merge pull request #7901 from openfoodfoundation/revert-7821-dependabot/npm_and_yarn/webpack-cli-4.7.2
...
Revert "Bump webpack-cli from 3.3.12 to 4.7.2"
2021-07-09 11:02:15 +02:00
Matt-Yorkley
626ced812a
Revert "Bump webpack-cli from 3.3.12 to 4.7.2"
2021-07-09 10:38:47 +02:00
Maikel
75bdb82b5c
Merge pull request #7900 from openfoodfoundation/transifex
...
Transifex
2021-07-09 17:19:08 +10:00
Transifex-Openfoodnetwork
74ba812061
Updating translations for config/locales/ru.yml
2021-07-09 16:23:32 +10:00
Andy Brett
c966c3b8d7
Merge pull request #7889 from openfoodfoundation/transifex
...
Transifex
2021-07-08 17:16:36 -07:00
Andy Brett
762d0ca338
Merge pull request #7899 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.4
...
Bump @storybook/addon-docs from 6.3.2 to 6.3.4
2021-07-08 16:55:17 -07:00
dependabot[bot]
131b22576b
Bump @storybook/addon-docs from 6.3.2 to 6.3.4
...
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs ) from 6.3.2 to 6.3.4.
- [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.4/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-07-08 23:34:47 +00:00
Andy Brett
704da21c60
Merge pull request #7897 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.3
...
Bump @storybook/server from 6.3.2 to 6.3.3
2021-07-08 16:29:27 -07:00
Andy Brett
8bbb150b07
Merge pull request #7896 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.3
...
Bump @storybook/addon-controls from 6.3.2 to 6.3.3
2021-07-08 16:29:12 -07:00
Mathieu Lovato Stumpf Guntz
9670ca0fbb
Update schema after recent migrations
...
Add table `terms_of_service_files` and a `tax_category_id` field
2021-07-08 19:10:53 +02:00
dependabot[bot]
76f91e7854
Bump @storybook/server from 6.3.2 to 6.3.3
...
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server ) from 6.3.2 to 6.3.3.
- [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.3/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 >
2021-07-08 09:06:23 +00:00
dependabot[bot]
f911f66ead
Bump @storybook/addon-controls from 6.3.2 to 6.3.3
...
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls ) from 6.3.2 to 6.3.3.
- [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.3/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-07-08 09:05:45 +00:00
Jean-Baptiste Bellet
1a8a12fb0c
Filter language to not display the current lang in the dropdown
...
No need to set a lang that is actually already set
2021-07-08 09:15:09 +02:00
Guido Oliveira
9bc41cf04f
Add translations to shopfront sorting placeholders
2021-07-07 14:39:10 -03:00
Andy Brett
869532d094
Merge pull request #7888 from openfoodfoundation/dependabot/bundler/rubocop-1.18.3
...
Bump rubocop from 1.18.2 to 1.18.3
2021-07-07 09:36:57 -07:00
Nihal Mohammed
db88121ed8
Update Customer model to validate email with valid_email2 gem
2021-07-07 20:30:06 +05:30
Nihal Mohammed
262baf1870
Add valid_email2 gem to Gemfile and run bundle install
2021-07-07 20:00:00 +05:30
Transifex-Openfoodnetwork
277a2a4d58
Updating translations for config/locales/de_DE.yml
2021-07-07 22:50:38 +10:00
dependabot[bot]
11a748b94e
Bump rubocop from 1.18.2 to 1.18.3
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.18.2 to 1.18.3.
- [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.2...v1.18.3 )
---
updated-dependencies:
- dependency-name: rubocop
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-07-07 09:04:35 +00:00
Andy Brett
46cd05c54a
Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer
...
Enable sorting by producer in shopfront
2021-07-06 09:27:42 -07:00
Andy Brett
ff3784ad3f
Merge pull request #7851 from apricot12/view_deleted_payments_in_admin
...
Allow viewing of payments made with deleted pyment methods in admin
2021-07-06 07:24:42 -07:00
Andy Brett
4f18cf6645
Merge pull request #7882 from openfoodfoundation/dependabot/bundler/view_component-2.35.0
...
Bump view_component from 2.34.0 to 2.35.0
2021-07-06 06:43:38 -07:00
Jean-Baptiste Bellet
aa982fe8df
Create a new method to change the lang of the app
...
- The old method (link to `?locale=#{l.to_s}`) was not functional for path that already has query params in current path (such as `/user/spree_user/password/edit?reset_password_token=`) ;
- This seems that the best way to handle this, is to create a new route, new method that effectively set the lang (not the locale actually...) and then redirect_back (ie. using the HTTP_REFERER, with a fallback to `/`)
s
2021-07-06 10:09:37 +02:00
Andy Brett
6a126835cc
Merge pull request #7881 from openfoodfoundation/dependabot/bundler/rubocop-1.18.2
...
Bump rubocop from 1.18.1 to 1.18.2
2021-07-05 10:30:01 -07:00