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

Merge branch 'ticket-14309-fixAlreadyPaid' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-10-30 10:27:59 +01:00
commit b7830f009e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/PDF.php
View File

@ -1231,8 +1231,9 @@ class PDFCore extends PDF_PageGroupCore
}
$this->Cell($w[++$i], $lineSize, $productQuantity, 'BT', 0, 'C');
if (!$delivery)
$this->Cell($w[++$i], $lineSize, (self::$orderSlip ? '-' : '').self::convertSign(Tools::displayPrice($final_price, self::$currency, true)), 'BT', 0, 'R');
if (!$delivery && isset($w[++$i])) {
$this->Cell($w[$i], $lineSize, (self::$orderSlip ? '-' : '').self::convertSign(Tools::displayPrice($final_price, self::$currency, true)), 'BT', 0, 'R');
}
$this->Ln();
}
}

9
modules/paybox/paybox.php
View File

@ -226,8 +226,13 @@ class Paybox extends PaymentModule
global $cart, $smarty;
$customer = new Customer((int)$cart->id_customer);
if (!Validate::isLoadedObject($customer))
if (!Validate::isLoadedObject($customer)) {
die(Tools::displayError());
}
if ($id_order = (int)Order::getOrderByCartId($cart->id)) {
Tools::redirect('order-detail.php?id_order='.$id_order);
}
// verif if there's at least one order with this delivery address
$orders_with_delivery_address = Db::getInstance()->getValue('
@ -428,7 +433,7 @@ class Paybox extends PaymentModule
parent::validateOrder((int)$id_cart, (int)$id_order_state, (float)$amount_paid, $payment_method, $message, $transaction, $currency_special, $dont_touch_amount, $secure_key);
}
if(!empty($values) && isset($values['i'])) {
if(!empty($values) && isset($values['i']) && !empty($values['i'])) {
if (!class_exists('Fraud')) {
include_once _MODULE_DIR_.'fraud/fraud.php';
}