From 7db8ff50441722589d799e4ca75dc5b0bb2f9797 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Mon, 18 May 2020 14:47:20 +0300 Subject: [PATCH] don't use 1.7 controllers lifecycle --- retailcrm/controllers/front/Consultant.php | 13 +------------ retailcrm/controllers/front/DaemonCollector.php | 13 +------------ retailcrm/controllers/front/Jobs.php | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/retailcrm/controllers/front/Consultant.php b/retailcrm/controllers/front/Consultant.php index 244e994..acdd847 100644 --- a/retailcrm/controllers/front/Consultant.php +++ b/retailcrm/controllers/front/Consultant.php @@ -53,18 +53,7 @@ class RetailcrmConsultantModuleFrontController extends ModuleFrontController header('Content-Type: application/json'); } - if (Tools::substr(_PS_VERSION_, 0, 3) == '1.6') { - echo $response; - } else { - try { - parent::initContent(); - $this->ajaxRender($response); - } catch (\Exception $exception) { - // Sometimes ps_shoppingcart throws exception which breaks our controller. - // We don't care about ps_shoppingcart here, so, we will fallback to old way. - echo $response; - } - } + echo $response; } /** diff --git a/retailcrm/controllers/front/DaemonCollector.php b/retailcrm/controllers/front/DaemonCollector.php index e5fca39..52cebda 100644 --- a/retailcrm/controllers/front/DaemonCollector.php +++ b/retailcrm/controllers/front/DaemonCollector.php @@ -53,18 +53,7 @@ class RetailcrmDaemonCollectorModuleFrontController extends ModuleFrontControlle header('Content-Type: application/json'); } - if (Tools::substr(_PS_VERSION_, 0, 3) == '1.6') { - echo $response; - } else { - try { - parent::initContent(); - $this->ajaxRender($response); - } catch (\Exception $exception) { - // Sometimes ps_shoppingcart throws exception which breaks our controller. - // We don't care about ps_shoppingcart here, so, we will fallback to old way. - echo $response; - } - } + echo $response; } /** diff --git a/retailcrm/controllers/front/Jobs.php b/retailcrm/controllers/front/Jobs.php index 2e1cc72..1b890c0 100644 --- a/retailcrm/controllers/front/Jobs.php +++ b/retailcrm/controllers/front/Jobs.php @@ -53,18 +53,7 @@ class RetailcrmJobsModuleFrontController extends ModuleFrontController header('Content-Type: application/json'); } - if (Tools::substr(_PS_VERSION_, 0, 3) == '1.6') { - echo $response; - } else { - try { - parent::initContent(); - $this->ajaxRender($response); - } catch (\Exception $exception) { - // Sometimes ps_shoppingcart throws exception which breaks our controller. - // We don't care about ps_shoppingcart here, so, we will fallback to old way. - echo $response; - } - } + echo $response; } /**