From 731857719b25e0d0de84dc5eab4b01461cdc5a91 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Thu, 16 Nov 2017 10:32:18 +0100 Subject: [PATCH 1/3] Temporary disable sensefuel display --- modules/sensefuel/sensefuel.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/sensefuel/sensefuel.php b/modules/sensefuel/sensefuel.php index eac26489..478f9d08 100644 --- a/modules/sensefuel/sensefuel.php +++ b/modules/sensefuel/sensefuel.php @@ -38,6 +38,7 @@ class SenseFuel extends Module public function hookTop($params) { + /* if(_PS_MOBILE_){ return false; } @@ -60,11 +61,12 @@ class SenseFuel extends Module } return false; - + */ } public function hookSubTop($params) { + /* if(!_PS_MOBILE_){ return false; } @@ -87,11 +89,12 @@ class SenseFuel extends Module } return false; - + */ } public function hookFooter($params) { + /* global $site_version, $smarty; if (null !== $site_version && ( in_array($site_version, self::$ACTIVE_VERSION_ARRAY, true) @@ -101,6 +104,7 @@ class SenseFuel extends Module } return false; + */ } } \ No newline at end of file From 039ec2b22589e9e19558961b9be23aab0d79c4ce Mon Sep 17 00:00:00 2001 From: Christophe LATOUR Date: Thu, 16 Nov 2017 16:55:03 +0100 Subject: [PATCH 2/3] fix 500 : [Thu Nov 16 14:44:30.387531 2017] [:error] [pid 1123] [client 82.229.2.146:56843] exception 'ErrorException' with message 'Undefined offset: 1' in /home/www/bebeboutik.com/www/classes/PDF.php:552 --- classes/PDF.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/PDF.php b/classes/PDF.php index 22b126eb..88aa6771 100755 --- a/classes/PDF.php +++ b/classes/PDF.php @@ -549,7 +549,7 @@ class PDFCore extends PDF_PageGroupCore 'company' => trim($mr_point['MR_Selected_LgAdr1']), 'vat_number' => '', 'address1' => trim($address_lines[0]), - 'address2' => trim($address_lines[1]), + 'address2' => isset($address_lines[1]) ? trim($address_lines[1]) : '', 'postcode' => trim($mr_point['MR_Selected_CP']), 'city' => trim($mr_point['MR_Selected_Ville']), 'Country:name' => trim($mr_point['MR_Selected_Pays']), From d24b02706e73de524f458f25b1141965626cdb46 Mon Sep 17 00:00:00 2001 From: Christophe LATOUR Date: Fri, 17 Nov 2017 10:47:51 +0100 Subject: [PATCH 3/3] Fix secure_key error --- override/classes/PaymentModule.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/override/classes/PaymentModule.php b/override/classes/PaymentModule.php index e50215b6..030ac2c4 100755 --- a/override/classes/PaymentModule.php +++ b/override/classes/PaymentModule.php @@ -8,8 +8,16 @@ // Does order already exists ? if (Validate::isLoadedObject($cart) AND $cart->OrderExists() == false) { - if ($secure_key !== false AND $secure_key != $cart->secure_key) - die(Tools::displayError()); + /* @Override + * do not die and create Order in error state + */ + // die(Tools::displayError()); + + if ($secure_key !== false AND $secure_key != $cart->secure_key) { + $id_order_state = Configuration::get('PS_OS_ERROR'); + $message = "Problème de sercure_key. A valider manuellement" . "\n\n" . $message; + Logger::addLog('Invalid secure_key', 4, '0000001', 'Cart', intval($id_cart)); + } // Copying data from cart $order = new Order();