MageBase_DpsPaymentExpress - Version 1.1.13

Version Notes

reactivate quote
correct brace on abs amount check
update dps branding

Download this release

Release Info

Developer Magento Core Team
Extension MageBase_DpsPaymentExpress
Version 1.1.13
Comparing to
See all releases


Code changes from version 1.1.11 to 1.1.13

Files changed (6) hide show
  1. app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpay.php +1 -1
  2. app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpost.php +1 -1
  3. app/code/community/MageBase/DpsPaymentExpress/controllers/PxpayController.php +11 -5
  4. package.xml +7 -5
  5. skin/frontend/base/default/images/magebase/dps/dpslogo.png +0 -0
  6. skin/frontend/base/default/images/magebase/dps/dpspxlogo.png +0 -0
app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpay.php CHANGED
@@ -350,7 +350,7 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpay extends Mage_Payment_Model_M
350
  Mage::log("Error in DPS Response Validation: No Order", null, self::DPS_LOG_FILENAME);
351
  return MageBase_DpsPaymentExpress_Model_Method_Common::STATUS_ERROR;
352
  }
353
- if (abs((float)$resultXml->AmountSettlement - $order->getBaseGrandTotal() >0.0005)) {
354
  Mage::log(
355
  $order->getIncrementId(). " Error in DPS Response Validation: Mismatched totals",
356
  null,
350
  Mage::log("Error in DPS Response Validation: No Order", null, self::DPS_LOG_FILENAME);
351
  return MageBase_DpsPaymentExpress_Model_Method_Common::STATUS_ERROR;
352
  }
353
+ if (abs((float)$resultXml->AmountSettlement - $order->getBaseGrandTotal()) >0.0005) {
354
  Mage::log(
355
  $order->getIncrementId(). " Error in DPS Response Validation: Mismatched totals",
356
  null,
app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpost.php CHANGED
@@ -362,7 +362,7 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpost extends Mage_Payment_Model_
362
  Mage::log("Error in DPS Response Validation: No Order", null, self::DPS_LOG_FILENAME);
363
  return false;
364
  }
365
- if (abs((float)$resultXml->Transaction[0]->Amount - $order->getBaseGrandTotal() >0.0005)) {
366
  Mage::log("Error in DPS Response Validation: Mismatched totals", null, self::DPS_LOG_FILENAME);
367
  return false;
368
  }
362
  Mage::log("Error in DPS Response Validation: No Order", null, self::DPS_LOG_FILENAME);
363
  return false;
364
  }
365
+ if (abs((float)$resultXml->Transaction[0]->Amount - $order->getBaseGrandTotal()) >0.0005) {
366
  Mage::log("Error in DPS Response Validation: Mismatched totals", null, self::DPS_LOG_FILENAME);
367
  return false;
368
  }
app/code/community/MageBase/DpsPaymentExpress/controllers/PxpayController.php CHANGED
@@ -131,10 +131,16 @@ class MageBase_DpsPaymentExpress_PxpayController extends Mage_Core_Controller_Fr
131
  );
132
  }
133
  $resultXml = $this->_processFailResponse($this->getRequest()->getParam('result'));
134
- if ($session = Mage::getSingleton('checkout/session')) {
135
- $session->setLastQuoteId((int)$resultXml->TxnData2)
136
- ->setLastRealOrderId((string)$resultXml->MerchantReference);
137
- $this->_redirect('checkout/onepage/failure', array('_secure'=>true));
 
 
 
 
 
 
138
  }
139
  }
140
 
@@ -158,4 +164,4 @@ class MageBase_DpsPaymentExpress_PxpayController extends Mage_Core_Controller_Fr
158
  return Mage::getSingleton('magebasedps/method_pxpay')->validateUserId($userId);
159
  }
160
 
161
- }
131
  );
132
  }
133
  $resultXml = $this->_processFailResponse($this->getRequest()->getParam('result'));
134
+ //reactivate quote
135
+ if ($session = Mage::getSingleton('checkout/session')
136
+ && (int)$resultXml->TxnData2
137
+ && (string)$resultXml->MerchantReference
138
+ && $session->getLastRealOrderId() == (string)$resultXml->MerchantReference) {
139
+ Mage::getModel('sales/quote')->load((int)$resultXml->TxnData2)->setIsActive(true)->save();
140
+ $session->setLastQuoteId((int)$resultXml->TxnData2);
141
+ }
142
+ if ($session) {
143
+ $this->_redirect('checkout/onepage/failure', array('_secure' => true));
144
  }
145
  }
146
 
164
  return Mage::getSingleton('magebasedps/method_pxpay')->validateUserId($userId);
165
  }
166
 
167
+ }
package.xml CHANGED
@@ -1,18 +1,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MageBase_DpsPaymentExpress</name>
4
- <version>1.1.11</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Accept credit card payments via Payment Express from DPS - this extension supports PxPay and PxPost.</summary>
10
  <description>Accept credit card payments via Payment Express from DPS - this extension supports PxPay and PxPost.</description>
11
- <notes>display card info correctly during PXPost checkout</notes>
 
 
12
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
13
- <date>2010-11-08</date>
14
- <time>07:59:16</time>
15
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="magebase"><dir name="dps"><dir name="pxpay"><dir name="pdf"><file name="pxpay.phtml" hash="30691a7b7eddbf52217c2d8194fe3f52"/></dir><file name="form.phtml" hash="1b6d58c3bde68990b743c93a9be529aa"/><file name="info.phtml" hash="8a032b2e8b31234a30121289c64ad175"/></dir><dir name="pxpost"><dir name="pdf"><file name="pxpost.phtml" hash="81e5f3b568e748460a5ca61e42138f8e"/></dir><file name="form.phtml" hash="27bec2c3b982473d7c0c1a44762adac4"/><file name="info.phtml" hash="deaa639a34e9b35cbc41c4a793d4dede"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="magebase"><dir name="dps"><dir name="pxpay"><file name="form.phtml" hash="d1ec1d94031a875ba2819c5f799899c7"/><file name="info.phtml" hash="c53fb2bf0a1afdc81fac85afc15b35e3"/></dir><dir name="pxpost"><file name="form.phtml" hash="84c23e6c9202d6573c44f6ff3c6cd6b5"/><file name="info.phtml" hash="d2fd0f5603342e235ae8cd6ce1346ce2"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="MageBase_DpsPaymentExpress.xml" hash="fae6ba260c006016d14d9a508d17cf14"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="magebase"><dir name="dps"><file name="AmexLogo.png" hash="775a3f26a4b5f7a6201b1331e4fe5579"/><file name="DinersLogo.png" hash="64500fdde86e960ac894f7cf0c44b2d8"/><file name="dpslogo.png" hash="8cc607a6a0bb32cea44d71fdc6086970"/><file name="dpspxlogo.png" hash="2f4e2d293b1e67f4a380f034bb49c788"/><file name="JCBLogo.png" hash="73f9e8b87c6c2dbf252bbb0de43591bc"/><file name="MasterCardLogo.png" hash="801014f81e405cec951076f4080b04f5"/><file name="MCSecureCodeLogo.png" hash="9f31e5ccadd98dc15d0110d0e3b450f7"/><file name="VisaLogo.png" hash="17173fb8723d34cea61a50c01c4845ed"/><file name="VisaVerifiedLogo.png" hash="af7f6a27a6449a50d1d623d925585c47"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="MageBase"><dir name="DpsPaymentExpress"><dir name="Block"><dir name="Pxpay"><file name="Form.php" hash="0513bd45150f03dab2c2b08dc0456de8"/><file name="Info.php" hash="68328c0824a4666c618cf3742dd4baff"/></dir><dir name="Pxpost"><file name="Form.php" hash="48cda517e5c97bf8b031d195b79d76f9"/><file name="Info.php" hash="498c831213c26a78c12e28203273e937"/></dir></dir><dir name="controllers"><file name="PxpayController.php" hash="c81620b6757b9819d600e74f4eea6f89"/></dir><dir name="etc"><file name="config.xml" hash="b93eaa11723750631a534e466c603fa2"/><file name="system.xml" hash="87051f2d48e3720938b28142e7f37bb1"/></dir><dir name="Helper"><file name="Data.php" hash="0eea8b0b6d3c48e7e64666d4576d9a30"/></dir><dir name="Model"><dir name="Method"><file name="Common.php" hash="1261a0121dff3725f85d9a7c955ada7c"/><file name="Pxpay.php" hash="083b0777e0c2585bafa52ec8e81ee22d"/><file name="Pxpost.php" hash="bd518dec2435ea91a04d3be4e0da3b73"/></dir><dir name="Mysql4"><dir name="Debug"><file name="Collection.php" hash="6ef2919222f3dcb32599349245e76214"/></dir><file name="Debug.php" hash="56eb2bc341b9cb4ba8d9ae239169766e"/><file name="Setup.php" hash="8a395090a44fda7530548abd2d87835e"/></dir><dir name="System"><file name="Logos.php" hash="bfca463fa7d292fbd2b69a33d332d55a"/><file name="PaymentAction.php" hash="0be4f9a5c602b2d2723203ec56f51a8c"/><file name="PendingOrder.php" hash="31d7bd6f5fad8e1fa4315d32d123be0f"/></dir><file name="Debug.php" hash="dadf96f68c9cf4d09aad73ff0bacab0e"/></dir><dir name="sql"><dir name="magebasedps_setup"><file name="mysql4-install-0.5.0.php" hash="c512ded8c0dd63b1dcd8e8cbfb5893e8"/><file name="mysql4-upgrade-0.5.0-1.0.0.php" hash="6dbc67541449a0f2d43460acb9b6bbff"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MageBase_DpsPaymentExpress</name>
4
+ <version>1.1.13</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Accept credit card payments via Payment Express from DPS - this extension supports PxPay and PxPost.</summary>
10
  <description>Accept credit card payments via Payment Express from DPS - this extension supports PxPay and PxPost.</description>
11
+ <notes>reactivate quote
12
+ correct brace on abs amount check
13
+ update dps branding</notes>
14
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
15
+ <date>2010-12-26</date>
16
+ <time>23:59:59</time>
17
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="magebase"><dir name="dps"><dir name="pxpay"><dir name="pdf"><file name="pxpay.phtml" hash="30691a7b7eddbf52217c2d8194fe3f52"/></dir><file name="form.phtml" hash="1b6d58c3bde68990b743c93a9be529aa"/><file name="info.phtml" hash="8a032b2e8b31234a30121289c64ad175"/></dir><dir name="pxpost"><dir name="pdf"><file name="pxpost.phtml" hash="81e5f3b568e748460a5ca61e42138f8e"/></dir><file name="form.phtml" hash="27bec2c3b982473d7c0c1a44762adac4"/><file name="info.phtml" hash="deaa639a34e9b35cbc41c4a793d4dede"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="magebase"><dir name="dps"><dir name="pxpay"><file name="form.phtml" hash="d1ec1d94031a875ba2819c5f799899c7"/><file name="info.phtml" hash="c53fb2bf0a1afdc81fac85afc15b35e3"/></dir><dir name="pxpost"><file name="form.phtml" hash="84c23e6c9202d6573c44f6ff3c6cd6b5"/><file name="info.phtml" hash="d2fd0f5603342e235ae8cd6ce1346ce2"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="MageBase_DpsPaymentExpress.xml" hash="fae6ba260c006016d14d9a508d17cf14"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="magebase"><dir name="dps"><file name="AmexLogo.png" hash="775a3f26a4b5f7a6201b1331e4fe5579"/><file name="DinersLogo.png" hash="64500fdde86e960ac894f7cf0c44b2d8"/><file name="dpslogo.png" hash="a79b9df3fe45acb4b714cabed162ebda"/><file name="dpspxlogo.png" hash="31b1338586485c872a0f39a41813b248"/><file name="JCBLogo.png" hash="73f9e8b87c6c2dbf252bbb0de43591bc"/><file name="MasterCardLogo.png" hash="801014f81e405cec951076f4080b04f5"/><file name="MCSecureCodeLogo.png" hash="9f31e5ccadd98dc15d0110d0e3b450f7"/><file name="VisaLogo.png" hash="17173fb8723d34cea61a50c01c4845ed"/><file name="VisaVerifiedLogo.png" hash="af7f6a27a6449a50d1d623d925585c47"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="MageBase"><dir name="DpsPaymentExpress"><dir name="Block"><dir name="Pxpay"><file name="Form.php" hash="0513bd45150f03dab2c2b08dc0456de8"/><file name="Info.php" hash="68328c0824a4666c618cf3742dd4baff"/></dir><dir name="Pxpost"><file name="Form.php" hash="48cda517e5c97bf8b031d195b79d76f9"/><file name="Info.php" hash="498c831213c26a78c12e28203273e937"/></dir></dir><dir name="controllers"><file name="PxpayController.php" hash="5ee77e5f760b803102f8a3674c7e86c5"/></dir><dir name="etc"><file name="config.xml" hash="b93eaa11723750631a534e466c603fa2"/><file name="system.xml" hash="87051f2d48e3720938b28142e7f37bb1"/></dir><dir name="Helper"><file name="Data.php" hash="0eea8b0b6d3c48e7e64666d4576d9a30"/></dir><dir name="Model"><dir name="Method"><file name="Common.php" hash="1261a0121dff3725f85d9a7c955ada7c"/><file name="Pxpay.php" hash="4c572853e0288176aa882b4977d9793e"/><file name="Pxpost.php" hash="a7d4acb0dbf3585b6291c6accc569bb9"/></dir><dir name="Mysql4"><dir name="Debug"><file name="Collection.php" hash="6ef2919222f3dcb32599349245e76214"/></dir><file name="Debug.php" hash="56eb2bc341b9cb4ba8d9ae239169766e"/><file name="Setup.php" hash="8a395090a44fda7530548abd2d87835e"/></dir><dir name="System"><file name="Logos.php" hash="bfca463fa7d292fbd2b69a33d332d55a"/><file name="PaymentAction.php" hash="0be4f9a5c602b2d2723203ec56f51a8c"/><file name="PendingOrder.php" hash="31d7bd6f5fad8e1fa4315d32d123be0f"/></dir><file name="Debug.php" hash="dadf96f68c9cf4d09aad73ff0bacab0e"/></dir><dir name="sql"><dir name="magebasedps_setup"><file name="mysql4-install-0.5.0.php" hash="c512ded8c0dd63b1dcd8e8cbfb5893e8"/><file name="mysql4-upgrade-0.5.0-1.0.0.php" hash="6dbc67541449a0f2d43460acb9b6bbff"/></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies/>
20
  </package>
skin/frontend/base/default/images/magebase/dps/dpslogo.png CHANGED
Binary file
skin/frontend/base/default/images/magebase/dps/dpspxlogo.png CHANGED
Binary file