antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
Nolwenn J 2017-11-17 10:54:23 +01:00
commit 7151304a41
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/PDF.php
View File

@ -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']),

8
modules/sensefuel/sensefuel.php
View File

@ -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;
*/
}
}

12
override/classes/PaymentModule.php
View File

@ -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();