Commit Graph

3531 Commits

Author SHA1 Message Date
Matt-Yorkley
f4c86a1b51 Merge pull request #8061 from Matt-Yorkley/turbo-checkout
Split Checkout new toys
2021-09-17 10:48:59 +02:00
Matt-Yorkley
47346e9f2c Uncomment ActionCable in application.rb
We're not directly utilising it yet, but CableReady expects it to be loaded.
2021-09-15 18:52:24 +01:00
Luis Ramos
60a8ae6675 Remove Stripe Connect gateway and related code 2021-09-10 14:43:24 +05:30
Maikel
9affc6a945 Merge pull request #8108 from Matt-Yorkley/andand
Remove `andand` gem
2021-09-10 15:06:00 +10:00
Andy Brett
6fea506e05 Update all locales with the latest Transifex translations 2021-09-09 17:52:29 -07:00
Andy Brett
392ba6f3d1 Merge pull request #7975 from vishaldeepak/mail-customer-information
Add customer information to mail when we notify producers when required
2021-09-09 16:10:46 -07:00
Andy Brett
9124e03c11 Merge pull request #8144 from meronokbay/6942-fix-payment-method-fee-bug
6942 fix payment method fee bug
2021-09-09 09:28:40 -07:00
Andy Brett
de29d7e7d7 Merge pull request #8125 from jibees/5782-add-i18n-for-devise
Add devise-i18n and handle i18nization for devise controllers
2021-09-08 11:48:12 -07:00
Matt-Yorkley
1d5077061e Remove andand
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Matt-Yorkley
a23171ea51 Compile Webpacker assets only once in test environment 2021-09-08 10:34:34 +01:00
Matt-Yorkley
b4278aabbf Merge branch 'master' into 8009-handling-shipping-adress 2021-09-07 09:44:49 +02:00
Matt-Yorkley
78e28c517b Make log_level more easily configurable in development 2021-09-06 19:13:00 +01:00
Meron Ogbai
712c204bca Add error message in en.yml 2021-09-05 01:09:03 +03:00
Matt-Yorkley
86da71d6c0 Update all locales with the latest Transifex translations 2021-09-03 10:33:33 +01:00
Matt-Yorkley
dc8939c35f Strip subdomains from session cookie host 2021-09-02 17:29:26 +01:00
Jean-Baptiste Bellet
1b7c36664e Add missing i18n key for Devise
and update tests as well:
 - from feature to system
 - Add the reset password scenario
 - Add some errors scenario to the reset password scenario: token expired, token invalid, and not the same password
2021-09-01 17:16:29 +02:00
Matt-Yorkley
57504f42d8 Move validations to state transitions 2021-09-01 15:04:53 +01:00
Matt-Yorkley
aaf45afbfe Merge pull request #8090 from Matt-Yorkley/session-storage
Allow sessions to work across subdomains
2021-08-31 22:11:44 +02:00
Andy Brett
3fcce8574e Merge pull request #8040 from guidoDutra/7627-prevent-removing-last-item-in-order
Prevent removing last item in order
2021-08-26 10:01:42 -07:00
Jean-Baptiste Bellet
748a37f670 Terms and conditions error message 2021-08-26 09:28:31 +02:00
Jean-Baptiste Bellet
44ab87961a i18nize the global error message 2021-08-26 09:28:31 +02:00
Jean-Baptiste Bellet
b5024c5a16 On summary page, display shipping address as well as billing one 2021-08-25 16:31:45 +02:00
vishaldeepak
813deb49a4 Add customer information to mail when we notify producers when required 2021-08-25 08:29:54 +05:30
Andy Brett
c02b5ccd85 Fix typo in translation 2021-08-24 11:47:05 -07:00
Jean-Baptiste Bellet
fe65359d71 Display no shipping method selected error 2021-08-23 10:16:53 +02:00
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
Jean-Baptiste Bellet
c806b3e889 Be more generic: address is enough
as it could be billing or shipping address
2021-08-19 10:33:16 +02:00
Guido Oliveira
b1cd163900 Prevent removing last item in order 2021-08-18 12:00:32 -03:00
Matt-Yorkley
63dc188d5e Merge pull request #8032 from Matt-Yorkley/order-confirm
Split checkout backend
2021-08-16 23:12:06 +02:00
Matt-Yorkley
2b555691a4 Update all locales with the latest Transifex translations 2021-08-13 20:15:00 +01:00
Matt-Yorkley
0158106f28 Merge pull request #7949 from Matt-Yorkley/producers-caching
Fragment-Cache producers AMS data
2021-08-12 13:27:41 +02:00
Matt-Yorkley
055c6b78af Add order confirmation step to checkout flow 2021-08-11 15:53:01 +01:00
Jean-Baptiste Bellet
b66b1fcdae Add step 3 2021-08-11 15:22:26 +01:00
Matt-Yorkley
d122af286b Update all locales with the latest Transifex translations 2021-08-05 16:38:28 +01:00
Matt-Yorkley
a92847d80d Merge pull request #7947 from andrewpbrett/zeitwerk
Use zeitwerk for autoloading
2021-08-05 00:36:32 +02:00
Transifex-Openfoodnetwork
8d16c4c97f Updating translations for config/locales/en_FR.yml 2021-08-04 05:43:13 +10:00
Transifex-Openfoodnetwork
80a6527a5a Updating translations for config/locales/fr.yml 2021-08-04 05:39:37 +10:00
Matt-Yorkley
b15ae89944 Merge pull request #7840 from jibees/new-checkout-first-step
New checkout first + second step
2021-08-03 12:00:26 +02:00
Matt-Yorkley
623c0eada5 Reinstate removed naming on checkout routes and tidy up 2021-08-03 11:24:22 +02:00
Matt-Yorkley
a32ca23ca5 Simplify routes and partials 2021-08-03 11:24:03 +02:00
Matt-Yorkley
60aec2eff0 Update all locales with the latest Transifex translations 2021-07-29 18:42:50 +01:00
Transifex-Openfoodnetwork
832f08d13a Updating translations for config/locales/de_DE.yml 2021-07-28 09:12:46 +10:00
Transifex-Openfoodnetwork
db0063314b Updating translations for config/locales/en_FR.yml 2021-07-27 22:33:38 +10:00
Transifex-Openfoodnetwork
4e6bc33b05 Updating translations for config/locales/fr.yml 2021-07-27 22:33:04 +10:00
Matt-Yorkley
28fe72c1ec Merge pull request #7976 from openfoodfoundation/transifex
Transifex
2021-07-27 14:26:22 +02:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin
[Adjustments] Admin adjustments
2021-07-27 12:23:29 +02:00
Matt-Yorkley
9d4b34b35b Merge pull request #7977 from Matt-Yorkley/tidy-up
Spree tidy-up
2021-07-27 11:52:22 +02:00
Jean-Baptiste Bellet
57d7191332 Add new step, second one: payment method
Add payment method form

- select the right form depending on the path
2021-07-26 15:47:36 +02:00
Andy Brett
0ea968a900 add redirection to correct step 2021-07-26 15:47:36 +02:00