17829 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Luis Ramos	fa77204e14	Adapt spec to the move of the controller, in prod the call to request.env['PATH_INFO'] will work correctly	2020-10-31 10:44:19 +00:00
Luis Ramos	af713385d8	Add frozen string literal	2020-10-31 10:16:37 +00:00
Luis Ramos	c9972189d0	Change usage of Spree::Admin::BaseController to Admin::BaseController	2020-10-31 09:56:59 +00:00
Luis Ramos	eb07a91acb	Adapt code from Spree::Admin::BaseController to Admin::BaseController	2020-10-31 09:52:34 +00:00
Luis Ramos	66ba9ff73d	Move Spree::Admin::BaseController to Admin::BaseController	2020-10-31 09:51:37 +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
Luis Ramos	4d64bf6ece	Add column to customers table to register last time enterprise terms and ... conditions were accepted so customer doesnt have to accept terms on all checkouts but only when the enterprise updates the terms file	2020-10-30 15:09:13 +00:00
Luis Ramos	3c9c5862d1	Verify terms and conditions updated_at timestamp is touched every time the file name changes. ... We will need this to check if user already accepted the terms and conditions of this enterprise.	2020-10-30 15:08:26 +00:00
Luis Ramos	78a8f53d8d	Change default translations to what's been requested on the issue	2020-10-30 15:08:26 +00:00
Luis Ramos	806c8b943d	Move small class to label so that rule is actually applied	2020-10-30 15:08:26 +00:00
Luis Ramos	85096a997f	Add a checkbox to checkout to tick for Terms and Conditions ... Checkout button should be disabled if checkbox is not ticked	2020-10-30 15:08:26 +00:00
Transifex-Openfoodnetwork	19b6cb13f1	Updating translations for config/locales/pt_BR.yml	2020-10-31 01:36:45 +11:00
Transifex-Openfoodnetwork	dd228cc750	Updating translations for config/locales/ar.yml	2020-10-30 22:39:44 +11:00
Luis Ramos	586e8a9abe	Fix some more rubocop issues	2020-10-30 10:13:16 +00:00
Luis Ramos	1847b62cf4	Fix some rubocop issues	2020-10-30 10:12:56 +00:00
Luis Ramos	0618c9e4dd	Fix line_items_decorator spec	2020-10-30 10:12:56 +00:00
Luis Ramos	d15301021a	Rename inject_json_list to inject_json_array	2020-10-30 10:12:56 +00:00
Luis Ramos	55e8dace44	Fix sort_by issue on relation by calling to_a	2020-10-30 10:12:56 +00:00
Luis Ramos	9a9b455e66	Fix problem in default_tax related to sum in active record	2020-10-30 10:12:56 +00:00
Luis Ramos	399fe2c01b	Make code work for relations and arrays	2020-10-30 10:12:56 +00:00
Luis Ramos	3aeb87debc	Make it work with both relations and arrays	2020-10-30 10:12:56 +00:00
Luis Ramos	7b06fdd943	Convert to array before using sort_by!	2020-10-30 10:12:56 +00:00
Luis Ramos	6755354196	Convert relation to_a to be able to use sum	2020-10-30 10:12:56 +00:00
Luis Ramos	440e69e156	Convert relation to array to be able to use sum	2020-10-30 10:12:47 +00:00