885 Commits

Author	SHA1	Message	Date
Jean-Baptiste Bellet	ba45dd84dd	Solves rubocop linter errors	2023-04-20 08:46:19 +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	3e0b358370	Merge pull request #10461 from vviekk/9978 ... Updating price, on_hand, on_demand validations for product import	2023-04-19 16:09:49 +01: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
saunmanoj888	c3d274c84f	Fix corrupt and invalid image upload issue	2023-04-19 16:11:46 +10:00
Maikel	0b03152f3b	Merge pull request #10697 from mkllnk/rubocop-config-update ... Update Rubocop config and replace deprecated TimeWithZone#to_s with argument	2023-04-19 11:23:34 +10: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
Filipe	871b2f8816	Merge pull request #10696 from mkllnk/login-as-admin ... Simplify login test helpers	2023-04-17 12:14:06 +01:00
Jean-Baptiste Bellet	11a7aa9f96	When clicking on "Clear Filters" button, to not reset variant selection ... + add some specs to cover that particular case	2023-04-17 11:08:17 +02:00
Jean-Baptiste Bellet	c0203e7091	Refactor by putting two specs into a shared_example ... "It's a Surprise Tool That Will Help Us Later"	2023-04-17 11:06:23 +02:00
Maikel	44cc5cc665	Merge pull request #10677 from mkllnk/spec-helpers ... Simplify spec helpers	2023-04-17 16:16:29 +10:00
Maikel Linke	5c6d9a092e	Simplify login spec helpers, avoid long lines ... The `login_as_admin_and_visit` helper was used a lot but isn't really shorter than: login_as_admin visit path_visit Calling those methods separately reduces line length. It also removes the potential impression that it may be more efficient to use the helper. Now we have less indirection if one of the calls fails and see the failing spec line straight away.	2023-04-17 11:08:32 +10:00
Maikel Linke	8d500a2c27	Remove superflouous login test helper ... It was often used with a `visit` statement after which resulted in unnecessary page loads. There was only one case where a `visit` was expected but it wasn't needed either.	2023-04-17 10:56:51 +10:00
Maikel Linke	425674c4e5	Remove unused return value of admin login helper ... Well, there was one use of the return helper. But I don't think that it's a very intuitive method.	2023-04-17 10:56:51 +10:00
Maikel Linke	dad4061ff9	Style Rails/ToFormattedS	2023-04-14 16:32:39 +10:00
Maikel Linke	c70a694111	Style line length - rubocop passes completely	2023-04-14 16:12:14 +10:00
Maikel Linke	9c88c77066	Style empty lines	2023-04-14 16:05:50 +10:00
Maikel	b0211d0930	Merge pull request #10686 from filipefurtad0/truncates_product_description ... Sets too long line truncation spec as pending	2023-04-14 15:11:31 +10:00
Maikel	5ff1b0d358	Merge pull request #10676 from filipefurtad0/fix_spec_ts_and_cs ... Adds pending test for default ToS	2023-04-14 14:00:32 +10: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
Konrad	0bfceb877d	Merge pull request #10666 from jibees/9723-admin-missing-translation-in-payment-report ... Admin, Payment reports: add missing translation for payment state	2023-04-12 15:47:23 +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	2841b42296	Specify truncate parameter as we don't always truncate description ... Only when too long.	2023-04-12 10:34:30 +02:00
filipefurtad0	26947a64c0	Adds test to check pagination upon line-item selection	2023-04-12 09:58:01 +02:00
Maikel Linke	f13c0e1dca	Bring all Rspec config for database cleaning together	2023-04-12 14:23:09 +10:00
filipefurtad0	70d9cfa08e	Sets too long line truncation spec as pending	2023-04-11 19:46:11 +01: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
Maikel Linke	30184ac6aa	Background reports time out earlier than nginx ... This allows us to display a friendly message before nginx displays its default error.	2023-04-11 16:44:13 +10:00
David Cook	a123d45eca	Fix spec ... It's worth noting that this page hasn't been updated by this PR. I honestly don't know why it broke, but don't care anymore. It seems the extra `login_as_admin_and_visit` was causing a race condition on one spec. It's not necessary so I've removed this context. Best viewed with whitespace ignored.	2023-04-11 16:38:49 +10:00
James Wu	546e90b286	Sort orders by last names	2023-04-11 15:25:20 +10:00
filipefurtad0	4e92f33b1c	DRYes spec; adds pending test for default ToS	2023-04-10 12:08:35 +01:00
Filipe	d9e9add78b	Merge pull request #10527 from vviekk/10456 ... Fixing 'unsaved' alert behaviour for order cycle edit forms	2023-04-06 17:05:49 +01:00
Jean-Baptiste Bellet	e74328f1d7	Add i18n for payment state key ... + update spec	2023-04-06 10:28:44 +02:00
Maikel	ef841b161f	Merge pull request #10660 from MadisonBowron/master ... Fix bug #10596, missing translation for editing shipping category	2023-04-05 16:12:20 +10:00
Maikel	c11dd2c1fb	Merge pull request #10642 from macanudo527/fix_rubocop_errors ... Fix Rubocop Layout/LineLength	2023-04-05 16:11:08 +10:00
Maikel Linke	8bbc545e39	Cover untranslated text by spec	2023-04-05 15:03:42 +10:00
Maikel Linke	020af0c0e4	Explain report timeout better to user	2023-04-05 09:59:02 +10:00
emiliecm	5abda22831	Fix bug #10596, missing translation for editing shipping category	2023-04-04 19:48:16 -04: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
Neal Chambers	940f806e5f	Fix Rubocop Layout/LineLength	2023-04-04 09:44:15 +09: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	4fa44e6c64	Put the white label behind a feature toggle white_label ... + update specs as well + for admin section also	2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet	5279be4dc6	Improve spec: visiting order confirmation with distributor ... Two cases: - the current distributor is the same than the order of the order confirmation page - the current distributor *is not* the same than the order of the order confirmation page (and has not set `hide_ofn_navigation` preference to `true`)	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