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

erge branch 'fix/secure_key' into develop

Browse Source
This commit is contained in:
Christophe LATOUR 2017-11-17 10:49:45 +01:00
commit b851050fed
2 changed files with 11 additions and 3 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']), 'company' => trim($mr_point['MR_Selected_LgAdr1']),
'vat_number' => '', 'vat_number' => '',
'address1' => trim($address_lines[0]), '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']), 'postcode' => trim($mr_point['MR_Selected_CP']),
'city' => trim($mr_point['MR_Selected_Ville']), 'city' => trim($mr_point['MR_Selected_Ville']),
'Country:name' => trim($mr_point['MR_Selected_Pays']), 'Country:name' => trim($mr_point['MR_Selected_Pays']),

12
override/classes/PaymentModule.php
View File

@ -8,8 +8,16 @@
// Does order already exists ? // Does order already exists ?
if (Validate::isLoadedObject($cart) AND $cart->OrderExists() == false) if (Validate::isLoadedObject($cart) AND $cart->OrderExists() == false)
{ {
if ($secure_key !== false AND $secure_key != $cart->secure_key) /* @Override
die(Tools::displayError()); * 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 // Copying data from cart
$order = new Order(); $order = new Order();