MageBase_DpsPaymentExpress - Version 1.1.8

Version Notes

fix SID parameter and properly close a tag

Download this release

Release Info

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


Code changes from version 1.1.7 to 1.1.8

Files changed (17) hide show
  1. app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpay.php +6 -7
  2. app/design/adminhtml/default/default/template/magebase/dps/pxpay/info.phtml +1 -1
  3. app/design/adminhtml/default/default/template/magebase/dps/pxpost/info.phtml +1 -1
  4. app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/form.phtml +0 -0
  5. app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/info.phtml +1 -1
  6. app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/form.phtml +0 -0
  7. app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/info.phtml +1 -1
  8. package.xml +5 -5
  9. skin/frontend/{base → default}/default/images/magebase/dps/AmexLogo.png +0 -0
  10. skin/frontend/{base → default}/default/images/magebase/dps/DinersLogo.png +0 -0
  11. skin/frontend/{base → default}/default/images/magebase/dps/JCBLogo.png +0 -0
  12. skin/frontend/{base → default}/default/images/magebase/dps/MCSecureCodeLogo.png +0 -0
  13. skin/frontend/{base → default}/default/images/magebase/dps/MasterCardLogo.png +0 -0
  14. skin/frontend/{base → default}/default/images/magebase/dps/VisaLogo.png +0 -0
  15. skin/frontend/{base → default}/default/images/magebase/dps/VisaVerifiedLogo.png +0 -0
  16. skin/frontend/{base → default}/default/images/magebase/dps/dpslogo.png +0 -0
  17. skin/frontend/{base → default}/default/images/magebase/dps/dpspxlogo.png +0 -0
app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpay.php CHANGED
@@ -208,9 +208,8 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpay extends Mage_Payment_Model_M
208
  * @param string $result [encrypted]
209
  * @return SimpleXMLElement
210
  */
211
- public function processFailResponse($result)
212
- {
213
- if (!$this->_isActive()) {
214
  throw new Exception("Payment method is not available.");
215
  }
216
  $responseXml = $this->getRealResponse($result);
@@ -251,8 +250,8 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpay extends Mage_Payment_Model_M
251
  $xml->addChild('TxnData3', '');
252
  $xml->addChild('TxnType', htmlentities($this->_getPxPayPaymentAction()));
253
  $xml->addChild('TxnId', $txnId);
254
- $xml->addChild('UrlFail', htmlentities(Mage::getUrl(self::URL_PXPAY_FAIL)));
255
- $xml->addChild('UrlSuccess', htmlentities(Mage::getUrl(self::URL_PXPAY_SUCCESS)));
256
  $xml->addChild('Opt', '');
257
 
258
  $client->setParameterPost('xml', $xml->asXML());
@@ -451,6 +450,7 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpay extends Mage_Payment_Model_M
451
  'ResponseText' => (string)$responseXml->ResponseText
452
  );
453
  $payment->setAdditionalData(serialize($data));
 
454
  }
455
 
456
  /**
@@ -504,8 +504,7 @@ class MageBase_DpsPaymentExpress_Model_Method_Pxpay extends Mage_Payment_Model_M
504
  $order = Mage::getModel('sales/order')->load(Mage::getSingleton('checkout/session')->getLastOrderId());
505
  }
506
  if ($order->getId() && $order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
507
- $order->registerCancellation(Mage::helper('magebasedps')->__('There has been an error processing your payment. Please try later or contact us for help.'), false)
508
- ->save();
509
  }
510
  }
511
 
208
  * @param string $result [encrypted]
209
  * @return SimpleXMLElement
210
  */
211
+ public function processFailResponse($result) {
212
+ if(!$this->_isActive()) {
 
213
  throw new Exception("Payment method is not available.");
214
  }
215
  $responseXml = $this->getRealResponse($result);
250
  $xml->addChild('TxnData3', '');
251
  $xml->addChild('TxnType', htmlentities($this->_getPxPayPaymentAction()));
252
  $xml->addChild('TxnId', $txnId);
253
+ $xml->addChild('UrlFail', htmlentities(Mage::getUrl(self::URL_PXPAY_FAIL, array('_nosid'=>true))));
254
+ $xml->addChild('UrlSuccess', htmlentities(Mage::getUrl(self::URL_PXPAY_SUCCESS, array('_nosid'=>true))));
255
  $xml->addChild('Opt', '');
256
 
257
  $client->setParameterPost('xml', $xml->asXML());
450
  'ResponseText' => (string)$responseXml->ResponseText
451
  );
452
  $payment->setAdditionalData(serialize($data));
453
+
454
  }
455
 
456
  /**
504
  $order = Mage::getModel('sales/order')->load(Mage::getSingleton('checkout/session')->getLastOrderId());
505
  }
506
  if ($order->getId() && $order->getState() != Mage_Sales_Model_Order::STATE_CANCELED) {
507
+ $order->cancel()->save();
 
508
  }
509
  }
510
 
app/design/adminhtml/default/default/template/magebase/dps/pxpay/info.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <tr><td width="45%" class="label"><?php echo $this->__('Amount Settled') ?></td><td><?php echo $this->getAdditionalData('AmountSettlement') ?></td>
28
  <tr><td width="45%" class="label"><?php echo $this->__('Settlement Currency') ?></td><td><?php echo $this->getAdditionalData('CurrencySettlement') ?></td>
29
  </table>
30
- <p id="magebasedps_txn_click"><a href="#"><span onclick="$$('#magebasedps_txn_details').first().show(); $$('#magebasedps_txn_click').first().hide();return false;">click to view transaction details</span></a</p>
31
  <div id="magebasedps_txn_details" style="display:none;">
32
  <table width="100%" border="0">
33
  <tr><td width="45%" class="label"><?php echo $this->__('CardNumber') ?></td><td><?php echo $this->getAdditionalData('CardNumber') ?></td>
27
  <tr><td width="45%" class="label"><?php echo $this->__('Amount Settled') ?></td><td><?php echo $this->getAdditionalData('AmountSettlement') ?></td>
28
  <tr><td width="45%" class="label"><?php echo $this->__('Settlement Currency') ?></td><td><?php echo $this->getAdditionalData('CurrencySettlement') ?></td>
29
  </table>
30
+ <p id="magebasedps_txn_click"><a href="#"><span onclick="$$('#magebasedps_txn_details').first().show(); $$('#magebasedps_txn_click').first().hide();return false;">click to view transaction details</span></a></p>
31
  <div id="magebasedps_txn_details" style="display:none;">
32
  <table width="100%" border="0">
33
  <tr><td width="45%" class="label"><?php echo $this->__('CardNumber') ?></td><td><?php echo $this->getAdditionalData('CardNumber') ?></td>
app/design/adminhtml/default/default/template/magebase/dps/pxpost/info.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <tr><td width="45%" class="label"><?php echo $this->__('Amount Settled') ?></td><td><?php echo $this->getAdditionalData('Amount') ?></td>
28
  <tr><td width="45%" class="label"><?php echo $this->__('Settlement Currency') ?></td><td><?php echo $this->getAdditionalData('CurrencyName') ?></td>
29
  </table>
30
- <p id="magebasedps_txn_click"><a href="#"><span onclick="$$('#magebasedps_txn_details').first().show(); $$('#magebasedps_txn_click').first().hide();return false;">click to view transaction details</span></a</p>
31
  <div id="magebasedps_txn_details" style="display:none;">
32
  <table width="100%" border="0">
33
  <tr><td width="45%" class="label"><?php echo $this->__('CardNumber') ?></td><td><?php echo $this->getAdditionalData('CardNumber') ?></td>
27
  <tr><td width="45%" class="label"><?php echo $this->__('Amount Settled') ?></td><td><?php echo $this->getAdditionalData('Amount') ?></td>
28
  <tr><td width="45%" class="label"><?php echo $this->__('Settlement Currency') ?></td><td><?php echo $this->getAdditionalData('CurrencyName') ?></td>
29
  </table>
30
+ <p id="magebasedps_txn_click"><a href="#"><span onclick="$$('#magebasedps_txn_details').first().show(); $$('#magebasedps_txn_click').first().hide();return false;">click to view transaction details</span></a></p>
31
  <div id="magebasedps_txn_details" style="display:none;">
32
  <table width="100%" border="0">
33
  <tr><td width="45%" class="label"><?php echo $this->__('CardNumber') ?></td><td><?php echo $this->getAdditionalData('CardNumber') ?></td>
app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/form.phtml RENAMED
File without changes
app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/info.phtml RENAMED
@@ -30,4 +30,4 @@
30
  </table>
31
  <?php else:?>
32
  <img src="<?php echo $this->getSkinUrl('images/magebase/dps/dpslogo.png'); ?>" alt="" />
33
- <?php endif;?>
30
  </table>
31
  <?php else:?>
32
  <img src="<?php echo $this->getSkinUrl('images/magebase/dps/dpslogo.png'); ?>" alt="" />
33
+ <?php endif;?>
app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/form.phtml RENAMED
File without changes
app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/info.phtml RENAMED
@@ -24,4 +24,4 @@
24
  <table width="100%" border="0">
25
  <tr><td width="35%"><?php echo $this->__('Card Type') ?></td><td><?php echo $this->getAdditionalData('CardName') ?></td>
26
  <tr><td width="35%"><?php echo $this->__('Name on Card') ?></td><td><?php echo $this->getAdditionalData('CardHolderName') ?></td>
27
- </table>
24
  <table width="100%" border="0">
25
  <tr><td width="35%"><?php echo $this->__('Card Type') ?></td><td><?php echo $this->getAdditionalData('CardName') ?></td>
26
  <tr><td width="35%"><?php echo $this->__('Name on Card') ?></td><td><?php echo $this->getAdditionalData('CardHolderName') ?></td>
27
+ </table>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MageBase_DpsPaymentExpress</name>
4
- <version>1.1.7</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>retrieve quote object from infoInstance instead of from session</notes>
12
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
13
- <date>2010-10-05</date>
14
- <time>05:17:33</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="36d793186537097726671bb6cd3ae5c2"/></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="011493fb070138a7c99b07c792a9c9b2"/></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="e370c27cfb4bd8e926315f7d2c47fb8f"/></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="e01145b1bed97bcb07d4e0c23897e809"/><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.8</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>fix SID parameter and properly close a tag</notes>
12
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
13
+ <date>2010-10-28</date>
14
+ <time>23:03:51</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="default"><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="d3ddb92a85edaffc585948f52c122535"/></dir><dir name="pxpost"><file name="form.phtml" hash="84c23e6c9202d6573c44f6ff3c6cd6b5"/><file name="info.phtml" hash="c89cbdc1023b6d348aefb826efc02a24"/></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="default"><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="c9730b6e58b84d7fc38be04e438f4edf"/><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>
skin/frontend/{base → default}/default/images/magebase/dps/AmexLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/DinersLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/JCBLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/MCSecureCodeLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/MasterCardLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/VisaLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/VisaVerifiedLogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/dpslogo.png RENAMED
File without changes
skin/frontend/{base → default}/default/images/magebase/dps/dpspxlogo.png RENAMED
File without changes