Icepay_IceAdvanced - Version 1.2.1

Version Notes

Enhancements:
- Refund now possible from within Magento
- Errors thrown during checkout now throw a 'Mage_Payment_Model_Info_Exception'
- Errors thrown during checkout are now translated

Bug Fixes:
- Applying tax 'after' or 'before' discount is now correctly calculated for Afterpay

Download this release

Release Info

Developer ICEPAY
Extension Icepay_IceAdvanced
Version 1.2.1
Comparing to
See all releases


Code changes from version 1.1.10 to 1.2.1

app/code/community/Icepay/IceAdvanced/Helper/Data.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  /**
4
  * ICEPAY Advanced - Helper class
5
- * @version 1.0.0
6
  * @author Olaf Abbenhuis
7
  * @author Wouter van Tilburg
8
  * @copyright ICEPAY <www.icepay.com>
@@ -14,15 +14,16 @@
14
  * charged in accordance with the standard ICEPAY tariffs.
15
  *
16
  */
17
- class Icepay_IceAdvanced_Helper_Data extends Mage_Core_Helper_Abstract {
 
18
  /* Install values */
19
 
20
  public $title = 'Advanced';
21
- public $version = '1.1.10';
22
  public $id = 'ADV';
23
  public $fingerprint = '7f4de76ecbf7d847caeba64c42938a6a05821c4f';
24
  public $compatibility_oldest_version = '1.5.0.0';
25
- public $compatibility_latest_version = '1.7.0.2';
26
  public $section = 'iceadvanced';
27
  public $serial_required = '0';
28
  public $filteredPaymentmethods = array('SMS', 'PHONE');
@@ -31,7 +32,7 @@ class Icepay_IceAdvanced_Helper_Data extends Mage_Core_Helper_Abstract {
31
  public function doChecks()
32
  {
33
  $lines = array();
34
-
35
  /* Check SOAP */
36
  $check = Mage::helper("icecore")->hasSOAP();
37
  array_push($lines, array(
@@ -136,4 +137,100 @@ class Icepay_IceAdvanced_Helper_Data extends Mage_Core_Helper_Abstract {
136
  return Mage::helper('icecore')->getConfigForStore($store, $val);
137
  }
138
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
139
  }
2
 
3
  /**
4
  * ICEPAY Advanced - Helper class
5
+ * @version 1.1.0
6
  * @author Olaf Abbenhuis
7
  * @author Wouter van Tilburg
8
  * @copyright ICEPAY <www.icepay.com>
14
  * charged in accordance with the standard ICEPAY tariffs.
15
  *
16
  */
17
+ class Icepay_IceAdvanced_Helper_Data extends Mage_Core_Helper_Abstract
18
+ {
19
  /* Install values */
20
 
21
  public $title = 'Advanced';
22
+ public $version = '1.2.0';
23
  public $id = 'ADV';
24
  public $fingerprint = '7f4de76ecbf7d847caeba64c42938a6a05821c4f';
25
  public $compatibility_oldest_version = '1.5.0.0';
26
+ public $compatibility_latest_version = '1.8.0.0';
27
  public $section = 'iceadvanced';
28
  public $serial_required = '0';
29
  public $filteredPaymentmethods = array('SMS', 'PHONE');
32
  public function doChecks()
33
  {
34
  $lines = array();
35
+
36
  /* Check SOAP */
37
  $check = Mage::helper("icecore")->hasSOAP();
38
  array_push($lines, array(
137
  return Mage::helper('icecore')->getConfigForStore($store, $val);
138
  }
139
 
140
+ /**
141
+ * Remove all whitespace from a string
142
+ *
143
+ * @param string $string
144
+ *
145
+ * @author Wouter van Tilburg
146
+ * @since 1.1.0
147
+ * @return string
148
+ */
149
+ private function removeWhitespace($string)
150
+ {
151
+ return str_replace(' ', '', $string);
152
+ }
153
+
154
+ /**
155
+ * Validate's the postcode based on country
156
+ *
157
+ * @param string $country
158
+ * @param string $postCode
159
+ *
160
+ * @author Wouter van Tilburg
161
+ * @since 1.1.0
162
+ * @throws Mage_Payment_Model_Info_Exception
163
+ */
164
+ public function validatePostCode($country, $postCode)
165
+ {
166
+ $postCode = $this->removeWhitespace($postCode);
167
+
168
+ switch ($country) {
169
+ case 'NL':
170
+ if (!preg_match('/^[1-9]{1}[0-9]{3}[A-Z]{2}$/', $postCode))
171
+ return false;
172
+ break;
173
+ case 'BE':
174
+ if (!preg_match('/^[1-9]{4}$/', $postCode))
175
+ throw new Mage_Payment_Model_Info_Exception('Your postal code is incorrect, must be in 1111 format.');
176
+ break;
177
+ case 'DE':
178
+ if (!preg_match('/^[1-9]{5}$/', $postCode))
179
+ throw new Mage_Payment_Model_Info_Exception('Your postal code is incorrect, must be in 11111 format.');
180
+ break;
181
+ }
182
+
183
+ return true;
184
+ }
185
+
186
+ /**
187
+ * Validate's the phonenumber based on country
188
+ *
189
+ * @param type $country
190
+ * @param type $phoneNumber
191
+ *
192
+ * @author Wouter van Tilburg
193
+ * @since 1.1.0
194
+ * @throws Mage_Payment_Model_Info_Exception
195
+ */
196
+ public function validatePhonenumber($country, $phoneNumber)
197
+ {
198
+ switch ($country) {
199
+ case 'NL':
200
+ if (!preg_match('/^\(?\+?\d{1,3}\)?\s?-?\s?[\d\s]*$/', $phoneNumber) OR strlen($phoneNumber) < 10)
201
+ return false;
202
+ break;
203
+ }
204
+
205
+ return true;
206
+ }
207
+
208
+ /**
209
+ * Validate's the street address (Afterpay)
210
+ *
211
+ * @param string $streetAddress
212
+ *
213
+ * @author Wouter van Tilburg
214
+ * @since 1.1.0
215
+ * @return boolean
216
+ */
217
+ public function validateStreetAddress($streetAddress)
218
+ {
219
+ $streetAddress = implode(' ', $streetAddress);
220
+
221
+ $pattern = '#^(.+\D+){1} ([0-9]{1,})\s?([\s\/]?[0-9]{0,}?[\s\S]{0,}?)?$#i';
222
+
223
+ $aMatch = array();
224
+
225
+ if (preg_match($pattern, $streetAddress, $aMatch)) {
226
+ $street = utf8_decode($aMatch[1]);
227
+ $houseNumber = utf8_decode($aMatch[2]);
228
+
229
+ if (!empty($street) && !empty($houseNumber))
230
+ return true;
231
+ }
232
+
233
+ return false;
234
+ }
235
+
236
  }
app/code/community/Icepay/IceAdvanced/Model/Checkout/Standard.php CHANGED
@@ -2,8 +2,9 @@
2
 
3
  /**
4
  * ICEPAY Advanced - Main Paymentmethod class
5
- * @version 1.0.0
6
  * @author Olaf Abbenhuis
 
7
  * @copyright ICEPAY <www.icepay.com>
8
  *
9
  * Disclaimer:
@@ -51,6 +52,55 @@ class Icepay_IceAdvanced_Model_Checkout_Standard extends Mage_Payment_Model_Meth
51
  $this->advSQL()->setScope(0); //Fallback to default store
52
  }
53
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
54
  public function initialize($paymentAction, $stateObject)
55
  {
56
  $stateObject->setState(Mage_Sales_Model_Order::STATE_NEW);
2
 
3
  /**
4
  * ICEPAY Advanced - Main Paymentmethod class
5
+ * @version 1.0.2
6
  * @author Olaf Abbenhuis
7
+ * @author Wouter van Tilburg
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
10
  * Disclaimer:
52
  $this->advSQL()->setScope(0); //Fallback to default store
53
  }
54
 
55
+ /**
56
+ * Request an online refund
57
+ *
58
+ * @param Varien_Object $payment
59
+ * @param string $amount
60
+ *
61
+ * @since 1.0.2
62
+ * @return \Icepay_IceAdvanced_Model_Checkout_Standard
63
+ */
64
+ public function refund(Varien_Object $payment, $amount)
65
+ {
66
+ // Get Magento Order
67
+ $order = $payment->getOrder();
68
+
69
+ // Get StoreId
70
+ $storeId = $order->getStoreId();
71
+
72
+ // Check if Auto Refund is enabled
73
+ if (!Mage::getStoreConfig(Icepay_IceCore_Model_Config::AUTOREFUND, $storeId))
74
+ return $this;
75
+
76
+ // Fetch ICEPAY merchant settings
77
+ $merchantID = Mage::getStoreConfig(Icepay_IceCore_Model_Config::MERCHANTID, $storeId);
78
+ $secretCode = Mage::getStoreConfig(Icepay_IceCore_Model_Config::SECRETCODE, $storeId);
79
+
80
+ // Get CurrencyCode
81
+ $currency = $order->getOrderCurrencyCode();
82
+
83
+ // Amount must be in cents
84
+ $amount = (int) (string) ($amount * 100);
85
+
86
+ // Fetch ICEPAY Payment ID
87
+ $paymentID = $payment->getLastTransId();
88
+
89
+ // Setup webservice
90
+ $webservice = Mage::getModel('Icepay_IceAdvanced_Model_Webservice_Refund');
91
+ $webservice->init($merchantID, $secretCode);
92
+
93
+ // Request refund
94
+ try {
95
+ $webservice->requestRefund($paymentID, $amount, $currency);
96
+ } catch (Exception $e) {
97
+ Mage::getSingleton('adminhtml/session')->addError("ICEPAY: Refund Failed! {$e->getMessage()}");
98
+ Mage::helper('icecore')->log("ICEPAY: Refund Failed! {$e->getMessage()}");
99
+ }
100
+
101
+ return $this;
102
+ }
103
+
104
  public function initialize($paymentAction, $stateObject)
105
  {
106
  $stateObject->setState(Mage_Sales_Model_Order::STATE_NEW);
app/code/community/Icepay/IceAdvanced/Model/Observer.php CHANGED
@@ -2,7 +2,8 @@
2
 
3
  /**
4
  * ICEPAY Advanced - Observer to save admin paymentmethods and save checkout payment
5
- * @version 1.0.0
 
6
  * @author Olaf Abbenhuis
7
  * @copyright ICEPAY <www.icepay.com>
8
  *
@@ -13,7 +14,8 @@
13
  * charged in accordance with the standard ICEPAY tariffs.
14
  *
15
  */
16
- class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Container {
 
17
 
18
  public $_currencyArr = array();
19
  public $_countryArr = array();
@@ -25,25 +27,16 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
25
  private $_advancedSQL = null;
26
  private $_coreSQL = null;
27
 
28
- private function validateStreetAddress($streetAddress)
29
- {
30
- $pattern = '#^(.+\D+){1} ([0-9]{1,})\s?([\s\/]?[0-9]{0,}?[\s\S]{0,}?)?$#i';
31
-
32
- $aMatch = array();
33
-
34
- if (preg_match($pattern, $streetAddress, $aMatch)) {
35
- $street = utf8_decode($aMatch[1]);
36
- $houseNumber = utf8_decode($aMatch[2]);
37
-
38
- if (empty($street) || empty($houseNumber))
39
- return false;
40
- } else {
41
- return false;
42
- }
43
-
44
- return true;
45
- }
46
-
47
  public function custom_quote_process(Varien_Event_Observer $observer)
48
  {
49
  $session = Mage::getSingleton('core/session');
@@ -51,10 +44,10 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
51
 
52
  if (!is_null($quoteID)) {
53
  $quoteDate = $session->getData('ic_quotedate');
54
-
55
  $diff = abs(strtotime(date("Y-m-d H:i:s")) - strtotime($quoteDate));
56
-
57
- if ($diff < 360) {
58
  $observer['checkout_session']->setQuoteId($quoteID);
59
  $observer['checkout_session']->setLoadInactive(true);
60
  }
@@ -63,84 +56,82 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
63
  return $observer;
64
  }
65
 
66
- public function sales_quote_collect_totals_after(Varien_Event_Observer $observer)
 
 
 
 
 
 
 
 
 
67
  {
68
- $paymentMethod = Mage::app()->getFrontController()->getRequest()->getParam('payment');
 
 
 
69
 
70
- if (!isset($paymentMethod))
71
  return;
72
 
73
- try {
74
- $paymentMethodCode = $observer->getEvent()->getQuote()->getPayment()->getMethodInstance()->getCode();
75
- $paymentMethodTitle = $observer->getEvent()->getQuote()->getPayment()->getMethodInstance()->getTitle();
76
- } catch (Exception $e) {
77
- return;
78
- }
79
 
80
- if (substr($paymentMethodCode, 0, 10) != "icepayadv_")
81
- return;
82
 
83
- if (strtoupper($paymentMethodTitle) != 'AFTERPAY')
84
- return;
 
 
 
 
 
 
 
 
 
 
 
85
 
86
- $message = false;
87
-
88
- $postCode = str_replace(' ', '', Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress()->getPostcode());
89
-
90
- switch (Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress()->getCountry()) {
91
- case 'NL':
92
- if (!preg_match('/^[1-9]{1}[0-9]{3}[A-Z]{2}$/', $postCode))
93
- $message = "Your postal code is incorrect, must be in 1111AA or 1111 AA format and cannot start with a 0.";
94
- break;
95
- case 'BE':
96
- if (!preg_match('/^[1-9]{4}$/', $postCode))
97
- $message = "Your postal code is incorrect, must be in 1111 format.";
98
- break;
99
- case 'DE':
100
- if (!preg_match('/^[1-9]{5}$/', $postCode))
101
- $message = "Your postal code is incorrect, must be in 11111 format.";
102
- break;
103
- }
104
 
105
- $phoneNumber = Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress()->getTelephone();
106
 
107
- switch (Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress()->getCountry()) {
108
- case 'NL':
109
- if (!preg_match('/^\(?\+?\d{1,3}\)?\s?-?\s?[\d\s]*$/', $phoneNumber) OR strlen($phoneNumber) < 10) {
110
- $message = "Your phonenumber is incorrect.";
111
- }
112
- break;
113
- }
114
 
115
- $billingStreetAddress = implode(' ', Mage::getSingleton('checkout/session')->getQuote()->getBillingAddress()->getStreet());
116
- if (!$this->validateStreetAddress($billingStreetAddress)) {
117
- $message = "Billing address incorrect.";
118
- }
119
 
120
- $shippingStreetAddress = implode(' ', Mage::getSingleton('checkout/session')->getQuote()->getShippingAddress()->getStreet());
121
- if (!$this->validateStreetAddress($shippingStreetAddress)) {
122
- $message = "Shipping address incorrect.";
123
- }
124
 
125
- if ($message) {
126
- Mage::getSingleton('checkout/session')->addError($message);
 
127
 
 
 
128
  Mage::app()->getResponse()->setRedirect(Mage::getUrl('checkout/cart'));
 
129
  Mage::app()->getResponse()->sendResponse();
130
  exit();
131
  }
132
-
133
- return;
134
  }
135
 
136
- /* Save the payment */
137
 
138
  public function sales_order_payment_place_end(Varien_Event_Observer $observer)
139
  {
140
  $payment = $observer->getPayment();
141
- $pmName = $payment->getMethodInstance()->getCode();
142
 
143
- if (substr($pmName, 0, 10) != "icepayadv_")
144
  return;
145
 
146
  if ($this->coreSQL()->isActive("iceadvanced"))
@@ -161,8 +152,7 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
161
  return;
162
  if ($data->getData("scope") == "default" || $data->getData("scope") == "stores") {
163
  $storeScope = $data->getData("scope_id");
164
- }
165
- else
166
  return;
167
  $this->advSQL()->setScope($storeScope);
168
  $this->advSQL()->clearConfig();
@@ -256,8 +246,7 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
256
  // Only allow payment and issuer data at default and store level
257
  if ($data->getData("scope") == "default" || $data->getData("scope") == "stores") {
258
  $storeScope = $data->getData("scope_id");
259
- }
260
- else
261
  return;
262
  $this->advSQL()->setScope($storeScope);
263
 
@@ -320,5 +309,3 @@ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Containe
320
  }
321
 
322
  }
323
-
324
- ?>
2
 
3
  /**
4
  * ICEPAY Advanced - Observer to save admin paymentmethods and save checkout payment
5
+ * @version 1.2.0
6
+ * @author Wouter van Tilburg
7
  * @author Olaf Abbenhuis
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
14
  * charged in accordance with the standard ICEPAY tariffs.
15
  *
16
  */
17
+ class Icepay_IceAdvanced_Model_Observer extends Mage_Payment_Block_Form_Container
18
+ {
19
 
20
  public $_currencyArr = array();
21
  public $_countryArr = array();
27
  private $_advancedSQL = null;
28
  private $_coreSQL = null;
29
 
30
+ /**
31
+ * Checks if an Icepay quote id is set, if so make the checkout session active
32
+ * Note: This is done so cancelled orders no longer have an empty card upon returning
33
+ *
34
+ * @param Varien_Event_Observer $observer
35
+ *
36
+ * @since 1.2.0
37
+ * @author Wouter van Tilburg
38
+ * @return \Varien_Event_Observer
39
+ */
 
 
 
 
 
 
 
 
 
40
  public function custom_quote_process(Varien_Event_Observer $observer)
41
  {
42
  $session = Mage::getSingleton('core/session');
44
 
45
  if (!is_null($quoteID)) {
46
  $quoteDate = $session->getData('ic_quotedate');
47
+
48
  $diff = abs(strtotime(date("Y-m-d H:i:s")) - strtotime($quoteDate));
49
+
50
+ if ($diff < 360) {
51
  $observer['checkout_session']->setQuoteId($quoteID);
52
  $observer['checkout_session']->setLoadInactive(true);
53
  }
56
  return $observer;
57
  }
58
 
59
+ /**
60
+ * sales_order_place_before
61
+ *
62
+ * @param Varien_Event_Observer $observer
63
+ *
64
+ * @since 1.2.0
65
+ * @author Wouter van Tilburg
66
+ * @return \Icepay_IceAdvanced_Model_Observer
67
+ */
68
+ public function sales_order_place_before(Varien_Event_Observer $observer)
69
  {
70
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
71
+
72
+ $paymentMethodCode = $quote->getPayment()->getMethodInstance()->getCode();
73
+ $paymentMethodTitle = $quote->getPayment()->getMethodInstance()->getTitle();
74
 
75
+ if (false === strpos($paymentMethodCode, 'icepayadv_'))
76
  return;
77
 
78
+ if (strtoupper($paymentMethodTitle) == 'AFTERPAY')
79
+ $this->initAfterpayValidation($quote);
 
 
 
 
80
 
81
+ return $this;
82
+ }
83
 
84
+ /**
85
+ * Validate additional information (Only for Afterpay)
86
+ *
87
+ * @param Object $quote
88
+ *
89
+ * @since 1.2.0
90
+ * @author Wouter van Tilburg
91
+ * @throws Mage_Payment_Model_Info_Exception
92
+ */
93
+ public function initAfterpayValidation($observer)
94
+ {
95
+ $billingAddress = $observer->getBillingAddress();
96
+ $shippingAddress = $observer->getShippingAddress();
97
 
98
+ $billingCountry = $billingAddress->getCountry();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
99
 
100
+ $errorMessage = false;
101
 
102
+ // Validate postcode
103
+ if (!Mage::Helper('iceadvanced')->validatePostCode($billingCountry, $billingAddress->getPostcode()))
104
+ $errorMessage = Mage::helper('iceadvanced')->__('It seems your billing address is incorrect, please confirm the postal code.');
 
 
 
 
105
 
106
+ // Validate phonenumber
107
+ if (!Mage::Helper('iceadvanced')->validatePhonenumber($billingCountry, $billingAddress->getTelephone()))
108
+ $errorMessage = Mage::helper('iceadvanced')->__('It seems your billing address is incorrect, please confirm the phonenumber.');
 
109
 
110
+ // Validate billing streetaddress
111
+ if (!Mage::helper('iceadvanced')->validateStreetAddress($billingAddress->getStreet()))
112
+ $errorMessage = Mage::helper('iceadvanced')->__('It seems your billing address is incorrect, please confirm the street and housenumber.');
 
113
 
114
+ // Validate shipping streetaddress
115
+ if (!Mage::helper('iceadvanced')->validateStreetAddress($shippingAddress->getStreet()))
116
+ $errorMessage = Mage::helper('iceadvanced')->__('It seems your shipping address is incorrect, please confirm the street and housenumber.');
117
 
118
+ if ($errorMessage) {
119
+ Mage::getSingleton('checkout/session')->addError($errorMessage);
120
  Mage::app()->getResponse()->setRedirect(Mage::getUrl('checkout/cart'));
121
+ session_write_close();
122
  Mage::app()->getResponse()->sendResponse();
123
  exit();
124
  }
 
 
125
  }
126
 
127
+ /* Save order */
128
 
129
  public function sales_order_payment_place_end(Varien_Event_Observer $observer)
130
  {
131
  $payment = $observer->getPayment();
132
+ $paymentMethodCode = $payment->getMethodInstance()->getCode();
133
 
134
+ if (strpos($paymentMethodCode, 'icepayadv_') === false)
135
  return;
136
 
137
  if ($this->coreSQL()->isActive("iceadvanced"))
152
  return;
153
  if ($data->getData("scope") == "default" || $data->getData("scope") == "stores") {
154
  $storeScope = $data->getData("scope_id");
155
+ } else
 
156
  return;
157
  $this->advSQL()->setScope($storeScope);
158
  $this->advSQL()->clearConfig();
246
  // Only allow payment and issuer data at default and store level
247
  if ($data->getData("scope") == "default" || $data->getData("scope") == "stores") {
248
  $storeScope = $data->getData("scope_id");
249
+ } else
 
250
  return;
251
  $this->advSQL()->setScope($storeScope);
252
 
309
  }
310
 
311
  }
 
 
app/code/community/Icepay/IceAdvanced/Model/Pay.php CHANGED
@@ -13,13 +13,18 @@
13
  * charged in accordance with the standard ICEPAY tariffs.
14
  *
15
  */
16
- class Icepay_IceAdvanced_Model_Pay extends Mage_Payment_Model_Method_Abstract {
 
17
 
18
  private $sqlModel;
 
19
 
20
  public function __construct()
21
  {
22
  $this->sqlModel = Mage::getModel('icecore/mysql4_iceCore');
 
 
 
23
  }
24
 
25
  public function getCheckoutResult()
@@ -101,39 +106,27 @@ class Icepay_IceAdvanced_Model_Pay extends Mage_Payment_Model_Method_Abstract {
101
 
102
  $ic_order->setShippingAddress($shippingAddress);
103
 
104
- // Add item specification for Afterpay
105
- $orderItems = $order->getItemsCollection();
106
-
107
- foreach ($orderItems as $item) {
108
- $itemData = $item->getData();
109
 
110
- if ($itemData['price'] == 0)
 
111
  continue;
 
 
 
112
 
113
- $product = Mage::getModel('catalog/product')->load($itemData['product_id']);
114
- $productData = $product->getData();
115
-
116
- $itemData['price'] * $itemData['tax_percent'];
117
-
118
- $itemData['price_incl_tax'] = number_format($itemData['price_incl_tax'], 2);
119
-
120
- if ($productData['tax_class_id'] == '0')
121
- $itemData['tax_percent'] = -1;
122
-
123
-
124
- // Add the products
125
- $itemData['description'] = (isset($itemData['description'])) ? $itemData['description'] : '';
126
 
127
  $ic_product = $ic_order->createProduct()
128
- ->setProductID($itemData['item_id'])
129
- ->setProductName($itemData['name'])
130
- ->setDescription($itemData['description'])
131
- ->setQuantity(round($itemData['qty_ordered']))
132
- ->setUnitPrice($itemData['price_incl_tax'] * 100)
133
  ->setVATCategory($ic_order->getCategoryForPercentage($itemData['tax_percent']));
134
 
135
  $ic_order->addproduct($ic_product);
136
- }
137
 
138
  $orderData = $order->getData();
139
 
@@ -155,7 +148,7 @@ class Icepay_IceAdvanced_Model_Pay extends Mage_Payment_Model_Method_Abstract {
155
 
156
  if (Mage::helper('icecore')->isModuleInstalled('MageWorx_MultiFees')) {
157
  $multiFeesExtension = Mage::getModel('iceadvanced/extensions_Mageworx_MultiFees');
158
- $ic_order = $multiFeesExtension->addPrice(unserialize($order->getDetailsMultifees()), $ic_order);
159
  }
160
 
161
  if (Mage::helper('icecore')->isModuleInstalled('MW_GiftWrap')) {
@@ -182,4 +175,4 @@ class Icepay_IceAdvanced_Model_Pay extends Mage_Payment_Model_Method_Abstract {
182
  }
183
  }
184
 
185
- }
13
  * charged in accordance with the standard ICEPAY tariffs.
14
  *
15
  */
16
+ class Icepay_IceAdvanced_Model_Pay extends Mage_Payment_Model_Method_Abstract
17
+ {
18
 
19
  private $sqlModel;
20
+ private $ic_order;
21
 
22
  public function __construct()
23
  {
24
  $this->sqlModel = Mage::getModel('icecore/mysql4_iceCore');
25
+ $this->ic_order = Mage::getModel('iceadvanced/order');
26
+
27
+ parent::__construct();
28
  }
29
 
30
  public function getCheckoutResult()
106
 
107
  $ic_order->setShippingAddress($shippingAddress);
108
 
 
 
 
 
 
109
 
110
+ foreach ($order->getAllItems() as $orderItem) {
111
+ if (empty($orderItem) || $orderItem->hasParentItemId()) {
112
  continue;
113
+ }
114
+
115
+ $itemData = $orderItem->getData();
116
 
117
+ //for compatibility reasons, $orderItem->getProduct() was not used
118
+ $product = Mage::getModel('catalog/product')->loadByAttribute('sku', $orderItem->getSku());
 
 
 
 
 
 
 
 
 
 
 
119
 
120
  $ic_product = $ic_order->createProduct()
121
+ ->setProductID($orderItem->getSku())
122
+ ->setProductName($product->getName())
123
+ ->setDescription($product->getName())
124
+ ->setQuantity((int) $orderItem->getQtyOrdered())
125
+ ->setUnitPrice(round(($orderItem->getBasePrice() + bcdiv($orderItem->getBaseTaxAmount(), $orderItem->getQtyOrdered(), 2) + bcdiv($orderItem->getBaseHiddenTaxAmount(), $orderItem->getQtyOrdered(), 2)) * 100, 0))
126
  ->setVATCategory($ic_order->getCategoryForPercentage($itemData['tax_percent']));
127
 
128
  $ic_order->addproduct($ic_product);
129
+ }
130
 
131
  $orderData = $order->getData();
132
 
148
 
149
  if (Mage::helper('icecore')->isModuleInstalled('MageWorx_MultiFees')) {
150
  $multiFeesExtension = Mage::getModel('iceadvanced/extensions_Mageworx_MultiFees');
151
+ $ic_order = $multiFeesExtension->addPrice(unserialize($order->getDetailsMultifees()), $ic_order);
152
  }
153
 
154
  if (Mage::helper('icecore')->isModuleInstalled('MW_GiftWrap')) {
175
  }
176
  }
177
 
178
+ }
app/code/community/Icepay/IceAdvanced/Model/Webservice/Advanced.php CHANGED
@@ -3,7 +3,7 @@
3
  /**
4
  * ICEPAY Advanced - Webservice
5
  *
6
- * @version 1.0.0
7
  * @author Wouter van Tilburg <wouter@icepay.eu>
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
@@ -21,14 +21,15 @@ class Icepay_IceAdvanced_Model_Webservice_Advanced extends Icepay_IceCore_Model_
21
  /**
22
  * Retrieve and return merchant's paymentmethods
23
  *
 
24
  * @return object
25
  */
26
  public function getMyPaymentMethods()
27
  {
28
  $obj = new stdClass();
29
 
30
- $obj->MerchantID = $this->merchantID;
31
- $obj->SecretCode = $this->secretCode;
32
  $obj->Timestamp = $this->getTimeStamp();
33
  $obj->Checksum = $this->generateChecksum($obj);
34
 
@@ -39,13 +40,15 @@ class Icepay_IceAdvanced_Model_Webservice_Advanced extends Icepay_IceCore_Model_
39
  * Create transaction and return result
40
  *
41
  * @param object $paymentObj
 
 
42
  * @return array
43
  */
44
  public function doCheckout($paymentObj, $orderObj = null)
45
  {
46
  $obj = new StdClass();
47
 
48
- $obj->MerchantID = $this->merchantID;
49
  $obj->Timestamp = $this->getTimeStamp();
50
  $obj->Amount = $paymentObj->getAmount();
51
  $obj->Country = $paymentObj->getCountry();
@@ -63,7 +66,7 @@ class Icepay_IceAdvanced_Model_Webservice_Advanced extends Icepay_IceCore_Model_
63
  if ($this->isExtendedCheckout($obj->PaymentMethod))
64
  $obj->XML = $orderObj->getXML();
65
 
66
- $obj->Checksum = $this->generateChecksum($obj, $this->secretCode);
67
 
68
  if ($this->isExtendedCheckout($obj->PaymentMethod)) {
69
  $result = $this->client->CheckoutExtended(array('request' => $obj));
@@ -78,6 +81,7 @@ class Icepay_IceAdvanced_Model_Webservice_Advanced extends Icepay_IceCore_Model_
78
  * Checks if paymentmethod requires extended checkout
79
  *
80
  * @param object $paymentMethod
 
81
  * @since 1.0.0
82
  * @return bool
83
  */
3
  /**
4
  * ICEPAY Advanced - Webservice
5
  *
6
+ * @version 1.0.1
7
  * @author Wouter van Tilburg <wouter@icepay.eu>
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
21
  /**
22
  * Retrieve and return merchant's paymentmethods
23
  *
24
+ * @since 1.0.0
25
  * @return object
26
  */
27
  public function getMyPaymentMethods()
28
  {
29
  $obj = new stdClass();
30
 
31
+ $obj->MerchantID = $this->getMerchantID();
32
+ $obj->SecretCode = $this->getSecretCode();
33
  $obj->Timestamp = $this->getTimeStamp();
34
  $obj->Checksum = $this->generateChecksum($obj);
35
 
40
  * Create transaction and return result
41
  *
42
  * @param object $paymentObj
43
+ *
44
+ * @since 1.0.0
45
  * @return array
46
  */
47
  public function doCheckout($paymentObj, $orderObj = null)
48
  {
49
  $obj = new StdClass();
50
 
51
+ $obj->MerchantID = $this->getMerchantID();
52
  $obj->Timestamp = $this->getTimeStamp();
53
  $obj->Amount = $paymentObj->getAmount();
54
  $obj->Country = $paymentObj->getCountry();
66
  if ($this->isExtendedCheckout($obj->PaymentMethod))
67
  $obj->XML = $orderObj->getXML();
68
 
69
+ $obj->Checksum = $this->generateChecksum($obj, $this->getSecretCode());
70
 
71
  if ($this->isExtendedCheckout($obj->PaymentMethod)) {
72
  $result = $this->client->CheckoutExtended(array('request' => $obj));
81
  * Checks if paymentmethod requires extended checkout
82
  *
83
  * @param object $paymentMethod
84
+ *
85
  * @since 1.0.0
86
  * @return bool
87
  */
app/code/community/Icepay/IceAdvanced/Model/Webservice/Refund.php ADDED
@@ -0,0 +1,52 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * ICEPAY Advamced - Webservice Refund Model
5
+ *
6
+ * @version 1.0.0
7
+ * @author Wouter van Tilburg <wouter@icepay.eu>
8
+ * @copyright ICEPAY <www.icepay.com>
9
+ *
10
+ * Disclaimer:
11
+ * The merchant is entitled to change de ICEPAY plug-in code,
12
+ * any changes will be at merchant's own risk.
13
+ * Requesting ICEPAY support for a modified plug-in will be
14
+ * charged in accordance with the standard ICEPAY tariffs.
15
+ *
16
+ */
17
+ class Icepay_IceAdvanced_Model_Webservice_Refund extends Icepay_IceCore_Model_Webservice_Core {
18
+
19
+ protected $serviceURL = 'https://connect.icepay.com/webservice/refund.svc?wsdl';
20
+
21
+ /**
22
+ * Request a full or partial refund
23
+ *
24
+ * @param int $paymentID
25
+ * @param int $refundAmount
26
+ * @param string $refundCurrency
27
+ *
28
+ * @since 1.0.0
29
+ * @return array
30
+ */
31
+ public function requestRefund($paymentID, $refundAmount, $refundCurrency)
32
+ {
33
+ $obj = new stdClass();
34
+
35
+ // Must be in specific order for checksum --
36
+ $obj->Secret = $this->getSecretCode();
37
+ $obj->MerchantID = $this->getMerchantID();
38
+ $obj->Timestamp = $this->getTimeStamp();
39
+ $obj->PaymentID = $paymentID;
40
+ $obj->RefundAmount = $refundAmount;
41
+ $obj->RefundCurrency = $refundCurrency;
42
+
43
+ // Generate Checksum
44
+ $obj->Checksum = $this->generateChecksum($obj);
45
+
46
+ // Ask for getPaymentRefunds and get response
47
+ $result = $this->client->requestRefund($obj);
48
+
49
+ return (array) $result->RequestRefundResult;
50
+ }
51
+ }
52
+
app/code/community/Icepay/IceAdvanced/controllers/AjaxController.php CHANGED
@@ -13,50 +13,54 @@
13
  * charged in accordance with the standard ICEPAY tariffs.
14
  *
15
  */
16
-
17
  class Icepay_IceAdvanced_AjaxController extends Mage_Adminhtml_Controller_Action {
18
 
19
  protected $webservice = null;
20
 
21
- public function iceWebservice() {
22
- if ($this->webservice == null) $this->webservice = new Icepay_IceAdvanced_Model_Paymentmethods();
 
 
23
  return $this->webservice;
24
  }
25
 
26
- public function indexAction() {
 
27
  $this->loadLayout();
28
  $this->renderLayout();
29
  }
30
 
31
- public function get_paymentmethodsAction() {
 
32
  $this->getResponse()->setBody(Zend_Json::encode($this->iceWebservice()->retrieveAdminGrid($this->getRequest()->get("store"))));
33
  }
34
-
35
- public function save_paymentmethodAction() {
36
-
 
37
  $adv_sql = Mage::getSingleton('iceadvanced/mysql4_iceAdvanced');
38
-
39
  $reference = $this->getRequest()->getPost("reference");
40
  $scopeID = $this->getRequest()->getPost("store");
41
 
42
- if (!isset($reference)) return;
43
-
 
44
  $adv_sql->setScope($scopeID);
45
-
46
  $settings = Mage::helper("iceadvanced")->getPaymentmethodExtraSettings();
47
-
48
- if ($this->getRequest()->getPost("active_issuers")){
49
- $issuers = explode(",",$this->getRequest()->getPost("active_issuers"));
50
- if (count($issuers) >= 1) array_push($settings, "active_issuers"); //At least 1 issuer active is required
 
51
  };
52
-
53
  foreach ($settings as $setting) {
54
  $adv_sql->saveConfigValue($reference, $setting, $this->getRequest()->getPost($setting));
55
  }
56
 
57
- $this->getResponse()->setBody(sprintf($this->__("%s settings have been saved."),$this->getRequest()->getPost("name")));
58
  }
59
-
60
-
61
 
62
  }
13
  * charged in accordance with the standard ICEPAY tariffs.
14
  *
15
  */
 
16
  class Icepay_IceAdvanced_AjaxController extends Mage_Adminhtml_Controller_Action {
17
 
18
  protected $webservice = null;
19
 
20
+ public function iceWebservice()
21
+ {
22
+ if ($this->webservice == null)
23
+ $this->webservice = new Icepay_IceAdvanced_Model_Paymentmethods();
24
  return $this->webservice;
25
  }
26
 
27
+ public function indexAction()
28
+ {
29
  $this->loadLayout();
30
  $this->renderLayout();
31
  }
32
 
33
+ public function get_paymentmethodsAction()
34
+ {
35
  $this->getResponse()->setBody(Zend_Json::encode($this->iceWebservice()->retrieveAdminGrid($this->getRequest()->get("store"))));
36
  }
37
+
38
+ public function save_paymentmethodAction()
39
+ {
40
+
41
  $adv_sql = Mage::getSingleton('iceadvanced/mysql4_iceAdvanced');
42
+
43
  $reference = $this->getRequest()->getPost("reference");
44
  $scopeID = $this->getRequest()->getPost("store");
45
 
46
+ if (!isset($reference))
47
+ return;
48
+
49
  $adv_sql->setScope($scopeID);
50
+
51
  $settings = Mage::helper("iceadvanced")->getPaymentmethodExtraSettings();
52
+
53
+ if ($this->getRequest()->getPost("active_issuers")) {
54
+ $issuers = explode(",", $this->getRequest()->getPost("active_issuers"));
55
+ if (count($issuers) >= 1)
56
+ array_push($settings, "active_issuers"); //At least 1 issuer active is required
57
  };
58
+
59
  foreach ($settings as $setting) {
60
  $adv_sql->saveConfigValue($reference, $setting, $this->getRequest()->getPost($setting));
61
  }
62
 
63
+ $this->getResponse()->setBody(sprintf($this->__("%s settings have been saved."), $this->getRequest()->getPost("name")));
64
  }
 
 
65
 
66
  }
app/code/community/Icepay/IceAdvanced/controllers/ProcessingController.php CHANGED
@@ -25,7 +25,7 @@ class Icepay_IceAdvanced_ProcessingController extends Mage_Core_Controller_Front
25
  {
26
  $pay = Mage::getModel('iceadvanced/pay');
27
  $result = $pay->getCheckoutResult();
28
-
29
  if (!is_array($result)) {
30
  Mage::getSingleton('checkout/session')->setErrorMessage(sprintf($this->__("The payment provider has returned the following error message: %s"), $result));
31
  parent::_redirect('checkout/onepage/failure');
25
  {
26
  $pay = Mage::getModel('iceadvanced/pay');
27
  $result = $pay->getCheckoutResult();
28
+
29
  if (!is_array($result)) {
30
  Mage::getSingleton('checkout/session')->setErrorMessage(sprintf($this->__("The payment provider has returned the following error message: %s"), $result));
31
  parent::_redirect('checkout/onepage/failure');
app/code/community/Icepay/IceAdvanced/etc/config.xml CHANGED
@@ -33,15 +33,15 @@
33
  </modules>
34
  </translate>
35
  <events>
36
- <sales_quote_collect_totals_after>
37
  <observers>
38
  <iceadvanced>
39
  <type>singleton</type>
40
  <class>iceadvanced/observer</class>
41
- <method>sales_quote_collect_totals_after</method>
42
  </iceadvanced>
43
  </observers>
44
- </sales_quote_collect_totals_after>
45
  <custom_quote_process>
46
  <observers>
47
  <iceadvanced>
33
  </modules>
34
  </translate>
35
  <events>
36
+ <sales_order_place_before>
37
  <observers>
38
  <iceadvanced>
39
  <type>singleton</type>
40
  <class>iceadvanced/observer</class>
41
+ <method>sales_order_place_before</method>
42
  </iceadvanced>
43
  </observers>
44
+ </sales_order_place_before>
45
  <custom_quote_process>
46
  <observers>
47
  <iceadvanced>
app/code/community/Icepay/IceCore/Helper/Data.php CHANGED
@@ -17,11 +17,11 @@ class Icepay_IceCore_Helper_Data extends Mage_Core_Helper_Abstract {
17
  /* Install values */
18
 
19
  public $title = "Core";
20
- public $version = "1.1.10";
21
  public $id = "003";
22
  public $fingerprint = "003";
23
  public $compatibility_oldest_version = "1.5.0.0";
24
- public $compatibility_latest_version = "1.7.0.2";
25
  public $section = "icecore";
26
  public $serial_required = "0";
27
  public $imageDir = "adminhtml/default/default/icepay/images/";
17
  /* Install values */
18
 
19
  public $title = "Core";
20
+ public $version = "1.2.0";
21
  public $id = "003";
22
  public $fingerprint = "003";
23
  public $compatibility_oldest_version = "1.5.0.0";
24
+ public $compatibility_latest_version = "1.8.0.0";
25
  public $section = "icecore";
26
  public $serial_required = "0";
27
  public $imageDir = "adminhtml/default/default/icepay/images/";
app/code/community/Icepay/IceCore/Model/Config.php CHANGED
@@ -22,6 +22,7 @@ class Icepay_IceCore_Model_Config
22
  const SECRETCODE = "icecore/settings/merchant_secret";
23
  const TRANSDESCR = "icecore/core_options/transaction_descr";
24
  const AUTOINVOICE = "icecore/core_options/order_autoinvoice";
 
25
 
26
  const STATUS_NEW = "NEW";
27
  const STATUS_OPEN = "OPEN";
22
  const SECRETCODE = "icecore/settings/merchant_secret";
23
  const TRANSDESCR = "icecore/core_options/transaction_descr";
24
  const AUTOINVOICE = "icecore/core_options/order_autoinvoice";
25
+ const AUTOREFUND = "icecore/core_options/order_autorefund";
26
 
27
  const STATUS_NEW = "NEW";
28
  const STATUS_OPEN = "OPEN";
app/code/community/Icepay/IceCore/Model/Webservice/Core.php CHANGED
@@ -3,7 +3,7 @@
3
  /**
4
  * ICEPAY - Webservice Core Model
5
  *
6
- * @version 1.0.0
7
  * @author Wouter van Tilburg <wouter@icepay.eu>
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
@@ -26,6 +26,7 @@ class Icepay_IceCore_Model_Webservice_Core {
26
  *
27
  * @param int $merchantID
28
  * @param string $secretCode
 
29
  * @since 1.0.0
30
  */
31
  public function init($merchantID, $secretCode)
@@ -36,9 +37,32 @@ class Icepay_IceCore_Model_Webservice_Core {
36
  $this->client = new SoapClient($this->serviceURL, array('cache_wsdl' => 'WSDL_CACHE_NONE', 'encoding' => 'UTF-8'));
37
  }
38
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
39
  /**
40
  * Return the user IP address
41
  *
 
42
  * @return string
43
  */
44
  protected function getIP()
@@ -49,7 +73,7 @@ class Icepay_IceCore_Model_Webservice_Core {
49
  /**
50
  * Return the current timestamp
51
  *
52
- * @since 1.0.0
53
  * @return type
54
  */
55
  protected function getTimestamp()
@@ -62,6 +86,8 @@ class Icepay_IceCore_Model_Webservice_Core {
62
  *
63
  * @param object $obj
64
  * @param string $secretCode
 
 
65
  * @return string
66
  */
67
  protected function generateChecksum($obj = null, $secretCode = null)
3
  /**
4
  * ICEPAY - Webservice Core Model
5
  *
6
+ * @version 1.0.1
7
  * @author Wouter van Tilburg <wouter@icepay.eu>
8
  * @copyright ICEPAY <www.icepay.com>
9
  *
26
  *
27
  * @param int $merchantID
28
  * @param string $secretCode
29
+ *
30
  * @since 1.0.0
31
  */
32
  public function init($merchantID, $secretCode)
37
  $this->client = new SoapClient($this->serviceURL, array('cache_wsdl' => 'WSDL_CACHE_NONE', 'encoding' => 'UTF-8'));
38
  }
39
 
40
+ /**
41
+ * Return Merchant ID
42
+ *
43
+ * @since 1.0.1
44
+ * @return string
45
+ */
46
+ public function getMerchantID()
47
+ {
48
+ return $this->merchantID;
49
+ }
50
+
51
+ /**
52
+ * Return SecretCode
53
+ *
54
+ * @since 1.0.1
55
+ * @return string
56
+ */
57
+ public function getSecretCode()
58
+ {
59
+ return $this->secretCode;
60
+ }
61
+
62
  /**
63
  * Return the user IP address
64
  *
65
+ * @since 1.0.0
66
  * @return string
67
  */
68
  protected function getIP()
73
  /**
74
  * Return the current timestamp
75
  *
76
+ * @since 1.0.0
77
  * @return type
78
  */
79
  protected function getTimestamp()
86
  *
87
  * @param object $obj
88
  * @param string $secretCode
89
+ *
90
+ * @since 1.0.0
91
  * @return string
92
  */
93
  protected function generateChecksum($obj = null, $secretCode = null)
app/code/community/Icepay/IceCore/etc/system.xml CHANGED
@@ -144,6 +144,16 @@
144
  <show_in_website>0</show_in_website>
145
  <show_in_store>1</show_in_store>
146
  <fields>
 
 
 
 
 
 
 
 
 
 
147
  <order_autoinvoice translate="label">
148
  <label>Auto invoice</label>
149
  <comment>Have Magento create the invoice automatically when payment has been completed.</comment>
@@ -159,7 +169,7 @@
159
  <comment>Some payment methods allow customized descriptions on the transaction statement. If left empty the Magento Order ID is used. (Max 100 char.)</comment>
160
  <frontend_type>text</frontend_type>
161
  <validate>validate-length maximum-length-99</validate>
162
- <sort_order>40</sort_order>
163
  <show_in_default>1</show_in_default>
164
  <show_in_website>0</show_in_website>
165
  <show_in_store>1</show_in_store>
@@ -168,7 +178,7 @@
168
  <label>(Optional) Custom IP Range for IP Check for Postbackk</label>
169
  <comment>For example a proxy: 1.222.333.444-100.222.333.444 For multiple ranges use a , seperator: 2.2.2.2-5.5.5.5,8.8.8.8-9.9.9.9</comment>
170
  <frontend_type>text</frontend_type>
171
- <sort_order>60</sort_order>
172
  <show_in_default>1</show_in_default>
173
  <show_in_website>0</show_in_website>
174
  <show_in_store>1</show_in_store>
144
  <show_in_website>0</show_in_website>
145
  <show_in_store>1</show_in_store>
146
  <fields>
147
+ <order_autorefund translate="label">
148
+ <label>Auto refund</label>
149
+ <comment>Have Magento refund the ICEPAY transaction online when creating a credit memo.</comment>
150
+ <frontend_type>select</frontend_type>
151
+ <source_model>adminhtml/system_config_source_yesno</source_model>
152
+ <sort_order>10</sort_order>
153
+ <show_in_default>1</show_in_default>
154
+ <show_in_website>0</show_in_website>
155
+ <show_in_store>1</show_in_store>
156
+ </order_autorefund>
157
  <order_autoinvoice translate="label">
158
  <label>Auto invoice</label>
159
  <comment>Have Magento create the invoice automatically when payment has been completed.</comment>
169
  <comment>Some payment methods allow customized descriptions on the transaction statement. If left empty the Magento Order ID is used. (Max 100 char.)</comment>
170
  <frontend_type>text</frontend_type>
171
  <validate>validate-length maximum-length-99</validate>
172
+ <sort_order>30</sort_order>
173
  <show_in_default>1</show_in_default>
174
  <show_in_website>0</show_in_website>
175
  <show_in_store>1</show_in_store>
178
  <label>(Optional) Custom IP Range for IP Check for Postbackk</label>
179
  <comment>For example a proxy: 1.222.333.444-100.222.333.444 For multiple ranges use a , seperator: 2.2.2.2-5.5.5.5,8.8.8.8-9.9.9.9</comment>
180
  <frontend_type>text</frontend_type>
181
+ <sort_order>40</sort_order>
182
  <show_in_default>1</show_in_default>
183
  <show_in_website>0</show_in_website>
184
  <show_in_store>1</show_in_store>
app/locale/en_US/Icepay_IceAdvanced.csv CHANGED
@@ -30,3 +30,9 @@
30
  "Please select an issuer","Please select an issuer"
31
  "Please select a country","Please select a country"
32
 
 
 
 
 
 
 
30
  "Please select an issuer","Please select an issuer"
31
  "Please select a country","Please select a country"
32
 
33
+ /*frontend-errors*/
34
+ "It seems your billing address is incorrect, please confirm the postal code.", "It seems your billing address is incorrect, please confirm the postal code."
35
+ "It seems your billing address is incorrect, please confirm the phonenumber.", "It seems your billing address is incorrect, please confirm the phonenumber."
36
+ "It seems your billing address is incorrect, please confirm the street and housenumber.", "It seems your billing address is incorrect, please confirm the street and housenumber."
37
+ "It seems your shipping address is incorrect, please confirm the street and housenumber.", "It seems your shipping address is incorrect, please confirm the street and housenumber."
38
+
app/locale/en_US/Icepay_IceCore.csv CHANGED
@@ -25,8 +25,8 @@
25
  "This configuration section is for implementing ICEPAY, please do not change these settings after saving.","This configuration section is for linking to your <a href="https://www.icepay.com/EN/Login?origin=magento_admin" target="blank">ICEPAY Merchant website</a>, please do not change these settings after saving."
26
  "Configuration Information","Configuration Information"
27
  "This is an overview of installed ICEPAY modules",""
28
- "Have Magento create the invoice automatically when payment has been completed.",""
29
-
30
  /*notifications*/
31
  "Merchant ID is properly configured","Merchant ID is properly configured"
32
  "Merchant ID not set for this storeview","Merchant ID not set for this storeview"
25
  "This configuration section is for implementing ICEPAY, please do not change these settings after saving.","This configuration section is for linking to your <a href="https://www.icepay.com/EN/Login?origin=magento_admin" target="blank">ICEPAY Merchant website</a>, please do not change these settings after saving."
26
  "Configuration Information","Configuration Information"
27
  "This is an overview of installed ICEPAY modules",""
28
+ "Have Magento create the invoice automatically when payment has been completed.","Have Magento create the invoice automatically when payment has been completed."
29
+ "Have Magento refund the ICEPAY transaction online when creating a credit memo.", "Have Magento refund the ICEPAY transaction online when creating a credit memo."
30
  /*notifications*/
31
  "Merchant ID is properly configured","Merchant ID is properly configured"
32
  "Merchant ID not set for this storeview","Merchant ID not set for this storeview"
app/locale/nl_NL/Icepay_IceAdvanced.csv CHANGED
@@ -1,31 +1,37 @@
1
  /*adminhtml*/
2
- "Paymentmethods,""Betaalmethoden"""
3
- "Filter paymentmethods on customer billing country,""Filter de betaalmethoden op het betaaladres van de klant"""
4
- "Configure ICEPAY paymentmethods [STORE VIEW],""Configureer ICEPAY Betaalmethoden, dit kunt u doen per Store View (winkel overzicht)"""
5
- "SOAP webservices available,""SOAP webservices zijn beschikbaar"""
6
- "SOAP was not found on this server,""SOAP is niet gevonden op deze server"""
7
- "%s paymentmethods in database,""%s betaalmethoden in database"""
8
- "%s paymentmethods stored for this Store view,""%s betaalmethoden opgeslagen voor dit winkel overzicht"""
9
- "%s paymentmethods stored in Default settings,""%s betaalmethoden opgeslagen bij de standaard instellingen"""
10
- "No active paymentmethods found,""Geen betaalmethoden gevonden"""
11
- "SOAP connection established,""SOAP connectie gemaakt"""
12
- "%s active paymentmethods found,""%s actieve betaalmethoden gevonden"""
13
- "Configure,""Instellen"""
14
- "Title,""Titel"""
15
- "Settings,""Instellingen"""
16
- "Settings for,""Instellingen voor"""
17
- "Sort order,""Sorteer volgorde"""
18
- "Get paymentmethods,""Haal de betaalmethoden op"""
19
- "Paymentmethod,""Betaalmethode"""
20
- "Save Config to configure,""Sla de wijzigingen op om de betaalmethode verder in te stellen"""
21
- "Please read the advanced manual,""<a href=""http://www.icepay.com/downloads/pdf/manuals/magento/icepay-manual-magento-advanced.pdf"" target=""blank"" class=""btn-manual""></a> <a href=""http://www.icepay.nl/webshop-modules/ideal-voor-magento-advanced"" target=""blank"" class=""btn-movie""></a><BR/><BR/><BR/><span class=""manual-comment"">Heeft u hulp nodig bij het instellen? Raadpleeg onze handleiding of installatie video.</span>"
22
- "Some payment methods allow customized descriptions on the transaction statement. If left empty the Magento Order ID is used. (Max 100 char.),""Enkele betaalmethoden ondersteunen een omschrijving in het transactie overzicht van de klant. Indien leeg gelaten wordt het Magento Bestel ID gebruikt."""
23
- "Description displayed in checkout,""Omschrijving tijdens het afrekenen."""
24
- "Save settings,""Instellingen opslaan"""
25
- "Cancel,""Annuleer"""
26
- "Use CTRL to activate/deactivate specific issuers,""Gebruik CTRL om specifieke issuers aan- of uit te schakelen. Minimaal 1 issuer dient geselecteerd te zijn."""
27
- "Use CTRL to select specific countries,""Gebruik CTRL om specifieke landen te selecteren."""
28
 
29
  /*frontend*/
30
- "Please select an issuer,""Maak uw keuze"""
31
- "Please select a country,""Maak uw keuze uit"""
 
 
 
 
 
 
1
  /*adminhtml*/
2
+ "Paymentmethods,"Betaalmethoden"
3
+ "Filter paymentmethods on customer billing country,"Filter de betaalmethoden op het betaaladres van de klant"
4
+ "Configure ICEPAY paymentmethods [STORE VIEW],"Configureer ICEPAY Betaalmethoden, dit kunt u doen per Store View (winkel overzicht)"
5
+ "SOAP webservices available,"SOAP webservices zijn beschikbaar"
6
+ "SOAP was not found on this server,"SOAP is niet gevonden op deze server"
7
+ "%s paymentmethods in database,"%s betaalmethoden in database"
8
+ "%s paymentmethods stored for this Store view,"%s betaalmethoden opgeslagen voor dit winkel overzicht"
9
+ "%s paymentmethods stored in Default settings,"%s betaalmethoden opgeslagen bij de standaard instellingen"
10
+ "No active paymentmethods found,"Geen betaalmethoden gevonden"
11
+ "SOAP connection established,"SOAP connectie gemaakt"
12
+ "%s active paymentmethods found,"%s actieve betaalmethoden gevonden"
13
+ "Configure,"Instellen"
14
+ "Title,"Titel"
15
+ "Settings,"Instellingen"
16
+ "Settings for,"Instellingen voor"
17
+ "Sort order,"Sorteer volgorde"
18
+ "Get paymentmethods,"Haal de betaalmethoden op"
19
+ "Paymentmethod,"Betaalmethode"
20
+ "Save Config to configure,"Sla de wijzigingen op om de betaalmethode verder in te stellen"
21
+ "Please read the advanced manual","<a href='http://www.icepay.com/downloads/pdf/manuals/magento/icepay-manual-magento-advanced.pdf' target="blank" class="btn-manual"></a> <a href="http://www.icepay.nl/webshop-modules/ideal-voor-magento-advanced" target="blank" class="btn-movie"></a><BR/><BR/><BR/><span class="manual-comment">Hulp nodig? Bekijk onze handleiding of installatie video!</span>
22
+ "Some payment methods allow customized descriptions on the transaction statement. If left empty the Magento Order ID is used. (Max 100 char.),"Enkele betaalmethoden ondersteunen een omschrijving in het transactie overzicht van de klant. Indien leeg gelaten wordt het Magento Bestel ID gebruikt."
23
+ "Description displayed in checkout,"Omschrijving tijdens het afrekenen."
24
+ "Save settings,"Instellingen opslaan"
25
+ "Cancel,"Annuleer"
26
+ "Use CTRL to activate/deactivate specific issuers,"Gebruik CTRL om specifieke issuers aan- of uit te schakelen. Minimaal 1 issuer dient geselecteerd te zijn."
27
+ "Use CTRL to select specific countries,"Gebruik CTRL om specifieke landen te selecteren."
28
 
29
  /*frontend*/
30
+ "Please select an issuer,"Maak uw keuze"
31
+ "Please select a country,"Maak uw keuze uit"
32
+
33
+ /*frontend-errors*/
34
+ "It seems your billing address is incorrect, please confirm the postal code.", "Het lijkt erop dat de postcode van uw factuuradres fout is."
35
+ "It seems your billing address is incorrect, please confirm the phonenumber.", "Het lijkt erop dat het telefoonnummber van uw factuuradres fout is."
36
+ "It seems your billing address is incorrect, please confirm the street and housenumber.", "Het lijkt erop dat de straat en/of het huisnummer van uw factuuradres fout is ingevuld."
37
+ "It seems your shipping address is incorrect, please confirm the street and housenumber.", "Het lijkt erop dat de straat en/of het huisnummer van uw verzendadres fout is ingevuld."
app/locale/nl_NL/Icepay_IceCore.csv CHANGED
@@ -17,15 +17,17 @@
17
  "URL for Postback/Notify","Postback URL"
18
  "Auto invoice","Automatische facturatie"
19
  "Description on transaction statement of customer","Omschrijving op het transactie overzicht van de klant"
20
- "Please read the core manual","<a href="http://www.icepay.com/downloads/pdf/manuals/magento/icepay-manual-magento-basic.pdf" target="blank" class="btn-manual"></a> <a href="http://www.icepay.nl/webshop-modules/ideal-voor-magento-basic" target="blank" class="btn-movie"></a><BR/><BR/><BR/><span class="manual-comment">Heeft u hulp nodig bij het instellen? Raadpleeg onze handleiding of installatie video.</span>
21
 
22
  /*comments*/
23
  "Step 1.","Stap 1."
24
  "Step 2.","Stap 2."
25
- "This configuration section is for implementing ICEPAY, please do not change these settings after saving.","Deze configuratie is voor het koppelen aan uw <a href="https://www.icepay.com/NL/Login?origin=magento_admin" target="blank">ICEPAY Merchant website</a>. Pas deze instellingen niet meer aan nadat alles correct is opgeslagen."
26
  "Configuration Information","Informatie over de configuratie"
27
  "This is an overview of installed ICEPAY modules",""
28
- "Have Magento create the invoice automatically when payment has been completed.",""
 
 
29
 
30
  /*notifications*/
31
  "Merchant ID is properly configured","Merchant ID is goed ingesteld"
17
  "URL for Postback/Notify","Postback URL"
18
  "Auto invoice","Automatische facturatie"
19
  "Description on transaction statement of customer","Omschrijving op het transactie overzicht van de klant"
20
+ "Please read the core manual","<a href='http://www.icepay.com/downloads/pdf/manuals/magento/icepay-manual-magento-basic.pdf' target='blank' class='btn-manual'></a> <a href='http://www.icepay.nl/webshop-modules/ideal-voor-magento-basic" target='blank" class='btn-movie'></a><BR/><BR/><BR/><span class='manual-comment'>Heeft u hulp nodig bij het instellen? Raadpleeg onze handleiding of installatie video.</span>
21
 
22
  /*comments*/
23
  "Step 1.","Stap 1."
24
  "Step 2.","Stap 2."
25
+ "This configuration section is for implementing ICEPAY, please do not change these settings after saving.","Deze configuratie is voor het koppelen aan uw <a href='https://www.icepay.com/NL/Login?origin=magento_admin' target='blank'>ICEPAY Merchant website</a>. Pas deze instellingen niet meer aan nadat alles correct is opgeslagen."
26
  "Configuration Information","Informatie over de configuratie"
27
  "This is an overview of installed ICEPAY modules",""
28
+ "Have Magento create the invoice automatically when payment has been completed.","Have Magento create the invoice automatically when payment has been completed."
29
+ "Have Magento refund the ICEPAY transaction online when creating a credit memo.", "Have Magento refund the ICEPAY transaction online when creating a credit memo."
30
+
31
 
32
  /*notifications*/
33
  "Merchant ID is properly configured","Merchant ID is goed ingesteld"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Icepay_IceAdvanced</name>
4
- <version>1.1.10</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
@@ -11,17 +11,17 @@ www.icepay.com</summary>
11
  <description>Enables payments using payment service provider ICEPAY.&#xD;
12
  The Advanced extension includes webservice support&#xD;
13
  </description>
14
- <notes>Bug Fixes:&#xD;
15
- - Refunded orders now receive the 'on hold' state instead of being locked.&#xD;
16
- - Cart is no longer empty when cancelling an order.&#xD;
17
- - Crossdomain configuration has been fixed.&#xD;
18
  &#xD;
19
- Enhancements:&#xD;
20
- - Compatible with the Multifees extension from MageWorx</notes>
21
  <authors><author><name>ICEPAY</name><user>ICEPAY_PSP</user><email>wouter.vantilburg@icepay.com</email></author><author><name>Wouter van Tilburg</name><user>wvantilburg</user><email>wouter@icepay.eu</email></author></authors>
22
- <date>2013-09-23</date>
23
- <time>12:17:08</time>
24
- <contents><target name="mageetc"><dir name="modules"><file name="Icepay_IceCore.xml" hash="268e777c318f1cd6258a56c3049ac678"/><file name="Icepay_IceAdvanced.xml" hash="069d0a2d2c7a34e366bc2b79483cd2b4"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Icepay_IceCore.csv" hash="9092007f82d233320603de2e60e411ea"/><file name="Icepay_IceAdvanced.csv" hash="5f22cd45bb0f95e01cd8bcfa0b20420c"/></dir><dir name="nl_NL"><file name="Icepay_IceCore.csv" hash="becf356de17d63f4cd237e03b1d704e8"/><file name="Icepay_IceAdvanced.csv" hash="5d1d00bd9add8b1fcb61cd10ee5fa2af"/></dir><dir name="de_DE"><file name="Icepay_IceAdvanced.csv" hash="3cae75009684ac7a1b4afb6667d6a477"/><file name="Icepay_IceCore.csv" hash="e8ad59c02f83d67b31e7bbef3ede043e"/></dir><dir name="es_ES"><file name="Icepay_IceAdvanced.csv" hash="f469c13d48a7361d0346fd29181c8370"/><file name="Icepay_IceCore.csv" hash="fa46bf1feedc31495401dfab9e4232d6"/></dir><dir name="fr_FR"><file name="Icepay_IceAdvanced.csv" hash="66ae26a1d9f20009878f19673d2d67b0"/><file name="Icepay_IceCore.csv" hash="5191576073b592b4285a983cc7fd17dc"/></dir><dir name="it_IT"><file name="Icepay_IceAdvanced.csv" hash="114d8290130a9f090efe210484eff1b9"/><file name="Icepay_IceCore.csv" hash="351fdc02d699cf65d763da8a44479f42"/></dir></target><target name="magecommunity"><dir name="Icepay"><dir name="IceCore"><dir><dir name="Block"><dir name="Adminhtml"><file name="CheckSettings.php" hash="1e37aaa21895b1536895d4b2f2063061"/><file name="GenerateURL.php" hash="6582848f5a1f7145baa398a1b8f0ccbd"/><dir name="Grid"><file name="Modules.php" hash="7e9bb7382c7f7052cce2f4959472cc87"/></dir><file name="Init.php" hash="16ee74a19916ce9f788d75c755d31a65"/></dir><dir name="Front"><file name="Statement.php" hash="85ee089622ff4a3bc15d08f0a2e80813"/><file name="Template.php" hash="06eb31a4a51dc6ee7143d6c8866131d6"/></dir></dir><dir name="Helper"><file name="Data.php" hash="e4c54519d0fa959cd4330f02020e2dd4"/></dir><dir name="Model"><file name="Config.php" hash="952b1621e8df054150a357b11f4af177"/><dir name="Icepay"><file name="Postback.php" hash="1ae0a88d9fba18470116d908097a88ea"/><file name="Result.php" hash="0ee6c3d80483312f9bd1743dbe52b7e2"/></dir><dir name="Mysql4"><file name="IceCore.php" hash="9d15c849be80cdb93075b4f7c15feb2d"/></dir><dir name="Webservice"><file name="Core.php" hash="04f8f3b25765e711a59b4bbbcd39c706"/></dir></dir><dir name="controllers"><file name="AboutController.php" hash="9ca5a652dbf27e57cc7bbcb7ed073e1b"/><file name="CheckController.php" hash="901adc45f9c44fa5b1a11dd36eb025d1"/><file name="IndexController.php" hash="01d74f3579ebf469788ee6e7e41d7b21"/><file name="ProcessingController.php" hash="4cbedbf49193562e9739b0a3d00b3dda"/></dir><dir name="etc"><file name="config.xml" hash="2071cc4fdc92ba6bb586b64d36165759"/><file name="system.xml" hash="424dcd8ca64f304c871326b749e0cc0f"/></dir><dir name="sql"><dir name="icepaycore_setup"><file name="mysql4-install-1.0.0.php" hash="bc37063c45b48e52a7e12584daf82aef"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="b1b1dfd41f1aff682dcf34fb544e922e"/></dir></dir></dir></dir><dir name="IceAdvanced"><dir><dir name="Block"><dir name="Adminhtml"><file name="CheckSettings.php" hash="1e9e08f5414b22dd84557ade567aba48"/><dir name="Grid"><file name="Paymentmethods.php" hash="9c1c2d535f17108128cf553119a931a5"/></dir><dir name="Setting"><file name="Paymentmethod.php" hash="dc5548c4bfde0375c3431d8d9972da1f"/></dir></dir><dir name="Payment"><dir name="Form"><file name="Default.php" hash="f96542cd1e5f13f3639ddc93b9c0172c"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="1d0189d3e01750827d0de4fc78492307"/></dir><dir name="Model"><dir name="Checkout"><file name="PaymentObject.php" hash="8cee8b70324b37453d6263d209dd5fe3"/><dir name="Placeholder"><file name="Paymentmethod01.php" hash="b825da0ac49ce5fba409116b2a46bf4f"/><file name="Paymentmethod02.php" hash="202eac322f5cd2df65034476d3e87dd5"/><file name="Paymentmethod03.php" hash="1f193436b77bed331837ab64d148c977"/><file name="Paymentmethod04.php" hash="3d4775f70070381a492b7207fce0d606"/><file name="Paymentmethod05.php" hash="16f86a94192131bddd0f078501c277d2"/><file name="Paymentmethod06.php" hash="113c6788b168790700d2baacbdbcb20c"/><file name="Paymentmethod07.php" hash="50635324e7913f864af6a32a65e299bb"/><file name="Paymentmethod08.php" hash="dba0bf1fb39667ff4b94dcea6821d372"/><file name="Paymentmethod09.php" hash="0029e9dcbb989ac4c6ae686b5d2db262"/><file name="Paymentmethod10.php" hash="94ff83c6d23c879f27c958de595bff3b"/><file name="Paymentmethod11.php" hash="4725cefbb4cdc69d12961853b4c00d13"/><file name="Paymentmethod12.php" hash="b82d7e8830a7b22f942496614d84f2ed"/><file name="Paymentmethod13.php" hash="43f18f4948afc2f7613b3ad47baa2577"/><file name="Paymentmethod14.php" hash="a04a63494d6e4df283049abfe35f57f8"/><file name="Paymentmethod15.php" hash="a5d02861c4668c74492b1865d471afdf"/><file name="Paymentmethod16.php" hash="a9d90c5414e27f814aa7b1ff1e212682"/><file name="Paymentmethod17.php" hash="e55127cbf73fecbb8ec66848f300c414"/><file name="Paymentmethod18.php" hash="388c76235c1c35a97ab8893d1f672807"/><file name="Paymentmethod19.php" hash="454f5142fb3e17152c137a052e13294c"/><file name="Paymentmethod20.php" hash="638b60e75678908fc92df8b1469a2500"/></dir><file name="Standard.php" hash="1b1fc9e469da666c3e778027c28e04ec"/></dir><dir name="Extensions"><dir name="MS"><file name="Customerreward.php" hash="e39bc48c00621f299b83d012cc0d9464"/></dir><dir name="MW"><file name="GiftWrap.php" hash="49e31b11e5ec1d6669ba67efe7c073ae"/></dir><dir name="MageWorx"><file name="MultiFees.php" hash="e40642173c9779217b9e1d8429e30ffa"/></dir></dir><dir name="Mysql4"><file name="IceAdvanced.php" hash="c519845e581a84aaaef93a7901ba5570"/></dir><file name="Observer.php" hash="965e55259b793fc60f95e96003ec06df"/><file name="Order.php" hash="a7f88e2e19ced7081b1e7a426d420fbf"/><file name="Pay.php" hash="7798eb00117c6a464c27524075e52b34"/><file name="Paymentmethods.php" hash="9a4ea214394e1813609ee4166f2e0b98"/><dir name="Webservice"><file name="Advanced.php" hash="23cd1ca7bc75f28f7aaa50c27506f391"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="bf146cf2c715de9856d3d145819a1ac4"/><file name="ConfigController.php" hash="9be40c50c69981034a9787a1f2e005f1"/><file name="ProcessingController.php" hash="c73ee3217fe10bd0f86c189a60a05521"/></dir><dir name="etc"><file name="config.xml" hash="a1ae9a88cdddb660ca6e29a38e75be8c"/><file name="system.xml" hash="f930475b43e85496582d66c4a76a6ed9"/></dir><dir name="sql"><dir name="icepayadvanced_setup"><file name="mysql4-install-1.0.0.php" hash="f0b069a3503871e8221dc30441012e56"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="6c771822888f14d9679f6b4ab71719c0"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="icepay"><file name="icepay-logo.png" hash="155f2d4dd137423ccbc3d4037cf46d5f"/><file name="logo-currence.png" hash="fa37b87e496d9955ef455e96251bd434"/><file name="logo-thawte.png" hash="dcf93e2d0631b1e2853ce8380d80c125"/><file name="logo-thuiswinkel.png" hash="4a54a5f4e09988a4b16697fe54a462e7"/><file name="nologo.png" hash="72e977c925c8b6c70ff5fb69c0e054c8"/><dir name="nl"><file name="afterpay.png" hash="b9d37ce8c7daad7939f25d4f3f522d28"/><file name="creditcard.png" hash="1036251ede1a09299feecb75043d6e16"/><file name="ddebit.png" hash="2efd78c91a6558f0e5e71a4cdc6f82e4"/><file name="directebank.png" hash="70c2f9d0c6726b7b4b72b97437ed137b"/><file name="elv.png" hash="cdb571467e6e3f0718887ea5c6e9dc24"/><file name="giropay.png" hash="57167e2c98a48f3a24b1743e74f6158a"/><file name="icepay.png" hash="39a55d71460ccce2b65517ce40d3826a"/><file name="ideal.png" hash="fc18c3e422e4163afee4646623b2569b"/><file name="mistercash.png" hash="84164ec464031eb983cf971c93883291"/><file name="nologo.png" hash="59b4f3e8abf4cd51d1c5ab9f1a425999"/><file name="paypal.png" hash="944b54460b95c4842ce19982264e577d"/><file name="paysafecard.png" hash="23deaae36aa2cb0d7ef1c04804e30145"/><file name="wallie.png" hash="489236d8a7d678f355d6401a1f34dd5b"/><file name="wire.png" hash="63be6b74df1fc107d31e7830756ae39b"/></dir><dir name="en"><file name="afterpay.png" hash="b9d37ce8c7daad7939f25d4f3f522d28"/><file name="creditcard.png" hash="1036251ede1a09299feecb75043d6e16"/><file name="ddebit.png" hash="408f41a0650a204cadb791c3e1b0e1a1"/><file name="directebank.png" hash="65bea681edb8442463b96ca0a6d2f604"/><file name="elv.png" hash="cdb571467e6e3f0718887ea5c6e9dc24"/><file name="giropay.png" hash="57167e2c98a48f3a24b1743e74f6158a"/><file name="icepay.png" hash="39a55d71460ccce2b65517ce40d3826a"/><file name="ideal.png" hash="fc18c3e422e4163afee4646623b2569b"/><file name="mistercash.png" hash="84164ec464031eb983cf971c93883291"/><file name="nologo.png" hash="72e977c925c8b6c70ff5fb69c0e054c8"/><file name="paypal.png" hash="944b54460b95c4842ce19982264e577d"/><file name="paysafecard.png" hash="23deaae36aa2cb0d7ef1c04804e30145"/><file name="wallie.png" hash="489236d8a7d678f355d6401a1f34dd5b"/><file name="wire.png" hash="d61bac01ea81d71bebc03f484b883c12"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="icepay"><file name="admin.css" hash="773bb7d4f87f42214421960f4ccda8c3"/><file name="general.css" hash="25fbd45dc203dce3f6bf907135a9f841"/><dir name="images"><file name="icepay-logo.png" hash="584d79128e6df216e9f7304329158b56"/><file name="section-logo.png" hash="5242ece5dd1434831174ef7fba8c2c4a"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="button-manual.png" hash="7b708db3c8915897a4e3526389b7e3b2"/><file name="button-movie.png" hash="c164da277349322fcd4480ece39d6e00"/><dir name="nl"><file name="afterpay.png" hash="a3b02f6f3e53f548d58d2da794f4c900"/><file name="creditcard.png" hash="48a101cac247f07311ef3ccf1075092d"/><file name="ddebit.png" hash="89793240543046ce977a11eee9b99368"/><file name="directebank.png" hash="ec990be24336501593956872b5a69a0c"/><file name="elv.png" hash="af722d1a80025fbef18faf9baafe91e3"/><file name="giropay.png" hash="5e167cb8dbe05391b1ecceb02042a158"/><file name="ideal.png" hash="16ecbed935f5fb896620c1ec60d5fecd"/><file name="mistercash.png" hash="fe437531e8ea3160dd3ce7c22c6d1dd7"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="paypal.png" hash="4d28dd0b563dcffb4192b5fe54a43530"/><file name="paysafecard.png" hash="55a46938a74dbba9f8fa2c63e464ae98"/><file name="wallie.png" hash="643897c26a2ad7be40457bc1faafd591"/><file name="wire.png" hash="6027a80b16b699c299e748fc1f891b03"/></dir><dir name="en"><file name="afterpay.png" hash="a3b02f6f3e53f548d58d2da794f4c900"/><file name="creditcard.png" hash="a1f1758c0ed18c576daddfad4e287dcf"/><file name="ddebit.png" hash="8eaa9ca96554a065bba75f3a3c62c25b"/><file name="directebank.png" hash="ec990be24336501593956872b5a69a0c"/><file name="elv.png" hash="af722d1a80025fbef18faf9baafe91e3"/><file name="giropay.png" hash="abbc084008a2bc4692cee1e014e88e01"/><file name="ideal.png" hash="3ad4441b5e59613b07efad0b4c781812"/><file name="mistercash.png" hash="fe437531e8ea3160dd3ce7c22c6d1dd7"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="paypal.png" hash="db854b8832246666da38130f2d527331"/><file name="paysafecard.png" hash="d9fac94c828b6429641e74f027a6e23d"/><file name="wallie.png" hash="9bbc206f96bfeb2ec82a47d6ecbae4b9"/><file name="wire.png" hash="f602b0978725d2663fe69c93276cace0"/></dir></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="icecore.xml" hash="98b5a6c55a72ba244b21a5815ae0c4fc"/></dir><dir name="template"><dir name="icepaycore"><file name="grid_modules.phtml" hash="f113cfa6d561031bcd5a90f3a1fb48a0"/></dir><dir name="icepayadvanced"><dir><dir name="form"><file name="default.phtml" hash="fdf9eb2d5c4a5ef8f43f6e9d8090ebd4"/></dir></dir><file name="grid_paymentmethods.phtml" hash="28f608b5e8c373b912bd5826424de840"/><file name="paymentmethod.phtml" hash="28dfbb959013471567d2db769516cb18"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="icecore.xml" hash="96ed3cf67c702affdb8869e1a6c5d980"/></dir><dir name="template"><dir name="icepaycore"><dir><dir name="front"><file name="check.phtml" hash="ae5608fb727b2457af10c7bd9faee6d9"/><file name="statement.phtml" hash="7cc11055297c480e75b6f082c41bdaa6"/></dir></dir></dir><dir name="icepayadvanced"><dir><dir name="form"><file name="default.phtml" hash="fdf9eb2d5c4a5ef8f43f6e9d8090ebd4"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Icepay_IceAdvanced</name>
4
+ <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
11
  <description>Enables payments using payment service provider ICEPAY.&#xD;
12
  The Advanced extension includes webservice support&#xD;
13
  </description>
14
+ <notes>Enhancements:&#xD;
15
+ - Refund now possible from within Magento&#xD;
16
+ - Errors thrown during checkout now throw a 'Mage_Payment_Model_Info_Exception'&#xD;
17
+ - Errors thrown during checkout are now translated&#xD;
18
  &#xD;
19
+ Bug Fixes:&#xD;
20
+ - Applying tax 'after' or 'before' discount is now correctly calculated for Afterpay</notes>
21
  <authors><author><name>ICEPAY</name><user>ICEPAY_PSP</user><email>wouter.vantilburg@icepay.com</email></author><author><name>Wouter van Tilburg</name><user>wvantilburg</user><email>wouter@icepay.eu</email></author></authors>
22
+ <date>2013-11-11</date>
23
+ <time>09:49:33</time>
24
+ <contents><target name="mageetc"><dir name="modules"><file name="Icepay_IceCore.xml" hash="268e777c318f1cd6258a56c3049ac678"/><file name="Icepay_IceAdvanced.xml" hash="069d0a2d2c7a34e366bc2b79483cd2b4"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Icepay_IceCore.csv" hash="f3c72eb858a4bd643b177f573593b04f"/><file name="Icepay_IceAdvanced.csv" hash="a2d4d7a36cf4155161c1205a26ea577b"/></dir><dir name="nl_NL"><file name="Icepay_IceCore.csv" hash="36d5cfcd04c82e747ba0934db755904a"/><file name="Icepay_IceAdvanced.csv" hash="692d6675d44b308801dc8c08e7cbcdec"/></dir><dir name="de_DE"><file name="Icepay_IceAdvanced.csv" hash="3cae75009684ac7a1b4afb6667d6a477"/><file name="Icepay_IceCore.csv" hash="e8ad59c02f83d67b31e7bbef3ede043e"/></dir><dir name="es_ES"><file name="Icepay_IceAdvanced.csv" hash="f469c13d48a7361d0346fd29181c8370"/><file name="Icepay_IceCore.csv" hash="fa46bf1feedc31495401dfab9e4232d6"/></dir><dir name="fr_FR"><file name="Icepay_IceAdvanced.csv" hash="66ae26a1d9f20009878f19673d2d67b0"/><file name="Icepay_IceCore.csv" hash="5191576073b592b4285a983cc7fd17dc"/></dir><dir name="it_IT"><file name="Icepay_IceAdvanced.csv" hash="114d8290130a9f090efe210484eff1b9"/><file name="Icepay_IceCore.csv" hash="351fdc02d699cf65d763da8a44479f42"/></dir></target><target name="magecommunity"><dir name="Icepay"><dir name="IceCore"><dir><dir name="Block"><dir name="Adminhtml"><file name="CheckSettings.php" hash="1e37aaa21895b1536895d4b2f2063061"/><file name="GenerateURL.php" hash="6582848f5a1f7145baa398a1b8f0ccbd"/><dir name="Grid"><file name="Modules.php" hash="7e9bb7382c7f7052cce2f4959472cc87"/></dir><file name="Init.php" hash="16ee74a19916ce9f788d75c755d31a65"/></dir><dir name="Front"><file name="Statement.php" hash="85ee089622ff4a3bc15d08f0a2e80813"/><file name="Template.php" hash="06eb31a4a51dc6ee7143d6c8866131d6"/></dir></dir><dir name="Helper"><file name="Data.php" hash="7ee95002246c00a32578e211671376c7"/></dir><dir name="Model"><file name="Config.php" hash="206f04e34ba26c7c0c87a2abe6ca7c08"/><dir name="Icepay"><file name="Postback.php" hash="1ae0a88d9fba18470116d908097a88ea"/><file name="Result.php" hash="0ee6c3d80483312f9bd1743dbe52b7e2"/></dir><dir name="Mysql4"><file name="IceCore.php" hash="9d15c849be80cdb93075b4f7c15feb2d"/></dir><dir name="Webservice"><file name="Core.php" hash="cfeff8b9baedad96b8d408b2a84e3757"/></dir></dir><dir name="controllers"><file name="AboutController.php" hash="9ca5a652dbf27e57cc7bbcb7ed073e1b"/><file name="CheckController.php" hash="901adc45f9c44fa5b1a11dd36eb025d1"/><file name="IndexController.php" hash="01d74f3579ebf469788ee6e7e41d7b21"/><file name="ProcessingController.php" hash="4cbedbf49193562e9739b0a3d00b3dda"/></dir><dir name="etc"><file name="config.xml" hash="2071cc4fdc92ba6bb586b64d36165759"/><file name="system.xml" hash="9bb5708798e3f97bfdff31f37b7dba49"/></dir><dir name="sql"><dir name="icepaycore_setup"><file name="mysql4-install-1.0.0.php" hash="bc37063c45b48e52a7e12584daf82aef"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="b1b1dfd41f1aff682dcf34fb544e922e"/></dir></dir></dir></dir><dir name="IceAdvanced"><dir><dir name="Block"><dir name="Adminhtml"><file name="CheckSettings.php" hash="1e9e08f5414b22dd84557ade567aba48"/><dir name="Grid"><file name="Paymentmethods.php" hash="9c1c2d535f17108128cf553119a931a5"/></dir><dir name="Setting"><file name="Paymentmethod.php" hash="dc5548c4bfde0375c3431d8d9972da1f"/></dir></dir><dir name="Payment"><dir name="Form"><file name="Default.php" hash="f96542cd1e5f13f3639ddc93b9c0172c"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="f60c4b2ce81b73508f40cb20c69938cc"/></dir><dir name="Model"><dir name="Checkout"><file name="PaymentObject.php" hash="8cee8b70324b37453d6263d209dd5fe3"/><dir name="Placeholder"><file name="Paymentmethod01.php" hash="b825da0ac49ce5fba409116b2a46bf4f"/><file name="Paymentmethod02.php" hash="202eac322f5cd2df65034476d3e87dd5"/><file name="Paymentmethod03.php" hash="1f193436b77bed331837ab64d148c977"/><file name="Paymentmethod04.php" hash="3d4775f70070381a492b7207fce0d606"/><file name="Paymentmethod05.php" hash="16f86a94192131bddd0f078501c277d2"/><file name="Paymentmethod06.php" hash="113c6788b168790700d2baacbdbcb20c"/><file name="Paymentmethod07.php" hash="50635324e7913f864af6a32a65e299bb"/><file name="Paymentmethod08.php" hash="dba0bf1fb39667ff4b94dcea6821d372"/><file name="Paymentmethod09.php" hash="0029e9dcbb989ac4c6ae686b5d2db262"/><file name="Paymentmethod10.php" hash="94ff83c6d23c879f27c958de595bff3b"/><file name="Paymentmethod11.php" hash="4725cefbb4cdc69d12961853b4c00d13"/><file name="Paymentmethod12.php" hash="b82d7e8830a7b22f942496614d84f2ed"/><file name="Paymentmethod13.php" hash="43f18f4948afc2f7613b3ad47baa2577"/><file name="Paymentmethod14.php" hash="a04a63494d6e4df283049abfe35f57f8"/><file name="Paymentmethod15.php" hash="a5d02861c4668c74492b1865d471afdf"/><file name="Paymentmethod16.php" hash="a9d90c5414e27f814aa7b1ff1e212682"/><file name="Paymentmethod17.php" hash="e55127cbf73fecbb8ec66848f300c414"/><file name="Paymentmethod18.php" hash="388c76235c1c35a97ab8893d1f672807"/><file name="Paymentmethod19.php" hash="454f5142fb3e17152c137a052e13294c"/><file name="Paymentmethod20.php" hash="638b60e75678908fc92df8b1469a2500"/></dir><file name="Standard.php" hash="361402304e52324c913c30e656772b53"/></dir><dir name="Extensions"><dir name="MS"><file name="Customerreward.php" hash="e39bc48c00621f299b83d012cc0d9464"/></dir><dir name="MW"><file name="GiftWrap.php" hash="49e31b11e5ec1d6669ba67efe7c073ae"/></dir><dir name="MageWorx"><file name="MultiFees.php" hash="e40642173c9779217b9e1d8429e30ffa"/></dir></dir><dir name="Mysql4"><file name="IceAdvanced.php" hash="c519845e581a84aaaef93a7901ba5570"/></dir><file name="Observer.php" hash="0607cad8ce0b6d3146fd06feb647e1f9"/><file name="Order.php" hash="a7f88e2e19ced7081b1e7a426d420fbf"/><file name="Pay.php" hash="c64836f3691f6701bf57946d282ffc5d"/><file name="Paymentmethods.php" hash="9a4ea214394e1813609ee4166f2e0b98"/><dir name="Webservice"><file name="Advanced.php" hash="ab5824d6c57d2af9bb2709422cf1b7ca"/><file name="Refund.php" hash="13aa4224c32fb5680eb836bbdd65bbf0"/></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="c56ac36213d730d2ef6f4cde8870f5d3"/><file name="ConfigController.php" hash="9be40c50c69981034a9787a1f2e005f1"/><file name="ProcessingController.php" hash="0372267e60254f8e0c916f264b72b7cf"/></dir><dir name="etc"><file name="config.xml" hash="e9192f5dc4996b1770ef40b4526f4e17"/><file name="system.xml" hash="f930475b43e85496582d66c4a76a6ed9"/></dir><dir name="sql"><dir name="icepayadvanced_setup"><file name="mysql4-install-1.0.0.php" hash="f0b069a3503871e8221dc30441012e56"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="6c771822888f14d9679f6b4ab71719c0"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="icepay"><file name="icepay-logo.png" hash="155f2d4dd137423ccbc3d4037cf46d5f"/><file name="logo-currence.png" hash="fa37b87e496d9955ef455e96251bd434"/><file name="logo-thawte.png" hash="dcf93e2d0631b1e2853ce8380d80c125"/><file name="logo-thuiswinkel.png" hash="4a54a5f4e09988a4b16697fe54a462e7"/><file name="nologo.png" hash="72e977c925c8b6c70ff5fb69c0e054c8"/><dir name="nl"><file name="afterpay.png" hash="b9d37ce8c7daad7939f25d4f3f522d28"/><file name="creditcard.png" hash="1036251ede1a09299feecb75043d6e16"/><file name="ddebit.png" hash="2efd78c91a6558f0e5e71a4cdc6f82e4"/><file name="directebank.png" hash="70c2f9d0c6726b7b4b72b97437ed137b"/><file name="elv.png" hash="cdb571467e6e3f0718887ea5c6e9dc24"/><file name="giropay.png" hash="57167e2c98a48f3a24b1743e74f6158a"/><file name="icepay.png" hash="39a55d71460ccce2b65517ce40d3826a"/><file name="ideal.png" hash="fc18c3e422e4163afee4646623b2569b"/><file name="mistercash.png" hash="84164ec464031eb983cf971c93883291"/><file name="nologo.png" hash="59b4f3e8abf4cd51d1c5ab9f1a425999"/><file name="paypal.png" hash="944b54460b95c4842ce19982264e577d"/><file name="paysafecard.png" hash="23deaae36aa2cb0d7ef1c04804e30145"/><file name="wallie.png" hash="489236d8a7d678f355d6401a1f34dd5b"/><file name="wire.png" hash="63be6b74df1fc107d31e7830756ae39b"/></dir><dir name="en"><file name="afterpay.png" hash="b9d37ce8c7daad7939f25d4f3f522d28"/><file name="creditcard.png" hash="1036251ede1a09299feecb75043d6e16"/><file name="ddebit.png" hash="408f41a0650a204cadb791c3e1b0e1a1"/><file name="directebank.png" hash="65bea681edb8442463b96ca0a6d2f604"/><file name="elv.png" hash="cdb571467e6e3f0718887ea5c6e9dc24"/><file name="giropay.png" hash="57167e2c98a48f3a24b1743e74f6158a"/><file name="icepay.png" hash="39a55d71460ccce2b65517ce40d3826a"/><file name="ideal.png" hash="fc18c3e422e4163afee4646623b2569b"/><file name="mistercash.png" hash="84164ec464031eb983cf971c93883291"/><file name="nologo.png" hash="72e977c925c8b6c70ff5fb69c0e054c8"/><file name="paypal.png" hash="944b54460b95c4842ce19982264e577d"/><file name="paysafecard.png" hash="23deaae36aa2cb0d7ef1c04804e30145"/><file name="wallie.png" hash="489236d8a7d678f355d6401a1f34dd5b"/><file name="wire.png" hash="d61bac01ea81d71bebc03f484b883c12"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="icepay"><file name="admin.css" hash="773bb7d4f87f42214421960f4ccda8c3"/><file name="general.css" hash="25fbd45dc203dce3f6bf907135a9f841"/><dir name="images"><file name="icepay-logo.png" hash="584d79128e6df216e9f7304329158b56"/><file name="section-logo.png" hash="5242ece5dd1434831174ef7fba8c2c4a"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="button-manual.png" hash="7b708db3c8915897a4e3526389b7e3b2"/><file name="button-movie.png" hash="c164da277349322fcd4480ece39d6e00"/><dir name="nl"><file name="afterpay.png" hash="a3b02f6f3e53f548d58d2da794f4c900"/><file name="creditcard.png" hash="48a101cac247f07311ef3ccf1075092d"/><file name="ddebit.png" hash="89793240543046ce977a11eee9b99368"/><file name="directebank.png" hash="ec990be24336501593956872b5a69a0c"/><file name="elv.png" hash="af722d1a80025fbef18faf9baafe91e3"/><file name="giropay.png" hash="5e167cb8dbe05391b1ecceb02042a158"/><file name="ideal.png" hash="16ecbed935f5fb896620c1ec60d5fecd"/><file name="mistercash.png" hash="fe437531e8ea3160dd3ce7c22c6d1dd7"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="paypal.png" hash="4d28dd0b563dcffb4192b5fe54a43530"/><file name="paysafecard.png" hash="55a46938a74dbba9f8fa2c63e464ae98"/><file name="wallie.png" hash="643897c26a2ad7be40457bc1faafd591"/><file name="wire.png" hash="6027a80b16b699c299e748fc1f891b03"/></dir><dir name="en"><file name="afterpay.png" hash="a3b02f6f3e53f548d58d2da794f4c900"/><file name="creditcard.png" hash="a1f1758c0ed18c576daddfad4e287dcf"/><file name="ddebit.png" hash="8eaa9ca96554a065bba75f3a3c62c25b"/><file name="directebank.png" hash="ec990be24336501593956872b5a69a0c"/><file name="elv.png" hash="af722d1a80025fbef18faf9baafe91e3"/><file name="giropay.png" hash="abbc084008a2bc4692cee1e014e88e01"/><file name="ideal.png" hash="3ad4441b5e59613b07efad0b4c781812"/><file name="mistercash.png" hash="fe437531e8ea3160dd3ce7c22c6d1dd7"/><file name="nologo.png" hash="57404bbcfb3e5a70239d3085e14471cc"/><file name="paypal.png" hash="db854b8832246666da38130f2d527331"/><file name="paysafecard.png" hash="d9fac94c828b6429641e74f027a6e23d"/><file name="wallie.png" hash="9bbc206f96bfeb2ec82a47d6ecbae4b9"/><file name="wire.png" hash="f602b0978725d2663fe69c93276cace0"/></dir></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="icecore.xml" hash="98b5a6c55a72ba244b21a5815ae0c4fc"/></dir><dir name="template"><dir name="icepaycore"><file name="grid_modules.phtml" hash="f113cfa6d561031bcd5a90f3a1fb48a0"/></dir><dir name="icepayadvanced"><dir><dir name="form"><file name="default.phtml" hash="fdf9eb2d5c4a5ef8f43f6e9d8090ebd4"/></dir></dir><file name="grid_paymentmethods.phtml" hash="28f608b5e8c373b912bd5826424de840"/><file name="paymentmethod.phtml" hash="28dfbb959013471567d2db769516cb18"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="icecore.xml" hash="96ed3cf67c702affdb8869e1a6c5d980"/></dir><dir name="template"><dir name="icepaycore"><dir><dir name="front"><file name="check.phtml" hash="ae5608fb727b2457af10c7bd9faee6d9"/><file name="statement.phtml" hash="7cc11055297c480e75b6f082c41bdaa6"/></dir></dir></dir><dir name="icepayadvanced"><dir><dir name="form"><file name="default.phtml" hash="fdf9eb2d5c4a5ef8f43f6e9d8090ebd4"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
25
  <compatible/>
26
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
27
  </package>