From 3623b7858387aeb6a5694a44756425ca9af42a3a Mon Sep 17 00:00:00 2001 From: Jonathan LELIEVRE Date: Wed, 13 Nov 2024 11:20:49 +0100 Subject: [PATCH] Revert unnecessary changes from merge action --- .github/workflows/php.yml | 2 +- docs/CHANGELOG.txt | 46 ------------------- .../modules_tests/override/classes/Cart.php | 4 +- .../default/ModulesBlockreassuranceAdmin.xlf | 34 ++++++++------ .../default/ModulesEmailsubscriptionShop.xlf | 2 +- translations/default/ModulesLinklistAdmin.xlf | 10 ++-- .../default/ModulesProductcommentsAdmin.xlf | 38 +++++++-------- translations/default/ShopFormsHelp.xlf | 6 ++- translations/default/ShopFormsLabels.xlf | 18 +++++--- .../default/ShopNotificationsSuccess.xlf | 18 ++++---- .../default/ShopThemeCustomeraccount.xlf | 27 +++++------ 11 files changed, 82 insertions(+), 123 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index f6c3726987e6d..ed3371226e814 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -42,7 +42,7 @@ jobs: run: COMPOSER_PROCESS_TIMEOUT=600 composer install --ansi --prefer-dist --no-interaction --no-progress - name: Run PHPCSFixer - run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --path-mode=intersection + run: ./vendor/bin/php-cs-fixer fix --dry-run --diff - name: Run ergebnis/composer-normalize run: composer normalize --dry-run --no-check-lock diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 3897dd69ff6a2..d10d8fa0532e7 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -1295,52 +1295,6 @@ Changelog for PrestaShop 9 - Refactoring: - #36882: Comment search process (by @Hlavtox) -#################################### -# v8.2.0 - (2024-09-23) -#################################### -- Back Office: - - Improvement: - - #36171: Remove email "Preview" from BO section "Statutes" (by @ShaiMagal) - - #36386: Fix typo in pack wording that doesn't make sense (by @Hlavtox) - - #36172: Input type "number" is not styled properly (by @ShaiMagal) - - #36714: Order modules on translation page alphabetically (by @Hlavtox) - - #36936: Remove redirection on cms exception (by @Hlavtox) - - Bug fix: - - #36457: Fix: Pass correct language ID to getAttributesName instead of hardcoded 1 (by @mouleeg) - - #36454: Prevent creating duplicate customers in some scenarios (by @Hlavtox) - - #36287: Fix issue with Product Customizations (by @Codencode) - - #36802: Fix: Error occurs when navigating new admin controllers with empty quick access links (by @Codencode) - - #36639: Check override conflicts at module install (by @ludoviccardinale & @matthieu-rolland) - - #36895: Update AdminCartsController.php (by @Codencode) - - #36914: Added management of the 'addedByModule' field in the "CustomizationField" object (by @Codencode) -- Front Office: - - Improvement: - - #36359: Match URLs with a trailing slash (by @Hlavtox) - - #36451: Enhance TemplateVarShop Function with Shop Group ID for Improved Multi-Shop Support (by @ChronoBrake) - - Bug fix: - - #36454: Prevent creating duplicate customers in some scenarios (by @Hlavtox) - - #36521: Handle hook prefix to allow dashboard module to be saved (by @PrestaEdit) - - #36664: Use attribute public name instead of private name in URL anchors (by @maxldn5) - - #36834: Fix: problems with product customizations issue 1 (by @Codencode) - - #36905: Fix: Cart.php class method _deleteCustomization not deleting all image files from same customization but only first (by @Codencode) -- Core: - - Improvement: - - #36398: Updated PrestaShop Packages (by @github-actions) - - #36417: Updated PrestaShop Packages (by @github-actions) - - #36576: Mail - Reply-To can be the same as the To address (spam indicator - negative points) (by @ShaiMagal) - - #36764: Version number 8.2.0 (by @matks) - - #36657: Add hook for assigning general purpose variables before the core does it (by @matthieu-rolland) - - #36575: Migrate lazy array improvements and cart presenter decoupling from develop to 8.2.x (by @matthieu-rolland) - - #36955: Use basename on user given filename in legacy uploadcontroller (by @matthieu-rolland) - - #36972: Update default catalog 8.2.x (by @ps-jarvis) - - Bug fix: - - #36662: Cast OrderProductForViewing - location to string for Memcached (by @ShaiMagal) - - #36840: Use PHP constants for doctrine config (by @matks) - - #36875: Add attr_stringify_fetches to PDO init config to avoid BC Break (by @fox-john) - - #36689: Can't transformToCustomer while password max length is shorter than default 16 length (by @ShaiMagal) - - Refactoring: - - #36882: Comment search process (by @Hlavtox) - #################################### # v8.1.7 - (2024-06-14) #################################### diff --git a/tests/Resources/modules_tests/override/classes/Cart.php b/tests/Resources/modules_tests/override/classes/Cart.php index a22df0fd9cc23..3011192ddf9d9 100644 --- a/tests/Resources/modules_tests/override/classes/Cart.php +++ b/tests/Resources/modules_tests/override/classes/Cart.php @@ -2,8 +2,6 @@ class Cart extends CartCore { - public const BOTH = 999; - /* * module: pscsx32412 * date: 2018-12-26 14:14:05 @@ -71,7 +69,7 @@ public function delete() WHERE `id_cart` = ' . (int) $this->id ); if (!Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_rule` WHERE `id_cart` = ' . (int) $this->id) - || !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) { + || !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) { return false; } diff --git a/translations/default/ModulesBlockreassuranceAdmin.xlf b/translations/default/ModulesBlockreassuranceAdmin.xlf index aed2620010a66..cfb6c916ab351 100644 --- a/translations/default/ModulesBlockreassuranceAdmin.xlf +++ b/translations/default/ModulesBlockreassuranceAdmin.xlf @@ -151,6 +151,15 @@ Comment: Confirm uninstall + + + + CMS Page + CMS Page + Line: 24 + + + @@ -236,11 +245,6 @@ Comment: Confirm uninstall - - CMS Page - CMS Page - Line: 81 - Block Content Block Content @@ -266,16 +270,6 @@ Comment: Confirm uninstall We recommend 3 blocks at maximum. Line: 118 - - None - None - Line: 77 - - - none - none - Line: 57 - @@ -308,6 +302,11 @@ Comment: Confirm uninstall + + None + None + Line: 93 + Header position on all pages Header position on all pages @@ -342,6 +341,11 @@ Comment: Confirm uninstall + + none + none + Line: 41 + Main column Main column diff --git a/translations/default/ModulesEmailsubscriptionShop.xlf b/translations/default/ModulesEmailsubscriptionShop.xlf index 0e792bbd001ba..92fc67afaa1f2 100644 --- a/translations/default/ModulesEmailsubscriptionShop.xlf +++ b/translations/default/ModulesEmailsubscriptionShop.xlf @@ -68,7 +68,7 @@ - + Newsletter diff --git a/translations/default/ModulesLinklistAdmin.xlf b/translations/default/ModulesLinklistAdmin.xlf index b0cde17af6273..109501744868e 100644 --- a/translations/default/ModulesLinklistAdmin.xlf +++ b/translations/default/ModulesLinklistAdmin.xlf @@ -30,11 +30,6 @@ ID Line: 91 - - Name of the block - Name of the block - Line: 98 - @@ -53,6 +48,11 @@ + + Name of the block + Name of the block + Line: 114 + Name of the block cannot be longer than %limit% characters Name of the block cannot be longer than %limit% characters diff --git a/translations/default/ModulesProductcommentsAdmin.xlf b/translations/default/ModulesProductcommentsAdmin.xlf index 5554b53a5cf86..e75b64c7ef98e 100644 --- a/translations/default/ModulesProductcommentsAdmin.xlf +++ b/translations/default/ModulesProductcommentsAdmin.xlf @@ -1,24 +1,5 @@ - - - - Valid for the entire catalog - Valid for the entire catalog - Line: 300 - - - Restricted to some categories - Restricted to some categories - Line: 301 - - - Restricted to some products - Restricted to some products - Line: 302 - - - @@ -263,6 +244,25 @@ Comment: retro compat 1.5 + + + + Valid for the entire catalog + Valid for the entire catalog + Line: 340 + + + Restricted to some categories + Restricted to some categories + Line: 341 + + + Restricted to some products + Restricted to some products + Line: 342 + + + diff --git a/translations/default/ShopFormsHelp.xlf b/translations/default/ShopFormsHelp.xlf index 902a1bb42be19..e481643634ff7 100644 --- a/translations/default/ShopFormsHelp.xlf +++ b/translations/default/ShopFormsHelp.xlf @@ -45,10 +45,14 @@ Customer password is too weak Line: 103 + + + + Enter a password to transform your guest account into a customer account. Enter a password to transform your guest account into a customer account. - Line: 91 + Line: 131 diff --git a/translations/default/ShopFormsLabels.xlf b/translations/default/ShopFormsLabels.xlf index 21297c08fe381..4b3fb9f8fd80c 100644 --- a/translations/default/ShopFormsLabels.xlf +++ b/translations/default/ShopFormsLabels.xlf @@ -126,19 +126,14 @@ Comment: Please localize this string with the applicable registration number typ Message Line: 101 - - Email address - Email address - Line: 58 - - + Your email address Your email address - Line: 42 + Line: 50 @@ -208,6 +203,15 @@ Comment: Please localize this string with the applicable registration number typ + + + + Email address + Email address + Line: 53 + + + diff --git a/translations/default/ShopNotificationsSuccess.xlf b/translations/default/ShopNotificationsSuccess.xlf index 0d0f671daba8e..c89322a116261 100644 --- a/translations/default/ShopNotificationsSuccess.xlf +++ b/translations/default/ShopNotificationsSuccess.xlf @@ -19,15 +19,6 @@ - - - - Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper. - Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper. - Line: 126 - - - @@ -37,6 +28,15 @@ + + + + Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper. + Your guest account has been successfully transformed into a customer account. You can now log in as a registered shopper. + Line: 193 + + + diff --git a/translations/default/ShopThemeCustomeraccount.xlf b/translations/default/ShopThemeCustomeraccount.xlf index c2c0bf918f099..0c9f638d497c4 100644 --- a/translations/default/ShopThemeCustomeraccount.xlf +++ b/translations/default/ShopThemeCustomeraccount.xlf @@ -105,6 +105,15 @@ + + + + You have given permission to receive your order in recycled packaging. + You have given permission to receive your order in recycled packaging. + Line: 90 + + + @@ -152,17 +161,13 @@ - + Virtual products can't be returned. Virtual products can't be returned. - Line: 51 + Line: 55 - - - - Returned Returned @@ -317,11 +322,6 @@ - - You have given permission to receive your order in recycled packaging. - You have given permission to receive your order in recycled packaging. - Line: 71 - Order details Order details @@ -515,11 +515,6 @@ - - Create an account - Create an account - Line: 28 - Already have an account? Already have an account?