6861 Commits

Author	SHA1	Message	Date
Nihal Mohammed	b2613f3331	Add translations	2022-03-28 18:26:39 +05:30
Nihal Mohammed	5f2f5456a0	Add code to sort order by supplier when Enterprise user chooses to	2022-03-28 18:12:39 +05:30
Filipe	be1c255067	Merge pull request #8892 from Matt-Yorkley/spree-login-routes ... Fix issue with unconfirmed email messages	2022-03-28 13:38:17 +01:00
Jean-Baptiste Bellet	b9efda9f64	Add custom confirm modal into the BOM interface	2022-03-25 10:58:33 +01:00
jibees	9a5318965c	Use as an helper ... Co-Authored-By: Maikel <maikel@email.org.au>	2022-03-24 09:11:58 +01:00
Nihal Mohammed	cc120aecb6	Add radio buttons to give Enterprise choice on sorting of items by name or supplier in invoice	2022-03-21 20:29:19 +05:30
Cillian O'Ruanaidh	1c80e88758	Fix order cycle advanced settings close button so it uses new remote toggle StimulusJs controller instead of old toggleSettings method ... Closes #9012	2022-03-17 16:30:26 +00:00
Filipe	c535ed5789	Merge pull request #8936 from cillian/language-metatags ... Include language metatags in html template when more than one language available	2022-03-17 16:16:07 +00:00
Filipe	53544ee66a	Merge pull request #8805 from cillian/remove-inline-advanced-settings-toggle-js ... Replace inline JS for toggling order cycle advanced settings with StimulusJs controller	2022-03-17 16:05:46 +00:00
Jean-Baptiste Bellet	df6cd5b266	Add already ordered panel only on summary step	2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet	ac361d3b64	Add already_opened on each step	2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet	bcf6c7984e	Display checkbox that "save as default address"	2022-03-14 09:05:45 +01:00
jibees	d4a4a36b14	Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion ... Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer	2022-03-11 08:56:41 +01:00
Jean-Baptiste Bellet	60ad92c4ff	Display ship address options checkboxes ... + Create the associated test: the trick is is that the selected delivery method is the one that required address **and** is before others that do not required ship address	2022-03-10 15:55:10 +01:00
Filipe	53d1994b2a	Merge pull request #8956 from Matt-Yorkley/welsh-javascript-fixes ... Fix Angular interpolation for translations with apostrophes	2022-03-07 12:23:04 +00:00
Matt-Yorkley	6729119489	Fix Angular interpolation for translations with apostrophes	2022-03-03 20:59:04 +00:00
Jean-Baptiste Bellet	2976b0717c	Display "Update" button on the order table page unless order is complete ... With the split checkout, we can access this page between the different steps: for this cases, cart actions should be displayed	2022-03-01 10:11:27 +01:00
Filipe	d052c4f8a4	Merge pull request #8869 from filipefurtad0/remove_signup_string ... Removes signup string from private shop login screen	2022-03-01 08:20:06 +00:00
Cillian O'Ruanaidh	21affa6250	Include language metatags in html template when more than one language available ... Fixes #8902 This is to help Google find pages in all languages, see https://developers.google.com/search/docs/advanced/crawling/localized-versions	2022-02-25 12:49:49 +00:00
Filipe	28ac9d980c	Merge pull request #8849 from jibees/render-pdf-with-stylesheet ... Create a new method pdf_stylesheet_pack_tag that actually include CSS in PDF files	2022-02-21 23:09:21 +00:00
Filipe	9966b5b33c	Merge pull request #8565 from jibees/8171-group-by-imperial-unit ... Handle imperial units in the Bulk Order Management interface	2022-02-21 14:47:38 +00:00
filipefurtad0	cefd5db6eb	Renames require_login_3_html key	2022-02-18 11:07:37 +00:00
Matt-Yorkley	3effff8821	Show resent confirmation message in current tab	2022-02-18 09:42:49 +00:00
filipefurtad0	27bc5805ae	Removes signup string from private shop login screen	2022-02-17 13:19:31 +00:00
Matt-Yorkley	9a27addd14	Merge pull request #8763 from openfoodfoundation/8577-split-name-column-in-customers-table ... Split name column in customers table	2022-02-17 11:57:01 +00:00
Filipe	4dbf047647	Merge pull request #8871 from jibees/8827-preselect-shipping-method ... SplitCheckout: preselect the shipping/payment method if the only one available	2022-02-17 10:54:20 +00:00
Jean-Baptiste Bellet	012e91879a	preselect the only available shipping method	2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet	7be2f418d0	preselect the only available payment method	2022-02-17 09:33:23 +01:00
François Turbelin	23776c7a3e	Fix more specs	2022-02-16 10:23:23 +11:00
Adrien Chauve	ca46359224	More fixes	2022-02-16 10:23:22 +11:00
Matt-Yorkley	e72cc516a8	Drop spree prefix in path generation	2022-02-15 09:47:06 +00:00
Jean-Baptiste Bellet	43cd604405	Update to the right link the "Back to Payment method" button ... + create a spec as well	2022-02-11 15:01:53 +01:00
Filipe	d8936b412e	Merge pull request #8819 from apricot12/8694-Improve_subsvriptions_index_perfomance ... 8694 improve subscriptions index perfomance by eager loading tags, suppliers and exchanges.	2022-02-10 17:37:00 +00:00
Jean-Baptiste Bellet	8624fa2a85	On last item deletion, prevent user on order canceling and cancellation email ... ... with a modal. User can cancel the modal or confirm the last item deletion & order cancelation with or without sending a cancellation email to the consumer.	2022-02-10 14:39:00 +01:00
Jean-Baptiste Bellet	92cd918e5a	Add LoginModal as controller + connect action to open login modal	2022-02-10 09:52:13 +01:00
Jean-Baptiste Bellet	a951fd2c06	Create a new method pdf_stylesheet_pack_tag that actually include CSS file ... If running in developpement (ie. `Webpacker.dev_server.running?`), use webpacker to actually render/serve the CSS files. Source: https://stackoverflow.com/a/60541688	2022-02-09 11:21:50 +01:00
Matt-Yorkley	1c180299a5	Pass indexed payment method tags to PaymentMethod Serializer	2022-02-08 11:42:24 +00:00
Cillian O'Ruanaidh	b43a68d717	Merge branch 'master' into remove-inline-advanced-settings-toggle-js	2022-02-04 12:24:17 +00:00
Cillian O'Ruanaidh	05756616dd	Add a remote-toggle controller that can toggle elements outside of its scope ... This is instead of adding the :data-controller attribute to the div#wrapper because that will wrap pretty much all content on the admin pages. Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>	2022-02-04 12:23:24 +00:00
Cillian O'Ruanaidh	d03b52a163	Revert "Replace inline JS for toggling order cycle advanced settings with StimulusJs controller" ... This reverts commit 67ae2e72f3.	2022-02-04 11:47:38 +00:00
Filipe	e403fc171d	Merge pull request #8808 from Matt-Yorkley/login-modal ... Remove all Angular code from Login/Signup process	2022-02-03 19:36:44 +00:00
Filipe	c4751d7056	Merge pull request #8813 from Matt-Yorkley/split-checkout-address-state ... Split checkout: fix loading of saved addresses	2022-02-03 19:06:35 +00:00
Filipe	998f7afdc4	Merge pull request #8523 from seballot/progress-for-ajax-request ... Improve loading spinner display	2022-02-01 10:03:04 +00:00
Jean-Baptiste Bellet	ae0a71b29d	This row adds an extra space on the right of the page ... which introduce an horizontal scroll: visual regression	2022-01-31 11:47:21 +01:00
Jean-Baptiste Bellet	d8391aa1d3	Create a div with a special class (checkout-step3) ... ... and attach the controller to it Add the T&Cs inside the sicked container with submit buttons	2022-01-31 11:31:32 +01:00
Jean-Baptiste Bellet	3abef1b703	Specify css for this sticky container ... with a nice box-shadow. Handle special case for mobile view (ie. max width 700px)	2022-01-31 11:31:32 +01:00
Matt-Yorkley	5e321c9f48	Fix country/state selection for shipping address; missing controller and data	2022-01-30 11:33:31 +00:00
Matt-Yorkley	611beb2e90	Rearrange controller placement, field order, and nesting	2022-01-30 11:33:31 +00:00
Matt-Yorkley	370ec17818	Improve countries and states loading	2022-01-30 11:33:31 +00:00
Matt-Yorkley	77d8e7da90	Use non-Angular login modal in /registration pages	2022-01-29 14:49:23 +00:00