ET_PaymentRobokassa - Version 1.0.4

Version Notes

stable release

Download this release

Release Info

Developer Magento Core Team
Extension ET_PaymentRobokassa
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (4) hide show
  1. app/code/community/ET/PaymentRobokassa/Model/Method/Etrobokassa.php +6 -3
  2. app/code/community/ET/PaymentRobokassa/controllers/GateController.php +6 -3
  3. app/code/community/ET/PaymentRobokassa/etc/config.xml +1 -1
  4. package.xml +4 -4
app/code/community/ET/PaymentRobokassa/Model/Method/Etrobokassa.php CHANGED
@@ -201,7 +201,8 @@ class ET_PaymentRobokassa_Model_Method_Etrobokassa extends Mage_Payment_Model_Me
201
  $postData = array(
202
  "MrchLogin" => $this->_sMerchantLogin,
203
  "OutSum" => round($outSum, 2),
204
- "InvId" => $order->getId(),
 
205
  "Desc" => $this->_sInvDesc,
206
  "SignatureValue" => $hash,
207
  "IncCurrLabel" => $this->_sIncCurrLabel,
@@ -222,7 +223,8 @@ class ET_PaymentRobokassa_Model_Method_Etrobokassa extends Mage_Payment_Model_Me
222
  try {
223
  $errors = array();
224
  $this->readConfig();
225
- $order = Mage::getModel("sales/order")->load($this->getOrderId($answer));
 
226
  $hashArray = array(
227
  $answer["OutSum"],
228
  $answer["InvId"],
@@ -299,7 +301,8 @@ class ET_PaymentRobokassa_Model_Method_Etrobokassa extends Mage_Payment_Model_Me
299
  $hashData = array(
300
  "MrchLogin" => $this->_sMerchantLogin,
301
  "OutSum" => round($outSum, 2),
302
- "InvId" => $order->getId(),
 
303
  "pass" => $this->_sMerchantPassOne,
304
  );
305
 
201
  $postData = array(
202
  "MrchLogin" => $this->_sMerchantLogin,
203
  "OutSum" => round($outSum, 2),
204
+ //"InvId" => $order->getId(),
205
+ "InvId" => $order->getIncrementId(),
206
  "Desc" => $this->_sInvDesc,
207
  "SignatureValue" => $hash,
208
  "IncCurrLabel" => $this->_sIncCurrLabel,
223
  try {
224
  $errors = array();
225
  $this->readConfig();
226
+ //$order = Mage::getModel("sales/order")->load($this->getOrderId($answer));
227
+ $order = Mage::getModel("sales/order")->loadByIncrementId($this->getOrderId($answer));
228
  $hashArray = array(
229
  $answer["OutSum"],
230
  $answer["InvId"],
301
  $hashData = array(
302
  "MrchLogin" => $this->_sMerchantLogin,
303
  "OutSum" => round($outSum, 2),
304
+ //"InvId" => $order->getId(),
305
+ "InvId" => $order->getIncrementId(),
306
  "pass" => $this->_sMerchantPassOne,
307
  );
308
 
app/code/community/ET/PaymentRobokassa/controllers/GateController.php CHANGED
@@ -79,10 +79,12 @@ class ET_PaymentRobokassa_GateController extends Mage_Core_Controller_Front_Acti
79
  $payment = Mage::getSingleton(self::MODULENAME . "/method_" . self::PAYMENTNAME);
80
  if ($payment->getOrderId($answer)) {
81
  /* @var $order Mage_Sales_Model_Order */
82
- $order = Mage::getModel('sales/order')->load($payment->getOrderId($answer));
83
-
84
  //true un success, false on fail or array of text on error
 
85
  $checkedAnswer = $payment->checkAnswerData($answer);
 
86
  if (is_array($checkedAnswer)) {
87
  $answer['Errors'] = $helper->arrayToRawData($checkedAnswer);
88
  }
@@ -141,7 +143,8 @@ class ET_PaymentRobokassa_GateController extends Mage_Core_Controller_Front_Acti
141
 
142
  if ($payment->getOrderId($answer)) {
143
  /** @var $order Mage_Sales_Model_Order */
144
- $order = Mage::getModel('sales/order')->load($payment->getOrderId($answer));
 
145
  $result = new Varien_Object(array(
146
  'answer' => $answer,
147
  'order' => $order,
79
  $payment = Mage::getSingleton(self::MODULENAME . "/method_" . self::PAYMENTNAME);
80
  if ($payment->getOrderId($answer)) {
81
  /* @var $order Mage_Sales_Model_Order */
82
+ //$order = Mage::getModel('sales/order')->load($payment->getOrderId($answer));
83
+ $order = Mage::getModel('sales/order')->loadByIncrementId($payment->getOrderId($answer));
84
  //true un success, false on fail or array of text on error
85
+
86
  $checkedAnswer = $payment->checkAnswerData($answer);
87
+
88
  if (is_array($checkedAnswer)) {
89
  $answer['Errors'] = $helper->arrayToRawData($checkedAnswer);
90
  }
143
 
144
  if ($payment->getOrderId($answer)) {
145
  /** @var $order Mage_Sales_Model_Order */
146
+ //$order = Mage::getModel('sales/order')->load($payment->getOrderId($answer));
147
+ $order = Mage::getModel('sales/order')->loadByIncrementId($payment->getOrderId($answer));
148
  $result = new Varien_Object(array(
149
  'answer' => $answer,
150
  'order' => $order,
app/code/community/ET/PaymentRobokassa/etc/config.xml CHANGED
@@ -22,7 +22,7 @@
22
  <modules>
23
  <ET_PaymentRobokassa>
24
  <name>ET Payment Robokassa</name>
25
- <version>1.0.3</version>
26
  <descr>
27
  <ru_RU><![CDATA[Платёжный модуль Robokassa. Позволяет использовать сервис приёма платежей Robokassa (robokassa.ru) на вашем Magento сайте.]]>
28
  </ru_RU>
22
  <modules>
23
  <ET_PaymentRobokassa>
24
  <name>ET Payment Robokassa</name>
25
+ <version>1.0.4</version>
26
  <descr>
27
  <ru_RU><![CDATA[Платёжный модуль Robokassa. Позволяет использовать сервис приёма платежей Robokassa (robokassa.ru) на вашем Magento сайте.]]>
28
  </ru_RU>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ET_PaymentRobokassa</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://shop.etwebsolutions.com/eng/etws-license-free-v1">ETWS Free License (EFL1)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>_Free payment extension ET Payment Robokassa allows you to use payment gateway Robokassa (robokassa.ru) on your website._</description>
11
  <notes>stable release</notes>
12
  <authors><author><name>Jurij</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author><author><name>Andrej</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author></authors>
13
- <date>2013-11-26</date>
14
- <time>14:15:19</time>
15
- <contents><target name="magecommunity"><dir name="ET"><dir name="PaymentRobokassa"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Heading.php" hash="71c419849070047ca9f024b08ea2cd1e"/><file name="Linktoinfo.php" hash="c4dc4b21897d093dbd9736c3079ce03b"/><file name="Linktooptions.php" hash="687813f8551ed509486fc7da6dc60540"/></dir></dir></dir></dir><file name="Support.php" hash="1e98b88c9d5a482c9f698637f3db0c21"/></dir><dir name="Single"><file name="Form.php" hash="748fa65742a34d66a80209dad81f23ea"/><file name="Info.php" hash="6ca2b3f7f318164f520144419ac3720e"/></dir><file name="Form.php" hash="3f3773311e029601aa6755fd2fc6a7f2"/><file name="Info.php" hash="3fc0ac20cd14002acdf8deff3359c68e"/><file name="Redirect.php" hash="45e05f5cc2869584eb90bd0a05e8fbc1"/></dir><dir name="Controller"><file name="Router.php" hash="8271139fa6af2cd57d6a5f45d767d4a1"/></dir><dir name="Helper"><file name="Data.php" hash="8e427557290d5bee091f3a181af45a4e"/></dir><dir name="Model"><dir name="Method"><file name="Etrobokassa.php" hash="a7cacaa3eb071b8a9f23d833c9894fda"/></dir><file name="Culture.php" hash="1f549bdc0bcb2dcf53b656bcf2bc4677"/><file name="Paysystem.php" hash="dbe855edb31265e13c389fc5d964fc62"/></dir><dir name="controllers"><file name="GateController.php" hash="885e80c9588e9dc802307819d8436012"/></dir><dir name="etc"><file name="config.xml" hash="f073750fb454c843b40bae704dec617f"/><file name="system.xml" hash="75d61cc3824fbc62e4d89c67b320d4fd"/></dir><dir name="sql"><dir name="etpaymentrobokassa_setup"><file name="mysql4-install-1.0.0.php" hash="550cabe108b7453b09d2de7e8720459d"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="ru_RU"><file name="ET_PaymentRobokassa.csv" hash="9df34388c47b662f17b5161e7c3fb242"/></dir><dir name="en_US"><file name="ET_PaymentRobokassa.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target><target name="mageetc"><dir name="modules"><file name="ET_PaymentRobokassa.xml" hash="29a6a6d442729714e93aded22ce4b1b2"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="et_paymentrobokassa"><dir name="single"><file name="form.phtml" hash="ffdb96cd7677d5b256a49bb8fe5d9145"/><file name="info.phtml" hash="460b5111ae8b9d78e0a320c5878cc30d"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="et_paymentrobokassa"><dir name="single"><file name="form.phtml" hash="594645a04acfd21185ba89fbc3752f60"/><file name="info.phtml" hash="460b5111ae8b9d78e0a320c5878cc30d"/></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ET_PaymentRobokassa</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://shop.etwebsolutions.com/eng/etws-license-free-v1">ETWS Free License (EFL1)</license>
7
  <channel>community</channel>
10
  <description>_Free payment extension ET Payment Robokassa allows you to use payment gateway Robokassa (robokassa.ru) on your website._</description>
11
  <notes>stable release</notes>
12
  <authors><author><name>Jurij</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author><author><name>Andrej</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author></authors>
13
+ <date>2013-12-28</date>
14
+ <time>15:03:30</time>
15
+ <contents><target name="magecommunity"><dir name="ET"><dir name="PaymentRobokassa"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Heading.php" hash="71c419849070047ca9f024b08ea2cd1e"/><file name="Linktoinfo.php" hash="c4dc4b21897d093dbd9736c3079ce03b"/><file name="Linktooptions.php" hash="687813f8551ed509486fc7da6dc60540"/></dir></dir></dir></dir><file name="Support.php" hash="1e98b88c9d5a482c9f698637f3db0c21"/></dir><dir name="Single"><file name="Form.php" hash="748fa65742a34d66a80209dad81f23ea"/><file name="Info.php" hash="6ca2b3f7f318164f520144419ac3720e"/></dir><file name="Form.php" hash="3f3773311e029601aa6755fd2fc6a7f2"/><file name="Info.php" hash="3fc0ac20cd14002acdf8deff3359c68e"/><file name="Redirect.php" hash="45e05f5cc2869584eb90bd0a05e8fbc1"/></dir><dir name="Controller"><file name="Router.php" hash="8271139fa6af2cd57d6a5f45d767d4a1"/></dir><dir name="Helper"><file name="Data.php" hash="8e427557290d5bee091f3a181af45a4e"/></dir><dir name="Model"><dir name="Method"><file name="Etrobokassa.php" hash="57d0793e722e55156bb0629cd437adac"/></dir><file name="Culture.php" hash="1f549bdc0bcb2dcf53b656bcf2bc4677"/><file name="Paysystem.php" hash="dbe855edb31265e13c389fc5d964fc62"/></dir><dir name="controllers"><file name="GateController.php" hash="8a14c909a69b7012d43a0f6fec47a728"/></dir><dir name="etc"><file name="config.xml" hash="5d1ad0d3948a4d9ba454ea179cf8fb4d"/><file name="system.xml" hash="75d61cc3824fbc62e4d89c67b320d4fd"/></dir><dir name="sql"><dir name="etpaymentrobokassa_setup"><file name="mysql4-install-1.0.0.php" hash="550cabe108b7453b09d2de7e8720459d"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="ru_RU"><file name="ET_PaymentRobokassa.csv" hash="9df34388c47b662f17b5161e7c3fb242"/></dir><dir name="en_US"><file name="ET_PaymentRobokassa.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target><target name="mageetc"><dir name="modules"><file name="ET_PaymentRobokassa.xml" hash="29a6a6d442729714e93aded22ce4b1b2"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="et_paymentrobokassa"><dir name="single"><file name="form.phtml" hash="ffdb96cd7677d5b256a49bb8fe5d9145"/><file name="info.phtml" hash="460b5111ae8b9d78e0a320c5878cc30d"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="et_paymentrobokassa"><dir name="single"><file name="form.phtml" hash="594645a04acfd21185ba89fbc3752f60"/><file name="info.phtml" hash="460b5111ae8b9d78e0a320c5878cc30d"/></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>