Raveinfosys_Sagepay - Version 1.0.1

Version Notes

Sagepay Payment Gateway Extension.

Download this release

Release Info

Developer Rave Infosys
Extension Raveinfosys_Sagepay
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (9) hide show
  1. app/code/community/Raveinfosys/Sagepay/Model/Observer.php +1 -1
  2. app/code/community/Raveinfosys/Sagepay/etc/config.xml +3 -3
  3. app/design/adminhtml/default/sagepay/template/sales/order/view/items.phtml +68 -0
  4. app/design/adminhtml/default/sagepay/template/sales/order/view/items/renderer/default.phtml +249 -0
  5. app/design/frontend/base/default/layout/sagepay.xml +18 -0
  6. app/design/frontend/base/default/layout/sagepay_checkout2.xml +0 -22
  7. app/design/frontend/base/default/template/sagepay/checkout/review/info.phtml +10 -0
  8. app/etc/modules/Raveinfosys_Sagepay.xml +3 -0
  9. package.xml +5 -5
app/code/community/Raveinfosys/Sagepay/Model/Observer.php CHANGED
@@ -13,7 +13,7 @@ class Raveinfosys_Sagepay_Model_Observer {
13
  }
14
  }
15
 
16
- public function layoutUpdate($observer)
17
  {
18
  if(!Mage::getStoreConfigFlag('advanced/modules_disable_output/'.$moduleName) && !Mage::getStoreConfigFlag('payment/sagepay/active')){
19
  return $observer;
13
  }
14
  }
15
 
16
+ public function layoutUpdate(Varien_Event_Observer $observer)
17
  {
18
  if(!Mage::getStoreConfigFlag('advanced/modules_disable_output/'.$moduleName) && !Mage::getStoreConfigFlag('payment/sagepay/active')){
19
  return $observer;
app/code/community/Raveinfosys/Sagepay/etc/config.xml CHANGED
@@ -52,15 +52,15 @@
52
  </sagepay>
53
  </observers>
54
  </payment_method_is_active>
55
- <core_layout_update_updates_get_after>
56
  <observers>
57
  <sagepay_core_layout_update_updates_get_after>
58
- <type>singleton</type>
59
  <class>Raveinfosys_Sagepay_Model_Observer</class>
60
  <method>layoutUpdate</method>
61
  </sagepay_core_layout_update_updates_get_after>
62
  </observers>
63
- </core_layout_update_updates_get_after>
64
  </events>
65
  </frontend>
66
  <admin>
52
  </sagepay>
53
  </observers>
54
  </payment_method_is_active>
55
+ <!-- <core_layout_update_updates_get_after>
56
  <observers>
57
  <sagepay_core_layout_update_updates_get_after>
58
+ <type>model</type>
59
  <class>Raveinfosys_Sagepay_Model_Observer</class>
60
  <method>layoutUpdate</method>
61
  </sagepay_core_layout_update_updates_get_after>
62
  </observers>
63
+ </core_layout_update_updates_get_after> -->
64
  </events>
65
  </frontend>
66
  <admin>
app/design/adminhtml/default/sagepay/template/sales/order/view/items.phtml ADDED
@@ -0,0 +1,68 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 default_default
23
+ * @copyright Copyright (c) 2012 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
+ <?php $_order = $this->getOrder() ?>
28
+ <div class="grid np">
29
+ <div class="hor-scroll">
30
+ <table cellspacing="0" class="data order-tables">
31
+ <col />
32
+ <col width="1" />
33
+ <col width="1" />
34
+ <col width="1" />
35
+ <col width="1" />
36
+ <col width="1" />
37
+ <col width="1" />
38
+ <col width="1" />
39
+ <col width="1" />
40
+ <col width="1" />
41
+ <col width="1" />
42
+ <thead>
43
+ <tr class="headings">
44
+ <th><?php echo $this->helper('sales')->__('Product') ?></th>
45
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Item Status') ?></span></th>
46
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Original Price') ?></span></th>
47
+ <th><?php echo $this->helper('sales')->__('Price') ?></th>
48
+ <th class="a-center"><?php echo $this->helper('sales')->__('Qty') ?></th>
49
+ <th><?php echo $this->helper('sales')->__('Subtotal') ?></th>
50
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Tax Amount') ?></span></th>
51
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Tax Percent') ?></span></th>
52
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Discount Amount') ?></span></th>
53
+ <th><span class="nobr"><?php echo $this->helper('sales')->__('Row Total') ?></span></th>
54
+ <th class="last"><span class="nobr"><?php echo $this->helper('sales')->__('Notes') ?></span></th>
55
+ </tr>
56
+ </thead>
57
+ <?php $_items = $this->getItemsCollection() ?>
58
+ <?php $i=0;foreach ($_items as $_item):?>
59
+ <?php if ($_item->getParentItem()) continue; else $i++;?>
60
+ <tbody class="<?php echo $i%2?'even':'odd' ?>">
61
+ <?php echo $this->getItemHtml($_item) ?>
62
+ <?php echo $this->getItemExtraInfoHtml($_item) ?>
63
+ </tbody>
64
+ <?php endforeach; ?>
65
+ </table>
66
+ </div>
67
+ </div>
68
+ <br />
app/design/adminhtml/default/sagepay/template/sales/order/view/items/renderer/default.phtml ADDED
@@ -0,0 +1,249 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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 default_default
23
+ * @copyright Copyright (c) 2012 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
+ <?php $_item = $this->getItem() ?>
28
+ <?php $this->setPriceDataObject($_item) ?>
29
+ <tr<?php if (!$this->canDisplayGiftmessage()): ?> class="border"<?php endif; ?>>
30
+ <td>
31
+ <?php if ($this->canDisplayContainer()): ?>
32
+ <div id="<?php echo $this->getHtmlId() ?>" class="item-container">
33
+ <?php endif; ?>
34
+ <div class="item-text">
35
+ <?php echo $this->getColumnHtml($_item, 'name') ?>
36
+ </div>
37
+ <?php if ($this->canDisplayContainer()): ?>
38
+ </div>
39
+ <?php endif ?>
40
+ </td>
41
+ <td class="a-center"><?php echo $_item->getStatus() ?></td>
42
+ <td class="a-right"><?php echo $this->displayPriceAttribute('original_price') ?></td>
43
+ <td class="a-right">
44
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
45
+ <span class="price-excl-tax">
46
+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
47
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
48
+ <?php endif; ?>
49
+
50
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
51
+ <?php
52
+ echo $this->displayPrices(
53
+ $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
54
+ $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
55
+ );
56
+ ?>
57
+ <?php else: ?>
58
+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
59
+ <?php endif; ?>
60
+
61
+
62
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
63
+ <br />
64
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
65
+ <small>
66
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
68
+ <?php endforeach; ?>
69
+ </small>
70
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
71
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
73
+ <?php endforeach; ?>
74
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
75
+ <small>
76
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
78
+ <?php endforeach; ?>
79
+ </small>
80
+ <?php endif; ?>
81
+
82
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
83
+ <br />
84
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
85
+ <?php
86
+ echo $this->displayPrices(
87
+ $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
88
+ $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
89
+ );
90
+ ?>
91
+ </span>
92
+ <?php endif; ?>
93
+ <?php endif; ?>
94
+ </span>
95
+ <br />
96
+ <?php endif; ?>
97
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
98
+ <span class="price-incl-tax">
99
+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
100
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
101
+ <?php endif; ?>
102
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
103
+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
104
+
105
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
106
+ <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
107
+ <?php else: ?>
108
+ <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
109
+ <?php endif; ?>
110
+
111
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
112
+ <br />
113
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
114
+ <small>
115
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
116
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
117
+ <?php endforeach; ?>
118
+ </small>
119
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
120
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
121
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
122
+ <?php endforeach; ?>
123
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
124
+ <small>
125
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
126
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
127
+ <?php endforeach; ?>
128
+ </small>
129
+ <?php endif; ?>
130
+
131
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
132
+ <br />
133
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
134
+ <?php endif; ?>
135
+ <?php endif; ?>
136
+ </span>
137
+ <?php endif; ?>
138
+
139
+ </td>
140
+ <td><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
141
+
142
+ <td class="a-right">
143
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
144
+ <span class="price-excl-tax">
145
+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
146
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
147
+ <?php endif; ?>
148
+
149
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
150
+ <?php
151
+ echo $this->displayPrices(
152
+ $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
153
+ $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
154
+ );
155
+ ?>
156
+ <?php else: ?>
157
+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
158
+ <?php endif; ?>
159
+
160
+
161
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
162
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
163
+ <small>
164
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
165
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
166
+ <?php endforeach; ?>
167
+ </small>
168
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
169
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
171
+ <?php endforeach; ?>
172
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
173
+ <small>
174
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
176
+ <?php endforeach; ?>
177
+ </small>
178
+ <?php endif; ?>
179
+
180
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
181
+ <br />
182
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
183
+ <?php
184
+ echo $this->displayPrices(
185
+ $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
186
+ $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
187
+ );
188
+ ?>
189
+ </span>
190
+ <?php endif; ?>
191
+ <?php endif; ?>
192
+ </span>
193
+ <br />
194
+ <?php endif; ?>
195
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
196
+ <span class="price-incl-tax">
197
+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
198
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
199
+ <?php endif; ?>
200
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
201
+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
202
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
203
+ <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
204
+ <?php else: ?>
205
+ <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
206
+ <?php endif; ?>
207
+
208
+
209
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
210
+
211
+ <br />
212
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
213
+ <small>
214
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
216
+ <?php endforeach; ?>
217
+ </small>
218
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
219
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
220
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
221
+ <?php endforeach; ?>
222
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
223
+ <small>
224
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
225
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
226
+ <?php endforeach; ?>
227
+ </small>
228
+ <?php endif; ?>
229
+
230
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
231
+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
232
+ <?php endif; ?>
233
+ <?php endif; ?>
234
+ </span>
235
+ <?php endif; ?>
236
+ </td>
237
+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
238
+ <td class="a-right"><?php echo $this->displayTaxPercent($_item) ?></td>
239
+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
240
+ <td class="a-right">
241
+ <?php echo $this->displayPrices(
242
+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
243
+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
244
+ ); ?>
245
+ </td>
246
+ <td class="a-right last">
247
+ <a href="<?php echo $this->getUrl('notes/adminhtml_notes/item', array('order_id'=>$_item->getOrderId(),'product_id'=>$_item->getProductId(),'_current'=>true));?>">notes</a>
248
+ </td>
249
+ </tr>
app/design/frontend/base/default/layout/sagepay.xml CHANGED
@@ -27,4 +27,22 @@
27
  </reference>
28
 
29
  </checkout_onepage_threedsuccess>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  </layout>
27
  </reference>
28
 
29
  </checkout_onepage_threedsuccess>
30
+
31
+ <checkout_onepage_review>
32
+ <reference name="root">
33
+ <action method="setTemplate">
34
+ <template>sagepay/checkout/review/info.phtml</template>
35
+ </action>
36
+ </reference>
37
+ </checkout_onepage_review>
38
+
39
+ <checkout_onepage_threedsuccess>
40
+
41
+ <reference name="root">
42
+ <action method="setTemplate">
43
+ <template>sagepay/threedsuccess.phtml</template>
44
+ </action>
45
+ </reference>
46
+
47
+ </checkout_onepage_threedsuccess>
48
  </layout>
app/design/frontend/base/default/layout/sagepay_checkout2.xml DELETED
@@ -1,22 +0,0 @@
1
- <?xml version="1.0"?>
2
- <layout version="0.1.0">
3
-
4
- <checkout_onepage_review>
5
- <reference name="root">
6
- <action method="setTemplate">
7
- <template>sagepay/checkout/review/info.phtml</template>
8
- </action>
9
- </reference>
10
- </checkout_onepage_review>
11
-
12
- <checkout_onepage_threedsuccess>
13
-
14
- <reference name="root">
15
- <action method="setTemplate">
16
- <template>sagepay/threedsuccess.phtml</template>
17
- </action>
18
- </reference>
19
-
20
- </checkout_onepage_threedsuccess>
21
-
22
- </layout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/sagepay/checkout/review/info.phtml CHANGED
@@ -25,6 +25,10 @@
25
  */
26
  ?>
27
  <?php echo $this->getChildHtml('items_before'); ?>
 
 
 
 
28
  <div id="checkout-review-table-wrapper">
29
  <table class="data-table" id="checkout-review-table">
30
  <?php if ($this->helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
@@ -77,9 +81,15 @@
77
  </span>
78
  </div>
79
  <script type="text/javascript">
 
80
  //<![CDATA[
81
  review = new Review('<?php echo $this->getUrl('checkout/onepage/threedsecure', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
82
  //]]>
 
 
 
 
 
83
  </script>
84
  </div>
85
 
25
  */
26
  ?>
27
  <?php echo $this->getChildHtml('items_before'); ?>
28
+ <?php
29
+ $quote = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getData();
30
+
31
+ ?>
32
  <div id="checkout-review-table-wrapper">
33
  <table class="data-table" id="checkout-review-table">
34
  <?php if ($this->helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
81
  </span>
82
  </div>
83
  <script type="text/javascript">
84
+ <?php if($quote['method']=='sagepay'):?>
85
  //<![CDATA[
86
  review = new Review('<?php echo $this->getUrl('checkout/onepage/threedsecure', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
87
  //]]>
88
+ <?php else:?>
89
+ //<![CDATA[
90
+ review = new Review('<?php echo $this->getUrl('checkout/onepage/saveOrder', array('form_key' => Mage::getSingleton('core/session')->getFormKey())) ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
91
+ //]]>
92
+ <?php endif;?>
93
  </script>
94
  </div>
95
 
app/etc/modules/Raveinfosys_Sagepay.xml CHANGED
@@ -4,6 +4,9 @@
4
  <Raveinfosys_Sagepay>
5
  <active>true</active>
6
  <codePool>community</codePool>
 
 
 
7
  </Raveinfosys_Sagepay>
8
  </modules>
9
  </config>
4
  <Raveinfosys_Sagepay>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <depends>
8
+ <Mage_Checkout/>
9
+ </depends>
10
  </Raveinfosys_Sagepay>
11
  </modules>
12
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Raveinfosys_Sagepay</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Sagepay Payment Gateway Extension.</description>
11
  <notes>Sagepay Payment Gateway Extension.</notes>
12
  <authors><author><name>Raveinfosys</name><user>raveinfo</user><email>magento@raveinfosys.com</email></author></authors>
13
- <date>2015-01-20</date>
14
- <time>14:11:31</time>
15
- <contents><target name="magecommunity"><dir name="Raveinfosys"><dir name="Sagepay"><dir name="Block"><dir name="Adminhtml"><dir name="Sagepay"><file name="Grid.php" hash="0db3367183d7a7fe8cae22603d554109"/></dir><file name="Sagepay.php" hash="388092e2215094c2b4290c2ef665451b"/></dir></dir><dir name="Controller"><file name="Observer.php" hash="a8f23ad01b720298539da718bd411579"/></dir><dir name="Helper"><file name="Data.php" hash="82d35f0afe82ce647662b580d280d42b"/></dir><dir name="Model"><file name="Config.php" hash="c3f8ce937d1861c8f516cb6584a07045"/><dir name="Mysql4"><dir name="Sagepay"><file name="Collection.php" hash="a34bc048d96c80c5aefad7611c814889"/></dir><file name="Sagepay.php" hash="4543355ccce2bb8416ae1b54710a5b1b"/><dir name="Transaction"><file name="Collection.php" hash="f254735999990aff4feb7f8f8c7894d5"/></dir><file name="Transaction.php" hash="6c2c64d04a006c8758f7f6a308678cd2"/></dir><file name="Observer.php" hash="aaea8b89460d22512d2a404119eb7448"/><file name="Payment.php" hash="7335959594e4937f4ce66ef3313683f4"/><file name="Sagepay.php" hash="b4fc9d2512d0f3380791a3bd30a32a7e"/><file name="Status.php" hash="efe219eb960f30999b6cc34714e02e4b"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Dropdown"><file name="Values.php" hash="c9ee28285f0c4e25edb61d26e350c425"/></dir></dir></dir></dir><file name="Transaction.php" hash="6de8d7dbcd024fa40cdbf945cd179fca"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SagepayController.php" hash="b929dc68f87b61a8f83831cf4b326aac"/></dir><dir name="Checkout"><file name="OnepageController.php" hash="497f7e4dfc9c7247f21c9918353b71a9"/></dir></dir><dir name="etc"><file name="config.xml" hash="f3065d6578a6fb1c3bcf8f3612fc6c12"/><file name="system.xml" hash="4f6cb32581acbf3d8741e2b15a6afe54"/></dir><dir name="sql"><dir name="sagepay_setup"><file name="mysql4-install-0.1.0.php" hash="c8b85994156863722912f98595ce8466"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="sagepay.xml" hash="1353d5cfbf553b1b8898c21650156f2b"/><file name="sagepay_checkout2.xml" hash="b71174f80025cd269f6e78d5899d3310"/></dir><dir name="template"><dir name="sagepay"><dir name="checkout"><file name="3dredirect.phtml" hash="bc7dbec38d65fb797d41d09e814338ab"/><dir name="review"><file name="info.phtml" hash="3589f7035de266a0215b21c429add040"/></dir></dir><file name="sagepay.phtml" hash="a58ed0d6297e62b457035fb51c7a4955"/><file name="threedsuccess.phtml" hash="83347f1b11211582fe8daa5fcd3dd5df"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="sagepay.xml" hash="befac7554e8892b1e06d5b1d68fae32e"/></dir></dir><dir name="sagepay"><dir name="template"><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="info.phtml" hash="2a503acd3054293d7259440435d40eaf"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Raveinfosys_Sagepay.xml" hash="e5cad5273f64c357723fbb14be5e12ee"/></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.0.0</min><max>5.6.3</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Raveinfosys_Sagepay</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license>OSL v3.0</license>
7
  <channel>community</channel>
10
  <description>Sagepay Payment Gateway Extension.</description>
11
  <notes>Sagepay Payment Gateway Extension.</notes>
12
  <authors><author><name>Raveinfosys</name><user>raveinfo</user><email>magento@raveinfosys.com</email></author></authors>
13
+ <date>2015-09-21</date>
14
+ <time>11:32:32</time>
15
+ <contents><target name="magecommunity"><dir name="Raveinfosys"><dir name="Sagepay"><dir name="Block"><dir name="Adminhtml"><dir name="Sagepay"><file name="Grid.php" hash="0db3367183d7a7fe8cae22603d554109"/></dir><file name="Sagepay.php" hash="388092e2215094c2b4290c2ef665451b"/></dir></dir><dir name="Controller"><file name="Observer.php" hash="a8f23ad01b720298539da718bd411579"/></dir><dir name="Helper"><file name="Data.php" hash="82d35f0afe82ce647662b580d280d42b"/></dir><dir name="Model"><file name="Config.php" hash="c3f8ce937d1861c8f516cb6584a07045"/><dir name="Mysql4"><dir name="Sagepay"><file name="Collection.php" hash="a34bc048d96c80c5aefad7611c814889"/></dir><file name="Sagepay.php" hash="4543355ccce2bb8416ae1b54710a5b1b"/><dir name="Transaction"><file name="Collection.php" hash="f254735999990aff4feb7f8f8c7894d5"/></dir><file name="Transaction.php" hash="6c2c64d04a006c8758f7f6a308678cd2"/></dir><file name="Observer.php" hash="87abcae5b96fb4b086c5ce527c8cef7a"/><file name="Payment.php" hash="7335959594e4937f4ce66ef3313683f4"/><file name="Sagepay.php" hash="b4fc9d2512d0f3380791a3bd30a32a7e"/><file name="Status.php" hash="efe219eb960f30999b6cc34714e02e4b"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Dropdown"><file name="Values.php" hash="c9ee28285f0c4e25edb61d26e350c425"/></dir></dir></dir></dir><file name="Transaction.php" hash="6de8d7dbcd024fa40cdbf945cd179fca"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SagepayController.php" hash="b929dc68f87b61a8f83831cf4b326aac"/></dir><dir name="Checkout"><file name="OnepageController.php" hash="497f7e4dfc9c7247f21c9918353b71a9"/></dir></dir><dir name="etc"><file name="config.xml" hash="a3c468c7232e42e7c41075ba98a887cb"/><file name="system.xml" hash="4f6cb32581acbf3d8741e2b15a6afe54"/></dir><dir name="sql"><dir name="sagepay_setup"><file name="mysql4-install-0.1.0.php" hash="c8b85994156863722912f98595ce8466"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="sagepay.xml" hash="5d58be735b1705d4341e0728656aa48d"/></dir><dir name="template"><dir name="sagepay"><dir name="checkout"><file name="3dredirect.phtml" hash="bc7dbec38d65fb797d41d09e814338ab"/><dir name="review"><file name="info.phtml" hash="daa7b988f6e41cc2ddf3d7343acd86f6"/></dir></dir><file name="sagepay.phtml" hash="a58ed0d6297e62b457035fb51c7a4955"/><file name="threedsuccess.phtml" hash="83347f1b11211582fe8daa5fcd3dd5df"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="sagepay.xml" hash="befac7554e8892b1e06d5b1d68fae32e"/></dir></dir><dir name="sagepay"><dir name="template"><dir name="sales"><dir name="order"><dir name="view"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="4b6e5e56132537b4eb690ebd189d70ba"/></dir></dir><file name="items.phtml" hash="5e392e35a8c3c123be3a15c49f63c3b8"/><dir name="tab"><file name="info.phtml" hash="2a503acd3054293d7259440435d40eaf"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Raveinfosys_Sagepay.xml" hash="ef02fac665847458f4c4a3980dd1aed0"/></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.0.0</min><max>5.6.12</max></php></required></dependencies>
18
  </package>