Merge pull request #27 from ionux/master
Fixed shipment order locking issue
This commit is contained in:
commit
c74f4f00f9
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue