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

Merge branch 'evo-savePaypal' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-09 17:19:45 +02:00
commit 649ff79d13
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/paypal/paypal.php
View File

@ -543,10 +543,17 @@ class PayPal extends PaymentModule
{
$cart = $this->context->cart;
$orders_with_delivery_address = Db::getInstance()->getValue('
SELECT COUNT(`id_order`)
FROM `'._DB_PREFIX_.'orders
WHERE `id_address_delivery` = '.(int)$cart->id_address_delivery.'
AND `id_customer` = '.(int)$cart->id_customer.'
SELECT COUNT(`o.id_order`)
FROM `'._DB_PREFIX_.'orders` o
WHERE o.`id_address_delivery` = '.(int)$cart->id_address_delivery.'
AND o.`id_customer` = '.(int)$cart->id_customer.'
AND (
o.valid = 1
OR (
o.valid = 0
AND (SELECT h.id_order_state FROM `'._DB_PREFIX_.'order_history` h WHERE h.id_order = o.id_order ORDER BY h.date_add DESC LIMIT 1) NOT IN (6,8,15,16,18)
)
)
');
$this->context->smarty->assign('accounts', (($orders_with_delivery_address==0)?array():$this->getBillingAgreement($cart->id_customer)));
$this->getTranslations();