sisowpayment - Version 4.5.5

Version Notes

Sisow plug and play, processing different payment methods from different countries. No programming, customization or coding needed! Sisow is a collecting payment provider in the Netherlands. Sisow collects the payments and distributes them to the owner of the webshop.

Download this release

Release Info

Developer Magento Core Team
Extension sisowpayment
Version 4.5.5
Comparing to
See all releases


Code changes from version 4.5.3 to 4.5.5

Files changed (6) hide show
  1. app/code/local/Sisow/Block/Redirect.php +6 -2
  2. app/code/local/Sisow/controllers/CheckoutController.php +48 -31
  3. app/code/local/Sisow/etc/config.xml +5 -0
  4. app/code/local/Sisow/etc/system.xml +44 -13
  5. app/design/frontend/base/default/template/sisow/checkout/default_form.phtml +10 -6
  6. package.xml +9 -7
app/code/local/Sisow/Block/Redirect.php CHANGED
@@ -268,8 +268,12 @@ class Sisow_Block_Redirect extends Mage_Core_Block_Abstract
268
  Mage::getSingleton('checkout/session')->addError("Betalen met Achteraf Betalen is op dit moment niet mogelijk, betaal anders.");
269
  else
270
  Mage::getSingleton('checkout/session')->addError("Sisow: " . $this->__('No communication')." (". $ex .", ". $base->errorCode . ")");
271
- $order->cancel();
272
- $order->save();
 
 
 
 
273
 
274
  $url = Mage::getUrl('checkout/cart');
275
  header('Location: ' . $url);
268
  Mage::getSingleton('checkout/session')->addError("Betalen met Achteraf Betalen is op dit moment niet mogelijk, betaal anders.");
269
  else
270
  Mage::getSingleton('checkout/session')->addError("Sisow: " . $this->__('No communication')." (". $ex .", ". $base->errorCode . ")");
271
+
272
+ if(!Mage::getStoreConfig('sisow_core/cancelorder'))
273
+ {
274
+ $order->cancel();
275
+ $order->save();
276
+ }
277
 
278
  $url = Mage::getUrl('checkout/cart');
279
  header('Location: ' . $url);
app/code/local/Sisow/controllers/CheckoutController.php CHANGED
@@ -11,13 +11,18 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
11
  public function returnAction()
12
  {
13
  if ($_GET['status'] == 'Success') {
 
 
 
 
 
14
  Mage::getSingleton('checkout/session')->getQuote()->setIsActive(false)->save();
15
 
16
  foreach (Mage::getSingleton('checkout/session')->getQuote()->getItemsCollection() as $item ) {
17
  Mage::getSingleton('checkout/cart')->removeItem( $item->getId() )->save();
18
  }
19
 
20
- return $this->_redirect("checkout/onepage/success", array("_secure" => true));
21
  } else {
22
  //alternatieve keep cart functie
23
  /*
@@ -46,7 +51,12 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
46
  */
47
  Mage::getSingleton('core/session')->addError('Betaling niet gelukt');
48
 
49
- return $this->_redirect('checkout/cart', array("_secure" => true));
 
 
 
 
 
50
  }
51
  }
52
 
@@ -98,7 +108,13 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
98
  if (method_exists($payment, 'getAdditionalInformation')) {
99
  $trxid = $payment->getAdditionalInformation('trxId');
100
  }
101
- $trxid = (isset($trxid) && $trxid != '') ? $trxid : filter_input(INPUT_GET, 'trxid');
 
 
 
 
 
 
102
 
103
  $base = Mage::getModel('sisow/base');
104
 
@@ -120,7 +136,7 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
120
 
121
  $statussesAlwaysProcess = array("Reversed", "Refunded", "Success");
122
 
123
- if ($ostate == Mage_Sales_Model_Order::STATE_PROCESSING && $ostatus == Mage::getStoreConfig('sisow_core/status_success') && !in_array($base->status, $statussesAlwaysProcess))
124
  {
125
  echo 'Order state & order status already processed';
126
  Mage::log($orderid . ': Order state & order status already processed.', null, 'log_sisow.log');
@@ -259,46 +275,47 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
259
  else
260
  $mail = (Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') > 0) ? Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') : Mage::getStoreConfig('sisow_core/autoinvoice');
261
 
262
- if ($mState == Mage_Sales_Model_Order::STATE_CANCELED) {
263
  $order->cancel();
264
  $order->setState($mState, $mStatus, $comm, true);
265
  $payment_transaction->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_VOID);
266
 
267
  echo '$order->setState(' . $mState . ', ' . $mStatus . ', ' . $comm . ')';
268
 
269
- } elseif ($mState !== null && ($mState != $ostate || $mStatus != $ostate)) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
270
  $order->setState($mState, $mStatus, $comm, true);
271
  $payment_transaction->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
272
  echo '$order->setState(' . $mState . ', ' . $mStatus . ', ' . $comm . ')';
273
  }
274
-
275
- //$order->save();
276
- if($mail > 1)
277
  {
278
- if ($order->canInvoice()) {
279
- $invoice = $order->prepareInvoice();
280
- $invoice->register()->capture();
281
- $invoice->setTransactionId($trxid);
282
- Mage::getModel('core/resource_transaction')
283
- ->addObject($invoice)
284
- ->addObject($invoice->getOrder())
285
- ->save();
286
-
287
- if ($mail == 3) {
288
- $invoice->sendEmail();
289
- $invoice->setEmailSent(true);
290
- }
291
- $invoice->save();
292
- echo 'Invoice created!';
293
- }
294
- else
295
- {
296
- echo 'Can\'t create Invoice!';
297
- }
298
  }
299
-
300
  $order->save();
301
-
302
  exit;
303
  }
304
  }
11
  public function returnAction()
12
  {
13
  if ($_GET['status'] == 'Success') {
14
+ $url = Mage::getStoreConfig('sisow_core/url_success');
15
+
16
+ if(empty($url))
17
+ $url = 'checkout/onepage/success';
18
+
19
  Mage::getSingleton('checkout/session')->getQuote()->setIsActive(false)->save();
20
 
21
  foreach (Mage::getSingleton('checkout/session')->getQuote()->getItemsCollection() as $item ) {
22
  Mage::getSingleton('checkout/cart')->removeItem( $item->getId() )->save();
23
  }
24
 
25
+ return $this->_redirect($url, array("_secure" => true));
26
  } else {
27
  //alternatieve keep cart functie
28
  /*
51
  */
52
  Mage::getSingleton('core/session')->addError('Betaling niet gelukt');
53
 
54
+ $url = Mage::getStoreConfig('sisow_core/url_failure');
55
+
56
+ if(empty($url))
57
+ $url = 'checkout/cart';
58
+
59
+ return $this->_redirect($url, array("_secure" => true));
60
  }
61
  }
62
 
108
  if (method_exists($payment, 'getAdditionalInformation')) {
109
  $trxid = $payment->getAdditionalInformation('trxId');
110
  }
111
+
112
+ if(!isset($trxid) || $trxid == '')
113
+ $trxid = filter_input(INPUT_GET, 'trxid');
114
+ else if ($trxid != filter_input(INPUT_GET, 'trxid') && filter_input(INPUT_GET, 'status') == 'Success')
115
+ $trxid = filter_input(INPUT_GET, 'trxid');
116
+ else if ($trxid != filter_input(INPUT_GET, 'trxid') && filter_input(INPUT_GET, 'status') != 'Success')
117
+ exit('Not the last transaction and the status is no success!');
118
 
119
  $base = Mage::getModel('sisow/base');
120
 
136
 
137
  $statussesAlwaysProcess = array("Reversed", "Refunded", "Success");
138
 
139
+ if ($ostate != Mage_Sales_Model_Order::STATE_NEW && $ostate != Mage_Sales_Model_Order::STATE_PENDING_PAYMENT && !in_array($base->status, $statussesAlwaysProcess))
140
  {
141
  echo 'Order state & order status already processed';
142
  Mage::log($orderid . ': Order state & order status already processed.', null, 'log_sisow.log');
275
  else
276
  $mail = (Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') > 0) ? Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') : Mage::getStoreConfig('sisow_core/autoinvoice');
277
 
278
+ if ($mState == Mage_Sales_Model_Order::STATE_CANCELED && !Mage::getStoreConfig('sisow_core/cancelorder')) {
279
  $order->cancel();
280
  $order->setState($mState, $mStatus, $comm, true);
281
  $payment_transaction->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_VOID);
282
 
283
  echo '$order->setState(' . $mState . ', ' . $mStatus . ', ' . $comm . ')';
284
 
285
+ } elseif ($mState != Mage_Sales_Model_Order::STATE_CANCELED && $mState !== null && ($mState != $ostate || $mStatus != $ostate)) {
286
+ if($mail > 1)
287
+ {
288
+ if ($order->canInvoice()) {
289
+ $invoice = $order->prepareInvoice();
290
+ $invoice->register()->capture();
291
+ $invoice->setTransactionId($trxid);
292
+ Mage::getModel('core/resource_transaction')
293
+ ->addObject($invoice)
294
+ ->addObject($invoice->getOrder())
295
+ ->save();
296
+
297
+ if ($mail == 3) {
298
+ $invoice->sendEmail();
299
+ $invoice->setEmailSent(true);
300
+ }
301
+ $invoice->save();
302
+ echo 'Invoice created!';
303
+ }
304
+ else
305
+ {
306
+ echo 'Can\'t create Invoice!';
307
+ }
308
+ }
309
  $order->setState($mState, $mStatus, $comm, true);
310
  $payment_transaction->addTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
311
  echo '$order->setState(' . $mState . ', ' . $mStatus . ', ' . $comm . ')';
312
  }
313
+ else
 
 
314
  {
315
+ $order->addStatusHistoryComment($comm);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
316
  }
317
+
318
  $order->save();
 
319
  exit;
320
  }
321
  }
app/code/local/Sisow/etc/config.xml CHANGED
@@ -224,6 +224,11 @@
224
  </adminhtml>
225
  <default>
226
  <payment>
 
 
 
 
 
227
  <sisow_ideal>
228
  <group>sisow</group>
229
  <active>0</active>
224
  </adminhtml>
225
  <default>
226
  <payment>
227
+ <settings>
228
+ <sisow_urlsuccess>checkout/onepage/success</sisow_urlsuccess>
229
+ <sisow_urlfailed>checkout/cart</sisow_urlfailed>
230
+ <cancelorder>yes</cancelorder>
231
+ </settings>
232
  <sisow_ideal>
233
  <group>sisow</group>
234
  <active>0</active>
app/code/local/Sisow/etc/system.xml CHANGED
@@ -30,7 +30,7 @@
30
  <comment><![CDATA[The Merchant ID form Sisow. You can find this in your Sisow profile.]]></comment>
31
  <frontend_type>text</frontend_type>
32
  <config_path>sisow_core/merchantid</config_path>
33
- <sort_order>10</sort_order>
34
  <show_in_default>1</show_in_default>
35
  <show_in_website>1</show_in_website>
36
  <show_in_store>1</show_in_store>
@@ -40,7 +40,7 @@
40
  <comment><![CDATA[The Merchant Key form Sisow. You can find this in your Sisow profile.]]></comment>
41
  <frontend_type>text</frontend_type>
42
  <config_path>sisow_core/merchantkey</config_path>
43
- <sort_order>20</sort_order>
44
  <show_in_default>1</show_in_default>
45
  <show_in_website>1</show_in_website>
46
  <show_in_store>1</show_in_store>
@@ -50,7 +50,7 @@
50
  <comment><![CDATA[The ShopID form Sisow. You can find this in your Sisow profile.]]></comment>
51
  <frontend_type>text</frontend_type>
52
  <config_path>sisow_core/shopid</config_path>
53
- <sort_order>30</sort_order>
54
  <show_in_default>1</show_in_default>
55
  <show_in_website>1</show_in_website>
56
  <show_in_store>1</show_in_store>
@@ -60,7 +60,7 @@
60
  <frontend_type>select</frontend_type>
61
  <config_path>sisow_core/newordermail</config_path>
62
  <source_model>sisow/config_newordermail</source_model>
63
- <sort_order>35</sort_order>
64
  <show_in_default>1</show_in_default>
65
  <show_in_website>1</show_in_website>
66
  <show_in_store>1</show_in_store>
@@ -71,7 +71,7 @@
71
  <frontend_type>select</frontend_type>
72
  <config_path>sisow_core/gatewayimage</config_path>
73
  <source_model>adminhtml/system_config_source_yesno</source_model>
74
- <sort_order>36</sort_order>
75
  <show_in_default>1</show_in_default>
76
  <show_in_website>1</show_in_website>
77
  <show_in_store>1</show_in_store>
@@ -82,18 +82,38 @@
82
  <frontend_type>select</frontend_type>
83
  <config_path>sisow_core/keepcart</config_path>
84
  <source_model>adminhtml/system_config_source_yesno</source_model>
85
- <sort_order>37</sort_order>
86
  <show_in_default>1</show_in_default>
87
  <show_in_website>1</show_in_website>
88
  <show_in_store>1</show_in_store>
89
  </keepcart>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  <basecurrency translate="label">
91
  <label>Base Currency</label>
92
  <comment><![CDATA[Use on every order the Base Currency of the store.]]></comment>
93
  <frontend_type>select</frontend_type>
94
  <config_path>sisow_core/basecurrency</config_path>
95
  <source_model>adminhtml/system_config_source_yesno</source_model>
96
- <sort_order>38</sort_order>
97
  <show_in_default>1</show_in_default>
98
  <show_in_website>1</show_in_website>
99
  <show_in_store>1</show_in_store>
@@ -103,7 +123,7 @@
103
  <frontend_type>select</frontend_type>
104
  <config_path>sisow_core/status_success</config_path>
105
  <source_model>adminhtml/system_config_source_order_status</source_model>
106
- <sort_order>40</sort_order>
107
  <show_in_default>1</show_in_default>
108
  <show_in_website>1</show_in_website>
109
  <show_in_store>1</show_in_store>
@@ -113,7 +133,7 @@
113
  <frontend_type>select</frontend_type>
114
  <config_path>sisow_core/status_cancelled</config_path>
115
  <source_model>adminhtml/system_config_source_order_status</source_model>
116
- <sort_order>50</sort_order>
117
  <show_in_default>1</show_in_default>
118
  <show_in_website>1</show_in_website>
119
  <show_in_store>1</show_in_store>
@@ -123,7 +143,7 @@
123
  <frontend_type>select</frontend_type>
124
  <config_path>sisow_core/status_expired</config_path>
125
  <source_model>adminhtml/system_config_source_order_status</source_model>
126
- <sort_order>60</sort_order>
127
  <show_in_default>1</show_in_default>
128
  <show_in_website>1</show_in_website>
129
  <show_in_store>1</show_in_store>
@@ -133,18 +153,29 @@
133
  <frontend_type>select</frontend_type>
134
  <config_path>sisow_core/status_failure</config_path>
135
  <source_model>adminhtml/system_config_source_order_status</source_model>
136
- <sort_order>70</sort_order>
137
  <show_in_default>1</show_in_default>
138
  <show_in_website>1</show_in_website>
139
  <show_in_store>1</show_in_store>
140
  </order_status_failure>
 
 
 
 
 
 
 
 
 
 
 
141
  <order_status_reservation translate="label,comment">
142
  <label>Order status 'reservation'</label>
143
  <comment><![CDATA[Only for Klarna Invoice and Klarna Account.]]></comment>
144
  <frontend_type>select</frontend_type>
145
  <config_path>sisow_core/status_reservation</config_path>
146
  <source_model>adminhtml/system_config_source_order_status</source_model>
147
- <sort_order>80</sort_order>
148
  <show_in_default>1</show_in_default>
149
  <show_in_website>1</show_in_website>
150
  <show_in_store>1</show_in_store>
@@ -154,7 +185,7 @@
154
  <frontend_type>select</frontend_type>
155
  <config_path>sisow_core/autoinvoice</config_path>
156
  <source_model>sisow/config_generalAutoinvoice</source_model>
157
- <sort_order>90</sort_order>
158
  <show_in_default>1</show_in_default>
159
  <show_in_website>1</show_in_website>
160
  <show_in_store>1</show_in_store>
30
  <comment><![CDATA[The Merchant ID form Sisow. You can find this in your Sisow profile.]]></comment>
31
  <frontend_type>text</frontend_type>
32
  <config_path>sisow_core/merchantid</config_path>
33
+ <sort_order>50</sort_order>
34
  <show_in_default>1</show_in_default>
35
  <show_in_website>1</show_in_website>
36
  <show_in_store>1</show_in_store>
40
  <comment><![CDATA[The Merchant Key form Sisow. You can find this in your Sisow profile.]]></comment>
41
  <frontend_type>text</frontend_type>
42
  <config_path>sisow_core/merchantkey</config_path>
43
+ <sort_order>100</sort_order>
44
  <show_in_default>1</show_in_default>
45
  <show_in_website>1</show_in_website>
46
  <show_in_store>1</show_in_store>
50
  <comment><![CDATA[The ShopID form Sisow. You can find this in your Sisow profile.]]></comment>
51
  <frontend_type>text</frontend_type>
52
  <config_path>sisow_core/shopid</config_path>
53
+ <sort_order>150</sort_order>
54
  <show_in_default>1</show_in_default>
55
  <show_in_website>1</show_in_website>
56
  <show_in_store>1</show_in_store>
60
  <frontend_type>select</frontend_type>
61
  <config_path>sisow_core/newordermail</config_path>
62
  <source_model>sisow/config_newordermail</source_model>
63
+ <sort_order>200</sort_order>
64
  <show_in_default>1</show_in_default>
65
  <show_in_website>1</show_in_website>
66
  <show_in_store>1</show_in_store>
71
  <frontend_type>select</frontend_type>
72
  <config_path>sisow_core/gatewayimage</config_path>
73
  <source_model>adminhtml/system_config_source_yesno</source_model>
74
+ <sort_order>250</sort_order>
75
  <show_in_default>1</show_in_default>
76
  <show_in_website>1</show_in_website>
77
  <show_in_store>1</show_in_store>
82
  <frontend_type>select</frontend_type>
83
  <config_path>sisow_core/keepcart</config_path>
84
  <source_model>adminhtml/system_config_source_yesno</source_model>
85
+ <sort_order>300</sort_order>
86
  <show_in_default>1</show_in_default>
87
  <show_in_website>1</show_in_website>
88
  <show_in_store>1</show_in_store>
89
  </keepcart>
90
+ <sisow_urlsuccess>
91
+ <label>Redirect url na 'Success'</label>
92
+ <comment><![CDATA[If empty 'checkout/onepage/success' is used.]]></comment>
93
+ <frontend_type>text</frontend_type>
94
+ <config_path>sisow_core/url_success</config_path>
95
+ <sort_order>315</sort_order>
96
+ <show_in_default>1</show_in_default>
97
+ <show_in_website>1</show_in_website>
98
+ <show_in_store>1</show_in_store>
99
+ </sisow_urlsuccess>
100
+ <sisow_urlfailed>
101
+ <label>Redirect url na 'Failure'</label>
102
+ <frontend_type>text</frontend_type>
103
+ <config_path>sisow_core/url_failure</config_path>
104
+ <comment><![CDATA[If empty 'checkout/cart' is used.]]></comment>
105
+ <sort_order>330</sort_order>
106
+ <show_in_default>1</show_in_default>
107
+ <show_in_website>1</show_in_website>
108
+ <show_in_store>1</show_in_store>
109
+ </sisow_urlfailed>
110
  <basecurrency translate="label">
111
  <label>Base Currency</label>
112
  <comment><![CDATA[Use on every order the Base Currency of the store.]]></comment>
113
  <frontend_type>select</frontend_type>
114
  <config_path>sisow_core/basecurrency</config_path>
115
  <source_model>adminhtml/system_config_source_yesno</source_model>
116
+ <sort_order>350</sort_order>
117
  <show_in_default>1</show_in_default>
118
  <show_in_website>1</show_in_website>
119
  <show_in_store>1</show_in_store>
123
  <frontend_type>select</frontend_type>
124
  <config_path>sisow_core/status_success</config_path>
125
  <source_model>adminhtml/system_config_source_order_status</source_model>
126
+ <sort_order>400</sort_order>
127
  <show_in_default>1</show_in_default>
128
  <show_in_website>1</show_in_website>
129
  <show_in_store>1</show_in_store>
133
  <frontend_type>select</frontend_type>
134
  <config_path>sisow_core/status_cancelled</config_path>
135
  <source_model>adminhtml/system_config_source_order_status</source_model>
136
+ <sort_order>450</sort_order>
137
  <show_in_default>1</show_in_default>
138
  <show_in_website>1</show_in_website>
139
  <show_in_store>1</show_in_store>
143
  <frontend_type>select</frontend_type>
144
  <config_path>sisow_core/status_expired</config_path>
145
  <source_model>adminhtml/system_config_source_order_status</source_model>
146
+ <sort_order>500</sort_order>
147
  <show_in_default>1</show_in_default>
148
  <show_in_website>1</show_in_website>
149
  <show_in_store>1</show_in_store>
153
  <frontend_type>select</frontend_type>
154
  <config_path>sisow_core/status_failure</config_path>
155
  <source_model>adminhtml/system_config_source_order_status</source_model>
156
+ <sort_order>550</sort_order>
157
  <show_in_default>1</show_in_default>
158
  <show_in_website>1</show_in_website>
159
  <show_in_store>1</show_in_store>
160
  </order_status_failure>
161
+ <cancelorder translate="label">
162
+ <label>Don't cancel orders</label>
163
+ <comment><![CDATA[Don't cancel the failed orders.]]></comment>
164
+ <frontend_type>select</frontend_type>
165
+ <config_path>sisow_core/cancelorder</config_path>
166
+ <source_model>adminhtml/system_config_source_yesno</source_model>
167
+ <sort_order>575</sort_order>
168
+ <show_in_default>1</show_in_default>
169
+ <show_in_website>1</show_in_website>
170
+ <show_in_store>1</show_in_store>
171
+ </cancelorder>
172
  <order_status_reservation translate="label,comment">
173
  <label>Order status 'reservation'</label>
174
  <comment><![CDATA[Only for Klarna Invoice and Klarna Account.]]></comment>
175
  <frontend_type>select</frontend_type>
176
  <config_path>sisow_core/status_reservation</config_path>
177
  <source_model>adminhtml/system_config_source_order_status</source_model>
178
+ <sort_order>600</sort_order>
179
  <show_in_default>1</show_in_default>
180
  <show_in_website>1</show_in_website>
181
  <show_in_store>1</show_in_store>
185
  <frontend_type>select</frontend_type>
186
  <config_path>sisow_core/autoinvoice</config_path>
187
  <source_model>sisow/config_generalAutoinvoice</source_model>
188
+ <sort_order>650</sort_order>
189
  <show_in_default>1</show_in_default>
190
  <show_in_website>1</show_in_website>
191
  <show_in_store>1</show_in_store>
app/design/frontend/base/default/template/sisow/checkout/default_form.phtml CHANGED
@@ -3,14 +3,18 @@ $_code = $this->getMethodCode();
3
  $_paymentfee = $this->getFee();
4
  ?>
5
 
 
 
 
 
 
6
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
7
  <li>
8
  <?php
9
- if($_paymentfee['incl'] > 0)
10
- {
11
- echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
12
- }
13
  ?>
14
-
15
  </li>
16
- </ul>
 
 
 
3
  $_paymentfee = $this->getFee();
4
  ?>
5
 
6
+ <?php
7
+ if($_paymentfee['incl'] > 0)
8
+ {
9
+ ?>
10
+
11
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
12
  <li>
13
  <?php
14
+ echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
 
 
 
15
  ?>
 
16
  </li>
17
+ </ul>
18
+ <?php
19
+ }
20
+ ?>
package.xml CHANGED
@@ -1,19 +1,21 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>sisowpayment</name>
4
- <version>4.5.3</version>
5
  <stability>stable</stability>
6
  <license/>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Update 4.5.3 for Sisow plug-in</summary>
10
- <description>Fix: Partial Refund gives right amount&#xD;
11
- Add: Option to use BaseCurrency or OrderCurrency</description>
 
 
12
  <notes>Sisow plug and play, processing different payment methods from different countries. No programming, customization or coding needed! Sisow is a collecting payment provider in the Netherlands. Sisow collects the payments and distributes them to the owner of the webshop.</notes>
13
  <authors><author><name>Sisow</name><user>auto-converted</user><email>info@sisow.nl</email></author></authors>
14
- <date>2016-02-12</date>
15
- <time>08:42:44</time>
16
- <contents><target name="magelocal"><dir name="Sisow"><dir name="Block"><dir name="Adminhtml"><file name="Notice.php" hash="56154d92843b3c8a205837010405923e"/></dir><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="1965cbd3a5bdfcec2b79fed11613b2c1"/></dir></dir></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="c086b64c05012dc579ee54fb6e50c5a3"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="c7b7b19d5f2d2c5fbd07f355f8f57f9e"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="ccfaa67f45416ab398ec55ea7356b537"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="a715f52568aa5f4a42a65437be3d0fb8"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="2158794a5836acedc765900403649b16"/></dir></dir></dir><dir name="Paymentmethod"><file name="Creditcard.php" hash="bddf58a2a12dae02e5061b04e68345da"/><file name="Default.php" hash="b1c2947be1e0e731a5aea8757f038018"/><file name="DefaultInfo.php" hash="12bc768b15a910295c911f4790ae936a"/><file name="Eps.php" hash="561dd123d17e0b8b44c8d365d0bc4e00"/><file name="Focum.php" hash="cc242ee202d45176ff1265ca445ec937"/><file name="Giropay.php" hash="712d77e79fcab547ca5544b7e6b2807f"/><file name="Ideal.php" hash="45d11ae70ca002c9c2f10431d65f388e"/><file name="IdealInfo.php" hash="f2be70b33ab781c89a25c4be6f738067"/><file name="Klarna.php" hash="8b529f2c376fd78888b91d8d73339118"/><file name="Klarnaacc.php" hash="2923d73bb1a9b8ad712d7671c6012e37"/><file name="Overboeking.php" hash="87050fba1fb782fce9e02e5c8095ef2e"/></dir><file name="Redirect.php" hash="47b8244c72595696e913354e09fc9c9d"/></dir><dir name="Helper"><file name="Data.php" hash="1cb75689669a43062f8539cecdb88730"/><file name="Paymentfee.php" hash="44f51f6166d85f0d6df2348c094ba0aa"/></dir><dir name="Model"><dir name="Config"><file name="Autoinvoice.php" hash="d4edbab951b4b16e8ccab660bbee8fda"/><file name="GeneralAutoinvoice.php" hash="603d830548bf012631fa0e0f00738802"/><file name="Newordermail.php" hash="b0225e1243442e4c1df1ea4eaab72c5c"/><file name="NewordermailMethod.php" hash="41813afa9531be21163c6a4c1550b759"/></dir><dir name="Methods"><file name="Abstract.php" hash="c9019e661566e87877031a14d2681cc4"/><file name="Ebill.php" hash="b4e00783ca4854a4a13e2f4ed78e0e77"/><file name="Eps.php" hash="2e167aa5f5de19e61372b82eefc43c40"/><file name="Focum.php" hash="8802d0c495c6188340391d0d6f5faa0c"/><file name="Giropay.php" hash="e9c83931c3d1491ff14d12288c4f6348"/><file name="Homepay.php" hash="03a60fca9ff4738f97926997935ed504"/><file name="Ideal.php" hash="26275c27874cd4e1eb32b7d59540c65e"/><file name="Klarna.php" hash="46a92a6a29e51e2e152389475e77d025"/><file name="Klarnaacc.php" hash="6905ba077eab559fe4d24a864e0ed416"/><file name="Maestro.php" hash="7372b9babeb8e60e6e7de39a6a249747"/><file name="Mastercard.php" hash="f09053c2dd9581aa094063254178207f"/><file name="Mistercash.php" hash="f56cfae23c74791432cef1e50733829c"/><file name="Overboeking.php" hash="72db34368e2ac6f7aea6ac2ea66b942c"/><file name="Paypalec.php" hash="8f802ac3efc8709ab17e130671b1c8dd"/><file name="Sofort.php" hash="f9ebf43bda7ffd62582c869a5ba5014b"/><file name="Visa.php" hash="0214e927261846df04892bdf2c048792"/><file name="VvvGiftcard.php" hash="f1dbe386cb6f401f80333a8f2ca1e310"/><file name="WebshopGiftcard.php" hash="3ea06c83b6c0d1f87f1d61dcbf3a55c7"/></dir><dir name="Observer"><file name="Order.php" hash="e5e0ce8e5a05c3c2f87d3893b9932be8"/><file name="Paymentfee.php" hash="78835217b2b6875e14da8b6630c21456"/><file name="Sendebill.php" hash="d43b7a2961da792d8b1d860cd34a111f"/><file name="Submit.php" hash="47aa5da33f953cf9363f05578b2850fe"/></dir><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="2340fd22ec6597f5fad53d9faea2d9fe"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="cec95df39f550cd70e6eb63b16cfb627"/></dir><file name="Tax.php" hash="5fba21bc05a7ed55b3c57ccb4b2790b5"/><file name="Total.php" hash="b77c63f1173d2112056a782490968cf6"/></dir><dir name="Quote"><file name="Quote.php" hash="838ad691a2da75b942a8ef41c2815a9a"/><file name="TaxTotal.php" hash="bd7cd2a16dc3dbc8c7a3c82746a0f671"/><file name="Total.php" hash="d2c8afd1ec4c96b6215ae28766e18177"/></dir></dir><file name="Base.php" hash="828936cbef4855f7c8b0a525ef62a1bf"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="0c39ef3b5c5124eeb374d961b75bdf56"/></dir><dir name="etc"><file name="config.xml" hash="22c0604b314c63478c39ba96023b1886"/><file name="system.xml" hash="bfda7d46ea42300de9311cef6bc007cd"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sisow"><dir name="adminhtml"><file name="notice.phtml" hash="7fa2d76678ad34eae48516fd757c30df"/></dir><dir name="checkout"><file name="default_info.phtml" hash="558581601de86afce3bd62ea50de7a4e"/><file name="ideal_info.phtml" hash="864ee0e16191ef6dca5c18522172b51c"/></dir><file name="form.phtml" hash="0dc40ad38b62218d6f947674312b7a61"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="sisow"><dir name="checkout"><file name="default_form.phtml" hash="200cebfa46ff85c95fdc0cedda4441a4"/><file name="default_info.phtml" hash="94eeee994f2f21dc36489f6b7824e616"/><file name="eps_form.phtml" hash="1754daa2e750bee86d28c8f420ce097c"/><file name="focum_form.phtml" hash="e9f87861ec8b28b4936ac57b93e14269"/><file name="giropay_form.phtml" hash="712362c1639f8427b219ce70dd9eec50"/><file name="ideal_form.phtml" hash="d6fc9f0477ffb5b30250de428bdda5f8"/><file name="ideal_info.phtml" hash="88e15559e2f0cca9744b4dae1a81a1ea"/><file name="klarna_form.phtml" hash="8a232f3e8f6e3bcf453298a922dd26bf"/><file name="klarnaacc_form.phtml" hash="c2e32986bbd9a95bea23b1ff8d49ef0e"/><file name="overboeking_form.phtml" hash="164e244d6df230f20f460012fc72a7d8"/></dir><dir name="paymentfee"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir></dir><file name="form.phtml" hash="8874a0713c384d1346f6ae713f2cb9bd"/><file name="formecare.phtml" hash="0de41387de5f0c8d35066c0f30e113c2"/><file name="formovb.phtml" hash="20da22a0ef4384411bf971ff133a6a2c"/></dir></dir><dir name="layout"><file name="sisow.xml" hash="bc2d1b353ba1597e72e1087967cc5275"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Sisow.xml" hash="7da3fbd82a48d5428b8c723bafbb946b"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="916f9b4ce70529a44cbe41237a8b714e"/></dir></target><target name="magemedia"><dir name="sisow"><dir name="logo"><file name="sisow_eps.png" hash="5e1f172ba0498467ba74a3a335867b39"/><file name="sisow_focum.png" hash="c066464cdf85d507da88917434de35d0"/><file name="sisow_giropay.png" hash="619d576140e1c6bd9fb503a1e82c1c28"/><file name="sisow_homepay.png" hash="72a2755d53b2ce5bec6e42bb449a40ad"/><file name="sisow_ideal.png" hash="a7bd660cf69f38e7871e6404a5032728"/><file name="sisow_maestro.png" hash="a2854af0b9d9bbdc85518f2706ec62bb"/><file name="sisow_mastercard.png" hash="bb28caeeeb40d2de50e5b684aa914aae"/><file name="sisow_mistercash.png" hash="d3710590ccfb187b16c33429ab4163c3"/><file name="sisow_paypalec.png" hash="145bdc920850740f1efce0ab4e450358"/><file name="sisow_sofort.png" hash="29b5b51aa6db9b9854ebf86331873331"/><file name="sisow_visa.png" hash="a8dd24b50cfd94c537d63dd9de126016"/><file name="sisow_vvv.png" hash="c49615bd95ecfa7a9cb513b0b5574dc7"/><file name="sisow_webshop.png" hash="47913a17b3ae5f6a03a28a8df5d9a483"/></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies/>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>sisowpayment</name>
4
+ <version>4.5.5</version>
5
  <stability>stable</stability>
6
  <license/>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Update 4.5.5 for Sisow plug-in</summary>
10
+ <description>Added: possibility to enter a custom return and cancel URL&#xD;
11
+ Added: possibility to let Cancelled/Failed transactions pending&#xD;
12
+ Fix: template gives no empty space when no payment fee is entered&#xD;
13
+ Fix: better Expired after Success catch</description>
14
  <notes>Sisow plug and play, processing different payment methods from different countries. No programming, customization or coding needed! Sisow is a collecting payment provider in the Netherlands. Sisow collects the payments and distributes them to the owner of the webshop.</notes>
15
  <authors><author><name>Sisow</name><user>auto-converted</user><email>info@sisow.nl</email></author></authors>
16
+ <date>2016-04-01</date>
17
+ <time>07:59:42</time>
18
+ <contents><target name="magelocal"><dir name="Sisow"><dir name="Block"><dir name="Adminhtml"><file name="Notice.php" hash="56154d92843b3c8a205837010405923e"/></dir><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="1965cbd3a5bdfcec2b79fed11613b2c1"/></dir></dir></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="c086b64c05012dc579ee54fb6e50c5a3"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="c7b7b19d5f2d2c5fbd07f355f8f57f9e"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="ccfaa67f45416ab398ec55ea7356b537"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="a715f52568aa5f4a42a65437be3d0fb8"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="2158794a5836acedc765900403649b16"/></dir></dir></dir><dir name="Paymentmethod"><file name="Creditcard.php" hash="bddf58a2a12dae02e5061b04e68345da"/><file name="Default.php" hash="b1c2947be1e0e731a5aea8757f038018"/><file name="DefaultInfo.php" hash="12bc768b15a910295c911f4790ae936a"/><file name="Eps.php" hash="561dd123d17e0b8b44c8d365d0bc4e00"/><file name="Focum.php" hash="cc242ee202d45176ff1265ca445ec937"/><file name="Giropay.php" hash="712d77e79fcab547ca5544b7e6b2807f"/><file name="Ideal.php" hash="45d11ae70ca002c9c2f10431d65f388e"/><file name="IdealInfo.php" hash="f2be70b33ab781c89a25c4be6f738067"/><file name="Klarna.php" hash="8b529f2c376fd78888b91d8d73339118"/><file name="Klarnaacc.php" hash="2923d73bb1a9b8ad712d7671c6012e37"/><file name="Overboeking.php" hash="87050fba1fb782fce9e02e5c8095ef2e"/></dir><file name="Redirect.php" hash="b18af0b53274c409f0d487dbfe312dc4"/></dir><dir name="Helper"><file name="Data.php" hash="1cb75689669a43062f8539cecdb88730"/><file name="Paymentfee.php" hash="44f51f6166d85f0d6df2348c094ba0aa"/></dir><dir name="Model"><dir name="Config"><file name="Autoinvoice.php" hash="d4edbab951b4b16e8ccab660bbee8fda"/><file name="GeneralAutoinvoice.php" hash="603d830548bf012631fa0e0f00738802"/><file name="Newordermail.php" hash="b0225e1243442e4c1df1ea4eaab72c5c"/><file name="NewordermailMethod.php" hash="41813afa9531be21163c6a4c1550b759"/></dir><dir name="Methods"><file name="Abstract.php" hash="c9019e661566e87877031a14d2681cc4"/><file name="Ebill.php" hash="b4e00783ca4854a4a13e2f4ed78e0e77"/><file name="Eps.php" hash="2e167aa5f5de19e61372b82eefc43c40"/><file name="Focum.php" hash="8802d0c495c6188340391d0d6f5faa0c"/><file name="Giropay.php" hash="e9c83931c3d1491ff14d12288c4f6348"/><file name="Homepay.php" hash="03a60fca9ff4738f97926997935ed504"/><file name="Ideal.php" hash="26275c27874cd4e1eb32b7d59540c65e"/><file name="Klarna.php" hash="46a92a6a29e51e2e152389475e77d025"/><file name="Klarnaacc.php" hash="6905ba077eab559fe4d24a864e0ed416"/><file name="Maestro.php" hash="7372b9babeb8e60e6e7de39a6a249747"/><file name="Mastercard.php" hash="f09053c2dd9581aa094063254178207f"/><file name="Mistercash.php" hash="f56cfae23c74791432cef1e50733829c"/><file name="Overboeking.php" hash="72db34368e2ac6f7aea6ac2ea66b942c"/><file name="Paypalec.php" hash="8f802ac3efc8709ab17e130671b1c8dd"/><file name="Sofort.php" hash="f9ebf43bda7ffd62582c869a5ba5014b"/><file name="Visa.php" hash="0214e927261846df04892bdf2c048792"/><file name="VvvGiftcard.php" hash="f1dbe386cb6f401f80333a8f2ca1e310"/><file name="WebshopGiftcard.php" hash="3ea06c83b6c0d1f87f1d61dcbf3a55c7"/></dir><dir name="Observer"><file name="Order.php" hash="e5e0ce8e5a05c3c2f87d3893b9932be8"/><file name="Paymentfee.php" hash="78835217b2b6875e14da8b6630c21456"/><file name="Sendebill.php" hash="d43b7a2961da792d8b1d860cd34a111f"/><file name="Submit.php" hash="47aa5da33f953cf9363f05578b2850fe"/></dir><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="2340fd22ec6597f5fad53d9faea2d9fe"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="cec95df39f550cd70e6eb63b16cfb627"/></dir><file name="Tax.php" hash="5fba21bc05a7ed55b3c57ccb4b2790b5"/><file name="Total.php" hash="b77c63f1173d2112056a782490968cf6"/></dir><dir name="Quote"><file name="Quote.php" hash="838ad691a2da75b942a8ef41c2815a9a"/><file name="TaxTotal.php" hash="bd7cd2a16dc3dbc8c7a3c82746a0f671"/><file name="Total.php" hash="d2c8afd1ec4c96b6215ae28766e18177"/></dir></dir><file name="Base.php" hash="828936cbef4855f7c8b0a525ef62a1bf"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="08e42de1874bd6dfae3f7e22d6958482"/></dir><dir name="etc"><file name="config.xml" hash="5cb8e94e3c216b0c92f1d976eb37de94"/><file name="system.xml" hash="0d1aeec52e0c4f88d84659f0f8e8c389"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sisow"><dir name="adminhtml"><file name="notice.phtml" hash="7fa2d76678ad34eae48516fd757c30df"/></dir><dir name="checkout"><file name="default_info.phtml" hash="558581601de86afce3bd62ea50de7a4e"/><file name="ideal_info.phtml" hash="864ee0e16191ef6dca5c18522172b51c"/></dir><file name="form.phtml" hash="0dc40ad38b62218d6f947674312b7a61"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="sisow"><dir name="checkout"><file name="default_form.phtml" hash="2a4465daf0f1d6495bc2381f6b0f0872"/><file name="default_info.phtml" hash="94eeee994f2f21dc36489f6b7824e616"/><file name="eps_form.phtml" hash="1754daa2e750bee86d28c8f420ce097c"/><file name="focum_form.phtml" hash="e9f87861ec8b28b4936ac57b93e14269"/><file name="giropay_form.phtml" hash="712362c1639f8427b219ce70dd9eec50"/><file name="ideal_form.phtml" hash="d6fc9f0477ffb5b30250de428bdda5f8"/><file name="ideal_info.phtml" hash="88e15559e2f0cca9744b4dae1a81a1ea"/><file name="klarna_form.phtml" hash="8a232f3e8f6e3bcf453298a922dd26bf"/><file name="klarnaacc_form.phtml" hash="c2e32986bbd9a95bea23b1ff8d49ef0e"/><file name="overboeking_form.phtml" hash="164e244d6df230f20f460012fc72a7d8"/></dir><dir name="paymentfee"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir></dir><file name="form.phtml" hash="8874a0713c384d1346f6ae713f2cb9bd"/><file name="formecare.phtml" hash="0de41387de5f0c8d35066c0f30e113c2"/><file name="formovb.phtml" hash="20da22a0ef4384411bf971ff133a6a2c"/></dir></dir><dir name="layout"><file name="sisow.xml" hash="bc2d1b353ba1597e72e1087967cc5275"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Sisow.xml" hash="7da3fbd82a48d5428b8c723bafbb946b"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="916f9b4ce70529a44cbe41237a8b714e"/></dir></target><target name="magemedia"><dir name="sisow"><dir name="logo"><file name="sisow_eps.png" hash="5e1f172ba0498467ba74a3a335867b39"/><file name="sisow_focum.png" hash="c066464cdf85d507da88917434de35d0"/><file name="sisow_giropay.png" hash="619d576140e1c6bd9fb503a1e82c1c28"/><file name="sisow_homepay.png" hash="72a2755d53b2ce5bec6e42bb449a40ad"/><file name="sisow_ideal.png" hash="a7bd660cf69f38e7871e6404a5032728"/><file name="sisow_maestro.png" hash="a2854af0b9d9bbdc85518f2706ec62bb"/><file name="sisow_mastercard.png" hash="bb28caeeeb40d2de50e5b684aa914aae"/><file name="sisow_mistercash.png" hash="d3710590ccfb187b16c33429ab4163c3"/><file name="sisow_paypalec.png" hash="145bdc920850740f1efce0ab4e450358"/><file name="sisow_sofort.png" hash="29b5b51aa6db9b9854ebf86331873331"/><file name="sisow_visa.png" hash="a8dd24b50cfd94c537d63dd9de126016"/><file name="sisow_vvv.png" hash="c49615bd95ecfa7a9cb513b0b5574dc7"/><file name="sisow_webshop.png" hash="47913a17b3ae5f6a03a28a8df5d9a483"/></dir></dir></target></contents>
19
  <compatible/>
20
  <dependencies/>
21
  </package>