17847 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Transifex-Openfoodnetwork	213f3cf072	Updating translations for config/locales/ar.yml	2020-11-06 07:43:38 +11:00
Transifex-Openfoodnetwork	e1962419c2	Updating translations for config/locales/ar.yml	2020-11-06 07:40:32 +11:00
Transifex-Openfoodnetwork	bb6f5cb3a7	Updating translations for config/locales/en_US.yml	2020-11-06 07:06:15 +11:00
Transifex-Openfoodnetwork	719007ecb4	Updating translations for config/locales/es.yml	2020-11-05 22:57:29 +11:00
Transifex-Openfoodnetwork	bd06f898a3	Updating translations for config/locales/ca.yml	2020-11-05 22:55:21 +11:00
Transifex-Openfoodnetwork	246a1f368b	Updating translations for config/locales/de_DE.yml	2020-11-05 21:59:09 +11:00
Transifex-Openfoodnetwork	f6443f00e5	Updating translations for config/locales/en_FR.yml	2020-11-05 19:23:26 +11:00
Transifex-Openfoodnetwork	fd52800d2c	Updating translations for config/locales/fr.yml	2020-11-05 19:21:40 +11:00
Transifex-Openfoodnetwork	31a34fc9d2	Updating translations for config/locales/en_NZ.yml	2020-11-05 10:00:28 +11:00
Transifex-Openfoodnetwork	3fc0d1bcb9	Updating translations for config/locales/en_NZ.yml	2020-11-05 09:57:27 +11:00
Transifex-Openfoodnetwork	daff0a250c	Updating translations for config/locales/pt_BR.yml	2020-11-04 03:32:20 +11:00
Transifex-Openfoodnetwork	65bccb9236	Updating translations for config/locales/ru.yml	2020-11-03 20:36:52 +11:00
Transifex-Openfoodnetwork	efe5a4700a	Updating translations for config/locales/en_FR.yml	2020-11-03 19:13:11 +11:00
Transifex-Openfoodnetwork	0103cc3a2f	Updating translations for config/locales/fr.yml	2020-11-03 19:13:06 +11:00
Transifex-Openfoodnetwork	2a2c7bdc4e	Updating translations for config/locales/es.yml	2020-11-03 08:49:53 +11:00
Transifex-Openfoodnetwork	ad76f3e91e	Updating translations for config/locales/ca.yml	2020-11-03 08:48:11 +11:00
Transifex-Openfoodnetwork	5c81f645c9	Updating translations for config/locales/fr.yml	2020-11-02 20:38:38 +11:00
Transifex-Openfoodnetwork	6ff8cadb26	Updating translations for config/locales/en_FR.yml	2020-11-02 20:27:13 +11:00
Transifex-Openfoodnetwork	04358dfa39	Updating translations for config/locales/en_FR.yml	2020-11-02 20:24:09 +11:00
Transifex-Openfoodnetwork	b23d6674b5	Updating translations for config/locales/ru.yml	2020-11-02 18:59:12 +11:00
Transifex-Openfoodnetwork	8904273bea	Updating translations for config/locales/ru.yml	2020-11-02 18:56:03 +11:00
Luis Ramos	1bb7fd9ec8	Merge pull request #6280 from Matt-Yorkley/eastern-slavic-plurals ... Add missing translation keys for Eastern Slavic plurals	2020-10-31 23:13:54 +00:00
Matt-Yorkley	bc40088eaf	Add missing translation keys for Eastern Slavic plurals ... There are multiple forms of pluralisation here, with different translations for each. перевод сложен !	2020-10-31 16:58:15 +00:00
Pau Perez	1abdd0112e	Update all locales with the latest Transifex translations v3.3.1	2020-10-31 10:46:12 +01:00
Pau Pérez Fabregat	bc6ffe3b0c	Merge pull request #6242 from openfoodfoundation/transifex ... Transifex	2020-10-31 10:36:12 +01:00
Luis Ramos	eea73aa989	Merge pull request #5919 from luisramos0/injector_refactor_for_rails41 ... [Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1	2020-10-31 09:33:27 +00:00
Pau Pérez Fabregat	03b0ce430d	Merge branch 'master' into transifex	2020-10-31 10:05:27 +01:00
Luis Ramos	ad14f7f9b0	Merge pull request #6203 from luisramos0/rubocop_fix ... Fix ~80 rubocop issues in serializers/api/admin	2020-10-30 16:48:22 +00:00
Luis Ramos	7cc7c62232	Fix long lines	2020-10-30 16:14:39 +00:00
Luis Ramos	b6dc46a911	Fix rubocop issue by nesting module and class declarations ... No file contents changed	2020-10-30 16:14:34 +00:00
Luis Ramos	0b70c67908	Merge pull request #5994 from openfoodfoundation/tcs_checkbox ... Terms and Conditions checkbox on checkout	2020-10-30 15:10:06 +00:00
Luis Ramos	71a181341b	Fix bug in terms_and_conditions_helper related to guest checkout where current_user is nil and T&Cs must be shown all the time	2020-10-30 15:09:13 +00:00
Luis Ramos	cf3f511f4d	Add directive spec to validate the dialog template is loaded on element click	2020-10-30 15:09:13 +00:00
Luis Ramos	1d1067ebc1	Add coverage to T&Cs file opening on a new tab and also for the upload timestamp now displayed in the page	2020-10-30 15:09:13 +00:00
Luis Ramos	bd4d0ba5d3	Make the warning message work for first upload and for changes	2020-10-30 15:09:13 +00:00
Luis Ramos	3b682bc47f	Add warning when uploading a file	2020-10-30 15:09:13 +00:00
Luis Ramos	be35f97622	Add tooltip icon to terms and conditions	2020-10-30 15:09:13 +00:00
Luis Ramos	ca79270ba3	Show T&Cs warning when uploading a new file	2020-10-30 15:09:13 +00:00
Luis Ramos	2cf7b1b36c	Make label translatable	2020-10-30 15:09:13 +00:00
Luis Ramos	f7c07f492c	Make TCs file input onoy accept pdf files	2020-10-30 15:09:13 +00:00
Luis Ramos	9f17e4fd8f	Add upload timestamp to TCs upload form in enterprise business details	2020-10-30 15:09:13 +00:00
Luis Ramos	c980d22826	Make TCs link open in a new tab in the backoffice	2020-10-30 15:09:13 +00:00
Luis Ramos	ceee89fad0	Make Checkout form submit read terms_and_conditions_accepted from the checkout form checkbox	2020-10-30 15:09:13 +00:00
Luis Ramos	a942218708	Fix post checkout actions spec	2020-10-30 15:09:13 +00:00
Luis Ramos	26946ec102	Fix edge case and some specs in post checkout actions	2020-10-30 15:09:13 +00:00
Luis Ramos	dd31cbe014	Cover case where enterprise uploads new T&Cs file and customer has already accepted before	2020-10-30 15:09:13 +00:00
Luis Ramos	46733d0c0d	Add feature spec to cover T&Cs ticked by default if customer has already accepted them	2020-10-30 15:09:13 +00:00
Luis Ramos	57a9d6e1e2	Make customer terms_and_conditions_accepted_at be set to current time ... after a successful checkout	2020-10-30 15:09:13 +00:00
Luis Ramos	ad592785cf	Rename methods to follwo ruby convention and improve readability	2020-10-30 15:09:13 +00:00
Luis Ramos	f3ba0ebdbb	Move code to a new helper	2020-10-30 15:09:13 +00:00