Datacash - Version 1.3.0

Version Notes

Version 1.3.0

Download this release

Release Info

Developer DataCash
Extension Datacash
Version 1.3.0
Comparing to
See all releases


Code changes from version 1.2.9 to 1.3.0

Files changed (11) hide show
  1. app/code/community/DataCash/Dpg/Block/Centinel/Review.php +65 -0
  2. app/code/community/DataCash/Dpg/Block/Centinel/Review/Billing.php +9 -0
  3. app/code/community/DataCash/Dpg/Block/Centinel/Review/Shipping.php +9 -0
  4. app/code/community/DataCash/Dpg/controllers/ReviewController.php +19 -0
  5. app/code/community/DataCash/Dpg/etc/config.xml +1 -1
  6. app/design/frontend/base/default/layout/datacash.xml +29 -1
  7. app/design/frontend/base/default/template/datacash/centinel/complete.phtml +19 -0
  8. app/design/frontend/base/default/template/datacash/centinel/review.phtml +133 -0
  9. app/design/frontend/base/default/template/datacash/centinel/review/address.phtml +107 -0
  10. app/design/frontend/base/default/template/datacash/centinel/review/details.phtml +60 -0
  11. package.xml +5 -5
app/code/community/DataCash/Dpg/Block/Centinel/Review.php ADDED
@@ -0,0 +1,65 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class DataCash_Dpg_Block_Centinel_Review extends Mage_Core_Block_Template
3
+ {
4
+ protected $_quote = false;
5
+
6
+ /**
7
+ * Return checkout session object
8
+ *
9
+ * @return Mage_Checkout_Model_Session
10
+ */
11
+ public function getCheckoutSession()
12
+ {
13
+ return Mage::getSingleton('checkout/session');
14
+ }
15
+
16
+ /**
17
+ * Return checkout quote object
18
+ *
19
+ * @return Mage_Sale_Model_Quote
20
+ */
21
+ public function getQuote()
22
+ {
23
+ if (!$this->_quote) {
24
+ $this->_quote = $this->getCheckoutSession()->getQuote();
25
+ }
26
+ return $this->_quote;
27
+ }
28
+
29
+ /**
30
+ * Return quote shipping address
31
+ *
32
+ * @return Mage_Sales_Model_Quote_Address
33
+ */
34
+ public function getShippingAddress()
35
+ {
36
+ if ($this->getQuote()->getIsVirtual()) {
37
+ return false;
38
+ }
39
+ return $this->getQuote()->getShippingAddress();
40
+ }
41
+
42
+ /**
43
+ * Return formatted shipping price
44
+ *
45
+ * @param float $price
46
+ * @param bool $isInclTax
47
+ *
48
+ * @return bool
49
+ */
50
+ public function getShippingPrice($price, $isInclTax)
51
+ {
52
+ return $this->_formatPrice($this->helper('tax')->getShippingPrice($price, $isInclTax, $this->getShippingAddress()));
53
+ }
54
+
55
+ /**
56
+ * Format price base on store convert price method
57
+ *
58
+ * @param float $price
59
+ * @return string
60
+ */
61
+ protected function _formatPrice($price)
62
+ {
63
+ return $this->getQuote()->getStore()->convertPrice($price, true);
64
+ }
65
+ }
app/code/community/DataCash/Dpg/Block/Centinel/Review/Billing.php ADDED
@@ -0,0 +1,9 @@
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class DataCash_Dpg_Block_Centinel_Review_Billing extends Mage_Checkout_Block_Onepage_Billing
3
+ {
4
+ public function setAddressForReview($address)
5
+ {
6
+ $this->_address = $address;
7
+ return $this;
8
+ }
9
+ }
app/code/community/DataCash/Dpg/Block/Centinel/Review/Shipping.php ADDED
@@ -0,0 +1,9 @@
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class DataCash_Dpg_Block_Centinel_Review_Shipping extends Mage_Checkout_Block_Onepage_Shipping
3
+ {
4
+ public function setAddressForReview($address)
5
+ {
6
+ $this->_address = $address;
7
+ return $this;
8
+ }
9
+ }
app/code/community/DataCash/Dpg/controllers/ReviewController.php ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class DataCash_Dpg_ReviewController extends DataCash_Dpg_Controller_Abstract
3
+ {
4
+ public function indexAction()
5
+ {
6
+ try {
7
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
8
+ if (!$quote || !$quote->getPayment() || !$quote->getPayment()->getMethodInstance()) {
9
+ throw new Exception("Quote not available");
10
+ }
11
+ } catch (Exception $e) {
12
+ Mage::logException($e);
13
+ Mage::getSingleton('checkout/session')->addError($e->getMessage());
14
+ $this->_redirect('checkout/onepage/success');
15
+ return;
16
+ }
17
+ $this->loadLayout()->renderLayout();
18
+ }
19
+ }
app/code/community/DataCash/Dpg/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <DataCash_Dpg>
5
- <version>1.2.9</version>
6
  </DataCash_Dpg>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <DataCash_Dpg>
5
+ <version>1.3.0</version>
6
  </DataCash_Dpg>
7
  </modules>
8
  <global>
app/design/frontend/base/default/layout/datacash.xml CHANGED
@@ -22,4 +22,32 @@
22
  <block type="dpg/form_apiprereg" name="payment.method.datacash_api_prereg" />
23
  </reference>
24
  </checkout_onepage_paymentmethod>
25
- </layout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
22
  <block type="dpg/form_apiprereg" name="payment.method.datacash_api_prereg" />
23
  </reference>
24
  </checkout_onepage_paymentmethod>
25
+ <centinel_index_authenticationcomplete>
26
+ <reference name="root">
27
+ <action method="setTemplate">
28
+ <template>datacash/centinel/complete.phtml</template>
29
+ </action>
30
+ </reference>
31
+ </centinel_index_authenticationcomplete>
32
+ <datacash_review_index translate="label">
33
+ <label>One Page Checkout</label>
34
+ <remove name="right"/>
35
+ <remove name="left"/>
36
+ <reference name="root">
37
+ <action method="setTemplate"><template>page/1column.phtml</template></action>
38
+ </reference>
39
+ <reference name="content">
40
+ <block type="dpg/centinel_review" name="datacash_dpg_centinel_review" template="datacash/centinel/review.phtml">
41
+ <block type="dpg/centinel_review_billing" name="datacash.review.billing" as="billing" template="datacash/centinel/review/address.phtml"/>
42
+ <block type="dpg/centinel_review_shipping" name="datacash.review.shipping" as="shipping" template="datacash/centinel/review/address.phtml"/>
43
+ <block type="checkout/cart_totals" name="datacash.review.details" as="details" template="datacash/centinel/review/details.phtml">
44
+ <action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>checkout/onepage/review/item.phtml</template></action>
45
+ <action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>checkout/onepage/review/item.phtml</template></action>
46
+ <action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>checkout/onepage/review/item.phtml</template></action>
47
+ <block type="checkout/cart_totals" name="datacash.review.details.totals" as="totals" template="checkout/onepage/review/totals.phtml"/>
48
+ </block>
49
+ <block type="checkout/agreements" name="datacash.review.details.agreements" as="agreements" template="checkout/onepage/agreements.phtml"/>
50
+ </block>
51
+ </reference>
52
+ </datacash_review_index>
53
+ </layout>
app/design/frontend/base/default/template/datacash/centinel/complete.phtml ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php if ($this->getIsProcessed()):?>
2
+ <?php if ($this->getIsSuccess()):?>
3
+ <script type="text/javascript">
4
+ //<![CDATA[
5
+ if (window.parent.CentinelAuthenticateController === undefined) {
6
+ location.href = '<?php echo Mage::getUrl('datacash/review/index', array('_secure' => 1)) ?>';
7
+ } else {
8
+ window.parent.CentinelAuthenticateController.success();
9
+ }
10
+ //]]>
11
+ </script>
12
+ <?php else:?>
13
+ <h4><?php echo $this->__('Verification Failed');?></h4>
14
+ <p><?php echo $this->__('The card has failed verification with the issuer bank.')?> <strong><?php echo $this->__('Order cannot be placed.')?></strong></p>
15
+ <?php endif;?>
16
+ <?php else:?>
17
+ <h4><?php echo $this->__('Verification cannot be processed');?></h4>
18
+ <p><?php echo $this->__('There has been wrong payment information submitted or the time limit has expired. Please, try again.')?> <strong><?php echo $this->__('Order cannot be placed.')?></strong></p>
19
+ <?php endif;?>
app/design/frontend/base/default/template/datacash/centinel/review.phtml ADDED
@@ -0,0 +1,133 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ $billingBlock = $this->getChild('billing')->setAddressForReview($this->getQuote()->getBillingAddress());
3
+ $shippingAddress = $this->getShippingAddress();
4
+ $shippingBlock = $this->getChild('shipping')->setAddressForReview($shippingAddress);
5
+ ?>
6
+ <div class="page-title">
7
+ <h1><?php echo $this->__('Review Order') ?></h1>
8
+ </div>
9
+ <div class="review-order">
10
+ <form id="co-payment-form" action="" method="post">
11
+ <input type="hidden" name="payment[method]" value="<?php echo $this->getQuote()->getPayment()->getMethod() ?>" />
12
+ </form>
13
+ <div class="info-set col2-set">
14
+ <h2 class="legend"><?php echo $this->__('Customer Information') ?></h2>
15
+ <ul class="form-list form-list-narrow">
16
+ <li id="customer-info-form" class="address-form">
17
+ <div class="field">
18
+ <label for=""><?php echo $this->__('Email Address') ?></label>
19
+ <div class="input-box">
20
+ <span><?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?></span>
21
+ </div>
22
+ </div>
23
+ </li>
24
+ </ul>
25
+ </div>
26
+ <div class="info-set col2-set">
27
+ <div class="col-1" id="billing-address">
28
+ <h2 class="legend"><?php echo $this->__('Billing Address') ?></h2>
29
+ <?php echo $billingBlock->toHtml(); ?>
30
+ </div>
31
+ <div class="col-2" id="shipping-address">
32
+ <?php if ($shippingAddress): ?>
33
+ <h2 class="legend"><?php echo $this->__('Shipping Address') ?></h2>
34
+ <?php echo $shippingBlock->toHtml(); ?>
35
+ <?php else: ?>
36
+ <h2 class="legend">&nbsp;</h2>
37
+ <?php endif; ?>
38
+ </div>
39
+ </div>
40
+ <div class="info-set col2-set">
41
+ <div class="col-1">
42
+ <div class="box payment-method">
43
+ <div class="box-title">
44
+ <h3><?php echo $this->__('Payment Method') ?></h3>
45
+ </div>
46
+ <div class="box-content">
47
+ <span><?php echo $this->getQuote()->getPayment()->getMethodInstance()->getTitle(); ?></span>
48
+ </div>
49
+ </div>
50
+ </div>
51
+ <div class="col-2">
52
+ <div class="box shipping-method">
53
+ <?php if ($shippingAddress): ?>
54
+ <div class="box-title">
55
+ <h3><?php echo $this->__('Shipping Method') ?></h3>
56
+ </div>
57
+ <div class="box-content">
58
+ <?php $shippingRates = $this->getQuote()->getShippingAddress()->getShippingRatesCollection(); ?>
59
+ <?php $methodCode = $this->getQuote()->getShippingAddress()->getShippingMethod(); ?>
60
+ <?php foreach($shippingRates as $rate): ?>
61
+ <?php if ($methodCode == $rate->getCode()): ?>
62
+ <span><?php echo $rate->getCarrierTitle(); ?> (<?php echo $this->getShippingPrice($rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>)</span>
63
+ <?php endif; ?>
64
+ <?php endforeach; ?>
65
+ </div>
66
+ <?php endif; ?>
67
+ </div>
68
+ </div>
69
+ </div>
70
+ <?php echo $this->getChildHtml('details') ?>
71
+ <div class="buttons-set buttons-set-order" id="review-buttons-container">
72
+ <?php echo $this->getChildHtml('agreements') ?>
73
+ <button type="submit" title="<?php echo $this->__('Place Order') ?>" class="button btn-checkout" id="btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
74
+ <span class="please-wait" id="review-please-wait" style="display:none;">
75
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
76
+ </span>
77
+ </div>
78
+ </div>
79
+ <script type="text/javascript">
80
+ //<![CDATA[
81
+ var Review = Class.create();
82
+ Review.prototype = {
83
+ initialize: function(saveUrl, successUrl, failureUrl, agreementsForm){
84
+ this.saveUrl = saveUrl;
85
+ this.successUrl = successUrl;
86
+ this.failureUrl = failureUrl;
87
+ this.agreementsForm = agreementsForm;
88
+ this.loadingImage = $('review-please-wait');
89
+ this.triggerButton = $('btn-checkout');
90
+ },
91
+ save: function(){
92
+ this.loadingImage.show();
93
+ this.triggerButton.disabled = true;
94
+ var params = Form.serialize($('co-payment-form'));
95
+ if (this.agreementsForm){
96
+ params += '&'+Form.serialize(this.agreementsForm);
97
+ }
98
+ params.save = true;
99
+ var request = new Ajax.Request(
100
+ this.saveUrl,
101
+ {
102
+ method:'post',
103
+ parameters:params,
104
+ onComplete: this.onComplete.bindAsEventListener(this),
105
+ onSuccess: this.onSave.bindAsEventListener(this),
106
+ onFailure: this.onFailure.bindAsEventListener(this)
107
+ }
108
+ );
109
+ },
110
+ onComplete: function(transport){
111
+ //noop
112
+ },
113
+ onSave: function(transport){
114
+ var response = eval('(' + transport.responseText + ')');
115
+ if (response.success) {
116
+ location.href = this.successUrl;
117
+ } else {
118
+ var msg = response.error_messages;
119
+ if (typeof(msg)=='object') {
120
+ msg = msg.join("\n");
121
+ }
122
+ if (msg) {
123
+ alert(msg);
124
+ }
125
+ }
126
+ },
127
+ onFailure: function(transport){
128
+ location.href = this.failureUrl;
129
+ }
130
+ }
131
+ var review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('_secure' => 1, 'form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo Mage::getUrl('checkout/onepage/success', array('_secure' => 1)) ?>', '<?php echo Mage::getUrl('checkout/cart', array('_secure' => 1)) ?>', $('checkout-agreements'));
132
+ //]]>
133
+ </script>
app/design/frontend/base/default/template/datacash/centinel/review/address.phtml ADDED
@@ -0,0 +1,107 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <fieldset>
2
+ <ul class="form-list form-list-narrow">
3
+ <li id="address-form" class="address-form">
4
+ <fieldset>
5
+ <ul>
6
+ <li class="fields">
7
+ <div class="field">
8
+ <label for=""><?php echo $this->__('First Name') ?></label>
9
+ <div class="input-box">
10
+ <span><?php echo $this->escapeHtml($this->getAddress()->getFirstname()) ?></span>
11
+ </div>
12
+ </div>
13
+
14
+ <div class="field">
15
+ <label for=""><?php echo $this->__('Last Name') ?></label>
16
+ <div class="input-box">
17
+ <span><?php echo $this->escapeHtml($this->getAddress()->getLastname()) ?></span>
18
+ </div>
19
+ </div>
20
+ </li>
21
+ <li class="fields">
22
+ <div class="field">
23
+ <label for=""><?php echo $this->__('Company') ?></label>
24
+ <div class="input-box">
25
+ <span><?php echo $this->getAddress()->getCompany() ? $this->escapeHtml($this->getAddress()->getCompany()) : '-' ?></span>
26
+ </div>
27
+ </div>
28
+ <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
29
+ <div class="field">
30
+ <label for=""><?php echo $this->__('Email Address') ?></label>
31
+ <div class="input-box">
32
+ <span><?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?></span>
33
+ </div>
34
+ </div>
35
+ <?php endif; ?>
36
+ </li>
37
+ <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
38
+ <li class="wide">
39
+ <label for=""><?php echo $this->__('Address') ?></label>
40
+ <div class="input-box">
41
+ <span><?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?></span>
42
+ </div>
43
+ </li>
44
+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
45
+ <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
46
+ <li class="add-field">
47
+ <div class="input-box">
48
+ <span><?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?></span>
49
+ </div>
50
+ </li>
51
+ <?php endfor; ?>
52
+ <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
53
+ <li class="wide">
54
+ <label for=""><?php echo $this->__('VAT Number') ?></label>
55
+ <div class="input-box">
56
+ <span><?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?></span>
57
+ </div>
58
+ </li>
59
+ <?php endif; ?>
60
+ <li class="fields">
61
+ <div class="field">
62
+ <label for=""><?php echo $this->__('City') ?></label>
63
+ <div class="input-box">
64
+ <span><?php echo $this->escapeHtml($this->getAddress()->getCity()) ?></span>
65
+ </div>
66
+ </div>
67
+ <div class="field">
68
+ <label for=""><?php echo $this->__('State/Province') ?></label>
69
+ <div class="input-box">
70
+ <span><?php echo $this->getAddress()->getRegion() ? $this->escapeHtml($this->getAddress()->getRegion()) : '-' ?></span>
71
+ </div>
72
+ </div>
73
+ </li>
74
+ <li class="fields">
75
+ <div class="field">
76
+ <label for=""><?php echo $this->__('Zip/Postal Code') ?></label>
77
+ <div class="input-box">
78
+ <span><?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?></span>
79
+ </div>
80
+ </div>
81
+ <div class="field">
82
+ <label for=""><?php echo $this->__('Country') ?></label>
83
+ <div class="input-box">
84
+ <span><?php echo $this->escapeHtml($this->getAddress()->getCountry()) ?></span>
85
+ </div>
86
+ </div>
87
+ </li>
88
+ <li class="fields">
89
+ <div class="field">
90
+ <label for=""><?php echo $this->__('Telephone') ?></label>
91
+ <div class="input-box">
92
+ <span><?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?></span>
93
+ </div>
94
+ </div>
95
+ <div class="field">
96
+ <label for=""><?php echo $this->__('Fax') ?></label>
97
+ <div class="input-box">
98
+ <span><?php echo $this->getAddress()->getFax() ? $this->escapeHtml($this->getAddress()->getFax()) : '-' ?></span>
99
+ </div>
100
+ </div>
101
+ </li>
102
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
103
+ </ul>
104
+ </fieldset>
105
+ </li>
106
+ </ul>
107
+ </fieldset>
app/design/frontend/base/default/template/datacash/centinel/review/details.phtml ADDED
@@ -0,0 +1,60 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magentocommerce.com for more information.
20
+ *
21
+ * @category design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+ <table id="details-table" class="data-table">
28
+ <?php if ($this->helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
29
+ <col />
30
+ <col width="1" />
31
+ <col width="1" />
32
+ <col width="1" />
33
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
34
+ <col width="1" />
35
+ <col width="1" />
36
+ <?php endif; ?>
37
+ <thead>
38
+ <tr>
39
+ <th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Product Name') ?></th>
40
+ <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Price') ?></th>
41
+ <th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo $this->__('Qty') ?></th>
42
+ <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Subtotal') ?></th>
43
+ </tr>
44
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
45
+ <tr>
46
+ <th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
47
+ <th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
48
+ <th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
49
+ <th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
50
+ </tr>
51
+ <?php endif; ?>
52
+ </thead>
53
+ <?php echo $this->getChildHtml('totals'); ?>
54
+ <tbody>
55
+ <?php foreach($this->getItems() as $_item): ?>
56
+ <?php echo $this->getItemHtml($_item) ?>
57
+ <?php endforeach ?>
58
+ </tbody>
59
+ </table>
60
+ <script type="text/javascript">decorateTable('details-table');</script>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Datacash</name>
4
- <version>1.2.9</version>
5
  <stability>stable</stability>
6
  <license>OSL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>DataCash payment gateway integration</summary>
10
  <description>DataCash payment gateway integration. System requirements as for Magento http://www.magentocommerce.com/system-requirements. cURL with the FOLLOWLOCATION option is used for service calls to DataCash. FOLLOWLOCATION requires safe_mode to be off and open_basedir to be disabled in the php.ini</description>
11
- <notes>Version 1.2.9</notes>
12
  <authors><author><name>DataCash</name><user>datacash</user><email>support@datacash.com</email></author></authors>
13
- <date>2015-02-13</date>
14
- <time>14:13:35</time>
15
- <contents><target name="magecommunity"><dir name="DataCash"><dir name="Dpg"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Risk.php" hash="087e512ca652eccffd905c154f699b0b"/></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="c65030837e1ce97a063b9146f3bb983d"/></dir></dir></dir></dir><dir name="Form"><file name="Api.php" hash="033a34c52dc6dc03fa802c78e05fff9c"/><file name="Apiprereg.php" hash="bf28b55b476562ff459012c9fc21bc6d"/><file name="Hcc.php" hash="b3406a87a800b9182a0e4e259cf75754"/><file name="Hps.php" hash="47a732ebb397a14a145851cdb00ceb0b"/><file name="Iframe.php" hash="d0aad3633894b90f64112a962c8e3161"/><file name="Placeform.php" hash="19bafec3229f6f35382d9b725d41f620"/></dir><dir name="Iframe"><file name="Complete.php" hash="adbf0cb0a89aee5704cebf62dd63b4a9"/><file name="Start.php" hash="ef6527a85117c67a52291932339a25a1"/></dir><dir name="Info"><file name="Api.php" hash="a2893e155ba8c92776e12ed7d4472284"/><file name="Hcc.php" hash="7a2c713640e7fcee5d5c2150d1baff40"/><file name="Hps.php" hash="8b06d32980842db5274897d3bfba9df1"/></dir></dir><dir name="Controller"><file name="Abstract.php" hash="8be5810fc25d1d1aecb0df3b18b0e536"/></dir><dir name="Helper"><file name="Cdata.php" hash="8e73bf53fd94e3b3af31bf3d42c42d72"/><file name="Data.php" hash="d0432d33a8705ca3a34f192e1659699f"/></dir><dir name="Model"><dir name="Api"><file name="Abstract.php" hash="f64fb44b5e4d21cf5789be5fb404739a"/><file name="Direct.php" hash="71cca949b9d97a9947bff8a2f0b024a7"/><file name="Directprereg.php" hash="1ba0633478037b367bf3f15f091dcdb4"/><file name="Hcc.php" hash="5f0bfa147b92755cddb0243a49e0b6b9"/><file name="Hps.php" hash="40616c129c29acb6978b4bf543b4187c"/></dir><file name="Code.php" hash="43d2b25050901ebd6f6e82ed264de783"/><file name="Config.php" hash="6bc17df54e9692d696b84c16626f28fb"/><dir name="Datacash"><file name="Request.php" hash="06fa2fdf10c89d7b9934e723965255af"/><file name="Response.php" hash="5507d072f231eebcb3d7bff05da27ecb"/><dir name="Simplexml"><file name="Element.php" hash="ac1b66c652eb1843a36dcbf1b94a40fa"/></dir></dir><file name="Dpg.php" hash="5ded0f39a06d12f538fbdf8fe7553c7c"/><dir name="Entity"><file name="Setup.php" hash="d74a82e89fe2213034f6558956ad9633"/></dir><dir name="Method"><file name="Abstract.php" hash="56d0d20c9b81dbf437b8528cd61279fd"/><file name="Api.php" hash="8880dfa3dda98381eacec8ef2c9af040"/><file name="Apiprereg.php" hash="7af51159fa691a4593ca34754fa7490d"/><file name="Hcc.php" hash="eab5f28256dcc7948c07a45a18727bfd"/><dir name="Hosted"><file name="Abstract.php" hash="f52b0d48cc87e885359e43373dc37c13"/><file name="Interface.php" hash="926072fcd7d864e1f98da8b59b164eb7"/></dir><file name="Hps.php" hash="ce07c9a04d19558a052678e3df28c1f2"/></dir><file name="Observer.php" hash="bf6744f8b7ef6cd7acd430928ffa561c"/><dir name="Resource"><dir name="Risk"><file name="Collection.php" hash="b40b9dfa1942fb977518b0f139837b9b"/></dir><file name="Risk.php" hash="a2c777f8447d7302228201426295be0b"/><file name="Setup.php" hash="8c8dfa376d518c3b1122ecdeceec7683"/><dir name="Tokencard"><file name="Collection.php" hash="8f12f4c957db4c60542f345c909d7918"/></dir><file name="Tokencard.php" hash="4f1098828b12460edf828342fe88e559"/></dir><dir name="Risk"><file name="Abstract.php" hash="0f5506868fe68480d6c8b9049ae2d57d"/><file name="Bankresult.php" hash="3bdf045047881195a20bfec39e5c5f3a"/><file name="Score.php" hash="e564950b8da436b1369b240d094b4213"/><file name="Screening.php" hash="b28d2db8daab751830d737553617851d"/></dir><file name="Risk.php" hash="944331f5e7b96a29ba4940bbbb8739aa"/><dir name="Service"><file name="Abstract.php" hash="8815585398e87b8bcb6d4c282b954f95"/><file name="Direct.php" hash="2dc35bf8f06de86cbdcb2975ea08ef9d"/><file name="Directprereg.php" hash="342849147fb97872192d800a2457c917"/><file name="Hcc.php" hash="090324b893a844715e3c06384bd456fe"/><dir name="State"><file name="Datacash.php" hash="79df9d849f4d23e154c1075b776ca888"/></dir></dir><file name="Service.php" hash="3c5374cf5d2f3d802fe032dce47c1c64"/><dir name="Source"><file name="Acceptreject.php" hash="a3142c294701177d85aab3a6f214e9b2"/><file name="Authtypes.php" hash="a7923edddb42f8ea86b2abb07546d62a"/><file name="GatewayMode.php" hash="c449151400da02fd3eff28cd799d4b46"/><file name="RsgBillingShipping.php" hash="03055dbd794ddef88e4c89d9f690e470"/><file name="RsgServiceTypes.php" hash="0560250f3db9da1d187d4e1d55b5b52e"/><file name="Threedstypes.php" hash="5f404d5d676a3baf0e0e71f1331decc2"/></dir><file name="Tokencard.php" hash="a83e3a6c6bfd86377727e5fab0b1020b"/></dir><dir name="controllers"><file name="HccController.php" hash="4257caa14117e23565568855abe307a9"/><file name="HostedController.php" hash="d08cef939ce21212e30150354f86f6fc"/><file name="HpsController.php" hash="7c94d6d858f20f810cfd6df61a3238f3"/><file name="RsgController.php" hash="631c247eb35e325b268a6996baa0b39b"/><file name="T3mController.php" hash="8d7888657be282bafd75f2802a818556"/></dir><dir name="etc"><file name="config.xml" hash="33995d349cdac0fff096cfd54ad9a33a"/><file name="system.xml" hash="ddc40b2cf948a52f4e098eca518f84d1"/></dir><dir name="sql"><dir name="datacash_dpg_setup"><file name="mysql4-install-0.1.0.php" hash="00a5d0be2b14d26ed85ed891b811abfc"/><file name="mysql4-upgrade-1.0.1-1.1.0.php" hash="a793557ab661f8d8a8535ae3a0683151"/><file name="mysql4-upgrade-1.2.5-1.2.6.php" hash="0a8b673a9e4c5f66ccf209ade90f370a"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="datacash"><dir><dir name="form"><file name="cc.phtml" hash="b798c2c2c0729bef424d1be5f64ca024"/><file name="cc.phtml.backup" hash="4930cc189ac48efe55694e5aec89939f"/><file name="cc_prereg.phtml" hash="5b33eaca19e25153a7bcedee02a6f0a6"/></dir><dir name="hcc"><file name="form.phtml" hash="81ed0746ffbd96d8000b95db7c281d03"/><file name="info.phtml" hash="eb512a6dab0d1396742cddf5c5db1598"/><file name="placeform.phtml" hash="b79869ff4346c230c6214b2bffdbc46c"/></dir><dir name="hps"><file name="form.phtml" hash="81ed0746ffbd96d8000b95db7c281d03"/><file name="info.phtml" hash="4bd99be8a9e08b77618fc2f596d2856a"/></dir><dir name="iframe"><file name="complete.phtml" hash="9190056410f552cb802a85b582127065"/><file name="form.phtml" hash="74abd537d1256778a19dd580d236224f"/><file name="start.phtml" hash="3493cd85bf3b3ca604990bd3d810d14d"/></dir></dir></dir></dir><dir name="layout"><file name="datacash.xml" hash="5f2531bbff2d8a5d2a20ea3ec91ea91e"/></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_GB"><file name="DataCash_Dpg.csv" hash="f5d24ae44a0d5f3ac76e74430059152d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DataCash_Payment.xml" hash="7f1d393c458e2287f492fc01dd2f1265"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Datacash</name>
4
+ <version>1.3.0</version>
5
  <stability>stable</stability>
6
  <license>OSL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>DataCash payment gateway integration</summary>
10
  <description>DataCash payment gateway integration. System requirements as for Magento http://www.magentocommerce.com/system-requirements. cURL with the FOLLOWLOCATION option is used for service calls to DataCash. FOLLOWLOCATION requires safe_mode to be off and open_basedir to be disabled in the php.ini</description>
11
+ <notes>Version 1.3.0</notes>
12
  <authors><author><name>DataCash</name><user>datacash</user><email>support@datacash.com</email></author></authors>
13
+ <date>2015-05-06</date>
14
+ <time>13:36:45</time>
15
+ <contents><target name="magecommunity"><dir name="DataCash"><dir name="Dpg"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Risk.php" hash="087e512ca652eccffd905c154f699b0b"/></dir></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Hint.php" hash="c65030837e1ce97a063b9146f3bb983d"/></dir></dir></dir></dir><dir name="Centinel"><dir name="Review"><file name="Billing.php" hash="a226489c21dc23ceda10b49f19c835a9"/><file name="Shipping.php" hash="3cc878e7a2de681961dad43e5be729cf"/></dir><file name="Review.php" hash="31f882019d67927c971a92eead2b4fe4"/></dir><dir name="Form"><file name="Api.php" hash="033a34c52dc6dc03fa802c78e05fff9c"/><file name="Apiprereg.php" hash="bf28b55b476562ff459012c9fc21bc6d"/><file name="Hcc.php" hash="b3406a87a800b9182a0e4e259cf75754"/><file name="Hps.php" hash="47a732ebb397a14a145851cdb00ceb0b"/><file name="Iframe.php" hash="d0aad3633894b90f64112a962c8e3161"/><file name="Placeform.php" hash="19bafec3229f6f35382d9b725d41f620"/></dir><dir name="Iframe"><file name="Complete.php" hash="adbf0cb0a89aee5704cebf62dd63b4a9"/><file name="Start.php" hash="ef6527a85117c67a52291932339a25a1"/></dir><dir name="Info"><file name="Api.php" hash="a2893e155ba8c92776e12ed7d4472284"/><file name="Hcc.php" hash="7a2c713640e7fcee5d5c2150d1baff40"/><file name="Hps.php" hash="8b06d32980842db5274897d3bfba9df1"/></dir></dir><dir name="Controller"><file name="Abstract.php" hash="8be5810fc25d1d1aecb0df3b18b0e536"/></dir><dir name="controllers"><file name="HccController.php" hash="4257caa14117e23565568855abe307a9"/><file name="HostedController.php" hash="d08cef939ce21212e30150354f86f6fc"/><file name="HpsController.php" hash="7c94d6d858f20f810cfd6df61a3238f3"/><file name="ReviewController.php" hash="5bc5f2c2f1a4c0fa6fb4838f92ba676b"/><file name="RsgController.php" hash="631c247eb35e325b268a6996baa0b39b"/><file name="T3mController.php" hash="8d7888657be282bafd75f2802a818556"/></dir><dir name="etc"><file name="config.xml" hash="e07edc630a0f7a8038ed627110ff0990"/><file name="system.xml" hash="ddc40b2cf948a52f4e098eca518f84d1"/></dir><dir name="Helper"><file name="Cdata.php" hash="8e73bf53fd94e3b3af31bf3d42c42d72"/><file name="Data.php" hash="d0432d33a8705ca3a34f192e1659699f"/></dir><dir name="Model"><dir name="Api"><file name="Abstract.php" hash="f64fb44b5e4d21cf5789be5fb404739a"/><file name="Direct.php" hash="71cca949b9d97a9947bff8a2f0b024a7"/><file name="Directprereg.php" hash="1ba0633478037b367bf3f15f091dcdb4"/><file name="Hcc.php" hash="5f0bfa147b92755cddb0243a49e0b6b9"/><file name="Hps.php" hash="40616c129c29acb6978b4bf543b4187c"/></dir><file name="Code.php" hash="43d2b25050901ebd6f6e82ed264de783"/><file name="Config.php" hash="6bc17df54e9692d696b84c16626f28fb"/><dir name="Datacash"><file name="Request.php" hash="06fa2fdf10c89d7b9934e723965255af"/><file name="Response.php" hash="5507d072f231eebcb3d7bff05da27ecb"/><dir name="Simplexml"><file name="Element.php" hash="ac1b66c652eb1843a36dcbf1b94a40fa"/></dir></dir><file name="Dpg.php" hash="5ded0f39a06d12f538fbdf8fe7553c7c"/><dir name="Entity"><file name="Setup.php" hash="d74a82e89fe2213034f6558956ad9633"/></dir><dir name="Method"><file name="Abstract.php" hash="56d0d20c9b81dbf437b8528cd61279fd"/><file name="Api.php" hash="8880dfa3dda98381eacec8ef2c9af040"/><file name="Apiprereg.php" hash="7af51159fa691a4593ca34754fa7490d"/><file name="Hcc.php" hash="eab5f28256dcc7948c07a45a18727bfd"/><dir name="Hosted"><file name="Abstract.php" hash="f52b0d48cc87e885359e43373dc37c13"/><file name="Interface.php" hash="926072fcd7d864e1f98da8b59b164eb7"/></dir><file name="Hps.php" hash="ce07c9a04d19558a052678e3df28c1f2"/></dir><file name="Observer.php" hash="bf6744f8b7ef6cd7acd430928ffa561c"/><dir name="Resource"><dir name="Risk"><file name="Collection.php" hash="b40b9dfa1942fb977518b0f139837b9b"/></dir><file name="Risk.php" hash="a2c777f8447d7302228201426295be0b"/><file name="Setup.php" hash="8c8dfa376d518c3b1122ecdeceec7683"/><dir name="Tokencard"><file name="Collection.php" hash="8f12f4c957db4c60542f345c909d7918"/></dir><file name="Tokencard.php" hash="4f1098828b12460edf828342fe88e559"/></dir><dir name="Risk"><file name="Abstract.php" hash="0f5506868fe68480d6c8b9049ae2d57d"/><file name="Bankresult.php" hash="3bdf045047881195a20bfec39e5c5f3a"/><file name="Score.php" hash="e564950b8da436b1369b240d094b4213"/><file name="Screening.php" hash="b28d2db8daab751830d737553617851d"/></dir><file name="Risk.php" hash="944331f5e7b96a29ba4940bbbb8739aa"/><dir name="Service"><file name="Abstract.php" hash="8815585398e87b8bcb6d4c282b954f95"/><file name="Direct.php" hash="2dc35bf8f06de86cbdcb2975ea08ef9d"/><file name="Directprereg.php" hash="342849147fb97872192d800a2457c917"/><file name="Hcc.php" hash="090324b893a844715e3c06384bd456fe"/><dir name="State"><file name="Datacash.php" hash="79df9d849f4d23e154c1075b776ca888"/></dir></dir><file name="Service.php" hash="3c5374cf5d2f3d802fe032dce47c1c64"/><dir name="Source"><file name="Acceptreject.php" hash="a3142c294701177d85aab3a6f214e9b2"/><file name="Authtypes.php" hash="a7923edddb42f8ea86b2abb07546d62a"/><file name="GatewayMode.php" hash="c449151400da02fd3eff28cd799d4b46"/><file name="RsgBillingShipping.php" hash="03055dbd794ddef88e4c89d9f690e470"/><file name="RsgServiceTypes.php" hash="0560250f3db9da1d187d4e1d55b5b52e"/><file name="Threedstypes.php" hash="5f404d5d676a3baf0e0e71f1331decc2"/></dir><file name="Tokencard.php" hash="a83e3a6c6bfd86377727e5fab0b1020b"/></dir><dir name="sql"><dir name="datacash_dpg_setup"><file name="mysql4-install-0.1.0.php" hash="00a5d0be2b14d26ed85ed891b811abfc"/><file name="mysql4-upgrade-1.0.1-1.1.0.php" hash="a793557ab661f8d8a8535ae3a0683151"/><file name="mysql4-upgrade-1.2.5-1.2.6.php" hash="0a8b673a9e4c5f66ccf209ade90f370a"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="datacash"><dir><dir name="centinel"><file name="complete.phtml" hash="ff63975cef3640b6dabed450f09d7ad9"/><dir name="review"><file name="address.phtml" hash="6bea77f79f16659dbdf7888d563fa16d"/><file name="details.phtml" hash="9d82bbf88b561a04b4878c06b14ead52"/></dir><file name="review.phtml" hash="99f84bfe40bb5a1e0f9e66b030d79398"/></dir><dir name="form"><file name="cc.phtml" hash="b798c2c2c0729bef424d1be5f64ca024"/><file name="cc.phtml.backup" hash="4930cc189ac48efe55694e5aec89939f"/><file name="cc_prereg.phtml" hash="5b33eaca19e25153a7bcedee02a6f0a6"/></dir><dir name="hcc"><file name="form.phtml" hash="81ed0746ffbd96d8000b95db7c281d03"/><file name="info.phtml" hash="eb512a6dab0d1396742cddf5c5db1598"/><file name="placeform.phtml" hash="b79869ff4346c230c6214b2bffdbc46c"/></dir><dir name="hps"><file name="form.phtml" hash="81ed0746ffbd96d8000b95db7c281d03"/><file name="info.phtml" hash="4bd99be8a9e08b77618fc2f596d2856a"/></dir><dir name="iframe"><file name="complete.phtml" hash="9190056410f552cb802a85b582127065"/><file name="form.phtml" hash="74abd537d1256778a19dd580d236224f"/><file name="start.phtml" hash="3493cd85bf3b3ca604990bd3d810d14d"/></dir></dir></dir></dir><dir name="layout"><file name="datacash.xml" hash="a2c3bbf2ebdac733509894c37500d948"/></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_GB"><file name="DataCash_Dpg.csv" hash="f5d24ae44a0d5f3ac76e74430059152d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DataCash_Payment.xml" hash="7f1d393c458e2287f492fc01dd2f1265"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>