Merge branch 'paypal_billing' into develop
This commit is contained in:
commit
83675d8a08
@ -151,6 +151,7 @@ class PayPalOrder
|
|||||||
if (!isset($transaction['payment_status']) || !$transaction['payment_status'])
|
if (!isset($transaction['payment_status']) || !$transaction['payment_status'])
|
||||||
$transaction['payment_status'] = 'NULL';
|
$transaction['payment_status'] = 'NULL';
|
||||||
|
|
||||||
|
|
||||||
Db::getInstance()->Execute('
|
Db::getInstance()->Execute('
|
||||||
INSERT INTO `'._DB_PREFIX_.'paypal_order`
|
INSERT INTO `'._DB_PREFIX_.'paypal_order`
|
||||||
(`id_order`, `id_transaction`, `id_invoice`, `currency`, `total_paid`, `shipping`, `capture`, `payment_date`, `payment_method`, `payment_status`, `is_billing`)
|
(`id_order`, `id_transaction`, `id_invoice`, `currency`, `total_paid`, `shipping`, `capture`, `payment_date`, `payment_method`, `payment_status`, `is_billing`)
|
||||||
@ -161,9 +162,8 @@ class PayPalOrder
|
|||||||
\''.(int)Configuration::get('PAYPAL_CAPTURE').'\',
|
\''.(int)Configuration::get('PAYPAL_CAPTURE').'\',
|
||||||
\''.pSQL($transaction['payment_date']).'\',
|
\''.pSQL($transaction['payment_date']).'\',
|
||||||
\''.(int)Configuration::get('PAYPAL_PAYMENT_METHOD').'\',
|
\''.(int)Configuration::get('PAYPAL_PAYMENT_METHOD').'\',
|
||||||
\''.(int)Configuration::get('PAYPAL_PAYMENT_METHOD').'\',
|
|
||||||
\''.pSQL($transaction['payment_status']).'\',
|
\''.pSQL($transaction['payment_status']).'\',
|
||||||
\''.(int) $is_billing.'\')'
|
'.(int) $is_billing.')'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user