14886 Commits

Author	SHA1	Message	Date
Matt-Yorkley	5dd801b432	Fix tab-buttons element overlapping order cycle selector	2020-05-18 14:27:05 +02:00
Luis Ramos	ea8157a5c6	Merge pull request #5304 from dacook/5299-orders-filter-several-tags ... 5299 Impossible to filter orders with several tags	2020-05-18 11:25:54 +01:00
Luis Ramos	37350fcbb0	Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query	2020-05-18 10:55:03 +01:00
Luis Ramos	6c81c19f00	Remove dead code	2020-05-16 14:19:25 +01:00
Robin Klaus	438c0ecde9	delete extra lines	2020-05-16 20:12:54 +10:00
Robin Klaus	ba8ecf19ac	Added input code to two additional pages to cover shop tab search boxes	2020-05-16 12:56:06 +10:00
Luis Ramos	1c749a8029	Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles	2020-05-15 19:36:59 +01:00
Luis Ramos	a438317d69	Extract order_cart_reset service from enterprises_controller	2020-05-15 19:30:00 +01:00
Luis Ramos	35824c7aa1	Rename restartCheckout to order_checkout_restart to make it follow service naming convention	2020-05-15 19:29:37 +01:00
Luis Ramos	ba585064e1	Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders	2020-05-15 19:29:37 +01:00
Luis Ramos	21d1a7bc04	Remove dead code	2020-05-15 19:29:37 +01:00
Luis Ramos	6827ce5c7f	Refactor order.set_order_cycle, return early and remove indentation	2020-05-15 19:29:37 +01:00
Luis Ramos	94bb95861b	If selected OC is not in the available OCs, empty the order	2020-05-15 19:29:35 +01:00
Lucas Hiago	98cbe5762a	Remove unused css property from image in cancel email	2020-05-15 10:59:56 -03:00
Lucas Hiago	0caa91d057	Remove second table of cancel email instructions style	2020-05-15 10:59:56 -03:00
Lucas Hiago	f72da4abe4	Add refund message in order cancel mail	2020-05-15 10:59:56 -03:00
Lucas Hiago	42012d6482	Add new order sumary in order cancel mail	2020-05-15 10:59:55 -03:00
Lucas Hiago	1c1200125e	Add new greeting table in order cancel mail	2020-05-15 10:59:55 -03:00
Lucas Hiago	0b8771ccf0	Add connect with us footer to order cancelation email	2020-05-15 10:59:55 -03:00
Luis Ramos	52e7ca2417	Select first default OC only if no OC is already selected	2020-05-15 14:26:56 +01:00
Luis Ramos	c3f0c0ed7f	Extract method to prepare work ahead	2020-05-15 14:25:20 +01:00
Matt-Yorkley	c2efa901c2	Don't highlight update button when form is invalid	2020-05-15 13:38:17 +02:00
Luis Ramos	4292636e70	Remove close button in product modal	2020-05-15 12:16:19 +01:00
Luis Ramos	d95b2a97b0	Add missing padding above close button (both for the case with image or just with text) and also below product image	2020-05-15 12:12:07 +01:00
Luis Ramos	edaf419857	Use rem instead of px or em	2020-05-15 12:12:07 +01:00
Luis Ramos	38bc076c77	Fix some rubocop issues	2020-05-15 12:12:07 +01:00
Luis Ramos	30fe457cb5	Make product modal show close button only if there is a scroll bar	2020-05-15 12:12:07 +01:00
Luis Ramos	3a512478d6	Improve the mobile registration modal by adding a margin	2020-05-15 12:12:07 +01:00
Luis Ramos	4b63893377	Improve mobile login modal with a margin	2020-05-15 12:12:07 +01:00
Luis Ramos	50fa4fc93d	Make modal close buttons a little darker with a white cross	2020-05-15 12:12:07 +01:00
Luis Ramos	cbfaaabb72	Adjust different paddings and margins to make mobile product modal contents similar to required design	2020-05-15 12:12:07 +01:00
Luis Ramos	0a378a897b	Add close button to mobile product modal, this can be reused in other modals later	2020-05-15 12:12:07 +01:00
Luis Ramos	35ac5e093e	Adapt modal size to leave some background visible so that user can click to disable modal	2020-05-15 12:12:07 +01:00
Luis Ramos	39e47998e1	Make the background opacity of modals in the FrontOffice a litle darker according to design	2020-05-15 12:12:07 +01:00
Luis Ramos	14478d5fc1	Style producer name and properties in product modal	2020-05-15 12:12:07 +01:00
Luis Ramos	59a13adff0	Remove product category from product modal	2020-05-15 12:11:32 +01:00
Luis Ramos	fee03c4101	Remove repeated/dead rules	2020-05-15 12:11:32 +01:00
Luis Ramos	9a115afd4f	Remove bars around product description and border around product image	2020-05-15 12:11:32 +01:00
Matt-Yorkley	3ba1182661	Dynamically mark quantity field as invalid when stock is incorrect	2020-05-15 12:59:29 +02:00
Matt-Yorkley	42195b76d3	Highlight update button when cart page form is "dirty"	2020-05-15 12:59:29 +02:00
Matt-Yorkley	73b533690e	Refactor cart update button syntax	2020-05-15 12:59:29 +02:00
Matt-Yorkley	78f736db45	Add red border on quantity field when it must be updated	2020-05-15 12:59:28 +02:00
Luis Ramos	4fe1135a33	Merge pull request #5376 from rmklaus12/5104-mobile-keyboard-inputs ... Added inputmode attribute to show appropriate mobile keyboard for sel…	2020-05-15 08:49:42 +01:00
David Cook	f5629d59b0	5299: Add trailing square brackets for array parameters (distributor and order_cycle)	2020-05-15 15:04:01 +10:00
David Cook	8a2c65b6bb	Remove duplicate line	2020-05-15 15:04:01 +10:00
Luis Ramos	19da0ba969	Merge branch 'master' into 3-0-stable-may13	2020-05-13 19:50:32 +01:00
Luis Ramos	5f7c1474a2	Merge pull request #5377 from manvil/1782_enterprise_at_same_address ... Handling multiple enterprises at the same location	2020-05-13 19:31:14 +01:00
Luis Ramos	ef2d7f9485	Merge pull request #5330 from openfoodfoundation/mobile-ux-filters ... [mobile ux] Merge search and filter epic to master	2020-05-13 08:59:32 +01:00
Luis Ramos	58842e8cab	Show order edit link on mobile instead of the cancel link	2020-05-12 19:44:01 +01:00
Matt-Yorkley	598071fa78	Remove conflicting "clear search" buttons added by Chrome	2020-05-12 18:59:15 +02:00