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

// REVERT MERGE

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hipay/hipay.php
+3 -3
View File
@@ -236,7 +236,7 @@ class Hipay extends PaymentModule
{
/* Paiement capturé sur Hipay = Paiement accepté sur Prestashop */
$orderMessage = $operation.': '.$status.'\ndate: '.$date.' '.$time.'\ntransaction: '.$transid.'\namount: '.(float)$amount.' '.$currency.'\nid_cart: '.(int)$id_cart;
$this->validateOrder((int)$id_cart, Configuration::get('PS_OS_PAYMENT'), (float)$amount, $this->displayName, $orderMessage, array(), NULL, false, Tools::getValue('token'));
$this->validateOrder((int)$id_cart, _PS_OS_PAYMENT_, (float)$amount, $this->displayName, $orderMessage, array(), NULL, false, Tools::getValue('token'));
}
elseif (trim($operation) == 'refund' AND trim(strtolower($status)) == 'ok')
{
@@ -245,12 +245,12 @@ class Hipay extends PaymentModule
die(Tools::displayError());
$order = new Order((int)($id_order));
if (!$order->valid OR $order->getCurrentState() === Configuration::get('PS_OS_REFUND'))
if (!$order->valid OR $order->getCurrentState() === _PS_OS_REFUND_)
die(Tools::displayError());
$orderHistory = new OrderHistory();
$orderHistory->id_order = (int)($order->id);
$orderHistory->changeIdOrderState((int)(Configuration::get('PS_OS_REFUND')), (int)($id_order));
$orderHistory->changeIdOrderState((int)(_PS_OS_REFUND_), (int)($id_order));
$orderHistory->addWithemail();
}
}