dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Bug fix for payment modules (shops informations on validate order)

Browse Source
This commit is contained in:
François Gaillard committed 2012-05-24 13:01:35 +00:00
1 parent 670f898e6b
commit 2b9410c426
1 file changed
+10 -4
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
+10 -4
View File
@@ -143,8 +143,6 @@ abstract class PaymentModuleCore extends Module
$cart = new Cart($id_cart); $cart = new Cart($id_cart);
$this->context->cart = $cart; $this->context->cart = $cart;
if (!$shop)
$shop = Context::getContext()->shop;
if (!$this->active) if (!$this->active)
die(Tools::displayError()); die(Tools::displayError());
// Does order already exists ? // Does order already exists ?
@@ -221,8 +219,16 @@ abstract class PaymentModuleCore extends Module
$order->id_cart = (int)$cart->id; $order->id_cart = (int)$cart->id;
$order->reference = $reference; $order->reference = $reference;
$order->id_shop = (int)(Shop::getContext() == Shop::CONTEXT_SHOP ? $shop->id : $cart->id_shop); if (($shop != null) || (Shop::getContext() == Shop::CONTEXT_SHOP))
$order->id_shop_group = (int)(Shop::getContext() == Shop::CONTEXT_SHOP ? $shop->id_shop_group : $cart->id_shop_group); {
$order->id_shop = (int)$shop->id;
$order->id_shop_group = (int)$shop->id_shop_group;
}
else
{
$order->id_shop = $cart->id_shop;
$order->id_shop_group = $cart->id_shop_group;
}
$customer = new Customer($order->id_customer); $customer = new Customer($order->id_customer);
$order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($customer->secure_key)); $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($customer->secure_key));