Merge pull request #221 from PrestaShop/dev

Release 8.0.0

Author: Quetzacoalt91

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,13 +7,14 @@ Check out our contribution guidelines to find out how to complete it:
 https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
 ------------------------------------------------------------------------------>
 
-| Questions     | Answers
-| ------------- | -------------------------------------------------------
-| Description?  | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
-| Type?         | bug fix / improvement / new feature / refacto / critical
-| BC breaks?    | yes / no
-| Deprecations? | yes / no
-| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}.
-| How to test?  | Please indicate how to best verify that this PR is correct.
+| Questions         | Answers
+| ----------------- | -------------------------------------------------------
+| Description?      | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
+| Type?             | bug fix / improvement / new feature / refacto / critical
+| BC breaks?        | yes / no
+| Deprecations?     | yes / no
+| Fixed ticket?     | Fixes PrestaShop/Prestashop#{issue number here}.
+| How to test?      | Please indicate how to best verify that this PR is correct.
+| Sponsor company   | Your company or customer's name goes here (if applicable).
 
 <!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->

.github/workflows/build-release.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
       - name: Install composer dependencies
         run: composer install --no-dev -o
       - name: Clean-up project
@@ -17,7 +17,7 @@ jobs:
       - name: Generate index.php
         run: ~/.composer/vendor/bin/autoindex
       - name: Create & upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}
           path: /home/runner/work/${{ github.event.repository.name }}
@@ -27,7 +27,7 @@ jobs:
     if: github.event_name == 'push' && (github.event.ref == 'refs/heads/main' || github.event.ref == 'refs/heads/master')
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ github.event.repository.name }}
           path: ${{ github.event.repository.name }}

.github/workflows/php.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       - name: PHP syntax checker 7.2
         uses: prestashop/github-action-php-lint/7.2@master
@@ -38,10 +38,10 @@ jobs:
               php-version: '7.4'
 
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
@@ -66,18 +66,18 @@ jobs:
           php-version: '7.4'
 
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       # Add vendor folder in cache to make next builds faster
       - name: Cache vendor folder
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
 
       # Add composer local folder in cache to make next builds faster
       - name: Cache composer folder
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: php-composer-cache

ProductComment.php

@@ -190,21 +190,6 @@ public static function getRatings($id_product)
         return Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getRow($sql);
     }
 
-    /**
-     * @deprecated 4.0.0
-     */
-    public static function getAverageGrade($id_product)
-    {
-        $validate = Configuration::get('PRODUCT_COMMENTS_MODERATE');
-
-        return Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getRow('
-		SELECT AVG(pc.`grade`) AS grade
-		FROM `' . _DB_PREFIX_ . 'product_comment` pc
-		WHERE pc.`id_product` = ' . (int) $id_product . '
-		AND pc.`deleted` = 0' .
-        ($validate == '1' ? ' AND pc.`validate` = 1' : ''));
-    }
-
     public static function getAveragesByProduct($id_product, $id_lang)
     {
         /* Get all grades */
@@ -234,31 +219,6 @@ public static function getAveragesByProduct($id_product, $id_lang)
         return $averages;
     }
 
-    /**
-     * Return number of comments and average grade by products
-     *
-     * @return int|false
-     *
-     * @deprecated 4.0.0
-     */
-    public static function getCommentNumber($id_product)
-    {
-        if (!Validate::isUnsignedId($id_product)) {
-            return false;
-        }
-        $validate = (bool) Configuration::get('PRODUCT_COMMENTS_MODERATE');
-        $cache_id = 'ProductComment::getCommentNumber_' . $id_product . '-' . $validate;
-        if (!Cache::isStored($cache_id)) {
-            $result = (int) Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getValue('
-			SELECT COUNT(`id_product_comment`) AS "nbr"
-			FROM `' . _DB_PREFIX_ . 'product_comment` pc
-			WHERE `id_product` = ' . $id_product . ($validate ? ' AND `validate` = 1' : ''));
-            Cache::store($cache_id, (string) $result);
-        }
-
-        return (int) Cache::retrieve($cache_id);
-    }
-
     /**
      * Return number of comments and average grade by products
      *
@@ -434,66 +394,6 @@ public static function deleteUsefulness($id_product_comment)
 		WHERE `id_product_comment` = ' . $id_product_comment);
     }
 
-    /**
-     * Report comment
-     *
-     * @return bool
-     *
-     * @deprecated 4.0.0 - migrated to controllers/front/ReportComment and src/Entity/ProductCommentReport
-     */
-    public static function reportComment($id_product_comment, $id_customer)
-    {
-        return Db::getInstance()->execute('
-			INSERT INTO `' . _DB_PREFIX_ . 'product_comment_report` (`id_product_comment`, `id_customer`)
-			VALUES (' . (int) $id_product_comment . ', ' . (int) $id_customer . ')');
-    }
-
-    /**
-     * Comment already report
-     *
-     * @return bool
-     *
-     * @deprecated 4.0.0 - migrated to controllers/front/ReportComment and src/Entity/ProductCommentReport
-     */
-    public static function isAlreadyReport($id_product_comment, $id_customer)
-    {
-        return (bool) Db::getInstance()->getValue('
-			SELECT COUNT(*)
-			FROM `' . _DB_PREFIX_ . 'product_comment_report`
-			WHERE `id_customer` = ' . (int) $id_customer . '
-			AND `id_product_comment` = ' . (int) $id_product_comment);
-    }
-
-    /**
-     * Set comment usefulness
-     *
-     * @return bool
-     *
-     * @deprecated 4.0.0 - migrated to controllers/front/UpdateCommentUsefulness and src/Entity/ProductCommentUsefulness
-     */
-    public static function setCommentUsefulness($id_product_comment, $usefulness, $id_customer)
-    {
-        return Db::getInstance()->execute('
-			INSERT INTO `' . _DB_PREFIX_ . 'product_comment_usefulness` (`id_product_comment`, `usefulness`, `id_customer`)
-			VALUES (' . (int) $id_product_comment . ', ' . (int) $usefulness . ', ' . (int) $id_customer . ')');
-    }
-
-    /**
-     * Usefulness already set
-     *
-     * @return bool
-     *
-     * @deprecated 4.0.0 - migrated to controllers/front/UpdateCommentUsefulness and src/Entity/ProductCommentUsefulness
-     */
-    public static function isAlreadyUsefulness($id_product_comment, $id_customer)
-    {
-        return (bool) Db::getInstance()->getValue('
-			SELECT COUNT(*)
-			FROM `' . _DB_PREFIX_ . 'product_comment_usefulness`
-			WHERE `id_customer` = ' . (int) $id_customer . '
-			AND `id_product_comment` = ' . (int) $id_product_comment);
-    }
-
     /**
      * Get reported comments
      *

ProductCommentCriterion.php

@@ -133,74 +133,6 @@ public function addCategory($id_category)
 		');
     }
 
-    /**
-     * Add grade to a criterion
-     *
-     * @return bool succeed
-     *
-     * @deprecated 4.0.0
-     */
-    public function addGrade($id_product_comment, $grade)
-    {
-        if (!Validate::isUnsignedId($id_product_comment)) {
-            exit(Tools::displayError());
-        }
-        if ($grade < 0) {
-            $grade = 0;
-        } elseif ($grade > 10) {
-            $grade = 10;
-        }
-
-        return Db::getInstance()->execute('
-		INSERT INTO `' . _DB_PREFIX_ . 'product_comment_grade`
-		(`id_product_comment`, `id_product_comment_criterion`, `grade`) VALUES(
-		' . $id_product_comment . ',
-		' . (int) $this->id . ',
-		' . (int) ($grade) . ')');
-    }
-
-    /**
-     * Get criterion by Product
-     *
-     * @return array Criterion
-     *
-     * @deprecated 4.0.0
-     */
-    public static function getByProduct($id_product, $id_lang)
-    {
-        if (!Validate::isUnsignedId($id_product) ||
-            !Validate::isUnsignedId($id_lang)) {
-            exit(Tools::displayError());
-        }
-
-        $cache_id = 'ProductCommentCriterion::getByProduct_' . $id_product . '-' . $id_lang;
-        if (!Cache::isStored($cache_id)) {
-            $result = Db::getInstance()->executeS('
-				SELECT pcc.`id_product_comment_criterion`, pccl.`name`
-				FROM `' . _DB_PREFIX_ . 'product_comment_criterion` pcc
-				LEFT JOIN `' . _DB_PREFIX_ . 'product_comment_criterion_lang` pccl
-					ON (pcc.id_product_comment_criterion = pccl.id_product_comment_criterion)
-				LEFT JOIN `' . _DB_PREFIX_ . 'product_comment_criterion_product` pccp
-					ON (pcc.`id_product_comment_criterion` = pccp.`id_product_comment_criterion` AND pccp.`id_product` = ' . $id_product . ')
-				LEFT JOIN `' . _DB_PREFIX_ . 'product_comment_criterion_category` pccc
-					ON (pcc.`id_product_comment_criterion` = pccc.`id_product_comment_criterion`)
-				LEFT JOIN `' . _DB_PREFIX_ . 'product_shop` ps
-					ON (ps.id_category_default = pccc.id_category AND ps.id_product = ' . $id_product . ')
-				WHERE pccl.`id_lang` = ' . $id_lang . '
-				AND (
-					pccp.id_product IS NOT NULL
-					OR ps.id_product IS NOT NULL
-					OR pcc.id_product_comment_criterion_type = 1
-				)
-				AND pcc.active = 1
-				GROUP BY pcc.id_product_comment_criterion
-			');
-            Cache::store($cache_id, $result);
-        }
-
-        return Cache::retrieve($cache_id);
-    }
-
     /**
      * Get Criterions
      *

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>productcomments</name>
     <displayName><![CDATA[Product Comments]]></displayName>
-    <version><![CDATA[7.0.0]]></version>
+    <version><![CDATA[8.0.0]]></version>
     <description><![CDATA[Allows users to post reviews and rate products on specific criteria.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

controllers/front/ListComments.php

@@ -71,6 +71,7 @@ public function display()
 
             if ($isLastNameAnonymous) {
                 $productComment['customer_name'] = $this->anonymizeName($productComment['customer_name']);
+                $productComment['lastname'] = '...';
             }
 
             $productComment['customer_name'] = htmlentities($productComment['customer_name']);

controllers/front/PostComment.php

@@ -34,7 +34,7 @@ class ProductCommentsPostCommentModuleFrontController extends ModuleFrontControl
     public function display()
     {
         header('Content-Type: application/json');
-        if (!(int) $this->context->cookie->id_customer && !Configuration::get('PRODUCT_COMMENTS_ALLOW_GUESTS')) {
+        if (!$this->context->customer->isLogged() && !Configuration::get('PRODUCT_COMMENTS_ALLOW_GUESTS')) {
             $this->ajaxRender(
                 json_encode(
                     [

productcomments.php

@@ -47,7 +47,7 @@ public function __construct()
     {
         $this->name = 'productcomments';
         $this->tab = 'front_office_features';
-        $this->version = '7.0.0';
+        $this->version = '8.0.0';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->bootstrap = true;
@@ -455,7 +455,7 @@ public function renderModerateLists()
             $helper->table = $this->name;
             $helper->table_id = 'waiting-approval-productcomments-list';
             $helper->token = Tools::getAdminTokenLite('AdminModules');
-            $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+            $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
             $helper->no_link = true;
 
             $return .= $helper->generateList($comments, $fields_list);
@@ -480,7 +480,7 @@ public function renderModerateLists()
         $helper->table = $this->name;
         $helper->table_id = 'reported-productcomments-list';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->no_link = true;
 
         $return .= $helper->generateList($comments, $fields_list);
@@ -564,7 +564,7 @@ public function renderCriterionList()
         $helper->title = $this->trans('Review Criteria', [], 'Modules.Productcomments.Admin');
         $helper->table = $this->name . 'criterion';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
 
         return $helper->generateList($criterions, $fields_list);
     }
@@ -585,7 +585,7 @@ public function renderCommentsList()
         $helper->table = $this->name;
         $helper->table_id = 'approved-productcomments-list';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->no_link = true;
 
         $page = ($page = Tools::getValue('submitFilter' . $helper->list_id)) ? (int) $page : 1;
@@ -1076,11 +1076,19 @@ public function renderWidget($hookName = null, array $configuration = [])
                 case 'quickview':
                     $filePath = $tplHookPath . 'product-additional-info-quickview.tpl';
                     break;
+                case 'refresh':
+                    if (Tools::getValue('quickview') == true) {
+                        $filePath = '';
+                    } else {
+                        $filePath = $tplHookPath . 'product-additional-info.tpl';
+                    }
+                    break;
                 case '':
                     $filePath = $tplHookPath . 'product-additional-info.tpl';
                     break;
-                default:    // 'refresh' and other unpredicted cases
+                default:
                     $filePath = '';
+                    break;
             }
         }