Commit Graph

3555 Commits

Author SHA1 Message Date
Maikel Linke
35ed7e852d Remove errornous quotes from alert text 2021-10-11 16:43:14 +11:00
Matt-Yorkley
86404045f2 Update all locales with the latest Transifex translations 2021-10-07 19:04:55 +01:00
Matt-Yorkley
10fe61b71f Merge pull request #8285 from openfoodfoundation/transifex
Transifex
2021-10-07 20:01:07 +02:00
Transifex-Openfoodnetwork
452f4ec0b8 Updating translations for config/locales/en_FR.yml 2021-10-08 03:16:20 +11:00
Transifex-Openfoodnetwork
09b9c8e10d Updating translations for config/locales/fr.yml 2021-10-08 03:15:23 +11:00
Nihal M. Kelanthodika
b0dcf47481 Add translation for "Reset Form" button 2021-10-06 15:06:56 +05:30
Nihal Mohammed
7ef6671e37 Add tooltip for business address
Fix schema
2021-10-06 15:06:56 +05:30
Nihal Mohammed
83524f2285 Update en.yml to include translations for business_address form 2021-10-06 15:06:56 +05:30
Transifex-Openfoodnetwork
474651a20a Updating translations for config/locales/fr_CA.yml 2021-10-06 08:14:55 +11:00
Transifex-Openfoodnetwork
cf82a87c0b Updating translations for config/locales/en_CA.yml 2021-10-06 07:56:29 +11:00
Matt-Yorkley
17c31a22bc Merge pull request #8260 from Matt-Yorkley/paperclip-uri-deprecation
Fix deprecation in Paperclip
2021-10-05 19:20:26 +02:00
Matt-Yorkley
43f28d94b9 Update all locales with the latest Transifex translations 2021-09-30 18:22:16 +01:00
Matt-Yorkley
61fa251f6a Merge pull request #8252 from openfoodfoundation/transifex
Transifex
2021-09-30 19:00:49 +02:00
Matt-Yorkley
cb65c7c2ef Fix deprecation warning in Paperclip
Fixes deprecation warnings in Paperclip::UrlGenerator#escape_url

On a side note: we shouldn't be using Paperclip at all, and should migrate to ActiveStorage.
2021-09-30 17:29:54 +01:00
Transifex-Openfoodnetwork
e26e6e8d8b Updating translations for config/locales/ru.yml 2021-09-29 20:29:57 +10:00
Andy Brett
5e658eb9dd Update all locales with the latest Transifex translations 2021-09-28 09:21:09 -07:00
Transifex-Openfoodnetwork
2079bf549d Updating translations for config/locales/nb.yml 2021-09-28 11:28:18 +10:00
Transifex-Openfoodnetwork
1abca497b7 Updating translations for config/locales/en_IE.yml 2021-09-28 11:25:12 +10:00
Maikel
c9d36e6f5c Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all
Fix payment method fee bug for all calculator types
2021-09-28 08:39:05 +10:00
Transifex-Openfoodnetwork
17d7270a32 Updating translations for config/locales/nb.yml 2021-09-21 21:31:51 +10:00
Maikel
58c0d30af3 Merge pull request #8207 from openfoodfoundation/revert-8064-Kill_stripe_connect
Revert "Kill stripe connect"
2021-09-20 08:59:16 +10:00
Maikel Linke
4336350140 Updates from Transifex 2021-09-20 08:54:17 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Meron Ogbai
957f834694 Rename preferred amount to preferred value 2021-09-17 18:49:57 +03:00
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