4577 Commits

Author	SHA1	Message	Date
Matt-Yorkley	0af20e48b0	Add missing translation key for enterprise taxon ordering	2020-10-31 19:17:19 +00: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
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	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	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
Luis Ramos	399fe2c01b	Make code work for relations and arrays	2020-10-30 10:12:56 +00:00
Luis Ramos	6b826423c1	Merge pull request #6145 from andrewpbrett/instance-unit-picker ... Allow instances to choose available units for products/variants	2020-10-29 22:22:33 +00:00
Andy Brett	292b33b4ea	simplify available units params (and remove regex!)	2020-10-29 09:18:24 -07:00
Andy Brett	67a603f77f	inject available_units for new variant creation	2020-10-29 09:18:24 -07:00
Andy Brett	331ac28b71	inject available units to edit variants page	2020-10-29 09:18:24 -07:00
Andy Brett	8585e6c7f0	add available units injection to BOM page	2020-10-29 09:18:19 -07:00
Andy Brett	4f579facfe	move all_units to admin helper	2020-10-29 09:17:49 -07:00
Andy Brett	fa62ec0bff	only show available units for products	2020-10-29 09:17:49 -07:00
Andy Brett	cb3ea133e9	add available units to instance prefs page	2020-10-29 09:17:31 -07:00
Luis Ramos	e860e2ca57	Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due	2020-10-29 13:38:36 +00:00
Luis Ramos	e4f3aae7c0	Add customer balance to customer list	2020-10-29 13:38:36 +00:00
Matt-Yorkley	5edd562691	Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings ... Merge Product Listings to master	2020-10-22 21:55:42 +02:00
Luis Ramos	61cfdb4038	Merge pull request #6114 from mbudm/issue/6031 ... Add matomo tag to admin pages	2020-10-22 15:24:34 +01:00
Matt-Yorkley	489529d30e	Merge pull request #5729 from luisramos0/image_settings ... Remove Image settings page and standardise Paperclip styles	2020-10-22 15:58:14 +02:00
Matt-Yorkley	01adf459b1	Replace top padding on product list	2020-10-22 09:59:16 +01:00
Maikel Linke	2887751098	Move translation to its own section	2020-10-22 15:46:49 +11:00
Maikel Linke	e37fedc435	Add bulk ribbon to bulk products	2020-10-22 15:46:49 +11:00
Maikel Linke	b57c912aa0	Add space between products and filters	2020-10-22 15:46:48 +11:00
Maikel Linke	66d5f8d5c1	Align first product flush to the search bar	2020-10-22 15:46:47 +11:00
Matt-Yorkley	b79d9bd75b	Fix screen-width bug for desktop down ... The width of these elements was ~105% of total screen width, adding horizontal scrollbars and whitespace on the left hand side	2020-10-22 15:46:47 +11:00
Matt-Yorkley	6bcf11e308	Adjust layout of variant rows for better use of vertical space	2020-10-22 15:46:47 +11:00
Matt-Yorkley	98e581c059	Remove pad-top class from products from to match alignment with filter sidebar	2020-10-22 15:46:46 +11:00
Matt-Yorkley	a89c81a033	Hide description paragraph if product has no description ... Improves the appearance of the layout when no description is present	2020-10-22 15:46:46 +11:00
Maikel Linke	4ab2375832	Reduce margin on the right of product listing	2020-10-22 15:46:45 +11:00
Maikel Linke	1fb544b803	Remove margin of product listing on mobile and tablet	2020-10-22 15:46:45 +11:00
Maikel Linke	526d4f53ad	Remove red overlay and icon on product image hover	2020-10-22 15:46:45 +11:00
Maikel Linke	fe1618cada	Add description to product listing ... It's truncated to one line and a click reveals the modal.	2020-10-22 15:46:45 +11:00
Maikel Linke	9f5cec6d08	Remove tractor in front of producer name	2020-10-22 15:46:44 +11:00
Maikel Linke	03d8ccfe2e	Remove modal open indicator	2020-10-22 15:46:44 +11:00
Maikel Linke	f05563b30f	Removal of category icon	2020-10-22 15:46:44 +11:00
Matt-Yorkley	f5ce0d501d	Merge pull request #5870 from luisramos0/prefs ... [Bye bye Spree] Bring models app_configuration and preference from spree_core	2020-10-20 21:12:54 +02:00
Luis Ramos	9f568c1e9d	Merge pull request #5928 from luisramos0/spree_core_js ... [Bye bye spree] Bring final bits of js and css from spree_core	2020-10-20 13:20:41 +01:00
Luis Ramos	0f06195baa	Remove Image settings page, these settings will come from ofn-install now	2020-10-20 11:20:37 +01:00
Maikel	8c65498661	Merge pull request #5998 from andrewpbrett/shipping-per-pound ... Per-pound shipping calculator	2020-10-16 15:27:57 +11:00
Matt-Yorkley	f260a2d114	Merge pull request #6141 from Matt-Yorkley/mobile-shops-list ... Make shops index page usable on mobile	2020-10-16 03:21:32 +02:00
Luis Ramos	6c95444339	Merge pull request #6020 from andresgutgon/fix/admin-menu-in-multiple-lines ... Fixed admin header buttons dropping multiple lines.	2020-10-07 21:24:48 +01:00