Skip to content

0.6.3 RC #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 29, 2015
Merged

0.6.3 RC #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3693dc8
Fix order status setting with proper (existing) state
Jul 29, 2015
48e6933
Merge branch 'master' of github.com:Magently/magento-sign2pay into ex…
Jul 29, 2015
fc7bf5e
Increase version, change changes section in package.xml
Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions app/code/community/Sign2pay/Payment/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,23 @@ public function attachPaymentScripts(array $additional = array())
);
}

/**
* Set status on order
*
* @param Mage_Sales_Model_Order $order
* @param string $status_code
*/
public function setStatusOnOrder($order, $status_code)
{
$collection = Mage::getResourceModel('sales/order_status_collection');
$collection->joinStates();
$collection->getSelect()
->where('main_table.status=?', $status_code)
->limit(1);

$status = $collection->fetchItem()->getData();

$order->setState($status['state'], $status['status']);
}

}
3 changes: 2 additions & 1 deletion app/code/community/Sign2pay/Payment/Model/Processor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ protected function _registerPaymentCapture()
->registerCaptureNotification(
$this->getRequestData('amount') / 100
);
$this->_order->setState(Mage::getStoreConfig('payment/sign2pay/complete_order_status', Mage::app()->getStore()), true);

Mage::helper('sign2pay')->setStatusOnOrder($this->_order, Mage::getStoreConfig('payment/sign2pay/complete_order_status', Mage::app()->getStore()));
$this->_order->save();

// notify customer
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Sign2pay/Payment/controllers/PaymentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function redirectAction()
return $this->_redirect('checkout/cart');
}

$order->setState(Mage::getStoreConfig('payment/sign2pay/order_status', Mage::app()->getStore()), true);
Mage::helper('sign2pay')->setStatusOnOrder($order, Mage::getStoreConfig('payment/sign2pay/order_status', Mage::app()->getStore()));
$order->save();

$this->loadLayout();
Expand Down
4 changes: 2 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>Sign2Pay_Mobile_Payments</name>
<version>0.6.2</version>
<version>0.6.3</version>
<stability>beta</stability>
<license>Sign2Pay Commercial License</license>
<channel>community</channel>
Expand All @@ -13,7 +13,7 @@ Analysing hundreds of data points in a single signature, Sign2Pay provides the s
&#xD;
Compatible with: 1.7, 1.8, 1.9</description>
<notes>Changes:&#xD;
- Fixed compatibility for Magento 1.7.0.2 and below</notes>
- Fixed order states placement for custom statuses</notes>
<authors><author><name>Sign2Pay</name><user>Sign2Pay</user><email>team@sign2pay.com</email></author></authors>
<date>2015-07-27</date>
<time>06:00:44</time>
Expand Down