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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-18 13:00:30 +02:00
commit d9c8a37f64
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/paypal/paypal.php
View File

@ -558,9 +558,7 @@ class PayPal extends PaymentModule
');
//$this->context->smarty->assign('accounts', (($orders_with_delivery_address==0)?array():$this->getBillingAgreement($cart->id_customer)));
// antadis pending account
// $this->getBillingAgreement($cart->id_customer)
$this->context->smarty->assign('accounts', array());
$this->context->smarty->assign('accounts', $this->getBillingAgreement($cart->id_customer));
$this->getTranslations();
$this->context->smarty->assign(array(
'custom' => Tools::jsonEncode(array('id_cart' => $cart->id, 'hash' => sha1(serialize($cart->nbProducts())))),