From 9f4a100e82939ef19ec5ff885d1107aa7cc0f91c Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 15 May 2024 18:33:55 +0530 Subject: [PATCH] Fixed: the abandoned cart KPI count and the abandoned cart filter autofill if text is translated --- controllers/admin/AdminCartsController.php | 6 +++--- controllers/admin/AdminStatsController.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 438bd31e8..5906adc80 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -42,11 +42,12 @@ class AdminCartsControllerCore extends AdminController $this->allow_export = true; $this->_orderWay = 'DESC'; $this->context = Context::getContext(); + $abandonedCartText = $this->l('Abandoned cart'); $this->_select = 'CONCAT(c.`firstname`, \' \', c.`lastname`) `customer`, a.id_cart total, TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) AS `time_diff`, IFNULL(GROUP_CONCAT(o.`id_order`), 0) AS `ids_order`, - IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$this->l('Abandoned cart').'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order, + IF (IFNULL(o.id_order, \''.$this->l('Non ordered cart').'\') = \''.$this->l('Non ordered cart').'\', IF(TIME_TO_SEC(TIMEDIFF(\''.pSQL(date('Y-m-d H:i:00', time())).'\', a.`date_add`)) > 86400, \''.$abandonedCartText.'\', \''.$this->l('Non ordered cart').'\'), GROUP_CONCAT(o.`id_order`)) AS filter_ids_order, IF(o.id_order, 1, 0) badge_success, IF(o.id_order, 0, 1) badge_danger, IF(co.id_guest, 1, 0) id_guest'; $this->_join = 'LEFT JOIN '._DB_PREFIX_.'customer c ON (c.id_customer = a.id_customer) LEFT JOIN '._DB_PREFIX_.'currency cu ON (cu.id_currency = a.id_currency) @@ -119,9 +120,8 @@ class AdminCartsControllerCore extends AdminController $this->processResetFilters(); $dateFrom = date('Y-m-d', strtotime('-2 day')); $dateTo = date('Y-m-d', strtotime('-1 day')); - $orderFilterValue = 'Abandoned'; $_POST[$this->table.'Filter_'.$this->fields_list['date_add']['filter_key']] = '["'.$dateFrom.'", "'.$dateTo.'"]'; - $_POST[$this->table.'Filter_filter_ids_order'] = $orderFilterValue; + $_POST[$this->table.'Filter_filter_ids_order'] = $abandonedCartText; $_POST['submitFilter'.$this->table] = true; } diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 2de11a362..3cad95f4f 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -81,7 +81,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getAbandonedCarts($date_from, $date_to) { return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' - SELECT COUNT(DISTINCT id_guest) + SELECT COUNT(DISTINCT id_cart) FROM `'._DB_PREFIX_.'cart` WHERE `date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'" AND NOT EXISTS (SELECT 1 FROM `'._DB_PREFIX_.'orders` WHERE `'._DB_PREFIX_.'orders`.id_cart = `'._DB_PREFIX_.'cart`.id_cart) @@ -638,7 +638,7 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'abandoned_cart': - $value = AdminStatsController::getAbandonedCarts(date('Y-m-d H:i:s', strtotime('-2 day')), date('Y-m-d H:i:s', strtotime('-1 day'))); + $value = AdminStatsController::getAbandonedCarts(date('Y-m-d', strtotime('-2 day')).' 0:0:0', date('Y-m-d', strtotime('-1 day')).' 23:59:59'); break; case 'installed_modules':