5698 Commits

Author	SHA1	Message	Date
Gaetan Craig-Riou	152af5e105	Merge pull request #10751 from mkllnk/mail-config ... Remove unused feature to intercept emails	2023-04-28 16:28:41 +10:00
Jean-Baptiste Bellet	b1de28eeea	When there is a white_label_logo_link pref. use it! ... + update spec as well + use an an helper to get the main logo link for a shopfront Co-Authored-By: Maikel <maikel@email.org.au>	2023-04-26 11:04:47 +02:00
Jean-Baptiste Bellet	35778ecf1d	If enterprise has a white_label_logo attached, then can edit its link	2023-04-26 11:04:47 +02:00
Maikel Linke	dae8703b02	Remove unused feature to intercept emails ... This option came from Spree and we never used it. The config input field is disabled in the admin interface and I checked our managed databases. I don't think that we will want this feature in the future either. Staging sends unmodified emails which is more realistic and we haven't had a use case to intercept those emails. There's still the BCC option if we need additional access.	2023-04-26 13:50:31 +10:00
Konrad	00d5bd9165	Merge pull request #10684 from MadisonBowron/master ... Fix admin product variants form to close issues #10579 & Wishlist: 430	2023-04-24 18:18:01 +02:00
Konrad	75b5d1fd6f	Merge pull request #10712 from jibees/6133-backoffice-orders-endless-spinner-and-error-500-after-skipping-oc-selector ... Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)	2023-04-22 16:04:15 +02:00
Jean-Baptiste Bellet	f42f513f8c	Display white_label_logo image when hide_ofn_navigation is set to true ... for both desktop and mobile view	2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet	54342254b6	Do not show white label logo is hide_ofn_navigation is not checked ... They are both strongly linked	2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet	6fdf9fa038	Add/Remove white label logo in enterprise preferences panel	2023-04-20 08:45:03 +02:00
Filipe	f206b7ed9e	Merge pull request #10661 from mkllnk/report-download ... [Hidden] Provide download link for reports generated in the background	2023-04-19 11:53:14 +01:00
Jean-Baptiste Bellet	7e306693a8	Use Rails standard naming: same name for the route and the method	2023-04-19 10:15:35 +02:00
Konrad	2fa86492d1	Merge pull request #10653 from openfoodfoundation/10645-pagination-in-bom-not-aggregating-results-when-clicking-a-productvariant ... BOM: When selecting a specific variant, trigger a new search that avoid pagination issues	2023-04-18 14:49:14 +02:00
Jean-Baptiste Bellet	722c660697	Do not show any links to other steps when no distribution set ... distribution means tuple: distributor + order cycle	2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet	ba1d985932	update the set_distribution form on the same path ... and use the same method `OrdersController#set_distribution`	2023-04-18 14:36:47 +02:00
MadisonBowron	697f2795d4	Remove arbitrary comments	2023-04-14 01:25:14 -04:00
Maikel Linke	98e4f867b4	Provide download link for generated reports	2023-04-14 11:29:35 +10:00
Konrad	2ace3afd67	Merge pull request #10606 from thejwuscript/10116-improve-bom-sorting ... Sort orders by last name	2023-04-12 16:36:45 +02:00
Filipe	c1d28b2e8f	Merge pull request #10119 from binarygit/donot-hide-producers-name-in-products ... Display producer's name in products inspite of hide all refs option	2023-04-12 13:07:52 +01:00
Jean-Baptiste Bellet	df5c21048a	Clear on bulk submenu should reset some filters + refresh data as well	2023-04-12 09:58:01 +02:00
Jean-Baptiste Bellet	8a124fb6be	BOM: once variant has been selected, refresh data with a new search ... - Remove variant_filter - instantiate a new search to avoid pagination issues	2023-04-12 09:58:00 +02:00
Filipe	0971e8d9b5	Merge pull request #10644 from mkllnk/report-timeout-message ... [Hidden] Display a friendly message when a background report times out	2023-04-11 19:40:42 +01:00
Jean-Baptiste Bellet	e78b44b9ca	Do not shows <a /> if producers is hidden ... Different style as it does not open any modal	2023-04-11 14:27:57 +02:00
binarygit	c5779eff81	Do not open modal for producer's who are 'hidden'	2023-04-11 14:27:57 +02:00
James Wu	a75f16e23c	Implement full_name_for_sorting	2023-04-11 15:25:20 +10:00
James Wu	546e90b286	Sort orders by last names	2023-04-11 15:25:20 +10:00
MadisonBowron	9d0a69cceb	Fix admin product variants form to close issues #10579 & #430	2023-04-10 18:53:01 -04:00
Filipe	2f6b730ed4	Merge pull request #10614 from cillian/business-address-country-state-placeholders ... Add placeholders to business address country and state select fields	2023-04-05 19:55:07 +01:00
Rachel Arnould	3e5becf70a	Merge pull request #10538 from jibees/10537-shopfront-product-description-is-too-long ... Shopfront: Force product description to be on one line	2023-04-05 17:42:18 +02:00
Cillian O'Ruanaidh	89dac47aa6	Add placeholders to business address country and state select fields	2023-04-04 19:22:22 +01:00
Maikel Linke	00a3976905	Display a friendly message when a report times out ... Once we get a download link for a report, we can display this message sooner. But for now we just use the existing request timeout.	2023-04-04 11:08:20 +10:00
Jean-Baptiste Bellet	4dfc56954c	Force .product-description to be one line ... and make it as a `div`	2023-03-31 10:41:27 +02:00
Jean-Baptiste Bellet	89036db666	Do not use a preference, but create a new column for hide_ofn_navigation	2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet	4ad2a1a723	Prefer a concern that set a variable instead of a global helper ... Therefor, for the right controllers, simply implements: ``` include WhiteLabel before_action :hide_ofn_navigation, only: [:show, :edit] ``` This is mort robust, since we're working in a controller level, not parsing URLs...	2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet	348c1ff7da	Hide the OFN navigation menu when distributor as set its preference ... Hide, when preference is true, for page: - shop - cart - checkout - order confirmation	2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet	c20ae0de1e	Edit hide_ofn_navigation in 'white label' panel for an enterprise	2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet	3452864503	Add "white label" panel in enterprise settings page	2023-03-30 09:17:57 +11:00
Filipe	62cdda2ce2	Merge pull request #10523 from rioug/10431-voucher-minimum-backend ... Voucher bare minimum backoffice	2023-03-29 20:21:57 +01:00
Maikel Linke	70aff98581	Remove unused product meta description from UI	2023-03-29 14:33:42 +11:00
Gaetan Craig-Riou	0c43d0f16a	Put vouchers admin screen behind 'vouchers' feature toggle	2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou	fb1ad4c65f	Remove non needed collumn from voucher list	2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou	04748b6e0e	Move voucher value to the model ... Use Spree::Money to display amount with currency	2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou	e4f40d14b8	Fix enterprise voucher tab ... Add harcoded voucher amount Add missing translation	2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou	a4add889a8	Add form on the new voucher page	2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou	f9f6793d10	Add template and basic controller for backoffice voucher pages	2023-03-28 13:39:29 +11:00
Konrad	c887efee54	Merge pull request #10519 from vviekk/viv/10515 ... Removing 'none' from shipping categories from product edit page	2023-03-27 14:01:11 +02:00
vviekk	9a10c8c25a	Removing none from shipping categories from product edit page	2023-03-27 11:56:10 +05:30
Konrad	4c61666fc7	Merge pull request #10547 from vviekk/10419 ... Enable invoices config only controls Print bulk action	2023-03-26 13:53:20 +02:00
Konrad	0c6a12a6f0	Merge pull request #10241 from binarygit/provide-err-msg-when-using-text-in-var-field ... Admin, edit variant: only allow numerical values for weight, height, width and depth fields	2023-03-26 13:03:20 +02:00
Filipe	31ffeab4cd	Merge pull request #10440 from mkllnk/rails7 ... Upgrade to Rails 7.0	2023-03-23 12:04:11 +00:00
Filipe	1673a18eb6	Merge pull request #9729 from binarygit/remove-angular-from-users ... Admin, Enterprise Settings, Users tabs: remove tooltips directives + use reflex to invite user to be managers	2023-03-23 11:52:18 +00:00