Prepare release of dashproducts v2.2.0

.github/workflows/php.yml

@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v2.0.0
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
@@ -74,14 +74,14 @@ jobs:
 
       # Add vendor folder in cache to make next builds faster
       - name: Cache vendor folder
-        uses: actions/cache@v1
+        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@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: php-composer-cache

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>dashproducts</name>
 	<displayName><![CDATA[Dashboard Products]]></displayName>
-	<version><![CDATA[2.1.4]]></version>
+	<version><![CDATA[2.2.0]]></version>
 	<description><![CDATA[Adds a block with a table of your latest orders and a ranking of your products]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[dashboard]]></tab>

dashproducts.php

@@ -33,7 +33,7 @@ public function __construct()
     {
         $this->name = 'dashproducts';
         $this->tab = 'administration';
-        $this->version = '2.1.4';
+        $this->version = '2.2.0';
         $this->author = 'PrestaShop';
 
         parent::__construct();
@@ -119,7 +119,7 @@ public function getTableRecentOrders()
                     ]),
                     Tools::htmlentitiesUTF8($order['firstname']),
                     Tools::htmlentitiesUTF8($order['lastname'])
-                ) : '',
+                ) : $this->trans('Deleted customer', [], 'AdminGlobal'),
                 'class' => 'text-left',
             ];
             $tr[] = [
@@ -148,7 +148,7 @@ public function getTableRecentOrders()
                 'id' => 'details',
                 'value' => '',
                 'class' => 'text-right',
-                'wrapper_start' => '<a class="btn btn-default" href="index.php?controller=AdminOrders&id_order=' . (int) $order['id_order'] . '&vieworder&token=' . Tools::getAdminTokenLite('AdminOrders') . '" title="' . $this->trans('Details', [], 'Modules.Dashproducts.Admin') . '"><i class="icon-search"></i>',
+                'wrapper_start' => '<a class="btn btn-default" href="' . $this->context->link->getAdminLink('AdminOrders', true, [], ['id_order' => (int) $order['id_order'], 'vieworder' => 1]) . '" title="' . $this->trans('Details', [], 'Modules.Dashproducts.Admin') . '"><i class="icon-search"></i>',
                 'wrapper_end' => '</a>',
             ];
 
@@ -198,7 +198,7 @@ public function getTableBestSellers($date_from, $date_to)
 					SELECT
 						product_id,
 						product_name,
-						SUM(product_quantity-product_quantity_refunded-product_quantity_return-product_quantity_reinjected) as total,
+						SUM(product_quantity-product_quantity_refunded-product_quantity_return) as total,
 						p.price as price,
 						pa.price as price_attribute,
 						SUM(total_price_tax_excl / conversion_rate) as sales,
@@ -471,7 +471,7 @@ public function getTotalViewed($date_from, $date_to, $limit = 10)
         WHERE pt.`name` = \'product\'
         ' . Shop::addSqlRestriction(false, 'pv') . '
         AND dr.`time_start` BETWEEN "' . pSQL($date_from) . '" AND "' . pSQL($date_to) . '"
-        AND dr.`time_end` BETWEEN "' . pSQL($date_from) . '" AND "' . pSQL($date_to) . '"
+        AND dr.`time_end` BETWEEN "' . pSQL($date_from) . '" AND "' . pSQL($date_to) . ' 23:59:59"
         ORDER BY pv.counter DESC
         LIMIT ' . (int) $limit);
     }
@@ -485,7 +485,7 @@ public function getMostSearchTerms($date_from, $date_to, $limit = 10)
         return Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->executeS('
 		SELECT `keywords`, count(`id_statssearch`) as count_keywords, `results`
 		FROM `' . _DB_PREFIX_ . 'statssearch` ss
-		WHERE ss.`date_add` BETWEEN "' . pSQL($date_from) . '" AND "' . pSQL($date_to) . '"
+		WHERE ss.`date_add` BETWEEN "' . pSQL($date_from) . '" AND "' . pSQL($date_to) . ' 23:59:59"
 		' . Shop::addSqlRestriction(false, 'ss') . '
 		GROUP BY ss.`keywords`
 		ORDER BY `count_keywords` DESC