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 #2 from jaafit/master 

Pull Japhet's latest fixes
This commit is contained in:
bitpay 2012-11-02 11:46:13 -07:00
parent 43a795a355 4a826731cd
commit 0cba29b9e9
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/code/community/Bitpay/Bitcoins/controllers/IndexController.php
View File

@ -34,7 +34,7 @@ class Bitpay_Bitcoins_IndexController extends Mage_Core_Controller_Front_Action
foreach($order->getInvoiceCollection() as $i) foreach($order->getInvoiceCollection() as $i)
$i->pay() $i->pay()
->save(); ->save();
$order->setState($order::STATE_PROCESSING, true) $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, true)
->save(); ->save();
break; break;
} }

0
app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/install-1.0.0.php → app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-0.1.0-1.0.0.php
View File

0
app/design/frontend/default/default/layout/bitcoins.xml → app/design/frontend/base/default/layout/bitcoins.xml
View File

2
app/design/frontend/default/default/template/bitcoins/iframe.phtml → app/design/frontend/base/default/template/bitcoins/iframe.phtml
View File

@ -8,6 +8,6 @@ switch($url){
case false: case false:
echo 'Error creating invoice. Please try again or try another payment solution.'; break; echo 'Error creating invoice. Please try again or try another payment solution.'; break;
default: default:
echo '<iframe src="'.$url.'" width="600" height="150"> </iframe>'; break; echo '<iframe src="'.$url.'"> </iframe>'; break;
} }
?> ?>