diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b3bbb2b..780ec78 100644 --- a/.github/workflows/php.yml +++ b/.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 diff --git a/composer.lock b/composer.lock index 10c2bb7..661574e 100644 --- a/composer.lock +++ b/composer.lock @@ -1954,26 +1954,23 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2017,7 +2014,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2033,20 +2030,20 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v5.4.3", + "version": "v5.4.46", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "553f50487389a977eb31cf6b37faae56da00f753" + "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753", - "reference": "553f50487389a977eb31cf6b37faae56da00f753", + "url": "https://api.github.com/repos/symfony/process/zipball/01906871cb9b5e3cf872863b91aba4ec9767daf4", + "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4", "shasum": "" }, "require": { @@ -2079,7 +2076,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.3" + "source": "https://github.com/symfony/process/tree/v5.4.46" }, "funding": [ { @@ -2095,7 +2092,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T16:28:35+00:00" + "time": "2024-11-06T09:18:28+00:00" }, { "name": "symfony/service-contracts", @@ -2252,5 +2249,5 @@ "php": ">=5.4" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } diff --git a/config.xml b/config.xml index 1b73f53..a620db1 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ dashproducts - + diff --git a/dashproducts.php b/dashproducts.php index 34f7b22..d89b6ed 100755 --- a/dashproducts.php +++ b/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' => '', + 'wrapper_start' => '', 'wrapper_end' => '', ]; @@ -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