MageBase_DpsPaymentExpress - Version 1.1.16

Version Notes

add diners to PxPost dropdown
fix cancel quote reactivation

Download this release

Release Info

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


Code changes from version 1.1.17 to 1.1.16

Files changed (16) hide show
  1. app/code/community/MageBase/DpsPaymentExpress/Model/Method/Pxpay.php +4 -5
  2. app/code/community/MageBase/DpsPaymentExpress/etc/config.xml +1 -1
  3. app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/form.phtml +0 -0
  4. app/design/frontend/{base → default}/default/template/magebase/dps/pxpay/info.phtml +1 -1
  5. app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/form.phtml +0 -51
  6. app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/info.phtml +0 -0
  7. package.xml +5 -5
  8. skin/frontend/{base → default}/default/images/magebase/dps/AmexLogo.png +0 -0
  9. skin/frontend/{base → default}/default/images/magebase/dps/DinersLogo.png +0 -0
  10. skin/frontend/{base → default}/default/images/magebase/dps/JCBLogo.png +0 -0
  11. skin/frontend/{base → default}/default/images/magebase/dps/MCSecureCodeLogo.png +0 -0
  12. skin/frontend/{base → default}/default/images/magebase/dps/MasterCardLogo.png +0 -0
  13. skin/frontend/{base → default}/default/images/magebase/dps/VisaLogo.png +0 -0
  14. skin/frontend/{base → default}/default/images/magebase/dps/VisaVerifiedLogo.png +0 -0
  15. skin/frontend/{base → default}/default/images/magebase/dps/dpslogo.png +0 -0
  16. 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);
@@ -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);
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/code/community/MageBase/DpsPaymentExpress/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <MageBase_DpsPaymentExpress>
5
- <version>1.1.17</version>
6
  </MageBase_DpsPaymentExpress>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <MageBase_DpsPaymentExpress>
5
+ <version>1.1.16</version>
6
  </MageBase_DpsPaymentExpress>
7
  </modules>
8
  <global>
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
@@ -106,57 +106,6 @@
106
  </li>
107
  <?php endif; ?>
108
 
109
- <?php if ($this->hasSsCardType()): ?>
110
- <li id="<?php echo $_code ?>_cc_type_ss_div">
111
- <ul class="inner-form">
112
- <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo $this->__('Switch/Solo Only') ?></label></li>
113
- <li>
114
- <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
115
- <span class="input-box">
116
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
117
- </span>
118
- </li>
119
-
120
- <li>
121
- <label for="<?php echo $_code ?>_start_month"><?php echo $this->__('Start Date') ?>:</label>
122
- <div class="input-box">
123
- <div class="v-fix">
124
- <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="validate-cc-ukss month">
125
- <?php foreach ($this->getCcMonths() as $k=>$v): ?>
126
- <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
127
- <?php endforeach ?>
128
- </select>
129
- </div>
130
- <div class="v-fix">
131
- <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="validate-cc-ukss year">
132
- <?php foreach ($this->getSsStartYears() as $k=>$v): ?>
133
- <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
134
- <?php endforeach ?>
135
- </select>
136
- </div>
137
- </div>
138
- </li>
139
- <li class="adv-container">&nbsp;</li>
140
- </ul>
141
- <script type="text/javascript">
142
- //<![CDATA[
143
- var SSChecked<?php echo $_code ?> = function() {
144
- var elm = $('<?php echo $_code ?>_cc_type');
145
- if (['SS','SM','SO'].indexOf(elm.value) != -1) {
146
- $('<?php echo $_code ?>_cc_type_ss_div').show();
147
- } else {
148
- $('<?php echo $_code ?>_cc_type_ss_div').hide();
149
- }
150
- };
151
-
152
- Event.observe($('<?php echo $_code ?>_cc_type'), 'change', SSChecked<?php echo $_code ?>);
153
- SSChecked<?php echo $_code ?>();
154
-
155
- //]]>
156
-
157
- </script>
158
- </li>
159
- <?php endif; ?>
160
  <?php if (count($_logos) > 0): ?>
161
  <li>
162
  <?php foreach($_logos as $_logo): ?>
106
  </li>
107
  <?php endif; ?>
108
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
109
  <?php if (count($_logos) > 0): ?>
110
  <li>
111
  <?php foreach($_logos as $_logo): ?>
app/design/frontend/{base → default}/default/template/magebase/dps/pxpost/info.phtml RENAMED
File without changes
package.xml CHANGED
@@ -1,19 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MageBase_DpsPaymentExpress</name>
4
- <version>1.1.17</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>add diners for pxpost
12
- fix for cancelled payment</notes>
13
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
14
  <date>2011-04-05</date>
15
- <time>03:31:39</time>
16
- <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="ef16ac590db5691a18e7581dbaac7849"/><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="70ce3b82f4f50c3724ce8915251e695c"/></dir><dir name="etc"><file name="config.xml" hash="988fdac32b43862c27c90ab44cb87f39"/><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="4b06d1ac374cef4780ff53550ca16bfb"/><file name="Pxpost.php" hash="318c797bedf13c56c00279ebc642b22c"/></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>
17
  <compatible/>
18
  <dependencies/>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MageBase_DpsPaymentExpress</name>
4
+ <version>1.1.16</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>add diners to PxPost dropdown
12
+ fix cancel quote reactivation</notes>
13
  <authors><author><name>Kristof Ringleff</name><user>auto-converted</user><email>info@magebase.com</email></author></authors>
14
  <date>2011-04-05</date>
15
+ <time>03:35:54</time>
16
+ <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="5897dd1bb81ff7b5161b0c595b9f23d0"/><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="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="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="70ce3b82f4f50c3724ce8915251e695c"/></dir><dir name="etc"><file name="config.xml" hash="aab1c2337435a6cc5fb9a3a98c2f52d2"/><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="8397e7cef53fd4aa9bde54cbe3e5805e"/><file name="Pxpost.php" hash="318c797bedf13c56c00279ebc642b22c"/></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>
17
  <compatible/>
18
  <dependencies/>
19
  </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