BTCPrivate
/
magento-plugin
mirror of https://github.com/BTCPrivate/magento-plugin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from ionux/master 

Fixed shipment order locking issue
This commit is contained in:
Ryan X. Charles 2014-03-17 11:42:29 -07:00
parent 82ad4204ac 0420a11299
commit c74f4f00f9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/code/community/Bitpay/Bitcoins/Model/PaymentMethod.php
View File

@ -174,19 +174,20 @@ class Bitpay_Bitcoins_Model_PaymentMethod extends Mage_Payment_Model_Method_Abst
} }
} }
$shipment = $order->prepareShipment(); //$shipment = $order->prepareShipment();
if($shipment) { //if($shipment) {
$shipment->register(); // $shipment->register();
$order->setIsInProcess(true); // $order->setIsInProcess(true);
$transaction_save = Mage::getModel('core/resource_transaction') // $transaction_save = Mage::getModel('core/resource_transaction')
->addObject($shipment) // ->addObject($shipment)
->addObject($shipment->getOrder()) // ->addObject($shipment->getOrder())
->save(); // ->save();
} //}
try { try {
$order->setState('Complete', 'complete', 'Completed by BitPay payments.', false); //$order->setState('Complete', 'complete', 'Completed by BitPay payments.', true);
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, 'processing', 'BitPay has confirmed the payment.', true);
$order->save(); $order->save();
} catch (Exception $e) { } catch (Exception $e) {
Mage::logException($e); Mage::logException($e);