From 970ac8a1ce4d120c178763feabfeac6b9d417e1e Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Thu, 19 Nov 2020 19:35:54 +0100 Subject: [PATCH 01/11] Update catalog-products-add-edit.md Product list : When the quantity of a product is at 0 or negative, it's displayed on a red background Duplicate --- back-office/catalog/products/catalog-products-add-edit.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index ef55abc0ee..8cbb27a578 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -44,7 +44,8 @@ Please note, when editing a standard product with combinations, you can’t chan * **Product list**: Link that displays the list of all products filtered as in the catalog, with their id, name, price, quantity. If you click on the id or the name, you arrive on the product page in basic settings tab. If you click on the price, you arrive on the product page in pricing tab. -If you click on the quantity, you arrive on the product page in the second tab which is: Quantities for a standard product without combinations or a pack, Combinations for a standard product with combination, Virtual product for a virtual product. +If you click on the quantity, you arrive on the product page in the second tab which is: Quantities for a standard product without combinations or a pack, Combinations for a standard product with combination, Virtual product for a virtual product. +When the quantity is equal or less than 0 the quantity is displayed with red backgound. * **Help**: Link to display the help in the right menu. * **Delete**: Button to delete the product. When you click on it, you have a modal to cancel or confirm the action. * **Preview**: When you click on this button, it saves and open a new browser tab with the product displayed in front-office. @@ -55,7 +56,7 @@ Keyboard shortcut: ALT + SHIFT + V * **Save**: Button to save all changes made in all tabs. Keyboard shortcut: ALT + SHIFT + S. If it’s saved with success, there is a green success message “Settings updated”. Otherwise, there is an error message. -* **Duplicate**: When you click on this button, it saves and duplicate the current product \(the duplicated product will be offline\). The duplicated product must be exactly the same. +* **Duplicate**: When you click on this button, it saves and duplicate the current product \(the duplicated product will be offline\). The duplicated product has all the product information (product associated, carriers configuration, associated suppliers, infromation of all the combinaition and the associated files) of the copied product. Keyboard shortcut: ALT + SHIFT + D * **Go to catalog**: When you click on this button, it saves and redirect to catalog product list. Keyboard shortcut: ALT + SHIFT + Q From ea2515c4d8c847a6169a62451b6a42bb302b73b5 Mon Sep 17 00:00:00 2001 From: marionf Date: Mon, 23 Nov 2020 11:51:54 +0100 Subject: [PATCH 02/11] Update ecotax part --- .../catalog/products/catalog-products-add-edit.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 8cbb27a578..8d32f28814 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -434,13 +434,8 @@ When the merchant changes it, the same field in the Basic settings tab is also u When a value is filled, the retail price (tax excl.) field is calculated automatically according to the tax rule chosen. To separate decimals a dot or a comma can be used, both should work no matter the language. When the merchant changes it, the same field in the Basic settings tab is also updated. -* **\(Retail\) price tax excl ecotax included**: "ecotax included" is displayed only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. -When a value is filled, the price tax incl field is calculated automatically according to the tax rule chosen. -To separate decimals a dot or a comma can be used, both should work no matter the language. When you change it, the same field in basic settings tab is also updated. -* **\(Retail\) price tax incl ecotax included**: This field shouldn't be displayed if taxes are disabled in International > Taxes \([issue 15330](https://github.com/PrestaShop/PrestaShop/issues/15330)\). -"ecotax included" is displayed only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. -When a value is filled, the price tax excl field is calculated automatically according to the tax rule chosen. -To separate decimals a dot or a comma can be used, both should work no matter the language. When you change it, the same field in basic settings tab is also updated. +* **\(Retail\) price tax excl ecotax included**: It's the same field as Retail price (tax excl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. +* **\(Retail\) price tax incl ecotax included**: It's the same field as Retail price (tax incl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. * **Tax rule**: This field shouldn't be displayed if taxes are disabled in International > Taxes \([issue 15330](https://github.com/PrestaShop/PrestaShop/issues/15330)\). Drop-down with all tax rules enabled and a “no tax” option. If there are several taxes rules with the same name, then the ID of the tax rule is displayed before its name. From c7bdbfcd79c3b285aa8197bcc18412516c348e19 Mon Sep 17 00:00:00 2001 From: marionf Date: Mon, 23 Nov 2020 14:59:36 +0100 Subject: [PATCH 03/11] add the link to the issue for ecotax --- back-office/catalog/products/catalog-products-add-edit.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 8d32f28814..78077b3d8b 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -434,8 +434,8 @@ When the merchant changes it, the same field in the Basic settings tab is also u When a value is filled, the retail price (tax excl.) field is calculated automatically according to the tax rule chosen. To separate decimals a dot or a comma can be used, both should work no matter the language. When the merchant changes it, the same field in the Basic settings tab is also updated. -* **\(Retail\) price tax excl ecotax included**: It's the same field as Retail price (tax excl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. -* **\(Retail\) price tax incl ecotax included**: It's the same field as Retail price (tax incl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. +* **\(Retail\) price tax excl ecotax included**: It's the same field as Retail price (tax excl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. [Improvement #15044](https://github.com/PrestaShop/PrestaShop/issues/15044) +* **\(Retail\) price tax incl ecotax included**: It's the same field as Retail price (tax incl.), the mention "ecotax included" is added to the label only if the “ecotax” option is enabled in International > Taxes. Except for a virtual product. This mention is added to make the merchant understand that he/she must enter the price with the ecotax included in this field. [Improvement #15044](https://github.com/PrestaShop/PrestaShop/issues/15044) * **Tax rule**: This field shouldn't be displayed if taxes are disabled in International > Taxes \([issue 15330](https://github.com/PrestaShop/PrestaShop/issues/15330)\). Drop-down with all tax rules enabled and a “no tax” option. If there are several taxes rules with the same name, then the ID of the tax rule is displayed before its name. @@ -456,7 +456,7 @@ Displayed in the product page in front-office next to the unit price * **Net turnover excluding tax**: This information is displayed when the ecotax is enabled and if it is not a virtual product. It’s the amount of Price \(tax excl.\) - ecotax \(tax incl.\). It is taken into account for the calculations instead of the field "Price \(tax excl.\)" when ecotax tax incl field is different from 0. -This value is recalculated when the merchant will change one of the following fields: Price \(tax excl.\) ecotax included, Price \(tax incl.\) ecotax included & Ecotax \(tax incl.\) +This value is recalculated when the merchant will change one of the following fields: Price \(tax excl.\) ecotax included, Price \(tax incl.\) ecotax included & Ecotax \(tax incl.\). [Improvement #15044](https://github.com/PrestaShop/PrestaShop/issues/15044) * **Cost price (tax excl.)**: By default, it’s set to 0.000000 It’s used for margin calculations. To separate decimals a dot or a comma can be used, both should work no matter the language. From 86462b719f4d0e0c50e1d14058e3a1087c8866dc Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Tue, 24 Nov 2020 10:45:38 +0100 Subject: [PATCH 04/11] Update back-office/catalog/products/catalog-products-add-edit.md Co-authored-by: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com> --- back-office/catalog/products/catalog-products-add-edit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 78077b3d8b..dd4e5eeb22 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -45,7 +45,7 @@ Please note, when editing a standard product with combinations, you can’t chan If you click on the id or the name, you arrive on the product page in basic settings tab. If you click on the price, you arrive on the product page in pricing tab. If you click on the quantity, you arrive on the product page in the second tab which is: Quantities for a standard product without combinations or a pack, Combinations for a standard product with combination, Virtual product for a virtual product. -When the quantity is equal or less than 0 the quantity is displayed with red backgound. +When the quantity is equal or less than 0 the quantity is displayed with a red background. * **Help**: Link to display the help in the right menu. * **Delete**: Button to delete the product. When you click on it, you have a modal to cancel or confirm the action. * **Preview**: When you click on this button, it saves and open a new browser tab with the product displayed in front-office. From 8b3f2aa12c6e31416f4d1473305a3cdee1435a76 Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Tue, 24 Nov 2020 10:47:36 +0100 Subject: [PATCH 05/11] Update back-office/catalog/products/catalog-products-add-edit.md Co-authored-by: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com> --- back-office/catalog/products/catalog-products-add-edit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index dd4e5eeb22..9acb441fde 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -56,7 +56,7 @@ Keyboard shortcut: ALT + SHIFT + V * **Save**: Button to save all changes made in all tabs. Keyboard shortcut: ALT + SHIFT + S. If it’s saved with success, there is a green success message “Settings updated”. Otherwise, there is an error message. -* **Duplicate**: When you click on this button, it saves and duplicate the current product \(the duplicated product will be offline\). The duplicated product has all the product information (product associated, carriers configuration, associated suppliers, infromation of all the combinaition and the associated files) of the copied product. +* **Duplicate**: When you click on this button, it saves and duplicates the current product \(the duplicated product will be offline\). The duplicated product has all the product information (related products, shipping configuration, associated suppliers, combinations, associated and attached files) of the copied product. Keyboard shortcut: ALT + SHIFT + D * **Go to catalog**: When you click on this button, it saves and redirect to catalog product list. Keyboard shortcut: ALT + SHIFT + Q From 374ff18ba98beacb012917c9adcdd59d2ec71c31 Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Mon, 30 Nov 2020 12:10:13 +0100 Subject: [PATCH 06/11] Update catalog-products-add-edit.md --- back-office/catalog/products/catalog-products-add-edit.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 9acb441fde..7252c37d41 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -156,7 +156,9 @@ The image is open in its default size. You can close it by clicking on the cross * The cross to close the frame and unselect images * Caption field: You can enter a caption which will be applied to all images. If some selected images already had captions, they are replaced when clicking on Save. - If more than one image is selected the checkbox "cover" disappears + If more than one image is selected the checkbox "cover" disappears. + +The **Features section** is displayed if the Feature option in the Advanced Parameters / Performance / Optional features page enables otherwise the section is hidden. * **Add a feature**: By default the selected option is "Choose a feature". All the features are displayed in the drop-down and are sorted by position ASC. If there are several features with the same name, then the ID of the feature is displayed before its name From aa8ddf8599af69104b99104142526905de4e67eb Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:33:45 +0100 Subject: [PATCH 07/11] Update categories --- .../products/catalog-products-add-edit.md | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 7252c37d41..7ef73a1001 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -101,26 +101,23 @@ When you change it, the price tax incl is updated. And the “tax rule” field If you select an United States tax rule, price tax incl = price tax excl because it is a tax per state and we can not say in which state is the shop. When you change it, the same field in pricing tab is also updated. Under the tax rule drop down, there is a “pricing” link. When you click on it, you switch to pricing tab. -* **Search category**: Search field to search a category. You can search by category name. -When you start typing, if there are results, they are displayed and highlighted \( [issue 14052](https://github.com/PrestaShop/PrestaShop/issues/14052)\) under and you can click on it. -* **Select category**: Allows to associate categories to the product. -A category is necessarily selected, it is impossible not to have one. -When you create a new product, “Home” is selected. -When you search a category elements are highlighted in dropdown when using keyboard and hover with mouse \([issue 14052](https://github.com/PrestaShop/PrestaShop/issues/14052)\). -When you click on the result, the category appears in “associated category” and is checked in the list. You can also select a category in the tree by clicking in the checkbox, then the category appears in “associated category”. -* **Unselect category**: You can unselect a category by unchecking the checkbox in the tree. Then, the category is removed in “associated category”. -You can also click on the cross in “associated category”. Then, the checkbox for the corresponding category is unchecked. -If you try to unselect all categories, you can’t do it for the last one. -* **Category tree**: When you create a new product, the tree is open for the first 2 levels of categories \([issue 14955](https://github.com/PrestaShop/PrestaShop/issues/14955)\). -When I click on "collapse" it folds the whole tree. I can also click on each parent to folds / unfolds its subcategories. When I click on "expend" the whole tree is opened. + +A category is necessarily selected, a product is always at least associated to one category. +When you create a new product, “Home” is selected. +* **Search category**: Allows to associate categories to the product. When the user searches a category, the results is displayed into a list that can be navigated using keyboard or hover with mouse \([issue 20331](https://github.com/PrestaShop/PrestaShop/issues/20331)\). The selected category by the user is add to **Associated categories** and is checked in the **Category tree.** +* **Associated categories**: Displays all the associated categorie. Each category can be removed by clicking on the cross button next to it. Removing a category uncheck the category on the tree. The last category can't be removed. +* **Category tree**: When the user creates a new product, the tree is open for the first 2 levels of categories \([issue 14955](https://github.com/PrestaShop/PrestaShop/issues/14955)\). +When the user clicks on "collapse" it folds the whole tree. The user can also click on each parent to folds / unfolds its subcategories. When the user clicks on "expend" the whole tree is opened. Categories are sorted by level AND position: Categ 1 level 1 position 1 Categ 3 level 1 position 2 Categ 2 level 1 position 3 Categ 2-2 level 2 position 1 -Categ 2-1 level 2 position 2 +Categ 2-1 level 2 position 2 +On the left of the category's name is display a checkbox, if it is checked then the category is associated to the product. * **Main category**: Radio button to select the main category of the product. There can only be one. The main category is the one that will be in the product URL, before the product name and in the breadcrumb in front-office you have all parent categories up to the main one. +If the category flaged as main category is unselected in the tree or removed from the associated category, the associated category with the hightest position on the tree will be assgned automaticaly the main categoty. * **Create a new category**: When you click on the button “Create a category”, this button disappears, a field “New category name” and a drop-down “parent of the category” are displayed with 2 buttons Cancel and Create. * **New category name**: Allows to create quickly a new category. The name will be the same in all languages. From 056108455517723e5854355bfd7ad1ba141e40c0 Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:39:37 +0100 Subject: [PATCH 08/11] update parent categories --- .../catalog/products/catalog-products-add-edit.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 7ef73a1001..b92bcd0141 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -113,11 +113,11 @@ Categ 1 level 1 position 1 Categ 3 level 1 position 2 Categ 2 level 1 position 3 Categ 2-2 level 2 position 1 -Categ 2-1 level 2 position 2 -On the left of the category's name is display a checkbox, if it is checked then the category is associated to the product. +Categ 2-1 level 2 position 2 +On the left of the category's name is display a checkbox, if it is checked then the category is associated to the product. The last category can't be removed unchecked. * **Main category**: Radio button to select the main category of the product. There can only be one. The main category is the one that will be in the product URL, before the product name and in the breadcrumb in front-office you have all parent categories up to the main one. -If the category flaged as main category is unselected in the tree or removed from the associated category, the associated category with the hightest position on the tree will be assgned automaticaly the main categoty. +If the category flaged as main category is unchecked in the tree or removed from the associated category, the associated category with the hightest position on the tree will be assgned automaticaly the main categoty. * **Create a new category**: When you click on the button “Create a category”, this button disappears, a field “New category name” and a drop-down “parent of the category” are displayed with 2 buttons Cancel and Create. * **New category name**: Allows to create quickly a new category. The name will be the same in all languages. @@ -128,8 +128,8 @@ When you save, if your category name contains an invalid character, an error mes Categ 3 level 1 position 2 Categ 2 level 1 position 3 Categ 2-2 level 2 position 1 - Categ 2-1 level 2 position 2 - + Categ 2-1 level 2 position 2 +If the list has elements with the same name, the lists displays the all the categaries with their ID. (ID - Name_category). * **Image upload**: Upload zone. When there is no image, you have the following message displayed “Drop images her or select files. Recommended size 800 x 800px for default theme. JPG, GIF or PNG format.” You can click in the entire zone to open the selector or you can drop one or many images in the entire zone. When there is already an image, you can click only on the frame with the “+” to open the selector. From 573fe881805cd2caa7d34ef0301e18947164ae49 Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Wed, 27 Jan 2021 16:30:18 +0100 Subject: [PATCH 09/11] Update back-office/catalog/products/catalog-products-add-edit.md Co-authored-by: marionf --- back-office/catalog/products/catalog-products-add-edit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index b92bcd0141..34876921bc 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -117,7 +117,7 @@ Categ 2-1 level 2 position 2 On the left of the category's name is display a checkbox, if it is checked then the category is associated to the product. The last category can't be removed unchecked. * **Main category**: Radio button to select the main category of the product. There can only be one. The main category is the one that will be in the product URL, before the product name and in the breadcrumb in front-office you have all parent categories up to the main one. -If the category flaged as main category is unchecked in the tree or removed from the associated category, the associated category with the hightest position on the tree will be assgned automaticaly the main categoty. +If the category flagged as the main category is unchecked in the tree or removed from the associated category, the associated category with the highest position on the tree will automatically be assigned as the main category. * **Create a new category**: When you click on the button “Create a category”, this button disappears, a field “New category name” and a drop-down “parent of the category” are displayed with 2 buttons Cancel and Create. * **New category name**: Allows to create quickly a new category. The name will be the same in all languages. From 4b4b4530e5b274229bd604475b7272d2478a3f7f Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Wed, 27 Jan 2021 16:30:38 +0100 Subject: [PATCH 10/11] Update back-office/catalog/products/catalog-products-add-edit.md Co-authored-by: marionf --- back-office/catalog/products/catalog-products-add-edit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index 34876921bc..dea9379c3f 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -155,7 +155,7 @@ The image is open in its default size. You can close it by clicking on the cross If more than one image is selected the checkbox "cover" disappears. -The **Features section** is displayed if the Feature option in the Advanced Parameters / Performance / Optional features page enables otherwise the section is hidden. +The **Features section** is displayed if the Feature option in Advanced Parameters > Performance > Optional features page is enabled. Otherwise, the section is hidden. * **Add a feature**: By default the selected option is "Choose a feature". All the features are displayed in the drop-down and are sorted by position ASC. If there are several features with the same name, then the ID of the feature is displayed before its name From 136c7d5899b3363351969a3e27aff7045856b9b4 Mon Sep 17 00:00:00 2001 From: Mateus <43613217+MatShir@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:28:13 +0100 Subject: [PATCH 11/11] Update back-office/catalog/products/catalog-products-add-edit.md Co-authored-by: marionf --- back-office/catalog/products/catalog-products-add-edit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-office/catalog/products/catalog-products-add-edit.md b/back-office/catalog/products/catalog-products-add-edit.md index dea9379c3f..bab0bcb5aa 100644 --- a/back-office/catalog/products/catalog-products-add-edit.md +++ b/back-office/catalog/products/catalog-products-add-edit.md @@ -129,7 +129,7 @@ When you save, if your category name contains an invalid character, an error mes Categ 2 level 1 position 3 Categ 2-2 level 2 position 1 Categ 2-1 level 2 position 2 -If the list has elements with the same name, the lists displays the all the categaries with their ID. (ID - Name_category). +If the list has elements with the same name, the lists displays all the categories with their ID. (ID - Name_category). * **Image upload**: Upload zone. When there is no image, you have the following message displayed “Drop images her or select files. Recommended size 800 x 800px for default theme. JPG, GIF or PNG format.” You can click in the entire zone to open the selector or you can drop one or many images in the entire zone. When there is already an image, you can click only on the frame with the “+” to open the selector.