MultiSafepay_Msp - Version 2.1.2

Version Notes

Tested by MultiSafepay

Release Info

Developer	MultiSafepay
Extension	MultiSafepay_Msp
Version	2.1.2
Comparing to
See all releases

Code changes from version 2.1.1 to 2.1.2

Files changed (25) hide show

app/code/community/MultiSafepay/Msp/Block/Klarna.php +17 -0
app/code/community/MultiSafepay/Msp/Helper/Data.php +3 -2
app/code/community/MultiSafepay/Msp/Model/Api/Paylink.php +8 -2
app/code/community/MultiSafepay/Msp/Model/Base.php +18 -6
app/code/community/MultiSafepay/Msp/Model/Checkout.php +7 -1
app/code/community/MultiSafepay/Msp/Model/Gateway/Abstract.php +16 -2
app/code/community/MultiSafepay/Msp/Model/Gateway/Klarna.php +78 -0
app/code/community/MultiSafepay/Msp/Model/Gateway/Wijncadeau.php +14 -0
app/code/community/MultiSafepay/Msp/Model/Observer/Order.php +14 -2
app/code/community/MultiSafepay/Msp/Model/Observer/Shipment.php +3 -2
app/code/community/MultiSafepay/Msp/Model/Payment.php +100 -69
app/code/community/MultiSafepay/Msp/Model/Service/Quote.php +40 -5
app/code/community/MultiSafepay/Msp/Model/Servicecost/Quote/Address/Total/Servicecost.php +7 -0
app/code/community/MultiSafepay/Msp/controllers/StandardController.php +3 -2
app/code/community/MultiSafepay/Msp/etc/config.xml +30 -1
app/code/community/MultiSafepay/Msp/etc/system.xml +447 -3
app/design/frontend/base/default/template/msp/klarna.phtml +13 -0
app/locale/de_DE/MultiSafepay_Msp.csv +4 -0
app/locale/es_ES/MultiSafepay_Msp.csv +4 -0
app/locale/fr_FR/MultiSafepay_Msp.csv +4 -0
app/locale/it_IT/MultiSafepay_Msp.csv +4 -1
app/locale/nl_NL/MultiSafepay_Msp.csv +4 -5
lib/multisafepay/MultiSafepay.combined.php +4 -2
media/msp/nl/msp_klarna.png +0 -0
package.xml +4 -4

app/code/community/MultiSafepay/Msp/Block/Klarna.php ADDED Viewed

	@@ -0,0 +1,17 @@


1	+ <?php
2	+
3	+ class MultiSafepay_Msp_Block_Klarna extends Mage_Payment_Block_Form {
4	+
5	+ public $_code;
6	+ public $_issuer;
7	+ public $_model;
8	+ public $_countryArr = null;
9	+ public $_country;
10	+
11	+ protected function _construct() {
12	+ $this->setTemplate('msp/klarna.phtml');
13	+
14	+ parent::_construct();
15	+ }
16	+
17	+ }

app/code/community/MultiSafepay/Msp/Helper/Data.php CHANGED Viewed

	@@ -36,7 +36,7 @@ class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract {
36	}
37	}
38	if ($return == '') {
39	- $return = $paymentTitle;
40	}
41	echo $return;
42	//return $return;
	@@ -91,7 +91,8 @@ class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract {
91
92	if (Mage::getStoreConfig('payment/msp/keep_cart', $storeId) \|\|
93	Mage::getStoreConfig('msp/settings/keep_cart', $storeId) \|\|
94	- $gatewayMethod == 'msp_payafter'~~) {~~

95
96	$needRestore = true;
97	}


36	}
37	}
38	if ($return == '') {
39	+ //$return = $paymentTitle;
40	}
41	echo $return;
42	//return $return;

91
92	if (Mage::getStoreConfig('payment/msp/keep_cart', $storeId) \|\|
93	Mage::getStoreConfig('msp/settings/keep_cart', $storeId) \|\|
94	+ $gatewayMethod == 'msp_payafter'\|\|
95	+ $gatewayMethod == 'msp_klarna') {
96
97	$needRestore = true;
98	}

app/code/community/MultiSafepay/Msp/Model/Api/Paylink.php CHANGED Viewed

	@@ -26,6 +26,7 @@ class MultiSafepay_Msp_Model_Api_Paylink {
26	'id' => '',
27	'currency' => '',
28	'amount' => '',

29	);
30	public $signature;
31	public $api_url;
	@@ -62,6 +63,11 @@ class MultiSafepay_Msp_Model_Api_Paylink {
62	'msp_directebanking' => 'DIRECTBANK',
63	'msp_directdebit' => 'DIRDEB',
64	'msp_amex',





65	);
66
67	/**
	@@ -97,7 +103,7 @@ class MultiSafepay_Msp_Model_Api_Paylink {
97	$mapi->merchant['site_id'] = $this->merchant['site_id'];
98	$mapi->merchant['site_code'] = $this->merchant['security_code'];
99
100	- $mapi->test = $this->~~getApiUrl()~~;
101	$mapi->merchant['notification_url'] = Mage::getUrl("msp/standard/notification") . '&type=initial';
102	$mapi->merchant['cancel_url'] = Mage::getUrl("msp/standard/cancel", array("_secure" => true));
103	$mapi->merchant['redirect_url'] = Mage::getUrl("msp/standard/return", array("_secure" => true));
	@@ -126,7 +132,7 @@ class MultiSafepay_Msp_Model_Api_Paylink {
126	$mapi->transaction['description'] = 'Order #' . $this->transaction['id'] . ' at ' . $storename;
127	$mapi->transaction['gateway'] = $this->availablePaymentMethodCodes[$pm_code];
128	$mapi->transaction['items'] = $items;
129	- $mapi->transaction['daysactive'] = '30';
130
131	$url = $mapi->startTransaction();
132


26	'id' => '',
27	'currency' => '',
28	'amount' => '',
29	+ 'days_active' => '',
30	);
31	public $signature;
32	public $api_url;

63	'msp_directebanking' => 'DIRECTBANK',
64	'msp_directdebit' => 'DIRDEB',
65	'msp_amex',
66	+ 'msp_yourgift',
67	+ 'msp_wijncadeau',
68	+ 'msp_lief',
69	+ 'msp_gezondheidsbon',
70	+ 'msp_fashioncheque',
71	);
72
73	/**

103	$mapi->merchant['site_id'] = $this->merchant['site_id'];
104	$mapi->merchant['site_code'] = $this->merchant['security_code'];
105
106	+ $mapi->test = $this->test;
107	$mapi->merchant['notification_url'] = Mage::getUrl("msp/standard/notification") . '&type=initial';
108	$mapi->merchant['cancel_url'] = Mage::getUrl("msp/standard/cancel", array("_secure" => true));
109	$mapi->merchant['redirect_url'] = Mage::getUrl("msp/standard/return", array("_secure" => true));

132	$mapi->transaction['description'] = 'Order #' . $this->transaction['id'] . ' at ' . $storename;
133	$mapi->transaction['gateway'] = $this->availablePaymentMethodCodes[$pm_code];
134	$mapi->transaction['items'] = $items;
135	+ $mapi->transaction['daysactive'] = $this->transaction['days_active'];
136
137	$url = $mapi->startTransaction();
138

app/code/community/MultiSafepay/Msp/Model/Base.php CHANGED Viewed

	@@ -111,7 +111,7 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object {
111	return $this->api;
112	}
113
114	- $isTestMode = (Mage::getStoreConfig('msp/~~msp_payafter~~/test_api_pad', $order->getStoreId()) == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
115	$suffix = '';
116
117	if ($isTestMode) {
	@@ -123,9 +123,9 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object {
123	$this->api->version = Mage::getConfig()->getNode('modules/MultiSafepay_Msp/version');
124	$this->api->use_shipping_notification = false;
125	$this->api->test = $isTestMode;
126	- $this->api->merchant['account_id'] = Mage::getStoreConfig('msp/~~msp_payafter~~/account_id_pad' . $suffix, $order->getStoreId());
127	- $this->api->merchant['site_id'] = Mage::getStoreConfig('msp/~~msp_payafter~~/site_id_pad' . $suffix, $order->getStoreId());
128	- $this->api->merchant['site_code'] = Mage::getStoreConfig('msp/~~msp_payafter~~/secure_code_pad' . $suffix, $order->getStoreId());
129	$this->api->plugin['shop'] = 'Magento';
130	$this->api->plugin['shop_version'] = Mage::getVersion();
131	$this->api->plugin['plugin_version'] = $this->api->version;
	@@ -181,6 +181,12 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object {
181	$statusPartialRefunded = $this->getConfigData("partial_refunded_status");
182	$autocreateInvoice = $this->getConfigData("autocreate_invoice");
183






184	/**
185	* Create the transaction details array
186	*/
	@@ -259,6 +265,12 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object {
259	$newStatus = true; // makes Magento use the default status belonging to state
260	$statusMessage = '';
261






262	switch ($mspStatus) {
263	case "initialized":
264
	@@ -610,11 +622,11 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object {
610	$gateway = $order->getPayment()->getMethodInstance()->_gateway;
611
612
613	- if ($mail_invoice && $gateway != 'PAYAFTER') {
614	$invoice->setEmailSent(true);
615	$invoice->sendEmail();
616	$invoice->save();
617	- } elseif ($gateway == 'PAYAFTER' && $send_bno_invoice && $mail_invoice) {
618	$invoice->setEmailSent(true);
619	$invoice->sendEmail();
620	$invoice->save();


111	return $this->api;
112	}
113
114	+ $isTestMode = (Mage::getStoreConfig('msp/' . $order->getPayment()->getMethodInstance()->getCode() . '/test_api_pad', $order->getStoreId()) == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
115	$suffix = '';
116
117	if ($isTestMode) {

123	$this->api->version = Mage::getConfig()->getNode('modules/MultiSafepay_Msp/version');
124	$this->api->use_shipping_notification = false;
125	$this->api->test = $isTestMode;
126	+ $this->api->merchant['account_id'] = Mage::getStoreConfig('msp/' . $order->getPayment()->getMethodInstance()->getCode() . '/account_id_pad' . $suffix, $order->getStoreId());
127	+ $this->api->merchant['site_id'] = Mage::getStoreConfig('msp/' . $order->getPayment()->getMethodInstance()->getCode() . '/site_id_pad' . $suffix, $order->getStoreId());
128	+ $this->api->merchant['site_code'] = Mage::getStoreConfig('msp/' . $order->getPayment()->getMethodInstance()->getCode() . '/secure_code_pad' . $suffix, $order->getStoreId());
129	$this->api->plugin['shop'] = 'Magento';
130	$this->api->plugin['shop_version'] = Mage::getVersion();
131	$this->api->plugin['plugin_version'] = $this->api->version;

181	$statusPartialRefunded = $this->getConfigData("partial_refunded_status");
182	$autocreateInvoice = $this->getConfigData("autocreate_invoice");
183
184	+ $creditmemo_enabled = $this->getConfigData("use_refund_credit_memo");
185	+
186	+ if ($creditmemo_enabled && ($mspStatus == 'refunded' \|\| $mspStatus == 'partial_refunded')) {
187	+ return true;
188	+ }
189	+
190	/**
191	* Create the transaction details array
192	*/

265	$newStatus = true; // makes Magento use the default status belonging to state
266	$statusMessage = '';
267
268	+
269	+ //If the order already has in invoice than it was paid for using another method? So if our transaction expires we shouldn't update it to cancelled because it was already invoiced.
270	+ if ($order->hasInvoices() && $mspStatus == 'expired') {
271	+ return true;
272	+ }
273	+
274	switch ($mspStatus) {
275	case "initialized":
276

622	$gateway = $order->getPayment()->getMethodInstance()->_gateway;
623
624
625	+ if ($mail_invoice && $gateway != 'PAYAFTER' && $gateway != 'KLARNA') {
626	$invoice->setEmailSent(true);
627	$invoice->sendEmail();
628	$invoice->save();
629	+ } elseif (($gateway == 'PAYAFTER' \|\| $gateway == 'KLARNA') && $send_bno_invoice && $mail_invoice) {
630	$invoice->setEmailSent(true);
631	$invoice->sendEmail();
632	$invoice->save();

app/code/community/MultiSafepay/Msp/Model/Checkout.php CHANGED Viewed

	@@ -352,8 +352,14 @@ class MultiSafepay_Msp_Model_Checkout extends Mage_Payment_Model_Method_Abstract
352	$base->unlock();
353	exit();
354	}






355
356	- ~~$this->_createOrder($quoteId);~~
357
358	$base->log("Quote ID: $quoteId");
359	// get the order


352	$base->unlock();
353	exit();
354	}
355	+
356	+ if($api->details['ewallet']['id'] == ''){
357	+ return true;
358	+ }else{
359	+ $this->_createOrder($quoteId);
360	+ }
361
362	+
363
364	$base->log("Quote ID: $quoteId");
365	// get the order

app/code/community/MultiSafepay/Msp/Model/Gateway/Abstract.php CHANGED Viewed

	@@ -29,6 +29,7 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
29	const MSP_GENERAL_CODE = 'msp';
30	const MSP_FASTCHECKOUT_CODE = 'mspcheckout';
31	const MSP_GENERAL_PAD_CODE = 'msp_payafter';

32	const MSP_GATEWAYS_CODE_PREFIX = 'msp_';
33
34	public $availablePaymentMethodCodes = array(
	@@ -36,6 +37,7 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
36	'mspcheckout',
37	'msp_ideal',
38	'msp_payafter',

39	'msp_mistercash',
40	'msp_visa',
41	'msp_mastercard',
	@@ -56,6 +58,11 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
56	'msp_directdebit',
57	'msp_fastcheckout',
58	'msp_amex',





59	);
60
61	public function __construct() {
	@@ -97,6 +104,10 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
97	if (!in_array($group_id, $specificgroups) && $selectedgroup !== "") {
98	$this->_canUseCheckout = false;
99	}




100	}
101	}
102
	@@ -320,6 +331,9 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
320	case self::MSP_GENERAL_PAD_CODE:
321	$settingsPathPrefix = 'msp/' . self::MSP_GENERAL_PAD_CODE;
322	break;



323
324	// MSP - Gateways
325	default:
	@@ -329,7 +343,7 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
329	$config = Mage::getStoreConfig($settingsPathPrefix, $order->getStoreId());
330
331	// use refund by Credit Memo is enabled
332	- $pathCreditMemoIsEnabled = ($payment->getCode() == self::MSP_GENERAL_PAD_CODE) ? 'msp/settings' : $settingsPathPrefix;
333	if (!Mage::getStoreConfigFlag($pathCreditMemoIsEnabled . '/use_refund_credit_memo', $order->getStoreId())) {
334	Mage::getSingleton('adminhtml/session')->addNotice(Mage::helper('msp')->__('Refund has not been send to MultiSafepay. You need to refund manually at MultiSafepay. Please check if the creditmemo option is configured within the MultiSafepay payment methods configuration!'));
335	return $this;
	@@ -358,7 +372,7 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
358
359	if ($mapi->error) {
360	Mage::getSingleton('adminhtml/session')->addError($mapi->error_code . ' - ' . $mapi->error);
361	- return false;
362	} else {
363	Mage::getSingleton('adminhtml/session')->addNotice(Mage::helper('msp')->__('Refund request has been sent successfully to MultiSafepay, your transaction has been refunded.'));
364	}


29	const MSP_GENERAL_CODE = 'msp';
30	const MSP_FASTCHECKOUT_CODE = 'mspcheckout';
31	const MSP_GENERAL_PAD_CODE = 'msp_payafter';
32	+ const MSP_GENERAL_KLARNA_CODE = 'msp_klarna';
33	const MSP_GATEWAYS_CODE_PREFIX = 'msp_';
34
35	public $availablePaymentMethodCodes = array(

37	'mspcheckout',
38	'msp_ideal',
39	'msp_payafter',
40	+ 'msp_klarna',
41	'msp_mistercash',
42	'msp_visa',
43	'msp_mastercard',

58	'msp_directdebit',
59	'msp_fastcheckout',
60	'msp_amex',
61	+ 'msp_yourgift',
62	+ 'msp_wijncadeau',
63	+ 'msp_lief',
64	+ 'msp_gezondheidsbon',
65	+ 'msp_fashioncheque',
66	);
67
68	public function __construct() {

104	if (!in_array($group_id, $specificgroups) && $selectedgroup !== "") {
105	$this->_canUseCheckout = false;
106	}
107	+ } else {
108	+ if (trim($this->getConfigData('specificgroups')) !== "") {
109	+ $this->_canUseCheckout = false;
110	+ }
111	}
112	}
113

331	case self::MSP_GENERAL_PAD_CODE:
332	$settingsPathPrefix = 'msp/' . self::MSP_GENERAL_PAD_CODE;
333	break;
334	+ case self::MSP_GENERAL_KLARNA_CODE:
335	+ $settingsPathPrefix = 'msp/' . self::MSP_GENERAL_KLARNA_CODE;
336	+ break;
337
338	// MSP - Gateways
339	default:

343	$config = Mage::getStoreConfig($settingsPathPrefix, $order->getStoreId());
344
345	// use refund by Credit Memo is enabled
346	+ $pathCreditMemoIsEnabled = (($payment->getCode() == self::MSP_GENERAL_PAD_CODE \|\| $payment->getCode() == self::MSP_GENERAL_KLARNA_CODE)) ? 'msp/settings' : $settingsPathPrefix;
347	if (!Mage::getStoreConfigFlag($pathCreditMemoIsEnabled . '/use_refund_credit_memo', $order->getStoreId())) {
348	Mage::getSingleton('adminhtml/session')->addNotice(Mage::helper('msp')->__('Refund has not been send to MultiSafepay. You need to refund manually at MultiSafepay. Please check if the creditmemo option is configured within the MultiSafepay payment methods configuration!'));
349	return $this;

372
373	if ($mapi->error) {
374	Mage::getSingleton('adminhtml/session')->addError($mapi->error_code . ' - ' . $mapi->error);
375	+ //return false;
376	} else {
377	Mage::getSingleton('adminhtml/session')->addNotice(Mage::helper('msp')->__('Refund request has been sent successfully to MultiSafepay, your transaction has been refunded.'));
378	}

app/code/community/MultiSafepay/Msp/Model/Gateway/Klarna.php ADDED Viewed

	@@ -0,0 +1,78 @@


1	+ <?php
2	+
3	+ /**
4	+ *
5	+ * @category MultiSafepay
6	+ * @package MultiSafepay_Msp
7	+ */
8	+ class MultiSafepay_Msp_Model_Gateway_Klarna extends MultiSafepay_Msp_Model_Gateway_Abstract {
9	+
10	+ protected $_code = "msp_klarna";
11	+ public $_model = "klarna";
12	+ public $_gateway = "KLARNA";
13	+ protected $_formBlockType = 'msp/klarna';
14	+ protected $_canUseCheckout = true;
15	+
16	+ public function __construct() {
17	+ $availableByIP = true;
18	+ if (Mage::getStoreConfig('msp/msp_klarna/ip_check')) {
19	+ if ($this->_isTestMode()) {
20	+ $data = Mage::getStoreConfig('msp/msp_klarna/ip_filter_test');
21	+ } else {
22	+ $data = Mage::getStoreConfig('msp/msp_klarna/ip_filter');
23	+ }
24	+
25	+ if (!in_array($_SERVER["REMOTE_ADDR"], explode(';', $data))) {
26	+ $availableByIP = false;
27	+ }
28	+ }
29	+
30	+ $currencies = explode(',', Mage::getStoreConfig('msp/' . $this->_code . '/allowed_currency'));
31	+ $isAllowConvert = Mage::getStoreConfigFlag('msp/settings/allow_convert_currency');
32	+
33	+ if ($isAllowConvert) {
34	+ $availableByCurrency = true;
35	+ } else {
36	+ if (in_array(Mage::app()->getStore()->getCurrentCurrencyCode(), $currencies)) {
37	+ $availableByCurrency = true;
38	+ } else {
39	+ $availableByCurrency = false;
40	+ }
41	+ }
42	+ $this->_canUseCheckout = $availableByIP && $availableByCurrency;
43	+ }
44	+
45	+ public function getOrderPlaceRedirectUrl() {
46	+ if (isset($_POST['payment']['birthday'])) {
47	+ $birthday = $_POST['payment']['birthday'];
48	+ } else {
49	+ $birthday = '';
50	+ }
51	+
52	+ if (isset($_POST['payment']['accountnumber'])) {
53	+ $accountnumber = $_POST['payment']['accountnumber'];
54	+ } else {
55	+ $accountnumber = '';
56	+ }
57	+
58	+ $url = $this->getModelUrl("msp/standard/redirect/issuer/" . $this->_issuer);
59	+ if (!strpos($url, "?"))
60	+ $url .= '?birthday=' . $birthday . '&accountnumber=' . $accountnumber;
61	+ else
62	+ $url .= '&birthday=' . $birthday . '&accountnumber=' . $accountnumber;
63	+ return $url;
64	+ }
65	+
66	+ /**
67	+ * Is Test Mode
68	+ *
69	+ * @param null\|integer\|Mage_Core_Model_Store $store
70	+ * @return bool
71	+ */
72	+ protected function _isTestMode($store = null) {
73	+ $mode = Mage::getStoreConfig('msp/msp_klarna/test_api_pad', $store);
74	+
75	+ return $mode == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE;
76	+ }
77	+
78	+ }

app/code/community/MultiSafepay/Msp/Model/Gateway/Wijncadeau.php ADDED Viewed

	@@ -0,0 +1,14 @@


1	+ <?php
2	+
3	+ /**
4	+ *
5	+ * @category MultiSafepay
6	+ * @package MultiSafepay_Msp
7	+ */
8	+ class MultiSafepay_Msp_Model_Gateway_Wijncadeau extends MultiSafepay_Msp_Model_Gateway_Abstract {
9	+
10	+ protected $_code = "msp_wijncadeau";
11	+ public $_model = "wijncadeau";
12	+ public $_gateway = "WIJNCADEAU";
13	+
14	+ }

app/code/community/MultiSafepay/Msp/Model/Observer/Order.php CHANGED Viewed

	@@ -10,6 +10,7 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
10	const MSP_GENERAL_CODE = 'msp';
11	const MSP_FASTCHECKOUT_CODE = 'mspcheckout';
12	const MSP_GENERAL_PAD_CODE = 'msp_payafter';

13	const MSP_GATEWAYS_CODE_PREFIX = 'msp_';
14
15	public $availablePaymentMethodCodes = array(
	@@ -35,6 +36,13 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
35	'msp_multisafepay',
36	'msp_directebanking',
37	'msp_directdebit',







38	);
39
40	public function sales_order_place_after(Varien_Event_Observer $observer) {
	@@ -72,7 +80,9 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
72	case self::MSP_GENERAL_PAD_CODE:
73	$settingsPathPrefix = 'msp/' . self::MSP_GENERAL_PAD_CODE;
74	break;
75	-


76	// MSP - Gateways
77	default:
78	$settingsPathPrefix = 'msp/settings';
	@@ -95,7 +105,7 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
95	$api = Mage::getModel('msp/api_paylink');
96
97	if (!$api->isPaymentLinkCreated($order)) {
98	- if ($payment->getCode() == self::MSP_GENERAL_PAD_CODE) {
99	$configMain = Mage::getStoreConfig('msp/settings', $order->getStoreId());
100	$api->test = ($config['test_api_pad'] == 'test');
101	$suffix = '';
	@@ -108,6 +118,7 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
108	$api->merchant['site_id'] = $config['site_id_pad' . $suffix];
109	$api->merchant['security_code'] = $config['secure_code_pad' . $suffix];
110	$api->merchant['api_key'] = $configMain['api_key'];

111	$api->debug = $configMain['debug'];
112	} else {
113	$api->test = ($config['test_api'] == 'test');
	@@ -115,6 +126,7 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
115	$api->merchant['site_id'] = $config['site_id'];
116	$api->merchant['security_code'] = $config['secure_code'];
117	$api->merchant['api_key'] = $config['api_key'];

118	$api->debug = $config['debug'];
119	}
120


10	const MSP_GENERAL_CODE = 'msp';
11	const MSP_FASTCHECKOUT_CODE = 'mspcheckout';
12	const MSP_GENERAL_PAD_CODE = 'msp_payafter';
13	+ const MSP_GENERAL_KLARNA_CODE = 'msp_klarna';
14	const MSP_GATEWAYS_CODE_PREFIX = 'msp_';
15
16	public $availablePaymentMethodCodes = array(

36	'msp_multisafepay',
37	'msp_directebanking',
38	'msp_directdebit',
39	+ 'msp_yourgift',
40	+ 'msp_wijncadeau',
41	+ 'msp_lief',
42	+ 'msp_amex',
43	+ 'msp_paypal',
44	+ 'msp_gezondheidsbon',
45	+ 'msp_fashioncheque',
46	);
47
48	public function sales_order_place_after(Varien_Event_Observer $observer) {

80	case self::MSP_GENERAL_PAD_CODE:
81	$settingsPathPrefix = 'msp/' . self::MSP_GENERAL_PAD_CODE;
82	break;
83	+ case self::MSP_GENERAL_KLARNA_CODE:
84	+ $settingsPathPrefix = 'msp/' . self::MSP_GENERAL_KLARNA_CODE;
85	+ break;
86	// MSP - Gateways
87	default:
88	$settingsPathPrefix = 'msp/settings';

105	$api = Mage::getModel('msp/api_paylink');
106
107	if (!$api->isPaymentLinkCreated($order)) {
108	+ if ($payment->getCode() == self::MSP_GENERAL_PAD_CODE \|\| $payment->getCode() == self::MSP_GENERAL_KLARNA_CODE) {
109	$configMain = Mage::getStoreConfig('msp/settings', $order->getStoreId());
110	$api->test = ($config['test_api_pad'] == 'test');
111	$suffix = '';

118	$api->merchant['site_id'] = $config['site_id_pad' . $suffix];
119	$api->merchant['security_code'] = $config['secure_code_pad' . $suffix];
120	$api->merchant['api_key'] = $configMain['api_key'];
121	+ $api->transaction['id'] = $configMain['daysactive'];
122	$api->debug = $configMain['debug'];
123	} else {
124	$api->test = ($config['test_api'] == 'test');

126	$api->merchant['site_id'] = $config['site_id'];
127	$api->merchant['security_code'] = $config['secure_code'];
128	$api->merchant['api_key'] = $config['api_key'];
129	+ $api->transaction['id'] = $configMain['daysactive'];
130	$api->debug = $config['debug'];
131	}
132

app/code/community/MultiSafepay/Msp/Model/Observer/Shipment.php CHANGED Viewed

	@@ -9,6 +9,7 @@ class MultiSafepay_Msp_Model_Observer_Shipment extends MultiSafepay_Msp_Model_Ob
9
10	public $availablePaymentMethodCodes = array(
11	'msp_payafter',

12	);
13
14	public function sales_order_shipment_save_after(Varien_Event_Observer $observer) {
	@@ -22,7 +23,7 @@ class MultiSafepay_Msp_Model_Observer_Shipment extends MultiSafepay_Msp_Model_Ob
22	$order = $shipment->getOrder();
23
24	// use send request if enabled
25	- if (!Mage::getStoreConfigFlag('msp/~~msp_payafter~~/send_request_after_shipping', $order->getStoreId())) {
26	return $this;
27	}
28
	@@ -47,7 +48,7 @@ class MultiSafepay_Msp_Model_Observer_Shipment extends MultiSafepay_Msp_Model_Ob
47	/** @var $base MultiSafepay_Msp_Model_Base */
48	$base = $checkout->getBase($order->getId());
49
50	- $configPayAfter = Mage::getStoreConfig('msp/~~msp_payafter~~', $order->getStoreId());
51	$configGateway = Mage::getStoreConfig('msp/settings', $order->getStoreId());
52
53	/** @var $api MultiSafepay_Msp_Model_Api_Shipment */


9
10	public $availablePaymentMethodCodes = array(
11	'msp_payafter',
12	+ 'msp_klarna',
13	);
14
15	public function sales_order_shipment_save_after(Varien_Event_Observer $observer) {

23	$order = $shipment->getOrder();
24
25	// use send request if enabled
26	+ if (!Mage::getStoreConfigFlag('msp/'.$order->getPayment()->getMethodInstance()->getCode().'/send_request_after_shipping', $order->getStoreId())) {
27	return $this;
28	}
29

48	/** @var $base MultiSafepay_Msp_Model_Base */
49	$base = $checkout->getBase($order->getId());
50
51	+ $configPayAfter = Mage::getStoreConfig('msp/'.$order->getPayment()->getMethodInstance()->getCode(), $order->getStoreId());
52	$configGateway = Mage::getStoreConfig('msp/settings', $order->getStoreId());
53
54	/** @var $api MultiSafepay_Msp_Model_Api_Shipment */

app/code/community/MultiSafepay/Msp/Model/Payment.php CHANGED Viewed

	@@ -195,6 +195,12 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
195	$order = $this->getOrder();
196	$quote = Mage::getModel('sales/quote')->load($order->getQuoteId());
197






198	$quote_base_grand_total = $quote->getBaseGrandTotal();
199	$order_base_grand_total = $order->getBaseGrandTotal();
200
	@@ -210,7 +216,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
210
211	// currency check
212	$isAllowConvert = Mage::getStoreConfigFlag('msp/settings/allow_convert_currency');
213	- $currencies = explode(',', Mage::getStoreConfig('msp/' . $~~order->getPayment(~~)~~->getMethodInstance()->getCode()~~ . '/allowed_currency'));
214	$canUseCurrentCurrency = in_array(Mage::app()->getStore()->getCurrentCurrencyCode(), $currencies);
215
216	$currentCurrencyCode = Mage::app()->getStore()->getCurrentCurrencyCode();
	@@ -242,7 +248,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
242	}
243	$items .= "</ul>\n";
244
245	- $isTestMode = $this->_isTestPayAfterDelivery();
246
247	$suffix = '';
248	if ($isTestMode) {
	@@ -351,12 +357,12 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
351	}
352
353
354	- $taxClass = Mage::getStoreConfig('msp/~~msp_payafter~~/fee_tax_class');
355
356	if ($taxClass == 0) {
357	$this->_rate = 1;
358	}
359	-
360	$taxCalculationModel = Mage::getSingleton('tax/calculation');
361	$request = $taxCalculationModel->getRateRequest(
362	$quote->getShippingAddress(), $quote->getBillingAddress(), $quote->getCustomerTaxClassId(), Mage::app()->getStore()->getId()
	@@ -385,43 +391,40 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
385	$fee = number_format($fee, 4, '.', ''); */
386
387	$total_fee = 0;
388	- $fee = Mage::getStoreConfig('msp/~~msp_payafter~~/fee_amount');
389	$fee_array = explode(':', $fee);
390
391	//fee is not configured
392	- if ($fee_array[0] == '') {
393	- ~~return~~;
394	- }
395	-
396	- ~~$fixed_fee~~ ~~= str_replace~~(~~',', '.',~~ $fee_array[0]);
397	-
398	- ~~//check~~ ~~for~~ ~~configured~~ ~~percentage~~ ~~value~~
399	- if ~~(!empty($fee_array[1]))~~ {
400	- ~~$fee_array[1]~~ ~~= str_replace~~(~~',', '.',~~ $~~fee_array[1]~~);
401	- $~~serviceCostPercentage~~ = ~~str_replace~~(~~'%',~~ ~~'',~~ $~~fee_array[1]~~);
402	- ~~//if~~ ~~the~~ ~~service cost is added, then first remove it before calcualting the fee~~
403	- if ($quote->~~getBaseServicecost~~()) {
404	- ~~$fee_percentage = ($quote->getBaseGrandTotal() - $quote->getBaseServicecost()) * ($serviceCostPercentage / 100);~~
405	- } ~~else~~ {
406	- $fee_percentage = $quote->getBaseGrandTotal() * ($serviceCostPercentage / 100);
407	}
408	- $total_fee += $~~fee_percentage~~;
409	- }
410	- $~~total_fee~~ += $~~fixed_fee~~;
411	- $fee = $~~total_fee~~;
412	- $tax = ($fee / $bigRate) * $rate;
413	- $fee= $fee-$tax;
414
415
416	- //add pay after delivery fee if enabled
417	- if (Mage::getStoreConfig('msp/~~msp_payafter~~/fee')) {
418	- $c_item = new MspItem('Fee', 'Fee', 1, $fee, 'KG', 0); // Todo adjust the amount to cents, and round it up.
419	- $c_item->SetMerchantItemId('Fee');
420	- $c_item->SetTaxTableSelector('FEE');
421	- $this->api->cart->AddItem($c_item);

422	}
423
424	-
425	//add none taxtable
426	$table = new MspAlternateTaxTable();
427	$table->name = 'none';
	@@ -463,9 +466,9 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
463	$this->api->customer['phone'] = '';
464	$this->api->gatewayinfo['phone'] = '';
465	}
466	-
467	-
468	-
469	//ALL data available? Then request the transaction link
470	$url = $this->api->startCheckout();
471
	@@ -487,7 +490,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
487	// raise error
488	//Mage::throwException(Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . " - " . $this->api->error);
489	if ($this->api->error_code == '1024') {
490	- $errorMessage = Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . " - " . $this->api->error . '<br />' . Mage::helper("msp")->__('We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor (<a href="http://www.multifactor.nl/contact" target="_blank">http://www.multifactor.nl/faq</a>). You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to <a href="mailto:support@multifactor.nl">support@multifactor.nl</a>. Please retry placing your order and select a different payment method.');
491	} else {
492	$errorMessage = Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . " - " . $this->api->error . '<br />' . Mage::helper("msp")->__("Please retry placing your order and select a different payment method.");
493	}
	@@ -532,13 +535,13 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
532	/**
533	* @return bool
534	*/
535	- protected function _isTestPayAfterDelivery() {
536	$isTest = ($this->getConfigData('test_api_pad') == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
537	if ($isTest) {
538	return true;
539	}
540
541	- if ($ips = Mage::getStoreConfig('msp/~~msp_payafter~~/ip_filter_test_for_live_mode')) {
542	if (in_array($_SERVER["REMOTE_ADDR"], explode(';', $ips))) {
543	return true;
544	}
	@@ -712,15 +715,15 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
712	//$quantity = round($item->getQtyOrdered(), 2);
713
714	$ndata = $item->getData();
715	-
716	if ($ndata['price'] != 0) {
717	//Test-> Magento rounds at 2 decimals so the recalculation goes wrong with large quantities.
718	- /* $price_with_tax = $ndata['price_incl_tax'];
719	- $tax_rate = $rate;
720	- $divided_value = 1 + ($tax_rate);
721	- $price_without_tax = $price_with_tax / $divided_value;
722	- $price = round($price_without_tax, 4)~~;*/~~
723	-
724	$price = number_format($this->_convertCurrency($ndata['price'], $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
725
726	$tierprices = $proddata->getTierPrice();
	@@ -730,21 +733,20 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
730	foreach ($product_tier_prices as $key => $value) {
731	$value = (object) $value;
732	if ($item->getQtyOrdered() >= $value->price_qty)
733	- ~~/*$~~price_with_tax = $value->price;
734	- $tax_rate = $rate;
735	- $divided_value = 1 + ($tax_rate);
736	- $price_without_tax = $price_with_tax / $divided_value;
737	- $price = round($price_without_tax, 4)~~;*/~~
738	-
739	- ~~if(~~$ndata['price'] ~~< $value->price){~~
740	- ~~$price~~ = ~~$ndata['price'];~~
741	- ~~}else{~~
742	- ~~$price = $value->price;~~
743	- }
744	-
745	- ~~$price = number_format($this->_convertCurrency($price, $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');~~
746	- }
747	- }
748
749
750	// create item
	@@ -801,7 +803,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
801	if ($gateway_data['method'] == 'msp') {
802	$currencies = explode(',', Mage::getStoreConfig('payment/msp/allowed_currency'));
803	} else {
804	- $currencies = explode(',', Mage::getStoreConfig('msp/' . strtolower($~~gateway~~) . '/allowed_currency'));
805	}
806
807	$canUseCurrentCurrency = in_array(Mage::app()->getStore()->getCurrentCurrencyCode(), $currencies);
	@@ -847,6 +849,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
847	$gateway_data['method'] == 'msp_lief' \|\|
848	$gateway_data['method'] == 'msp_parfumcadeaukaart' \|\|
849	$gateway_data['method'] == 'msp_parfumnl' \|\|

850	$gateway_data['method'] == 'msp_yourgift'
851	) {
852	$api = $this->getGatewaysApi(null, $order, $gateway_data['method']);
	@@ -884,6 +887,32 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
884	if (isset($_SERVER['HTTP_USER_AGENT'])) {
885	$api->customer['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
886	}


























887	$api->transaction['id'] = $orderId;
888	$api->transaction['amount'] = $amount;
889	$api->transaction['currency'] = $currencyCode;
	@@ -1004,7 +1033,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
1004	$base->preventLockDelete();
1005
1006	if ($initial) {
1007	- return;
1008	} else {
1009
1010	return false;
	@@ -1025,7 +1054,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
1025	}
1026
1027	// get the status
1028	- if ($payment_method_code == 'msp_payafter') {
1029	$api = $this->getPayAfterApi($orderId, $order);
1030	} elseif ($payment_method_code == 'msp_ebon' \|\|
1031	$payment_method_code == 'msp_webgift' \|\|
	@@ -1038,6 +1067,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
1038	$payment_method_code == 'msp_lief' \|\|
1039	$payment_method_code == 'msp_parfumcadeaukaart' \|\|
1040	$payment_method_code == 'msp_parfumnl' \|\|

1041	$payment_method_code == 'msp_yourgift'
1042	) {
1043	$api = $this->getGatewaysApi(null, $order, $payment_method_code);
	@@ -1092,11 +1122,12 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object {
1092	Mage::throwException(Mage::helper("msp")->__("Imposible convert %s to %s", $currentCurrencyCode, $targetCurrencyCode));
1093	}
1094
1095	- if ~~(strlen((string)~~ ~~$rateCurrentToTarget)~~ < ~~12)~~ {
1096	- ~~$revertCheckingCode~~ = ~~Mage::getModel~~(~~'directory/currency'~~)~~->load(~~$~~targetCurrencyCode~~);
1097	- $~~revertCheckingRate~~ = ~~$revertCheckingCode~~->~~getAnyRate~~($~~currentCurrencyCode~~);
1098	- $~~rateCurrentToTarget~~ = ~~1 /~~ $~~revertCheckingRate~~;
1099	- }

1100
1101	return round($amount * $rateCurrentToTarget, 2);
1102	}


195	$order = $this->getOrder();
196	$quote = Mage::getModel('sales/quote')->load($order->getQuoteId());
197
198	+
199	+
200	+ $gateway_data = $quote->getPayment()->getData();
201	+ $gateway = strtoupper(str_replace("msp_", '', $gateway_data['method']));
202	+
203	+
204	$quote_base_grand_total = $quote->getBaseGrandTotal();
205	$order_base_grand_total = $order->getBaseGrandTotal();
206

216
217	// currency check
218	$isAllowConvert = Mage::getStoreConfigFlag('msp/settings/allow_convert_currency');
219	+ $currencies = explode(',', Mage::getStoreConfig('msp/' . strtolower($gateway_data['method']) . '/allowed_currency'));
220	$canUseCurrentCurrency = in_array(Mage::app()->getStore()->getCurrentCurrencyCode(), $currencies);
221
222	$currentCurrencyCode = Mage::app()->getStore()->getCurrentCurrencyCode();

248	}
249	$items .= "</ul>\n";
250
251	+ $isTestMode = $this->_isTestPayAfterDelivery($order->getPayment()->getMethodInstance()->getCode());
252
253	$suffix = '';
254	if ($isTestMode) {

357	}
358
359
360	+ $taxClass = Mage::getStoreConfig('msp/msp_' . strtolower($this->_gateway) . '/fee_tax_class');
361
362	if ($taxClass == 0) {
363	$this->_rate = 1;
364	}
365	+
366	$taxCalculationModel = Mage::getSingleton('tax/calculation');
367	$request = $taxCalculationModel->getRateRequest(
368	$quote->getShippingAddress(), $quote->getBillingAddress(), $quote->getCustomerTaxClassId(), Mage::app()->getStore()->getId()

391	$fee = number_format($fee, 4, '.', ''); */
392
393	$total_fee = 0;
394	+ $fee = Mage::getStoreConfig('msp/msp_' . strtolower($this->_gateway) . '/fee_amount');
395	$fee_array = explode(':', $fee);
396
397	//fee is not configured
398	+ if ($fee_array[0] != '') {
399	+ $fixed_fee = str_replace(',', '.', $fee_array[0]);
400	+
401	+ //check for configured percentage value
402	+ if (!empty($fee_array[1])) {
403	+ $fee_array[1] = str_replace(',', '.', $fee_array[1]);
404	+ $serviceCostPercentage = str_replace('%', '', $fee_array[1]);
405	+ //if the service cost is added, then first remove it before calcualting the fee
406	+ if ($quote->getBaseServicecost()) {
407	+ $fee_percentage = ($quote->getBaseGrandTotal() - $quote->getBaseServicecost()) * ($serviceCostPercentage / 100);
408	+ } else {
409	+ $fee_percentage = $quote->getBaseGrandTotal() * ($serviceCostPercentage / 100);
410	+ }
411	+ $total_fee += $fee_percentage;

412	}
413	+ $total_fee += $fixed_fee;
414	+ $fee = $total_fee;
415	+ $tax = ($fee / $bigRate) * $rate;
416	+ $fee = $fee - $tax;


417
418
419	+ //add pay after delivery fee if enabled
420	+ if (Mage::getStoreConfig('msp/msp_' . strtolower($this->_gateway) . '/fee')) {
421	+ $c_item = new MspItem('Fee', 'Fee', 1, $fee, 'KG', 0); // Todo adjust the amount to cents, and round it up.
422	+ $c_item->SetMerchantItemId('Fee');
423	+ $c_item->SetTaxTableSelector('FEE');
424	+ $this->api->cart->AddItem($c_item);
425	+ }
426	}
427

428	//add none taxtable
429	$table = new MspAlternateTaxTable();
430	$table->name = 'none';

466	$this->api->customer['phone'] = '';
467	$this->api->gatewayinfo['phone'] = '';
468	}
469	+
470	+
471	+
472	//ALL data available? Then request the transaction link
473	$url = $this->api->startCheckout();
474

490	// raise error
491	//Mage::throwException(Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . " - " . $this->api->error);
492	if ($this->api->error_code == '1024') {
493	+ $errorMessage = Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . /" - " . $this->api->error ./ '<br />' . Mage::helper("msp")->__('We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor'). '<a href="http://www.multifactor.nl/contact" target="_blank">http://www.multifactor.nl/faq</a>'. Mage::helper("msp")->__('You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to ').' <a href="mailto:support@multifactor.nl">support@multifactor.nl</a>.'.Mage::helper("msp")->__('Please retry placing your order and select a different payment method.');
494	} else {
495	$errorMessage = Mage::helper("msp")->__("An error occured: ") . $this->api->error_code . " - " . $this->api->error . '<br />' . Mage::helper("msp")->__("Please retry placing your order and select a different payment method.");
496	}

535	/**
536	* @return bool
537	*/
538	+ protected function _isTestPayAfterDelivery($gateway) {
539	$isTest = ($this->getConfigData('test_api_pad') == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
540	if ($isTest) {
541	return true;
542	}
543
544	+ if ($ips = Mage::getStoreConfig('msp/' . $gateway . '/ip_filter_test_for_live_mode')) {
545	if (in_array($_SERVER["REMOTE_ADDR"], explode(';', $ips))) {
546	return true;
547	}

715	//$quantity = round($item->getQtyOrdered(), 2);
716
717	$ndata = $item->getData();
718	+
719	if ($ndata['price'] != 0) {
720	//Test-> Magento rounds at 2 decimals so the recalculation goes wrong with large quantities.
721	+ /* $price_with_tax = $ndata['price_incl_tax'];
722	+ $tax_rate = $rate;
723	+ $divided_value = 1 + ($tax_rate);
724	+ $price_without_tax = $price_with_tax / $divided_value;
725	+ $price = round($price_without_tax, 4); */
726	+
727	$price = number_format($this->_convertCurrency($ndata['price'], $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
728
729	$tierprices = $proddata->getTierPrice();

733	foreach ($product_tier_prices as $key => $value) {
734	$value = (object) $value;
735	if ($item->getQtyOrdered() >= $value->price_qty)
736	+ /* $price_with_tax = $value->price;
737	+ $tax_rate = $rate;
738	+ $divided_value = 1 + ($tax_rate);
739	+ $price_without_tax = $price_with_tax / $divided_value;
740	+ $price = round($price_without_tax, 4); */
741	+ if ($ndata['price'] < $value->price) {
742	+ $price = $ndata['price'];
743	+ } else {
744	+ $price = $value->price;
745	+ }
746	+
747	+ $price = number_format($this->_convertCurrency($price, $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
748	+ }
749	+ }

750
751
752	// create item

803	if ($gateway_data['method'] == 'msp') {
804	$currencies = explode(',', Mage::getStoreConfig('payment/msp/allowed_currency'));
805	} else {
806	+ $currencies = explode(',', Mage::getStoreConfig('msp/' . strtolower($gateway_data['method']) . '/allowed_currency'));
807	}
808
809	$canUseCurrentCurrency = in_array(Mage::app()->getStore()->getCurrentCurrencyCode(), $currencies);

849	$gateway_data['method'] == 'msp_lief' \|\|
850	$gateway_data['method'] == 'msp_parfumcadeaukaart' \|\|
851	$gateway_data['method'] == 'msp_parfumnl' \|\|
852	+ $gateway_data['method'] == 'msp_wijncadeau' \|\|
853	$gateway_data['method'] == 'msp_yourgift'
854	) {
855	$api = $this->getGatewaysApi(null, $order, $gateway_data['method']);

887	if (isset($_SERVER['HTTP_USER_AGENT'])) {
888	$api->customer['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
889	}
890	+
891	+
892	+ //add shipping details, used for PayPal
893	+ if (is_object($shipping)) {
894	+ $this->api->parseDeliveryAddress($shipping->getStreet(1));
895	+
896	+ if ($this->api->delivery['housenumber'] == '') {
897	+ $this->api->delivery['housenumber'] = $shipping->getStreet(2);
898	+ $this->api->delivery['address1'] = $shipping->getStreet(1);
899	+ }
900	+
901	+ $api->delivery['firstname'] = $shipping->getFirstname();
902	+ $api->delivery['lastname'] = $shipping->getLastname();
903	+ $api->delivery['address2'] = $shipping->getStreet(2);
904	+ $api->delivery['zipcode'] = $shipping->getPostcode();
905	+ $api->delivery['city'] = $shipping->getCity();
906	+ $api->delivery['state'] = $shipping->getState();
907	+ $api->delivery['country'] = $shipping->getCountry();
908	+ $api->delivery['phone'] = $shipping->getTelephone();
909	+ }
910	+
911	+ if ($gateway == "DIRECTEBANKING") {
912	+ $gateway = 'DIRECTBANK';
913	+ }
914	+
915	+
916	$api->transaction['id'] = $orderId;
917	$api->transaction['amount'] = $amount;
918	$api->transaction['currency'] = $currencyCode;

1033	$base->preventLockDelete();
1034
1035	if ($initial) {
1036	+ return false;
1037	} else {
1038
1039	return false;

1054	}
1055
1056	// get the status
1057	+ if ($payment_method_code == 'msp_payafter' \|\| $payment_method_code == 'msp_klarna') {
1058	$api = $this->getPayAfterApi($orderId, $order);
1059	} elseif ($payment_method_code == 'msp_ebon' \|\|
1060	$payment_method_code == 'msp_webgift' \|\|

1067	$payment_method_code == 'msp_lief' \|\|
1068	$payment_method_code == 'msp_parfumcadeaukaart' \|\|
1069	$payment_method_code == 'msp_parfumnl' \|\|
1070	+ $payment_method_code == 'msp_wijncadeau' \|\|
1071	$payment_method_code == 'msp_yourgift'
1072	) {
1073	$api = $this->getGatewaysApi(null, $order, $payment_method_code);

1122	Mage::throwException(Mage::helper("msp")->__("Imposible convert %s to %s", $currentCurrencyCode, $targetCurrencyCode));
1123	}
1124
1125	+ //Disabled check, fixes PLGMAG-10. Magento seems to not to update USD->EUR rate in db, resulting in wrong conversions. Now we calculate the rate manually and and don't trust Magento stored rate.
1126	+ // if (strlen((string) $rateCurrentToTarget) < 12) {
1127	+ $revertCheckingCode = Mage::getModel('directory/currency')->load($targetCurrencyCode);
1128	+ $revertCheckingRate = $revertCheckingCode->getAnyRate($currentCurrencyCode);
1129	+ $rateCurrentToTarget = 1 / $revertCheckingRate;
1130	+ //}
1131
1132	return round($amount * $rateCurrentToTarget, 2);
1133	}

app/code/community/MultiSafepay/Msp/Model/Service/Quote.php CHANGED Viewed

@@ -7,6 +7,38 @@
              */
             class MultiSafepay_Msp_Model_Service_Quote extends Mage_Sales_Model_Service_Quote {
                 /**
                  * @return Mage_Sales_Model_Order
                  */
@@ -17,12 +49,15 @@ class MultiSafepay_Msp_Model_Service_Quote extends Mage_Sales_Model_Service_Quot
                         return $order;
+                    }
-            -
                    if (Mage::getStoreConfig('payment/msp/keep_cart', $this->_quote->getStoreId()) ||
-            -
                            Mage::getStoreConfig('msp/settings/keep_cart', $this->_quote->getStoreId()) ||
-            -
                            $this->_quote->getPayment()->getMethod() == 'msp_payafter') {
-            -
                        $this->_quote->setIsActive(true)->save();
-            -
                        $this->_quote->setReservedOrderId(null)->save();
+                    }
                     return $order;


7	*/
8	class MultiSafepay_Msp_Model_Service_Quote extends Mage_Sales_Model_Service_Quote {
9
10	+ public $availablePaymentMethodCodes = array(
11	+ 'msp',
12	+ //'mspcheckout',
13	+ 'msp_ideal',
14	+ 'msp_payafter',
15	+ 'msp_mistercash',
16	+ 'msp_visa',
17	+ 'msp_mastercard',
18	+ 'msp_banktransfer',
19	+ 'msp_maestro',
20	+ 'msp_paypal',
21	+ 'msp_webgift',
22	+ 'msp_ebon',
23	+ 'msp_babygiftcard',
24	+ 'msp_boekenbon',
25	+ 'msp_erotiekbon',
26	+ 'msp_parfumnl',
27	+ 'msp_parfumcadeaukaart',
28	+ 'msp_degrotespeelgoedwinkel',
29	+ 'msp_giropay',
30	+ 'msp_multisafepay',
31	+ 'msp_directebanking',
32	+ 'msp_directdebit',
33	+ 'msp_yourgift',
34	+ 'msp_wijncadeau',
35	+ 'msp_lief',
36	+ 'msp_amex',
37	+ 'msp_paypal',
38	+ 'msp_gezondheidsbon',
39	+ 'msp_fashioncheque',
40	+ );
41	+
42	/**
43	* @return Mage_Sales_Model_Order
44	*/

49	return $order;
50	}
51
52	+ if (in_array($this->_quote->getPayment()->getMethod(), $this->availablePaymentMethodCodes)) {
53	+ if (Mage::getStoreConfig('payment/msp/keep_cart', $this->_quote->getStoreId()) \|\|
54	+ Mage::getStoreConfig('msp/settings/keep_cart', $this->_quote->getStoreId()) \|\|
55	+ $this->_quote->getPayment()->getMethod() == 'msp_payafter' \|\|
56	+ $this->_quote->getPayment()->getMethod() == 'msp_klarna') {
57
58	+ $this->_quote->setIsActive(true)->save();
59	+ $this->_quote->setReservedOrderId(null)->save();
60	+ }
61	}
62
63	return $order;

app/code/community/MultiSafepay/Msp/Model/Servicecost/Quote/Address/Total/Servicecost.php CHANGED Viewed

	@@ -10,6 +10,7 @@ class MultiSafepay_Msp_Model_Servicecost_Quote_Address_Total_Servicecost extends
10	'mspcheckout',
11	'msp_ideal',
12	'msp_payafter',

13	'msp_mistercash',
14	'msp_visa',
15	'msp_mastercard',
	@@ -30,6 +31,12 @@ class MultiSafepay_Msp_Model_Servicecost_Quote_Address_Total_Servicecost extends
30	'msp_directebanking',
31	'msp_directdebit',
32	'msp_fastcheckout',






33	);
34
35	public function __construct() {


10	'mspcheckout',
11	'msp_ideal',
12	'msp_payafter',
13	+ 'msp_klarna',
14	'msp_mistercash',
15	'msp_visa',
16	'msp_mastercard',

31	'msp_directebanking',
32	'msp_directdebit',
33	'msp_fastcheckout',
34	+ 'msp_yourgift',
35	+ 'msp_wijncadeau',
36	+ 'msp_lief',
37	+ 'msp_gezondheidsbon',
38	+ 'msp_fashioncheque',
39	+
40	);
41
42	public function __construct() {

app/code/community/MultiSafepay/Msp/controllers/StandardController.php CHANGED Viewed

	@@ -70,7 +70,7 @@ class MultiSafepay_Msp_StandardController extends Mage_Core_Controller_Front_Act
70
71	$paymentModel->setParams($this->getRequest()->getParams());
72
73	- if ($selected_gateway != 'PAYAFTER') {
74	$paymentLink = $paymentModel->startTransaction();
75	} else {
76	$paymentLink = $paymentModel->startPayAfterTransaction();
	@@ -132,7 +132,8 @@ class MultiSafepay_Msp_StandardController extends Mage_Core_Controller_Front_Act
132	//add keep cart function in cancelaction to have better support for onestepcheckout modules that overrule the observer
133	if (Mage::getStoreConfig('payment/msp/keep_cart', $quote->getStoreId()) \|\|
134	Mage::getStoreConfig('msp/settings/keep_cart', $quote->getStoreId()) \|\|
135	- $quote->getPayment()->getMethod() == 'msp_payafter'~~) {~~

136
137	if ($quoteId = $checkout->getLastQuoteId()) {
138	$quote = Mage::getModel('sales/quote')->load($quoteId);


70
71	$paymentModel->setParams($this->getRequest()->getParams());
72
73	+ if ($selected_gateway != 'PAYAFTER' && $selected_gateway != 'KLARNA') {
74	$paymentLink = $paymentModel->startTransaction();
75	} else {
76	$paymentLink = $paymentModel->startPayAfterTransaction();

132	//add keep cart function in cancelaction to have better support for onestepcheckout modules that overrule the observer
133	if (Mage::getStoreConfig('payment/msp/keep_cart', $quote->getStoreId()) \|\|
134	Mage::getStoreConfig('msp/settings/keep_cart', $quote->getStoreId()) \|\|
135	+ $quote->getPayment()->getMethod() == 'msp_payafter'\|\|
136	+ $quote->getPayment()->getMethod() == 'msp_klarna') {
137
138	if ($quoteId = $checkout->getLastQuoteId()) {
139	$quote = Mage::getModel('sales/quote')->load($quoteId);

app/code/community/MultiSafepay/Msp/etc/config.xml CHANGED Viewed

	@@ -9,7 +9,7 @@
9	<config>
10	<modules>
11	<MultiSafepay_Msp>
12	- <version>2.1.1</version>
13	</MultiSafepay_Msp>
14	</modules>
15	<global>
	@@ -242,6 +242,7 @@
242	<expired_status>canceled</expired_status>
243	<autocreate_invoice>0</autocreate_invoice>
244	<mail_invoice>0</mail_invoice>

245	<test_api>live</test_api>
246	<use_refund_credit_memo>0</use_refund_credit_memo>
247	<allow_convert_currency>1</allow_convert_currency>
	@@ -262,6 +263,11 @@
262	<model>msp/gateway_payafter</model>
263	<title>MSP Betaal na Ontvangst</title>
264	</msp_payafter>





265	<msp_amex>
266	<active>1</active>
267	<model>msp/gateway_amex</model>
	@@ -352,6 +358,11 @@
352	<model>msp/gateway_yourgift</model>
353	<title>MSP Your Giftcard</title>
354	</msp_yourgift>





355	<msp_degrotespeelgoedwinkel>
356	<active>1</active>
357	<model>msp/gateway_degrotespeelgoedwinkel</model>
	@@ -403,6 +414,7 @@
403	<autocreate_invoice>0</autocreate_invoice>
404	<mail_invoice>0</mail_invoice>
405	<test_api>live</test_api>

406	<allow_convert_currency>1</allow_convert_currency>
407	<use_refund_credit_memo>0</use_refund_credit_memo>
408	</settings>
	@@ -423,6 +435,16 @@
423	<max_order_total>300</max_order_total>
424	<send_request_after_shipping>0</send_request_after_shipping>
425	</msp_payafter>










426	<msp_amex translate="title" module="msp">
427	<active>0</active>
428	<model>msp/gateway_amex</model>
	@@ -549,6 +571,13 @@
549	<allowed_currency>EUR</allowed_currency>
550	<lang>nl</lang>
551	</msp_yourgift>







552	<msp_degrotespeelgoedwinkel translate="title" module="msp">
553	<active>0</active>
554	<model>msp/gateway_degrotespeelgoedwinkel</model>


9	<config>
10	<modules>
11	<MultiSafepay_Msp>
12	+ <version>2.1.2</version>
13	</MultiSafepay_Msp>
14	</modules>
15	<global>

242	<expired_status>canceled</expired_status>
243	<autocreate_invoice>0</autocreate_invoice>
244	<mail_invoice>0</mail_invoice>
245	+ <keep_cart>1</keep_cart>
246	<test_api>live</test_api>
247	<use_refund_credit_memo>0</use_refund_credit_memo>
248	<allow_convert_currency>1</allow_convert_currency>

263	<model>msp/gateway_payafter</model>
264	<title>MSP Betaal na Ontvangst</title>
265	</msp_payafter>
266	+ <msp_klarna>
267	+ <active>1</active>
268	+ <model>msp/gateway_klarna</model>
269	+ <title>Klarna</title>
270	+ </msp_klarna>
271	<msp_amex>
272	<active>1</active>
273	<model>msp/gateway_amex</model>

358	<model>msp/gateway_yourgift</model>
359	<title>MSP Your Giftcard</title>
360	</msp_yourgift>
361	+ <msp_wijncadeau>
362	+ <active>1</active>
363	+ <model>msp/gateway_wijncadeau</model>
364	+ <title>MSP Wijncadeau</title>
365	+ </msp_wijncadeau>
366	<msp_degrotespeelgoedwinkel>
367	<active>1</active>
368	<model>msp/gateway_degrotespeelgoedwinkel</model>

414	<autocreate_invoice>0</autocreate_invoice>
415	<mail_invoice>0</mail_invoice>
416	<test_api>live</test_api>
417	+ <keep_cart>1</keep_cart>
418	<allow_convert_currency>1</allow_convert_currency>
419	<use_refund_credit_memo>0</use_refund_credit_memo>
420	</settings>

435	<max_order_total>300</max_order_total>
436	<send_request_after_shipping>0</send_request_after_shipping>
437	</msp_payafter>
438	+ <msp_klarna translate="title" module="msp">
439	+ <active>0</active>
440	+ <model>msp/gateway_klarna</model>
441	+ <title>Klarna Factuur</title>
442	+ <allowed_currency>EUR</allowed_currency>
443	+ <lang>nl</lang>
444	+ <min_order_total>15</min_order_total>
445	+ <max_order_total>300</max_order_total>
446	+ <send_request_after_shipping>0</send_request_after_shipping>
447	+ </msp_klarna>
448	<msp_amex translate="title" module="msp">
449	<active>0</active>
450	<model>msp/gateway_amex</model>

571	<allowed_currency>EUR</allowed_currency>
572	<lang>nl</lang>
573	</msp_yourgift>
574	+ <msp_wijncadeau translate="title" module="msp">
575	+ <active>0</active>
576	+ <model>msp/gateway_wijncadeau</model>
577	+ <title>Wijncadeau</title>
578	+ <allowed_currency>EUR</allowed_currency>
579	+ <lang>nl</lang>
580	+ </msp_wijncadeau>
581	<msp_degrotespeelgoedwinkel translate="title" module="msp">
582	<active>0</active>
583	<model>msp/gateway_degrotespeelgoedwinkel</model>

app/code/community/MultiSafepay/Msp/etc/system.xml CHANGED Viewed

@@ -12,7 +12,7 @@
                     <payment>
                         <groups>
                             <msp translate="label" module="msp">
-            -
                                <label>MultiSafepay - 2.1.1</label>
                                 <sort_order>671</sort_order>
                                 <show_in_default>1</show_in_default>
                                 <show_in_website>1</show_in_website>
@@ -365,7 +365,7 @@
                     <!-- end: Main Settings (Payment Methods tab) -->
                     <!-- begin: MSP Gateways -->
                     <msp translate="label" module="msp">
-            -
                        <label>MultiSafepay - Gateways - 2.1.1</label>
                         <tab>sales</tab>
                         <frontend_type>text</frontend_type>
                         <sort_order>1000</sort_order>
@@ -1075,6 +1075,268 @@
                                     </specificgroups>
                                 </fields>
                             </msp_payafter>
                             <msp_mistercash translate="label" module="msp">
                                 <label>MisterCash</label>
                                 <sort_order>690</sort_order>
@@ -4599,6 +4861,188 @@
                                     </specificgroups>
                                 </fields>
                             </msp_yourgift>
                             <msp_degrotespeelgoedwinkel translate="label" module="msp">
                                 <label>De grote speelgoedwinkel coupon</label>
                                 <sort_order>744</sort_order>
@@ -4786,7 +5230,7 @@
                     <!-- end: MSP Gateways -->
                     <!-- begin: MSP Fast Checkout -->
                     <mspcheckout translate="label" module="msp">
-            -
                        <label>MultiSafepay - Fast Checkout - 2.1.1</label>
                         <tab>sales</tab>
                         <frontend_type>text</frontend_type>
                         <sort_order>1001</sort_order>


12	<payment>
13	<groups>
14	<msp translate="label" module="msp">
15	+ <label>MultiSafepay - 2.1.2</label>
16	<sort_order>671</sort_order>
17	<show_in_default>1</show_in_default>
18	<show_in_website>1</show_in_website>

365	<!-- end: Main Settings (Payment Methods tab) -->
366	<!-- begin: MSP Gateways -->
367	<msp translate="label" module="msp">
368	+ <label>MultiSafepay - Gateways - 2.1.2</label>
369	<tab>sales</tab>
370	<frontend_type>text</frontend_type>
371	<sort_order>1000</sort_order>

1075	</specificgroups>
1076	</fields>
1077	</msp_payafter>
1078	+ <msp_klarna translate="label" module="msp">
1079	+ <label>Klarna Factuur</label>
1080	+ <sort_order>681</sort_order>
1081	+ <show_in_default>1</show_in_default>
1082	+ <show_in_website>1</show_in_website>
1083	+ <show_in_store>1</show_in_store>
1084	+ <fields>
1085	+ <active translate="label">
1086	+ <label>Enabled</label>
1087	+ <frontend_type>select</frontend_type>
1088	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1089	+ <sort_order>10</sort_order>
1090	+ <show_in_default>1</show_in_default>
1091	+ <show_in_website>1</show_in_website>
1092	+ <show_in_store>1</show_in_store>
1093	+ </active>
1094	+ <test_api_pad translate="label comment">
1095	+ <label>Account type</label>
1096	+ <frontend_type>select</frontend_type>
1097	+
1098	+ <source_model>msp/config_sources_accounts</source_model>
1099	+ <sort_order>20</sort_order>
1100	+ <show_in_default>1</show_in_default>
1101	+ <show_in_website>1</show_in_website>
1102	+ <show_in_store>1</show_in_store>
1103	+ </test_api_pad>
1104	+ <account_id_pad translate="label">
1105	+ <label>Account ID</label>
1106	+ <frontend_type>text</frontend_type>
1107	+ <sort_order>30</sort_order>
1108	+ <show_in_default>1</show_in_default>
1109	+ <show_in_website>1</show_in_website>
1110	+ <show_in_store>1</show_in_store>
1111	+ </account_id_pad>
1112	+ <site_id_pad translate="label">
1113	+ <label>Site ID</label>
1114	+ <frontend_type>text</frontend_type>
1115	+ <sort_order>40</sort_order>
1116	+ <show_in_default>1</show_in_default>
1117	+ <show_in_website>1</show_in_website>
1118	+ <show_in_store>1</show_in_store>
1119	+ </site_id_pad>
1120	+ <secure_code_pad translate="label">
1121	+ <label>Site Code</label>
1122	+ <frontend_type>text</frontend_type>
1123	+ <sort_order>50</sort_order>
1124	+ <show_in_default>1</show_in_default>
1125	+ <show_in_website>1</show_in_website>
1126	+ <show_in_store>1</show_in_store>
1127	+ </secure_code_pad>
1128	+ <account_id_pad_test translate="label">
1129	+ <label>Account ID (for Test Accounts)</label>
1130	+ <frontend_type>text</frontend_type>
1131	+ <sort_order>53</sort_order>
1132	+ <show_in_default>1</show_in_default>
1133	+ <show_in_website>1</show_in_website>
1134	+ <show_in_store>1</show_in_store>
1135	+ </account_id_pad_test>
1136	+ <site_id_pad_test translate="label">
1137	+ <label>Site ID (for Test Accounts)</label>
1138	+ <frontend_type>text</frontend_type>
1139	+ <sort_order>56</sort_order>
1140	+ <show_in_default>1</show_in_default>
1141	+ <show_in_website>1</show_in_website>
1142	+ <show_in_store>1</show_in_store>
1143	+ </site_id_pad_test>
1144	+ <secure_code_pad_test translate="label">
1145	+ <label>Site Code (for Test Accounts)</label>
1146	+ <frontend_type>text</frontend_type>
1147	+ <sort_order>58</sort_order>
1148	+ <show_in_default>1</show_in_default>
1149	+ <show_in_website>1</show_in_website>
1150	+ <show_in_store>1</show_in_store>
1151	+ </secure_code_pad_test>
1152	+ <title translate="label">
1153	+ <label>Title</label>
1154	+ <frontend_type>text</frontend_type>
1155	+ <sort_order>60</sort_order>
1156	+ <show_in_default>1</show_in_default>
1157	+ <show_in_website>1</show_in_website>
1158	+ <show_in_store>1</show_in_store>
1159	+ </title>
1160	+ <pad_daysactive translate="label">
1161	+ <label>Days active before requests expires?</label>
1162	+ <frontend_type>text</frontend_type>
1163	+ <sort_order>61</sort_order>
1164	+ <show_in_default>1</show_in_default>
1165	+ <show_in_website>1</show_in_website>
1166	+ <show_in_store>1</show_in_store>
1167	+ </pad_daysactive>
1168	+
1169	+ <min_order_total translate="label">
1170	+ <label>Minimum Order Total</label>
1171	+ <frontend_type>text</frontend_type>
1172	+ <sort_order>110</sort_order>
1173	+ <show_in_default>1</show_in_default>
1174	+ <show_in_website>1</show_in_website>
1175	+ <show_in_store>4</show_in_store>
1176	+ </min_order_total>
1177	+ <max_order_total translate="label">
1178	+ <label>Maximum Order Total</label>
1179	+ <frontend_type>text</frontend_type>
1180	+ <sort_order>120</sort_order>
1181	+ <show_in_default>1</show_in_default>
1182	+ <show_in_website>1</show_in_website>
1183	+ <show_in_store>5</show_in_store>
1184	+ </max_order_total>
1185	+ <bno_no_invoice translate="label">
1186	+ <label>Enable the invoice e-mail for this payment method?</label>
1187	+ <frontend_type>select</frontend_type>
1188	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1189	+ <sort_order>121</sort_order>
1190	+ <show_in_default>1</show_in_default>
1191	+ <show_in_website>1</show_in_website>
1192	+ <show_in_store>1</show_in_store>
1193	+ </bno_no_invoice>
1194	+
1195	+ <allowed_currency translate="label comment">
1196	+ <label>Allowed Currency</label>
1197	+ <frontend_type>multiselect</frontend_type>
1198	+ <source_model>msp/config_sources_order_currency</source_model>
1199	+ <!--<source_model>msp/config_sources_order_email</source_model>-->
1200	+ <sort_order>122</sort_order>
1201	+ <show_in_default>1</show_in_default>
1202	+ <show_in_website>1</show_in_website>
1203	+ <show_in_store>1</show_in_store>
1204	+ </allowed_currency>
1205	+ <allowspecific translate="label">
1206	+ <label>Receive payments from applicable countries</label>
1207	+ <frontend_type>allowspecific</frontend_type>
1208	+ <sort_order>123</sort_order>
1209	+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1210	+ <show_in_default>1</show_in_default>
1211	+ <show_in_website>1</show_in_website>
1212	+ <show_in_store>1</show_in_store>
1213	+ </allowspecific>
1214	+ <specificcountry translate="label">
1215	+ <label>Receive payments from specific countries</label>
1216	+ <frontend_type>multiselect</frontend_type>
1217	+ <sort_order>124</sort_order>
1218	+ <source_model>adminhtml/system_config_source_country</source_model>
1219	+ <show_in_default>1</show_in_default>
1220	+ <show_in_website>1</show_in_website>
1221	+ <show_in_store>1</show_in_store>
1222	+ </specificcountry>
1223	+ <sort_order translate="label">
1224	+ <label>Sort order</label>
1225	+ <frontend_type>text</frontend_type>
1226	+ <sort_order>125</sort_order>
1227	+ <show_in_default>1</show_in_default>
1228	+ <show_in_website>1</show_in_website>
1229	+ <show_in_store>1</show_in_store>
1230	+ </sort_order>
1231	+ <ip_check translate="label">
1232	+ <label>Enable IP validation</label>
1233	+ <frontend_type>select</frontend_type>
1234	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1235	+ <sort_order>126</sort_order>
1236	+ <show_in_default>1</show_in_default>
1237	+ <show_in_website>1</show_in_website>
1238	+ <show_in_store>1</show_in_store>
1239	+ </ip_check>
1240	+ <ip_filter translate="label comment">
1241	+ <label>Only visible for the following IP address</label>
1242	+ <frontend_type>text</frontend_type>
1243	+ <comment>You can add multiple addresses seperated by ;</comment>
1244	+ <sort_order>127</sort_order>
1245	+ <show_in_default>1</show_in_default>
1246	+ <show_in_website>1</show_in_website>
1247	+ <show_in_store>1</show_in_store>
1248	+ </ip_filter>
1249	+ <ip_filter_test translate="label comment">
1250	+ <label>Only visible for the following IP address (for Test Account)</label>
1251	+ <frontend_type>text</frontend_type>
1252	+ <comment>You can add multiple addresses seperated by ;</comment>
1253	+ <sort_order>128</sort_order>
1254	+ <show_in_default>1</show_in_default>
1255	+ <show_in_website>1</show_in_website>
1256	+ <show_in_store>1</show_in_store>
1257	+ </ip_filter_test>
1258	+ <ip_filter_test_for_live_mode translate="label comment">
1259	+ <label>Enable Test Account for these IP(s) when enabled Live Account</label>
1260	+ <frontend_type>text</frontend_type>
1261	+ <sort_order>129</sort_order>
1262	+ <show_in_default>1</show_in_default>
1263	+ <show_in_website>1</show_in_website>
1264	+ <show_in_store>1</show_in_store>
1265	+ </ip_filter_test_for_live_mode>
1266	+ <send_request_after_shipping translate="label comment">
1267	+ <label>Send shipped status after complete order</label>
1268	+ <frontend_type>select</frontend_type>
1269	+ <comment>Order status will be set to shipped at MultiSafepay</comment>
1270	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1271	+ <sort_order>130</sort_order>
1272	+ <show_in_default>1</show_in_default>
1273	+ <show_in_website>1</show_in_website>
1274	+ <show_in_store>1</show_in_store>
1275	+ </send_request_after_shipping>
1276	+ <instructions translate="label">
1277	+ <label>Instructions</label>
1278	+ <frontend_type>textarea</frontend_type>
1279	+ <sort_order>131</sort_order>
1280	+ <show_in_default>1</show_in_default>
1281	+ <show_in_website>1</show_in_website>
1282	+ <show_in_store>1</show_in_store>
1283	+ </instructions>
1284	+ <fee translate="label">
1285	+ <label>Enable fee (inc. Tax)</label>
1286	+ <frontend_type>select</frontend_type>
1287	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1288	+ <sort_order>70</sort_order>
1289	+ <show_in_default>1</show_in_default>
1290	+ <show_in_website>1</show_in_website>
1291	+ <show_in_store>1</show_in_store>
1292	+ </fee>
1293	+ <fee_amount translate="label comment">
1294	+ <label>Payment fee amount</label>
1295	+ <frontend_type>text</frontend_type>
1296	+ <comment>Payment fee add like 0:5 this means a fixed fee of 0 euro and 5%</comment>
1297	+ <sort_order>80</sort_order>
1298	+ <show_in_default>1</show_in_default>
1299	+ <show_in_website>1</show_in_website>
1300	+ <show_in_store>1</show_in_store>
1301	+ </fee_amount>
1302	+ <fee_tax_class>
1303	+ <label>Tax class for payment fee</label>
1304	+ <comment>Select which tax class should be used for the payment fee</comment>
1305	+ <frontend_type>select</frontend_type>
1306	+ <source_model>msp/config_sources_taxClasses</source_model>
1307	+ <sort_order>90</sort_order>
1308	+ <show_in_default>1</show_in_default>
1309	+ <show_in_website>1</show_in_website>
1310	+ <show_in_store>1</show_in_store>
1311	+ </fee_tax_class>
1312	+ <fee_incexc translate="label">
1313	+ <label>Show payment fee incl. tax during checkout</label>
1314	+ <frontend_type>select</frontend_type>
1315	+ <source_model>adminhtml/system_config_source_yesno</source_model>
1316	+ <sort_order>81</sort_order>
1317	+ <show_in_default>1</show_in_default>
1318	+ <show_in_website>1</show_in_website>
1319	+ <show_in_store>1</show_in_store>
1320	+ </fee_incexc>
1321	+ <fee_description translate="label">
1322	+ <label>Payment fee description, visible in order totals</label>
1323	+ <frontend_type>text</frontend_type>
1324	+ <sort_order>100</sort_order>
1325	+ <show_in_default>1</show_in_default>
1326	+ <show_in_website>1</show_in_website>
1327	+ <show_in_store>1</show_in_store>
1328	+ </fee_description>
1329	+ <specificgroups translate="label">
1330	+ <label>Payment for Specific Customer Groups</label>
1331	+ <frontend_type>multiselect</frontend_type>
1332	+ <sort_order>101</sort_order>
1333	+ <source_model>adminhtml/system_config_source_customer_group</source_model>
1334	+ <show_in_default>1</show_in_default>
1335	+ <show_in_website>1</show_in_website>
1336	+ <show_in_store>1</show_in_store>
1337	+ </specificgroups>
1338	+ </fields>
1339	+ </msp_klarna>
1340	<msp_mistercash translate="label" module="msp">
1341	<label>MisterCash</label>
1342	<sort_order>690</sort_order>

4861	</specificgroups>
4862	</fields>
4863	</msp_yourgift>
4864	+ <msp_wijncadeau translate="label" module="msp">
4865	+ <label>Wijncadeau</label>
4866	+ <sort_order>744</sort_order>
4867	+ <show_in_default>1</show_in_default>
4868	+ <show_in_website>1</show_in_website>
4869	+ <show_in_store>1</show_in_store>
4870	+ <fields>
4871	+ <active translate="label">
4872	+ <label>Enabled</label>
4873	+ <frontend_type>select</frontend_type>
4874	+ <source_model>adminhtml/system_config_source_yesno</source_model>
4875	+ <sort_order>1</sort_order>
4876	+ <show_in_default>1</show_in_default>
4877	+ <show_in_website>1</show_in_website>
4878	+ <show_in_store>1</show_in_store>
4879	+ </active>
4880	+ <test_api_pad translate="label comment">
4881	+ <label>Account type</label>
4882	+ <frontend_type>select</frontend_type>
4883	+
4884	+ <source_model>msp/config_sources_accounts</source_model>
4885	+ <sort_order>20</sort_order>
4886	+ <show_in_default>1</show_in_default>
4887	+ <show_in_website>1</show_in_website>
4888	+ <show_in_store>1</show_in_store>
4889	+ </test_api_pad>
4890	+ <account_id_pad translate="label">
4891	+ <label>Account ID</label>
4892	+ <frontend_type>text</frontend_type>
4893	+ <sort_order>30</sort_order>
4894	+ <show_in_default>1</show_in_default>
4895	+ <show_in_website>1</show_in_website>
4896	+ <show_in_store>1</show_in_store>
4897	+ </account_id_pad>
4898	+ <site_id_pad translate="label">
4899	+ <label>Site ID</label>
4900	+ <frontend_type>text</frontend_type>
4901	+ <sort_order>40</sort_order>
4902	+ <show_in_default>1</show_in_default>
4903	+ <show_in_website>1</show_in_website>
4904	+ <show_in_store>1</show_in_store>
4905	+ </site_id_pad>
4906	+ <secure_code_pad translate="label">
4907	+ <label>Site Code</label>
4908	+ <frontend_type>text</frontend_type>
4909	+ <sort_order>50</sort_order>
4910	+ <show_in_default>1</show_in_default>
4911	+ <show_in_website>1</show_in_website>
4912	+ <show_in_store>1</show_in_store>
4913	+ </secure_code_pad>
4914	+ <account_id_pad_test translate="label">
4915	+ <label>Account ID (for Test Accounts)</label>
4916	+ <frontend_type>text</frontend_type>
4917	+ <sort_order>53</sort_order>
4918	+ <show_in_default>1</show_in_default>
4919	+ <show_in_website>1</show_in_website>
4920	+ <show_in_store>1</show_in_store>
4921	+ </account_id_pad_test>
4922	+ <site_id_pad_test translate="label">
4923	+ <label>Site ID (for Test Accounts)</label>
4924	+ <frontend_type>text</frontend_type>
4925	+ <sort_order>56</sort_order>
4926	+ <show_in_default>1</show_in_default>
4927	+ <show_in_website>1</show_in_website>
4928	+ <show_in_store>1</show_in_store>
4929	+ </site_id_pad_test>
4930	+ <secure_code_pad_test translate="label">
4931	+ <label>Site Code (for Test Accounts)</label>
4932	+ <frontend_type>text</frontend_type>
4933	+ <sort_order>58</sort_order>
4934	+ <show_in_default>1</show_in_default>
4935	+ <show_in_website>1</show_in_website>
4936	+ <show_in_store>1</show_in_store>
4937	+ </secure_code_pad_test>
4938	+ <title translate="label">
4939	+ <label>Title</label>
4940	+ <frontend_type>text</frontend_type>
4941	+ <sort_order>2</sort_order>
4942	+ <show_in_default>1</show_in_default>
4943	+ <show_in_website>1</show_in_website>
4944	+ <show_in_store>1</show_in_store>
4945	+ </title>
4946	+ <allowed_currency translate="label comment">
4947	+ <label>Allowed Currency</label>
4948	+ <frontend_type>multiselect</frontend_type>
4949	+ <source_model>msp/config_sources_order_currency</source_model>
4950	+ <!--<source_model>msp/config_sources_order_email</source_model>-->
4951	+ <sort_order>3</sort_order>
4952	+ <show_in_default>1</show_in_default>
4953	+ <show_in_website>1</show_in_website>
4954	+ <show_in_store>1</show_in_store>
4955	+ </allowed_currency>
4956	+ <allowspecific translate="label">
4957	+ <label>Receive payments from applicable countries</label>
4958	+ <frontend_type>allowspecific</frontend_type>
4959	+ <sort_order>13</sort_order>
4960	+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
4961	+ <show_in_default>1</show_in_default>
4962	+ <show_in_website>1</show_in_website>
4963	+ <show_in_store>1</show_in_store>
4964	+ </allowspecific>
4965	+ <specificcountry translate="label">
4966	+ <label>Receive payments from specific countries</label>
4967	+ <frontend_type>multiselect</frontend_type>
4968	+ <sort_order>14</sort_order>
4969	+ <source_model>adminhtml/system_config_source_country</source_model>
4970	+ <show_in_default>1</show_in_default>
4971	+ <show_in_website>1</show_in_website>
4972	+ <show_in_store>1</show_in_store>
4973	+ </specificcountry>
4974	+ <sort_order translate="label">
4975	+ <label>Sort order</label>
4976	+ <frontend_type>text</frontend_type>
4977	+ <sort_order>100</sort_order>
4978	+ <show_in_default>1</show_in_default>
4979	+ <show_in_website>1</show_in_website>
4980	+ <show_in_store>1</show_in_store>
4981	+ </sort_order>
4982	+ <instructions translate="label">
4983	+ <label>Instructions</label>
4984	+ <frontend_type>textarea</frontend_type>
4985	+ <sort_order>62</sort_order>
4986	+ <show_in_default>1</show_in_default>
4987	+ <show_in_website>1</show_in_website>
4988	+ <show_in_store>1</show_in_store>
4989	+ </instructions>
4990	+ <fee translate="label">
4991	+ <label>Enable fee (inc. Tax)</label>
4992	+ <frontend_type>select</frontend_type>
4993	+ <source_model>adminhtml/system_config_source_yesno</source_model>
4994	+ <sort_order>70</sort_order>
4995	+ <show_in_default>1</show_in_default>
4996	+ <show_in_website>1</show_in_website>
4997	+ <show_in_store>1</show_in_store>
4998	+ </fee>
4999	+ <fee_amount translate="label">
5000	+ <label>Payment fee amount</label>
5001	+ <frontend_type>text</frontend_type>
5002	+ <comment>Payment fee add like 0:5 this means a fixed fee of 0 euro and 5%</comment>
5003	+ <sort_order>80</sort_order>
5004	+ <show_in_default>1</show_in_default>
5005	+ <show_in_website>1</show_in_website>
5006	+ <show_in_store>1</show_in_store>
5007	+ </fee_amount>
5008	+ <fee_tax_class>
5009	+ <label>Tax class for payment fee</label>
5010	+ <comment>Select which tax class should be used for the payment fee</comment>
5011	+ <frontend_type>select</frontend_type>
5012	+ <source_model>msp/config_sources_taxClasses</source_model>
5013	+ <sort_order>90</sort_order>
5014	+ <show_in_default>1</show_in_default>
5015	+ <show_in_website>1</show_in_website>
5016	+ <show_in_store>1</show_in_store>
5017	+ </fee_tax_class>
5018	+ <fee_incexc translate="label">
5019	+ <label>Show payment fee incl. tax during checkout</label>
5020	+ <frontend_type>select</frontend_type>
5021	+ <source_model>adminhtml/system_config_source_yesno</source_model>
5022	+ <sort_order>81</sort_order>
5023	+ <show_in_default>1</show_in_default>
5024	+ <show_in_website>1</show_in_website>
5025	+ <show_in_store>1</show_in_store>
5026	+ </fee_incexc>
5027	+ <fee_description translate="label">
5028	+ <label>Payment fee description, visible in order totals</label>
5029	+ <frontend_type>text</frontend_type>
5030	+ <sort_order>100</sort_order>
5031	+ <show_in_default>1</show_in_default>
5032	+ <show_in_website>1</show_in_website>
5033	+ <show_in_store>1</show_in_store>
5034	+ </fee_description>
5035	+ <specificgroups translate="label">
5036	+ <label>Payment for Specific Customer Groups</label>
5037	+ <frontend_type>multiselect</frontend_type>
5038	+ <sort_order>101</sort_order>
5039	+ <source_model>adminhtml/system_config_source_customer_group</source_model>
5040	+ <show_in_default>1</show_in_default>
5041	+ <show_in_website>1</show_in_website>
5042	+ <show_in_store>1</show_in_store>
5043	+ </specificgroups>
5044	+ </fields>
5045	+ </msp_wijncadeau>
5046	<msp_degrotespeelgoedwinkel translate="label" module="msp">
5047	<label>De grote speelgoedwinkel coupon</label>
5048	<sort_order>744</sort_order>

5230	<!-- end: MSP Gateways -->
5231	<!-- begin: MSP Fast Checkout -->
5232	<mspcheckout translate="label" module="msp">
5233	+ <label>MultiSafepay - Fast Checkout - 2.1.2</label>
5234	<tab>sales</tab>
5235	<frontend_type>text</frontend_type>
5236	<sort_order>1001</sort_order>

app/design/frontend/base/default/template/msp/klarna.phtml ADDED Viewed

	@@ -0,0 +1,13 @@


1	+ <fieldset class="form-list">
2	+ <ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none">
3	+ <li>
4	+ <?php if ($this->getMethodCode() == 'msp_klarna') { ?>
5	+ <label for="birthday" style="width:200px!important;">Geboortedatum (dd-mm-yyyy):</label>
6	+ <input name='payment[birthday]' value="" id="birthday"/>
7	+ <br />
8	+ <label for="accountnumber" style="width:200px!important;">Rekeningnummer:</label>
9	+ <input name='payment[accountnumber]' value="" id="accountnumber"/>
10	+ <?php } ?>
11	+ </li>
12	+ </ul>
13	+ </fieldset>

app/locale/de_DE/MultiSafepay_Msp.csv CHANGED Viewed

	@@ -105,3 +105,7 @@
105	"@"," Bei "
106	"Order", "Bestellung Nr"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"


105	"@"," Bei "
106	"Order", "Bestellung Nr"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"
108	+ "Please retry placing your order and select a different payment method.", "U kunt uw order nog steeds afronden door te kiezen voor een andere betaalmethode."
109	+ "We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor", "Het spijt ons u te moeten informeren dat u Betaal na Ontvangst verzoek niet is geaccepteerd door Multifactor.<BR /> Mocht u vragen hebben over uw afwijzing, dan kunt u de FAQ op de website van Multifactor"
110	+ "You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to "," raadplegen. U kunt tevens contact opnemen met Multifactor via telefoonnummer 020-8500533 (Minimaal 2 uur na de afwijzing) of door het sturen van een e-mail naar: "
111	+

app/locale/es_ES/MultiSafepay_Msp.csv CHANGED Viewed

	@@ -105,3 +105,7 @@
105	"@"," @ "
106	"Order", "Order"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"


105	"@"," @ "
106	"Order", "Order"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"
108	+ "Please retry placing your order and select a different payment method.", "U kunt uw order nog steeds afronden door te kiezen voor een andere betaalmethode."
109	+ "We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor", "Het spijt ons u te moeten informeren dat u Betaal na Ontvangst verzoek niet is geaccepteerd door Multifactor.<BR /> Mocht u vragen hebben over uw afwijzing, dan kunt u de FAQ op de website van Multifactor"
110	+ "You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to "," raadplegen. U kunt tevens contact opnemen met Multifactor via telefoonnummer 020-8500533 (Minimaal 2 uur na de afwijzing) of door het sturen van een e-mail naar: "
111	+

app/locale/fr_FR/MultiSafepay_Msp.csv CHANGED Viewed

	@@ -105,3 +105,7 @@
105	"@"," @ "
106	"Order", "Order"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"


105	"@"," @ "
106	"Order", "Order"
107	"You are not allowed to request the product feed!", "You are not allowed to request the product feed!"
108	+ "Please retry placing your order and select a different payment method.", "U kunt uw order nog steeds afronden door te kiezen voor een andere betaalmethode."
109	+ "We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor", "Het spijt ons u te moeten informeren dat u Betaal na Ontvangst verzoek niet is geaccepteerd door Multifactor.<BR /> Mocht u vragen hebben over uw afwijzing, dan kunt u de FAQ op de website van Multifactor"
110	+ "You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to "," raadplegen. U kunt tevens contact opnemen met Multifactor via telefoonnummer 020-8500533 (Minimaal 2 uur na de afwijzing) of door het sturen van een e-mail naar: "
111	+

app/locale/it_IT/MultiSafepay_Msp.csv CHANGED Viewed

	@@ -106,4 +106,7 @@
106	"Type account", "Inserire account"
107	"@"," @ "
108	"Order", "Order"
109	- "You are not allowed to request the product feed!", "You are not allowed to request the product feed!"


106	"Type account", "Inserire account"
107	"@"," @ "
108	"Order", "Order"
109	+ "You are not allowed to request the product feed!", "You are not allowed to request the product feed!"
110	+ "Please retry placing your order and select a different payment method.", "U kunt uw order nog steeds afronden door te kiezen voor een andere betaalmethode."
111	+ "We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor", "Het spijt ons u te moeten informeren dat u Betaal na Ontvangst verzoek niet is geaccepteerd door Multifactor.<BR /> Mocht u vragen hebben over uw afwijzing, dan kunt u de FAQ op de website van Multifactor"
112	+ "You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to "," raadplegen. U kunt tevens contact opnemen met Multifactor via telefoonnummer 020-8500533 (Minimaal 2 uur na de afwijzing) of door het sturen van een e-mail naar: "

app/locale/nl_NL/MultiSafepay_Msp.csv CHANGED Viewed

	@@ -114,11 +114,10 @@
114	"Enable direct banktransfer (no MultiSafepay page)", "Activeer een directe bankoverschrijving (Geen MultiSafepay pagina)"
115	"Allow FastCheckout Product Feed", "Sta het ophalen van de producten feed voor FastCheckout toe"
116	"With this option enabled, FastCheckout can request your productfeed if configured at FastCheckout", "Met deze optie aan kan FastCheckout the producten feed ophalen."
117	-
118	-
119	-
120	-
121	-
122
123
124


114	"Enable direct banktransfer (no MultiSafepay page)", "Activeer een directe bankoverschrijving (Geen MultiSafepay pagina)"
115	"Allow FastCheckout Product Feed", "Sta het ophalen van de producten feed voor FastCheckout toe"
116	"With this option enabled, FastCheckout can request your productfeed if configured at FastCheckout", "Met deze optie aan kan FastCheckout the producten feed ophalen."
117	+ "An error occured: ", "Er is een fout opgetreden: "
118	+ "Please retry placing your order and select a different payment method.", "U kunt uw order nog steeds afronden door te kiezen voor een andere betaalmethode."
119	+ "We are sorry to inform you that your request for payment after delivery has been denied by Multifactor.<BR /> If you have questions about this rejection, you can checkout the FAQ on the website of Multifactor", "Het spijt ons u te moeten informeren dat u Betaal na Ontvangst verzoek niet is geaccepteerd door Multifactor.<BR /> Mocht u vragen hebben over uw afwijzing, dan kunt u de FAQ op de website van Multifactor"
120	+ "You can also contact Multifactor by calling 020-8500533 (at least 2 hours after this rejection) or by sending an email to "," raadplegen. U kunt tevens contact opnemen met Multifactor via telefoonnummer 020-8500533 (Minimaal 2 uur na de afwijzing) of door het sturen van een e-mail naar: "

121
122
123

lib/multisafepay/MultiSafepay.combined.php CHANGED Viewed

	@@ -2240,7 +2240,7 @@ class MspCart {
2240
2241	$xml_data->Pop($ship->type);
2242	} else if ($ship->type == "pickup") {
2243	- $xml_data->Push('pickup', array('name' => $ship->name));
2244	$xml_data->Element('price', $ship->price, array('currency' => $this->currency));
2245	$xml_data->Pop('pickup');
2246	}
	@@ -3648,14 +3648,16 @@ class MspPickUp {
3648	var $price;
3649	var $name;
3650	var $type = "pickup";

3651
3652	/**
3653	* @param string $name the name of this shipping option
3654	* @param double $price the handling cost (if there is one)
3655	*/
3656	- function MspPickUp($name, $price) {
3657	$this->price = $price;
3658	$this->name = $name;

3659	}
3660
3661	}


2240
2241	$xml_data->Pop($ship->type);
2242	} else if ($ship->type == "pickup") {
2243	+ $xml_data->Push('pickup', array('name' => $ship->name, 'provider'=> $ship->provider));
2244	$xml_data->Element('price', $ship->price, array('currency' => $this->currency));
2245	$xml_data->Pop('pickup');
2246	}

3648	var $price;
3649	var $name;
3650	var $type = "pickup";
3651	+ var $provider;
3652
3653	/**
3654	* @param string $name the name of this shipping option
3655	* @param double $price the handling cost (if there is one)
3656	*/
3657	+ function MspPickUp($name, $price, $provider = '') {
3658	$this->price = $price;
3659	$this->name = $name;
3660	+ $this->provider = $provider;
3661	}
3662
3663	}

media/msp/nl/msp_klarna.png ADDED Viewed

Binary file

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>MultiSafepay_Msp</name>
4	- <version>2.1.1</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
7	<channel>community</channel>
	@@ -10,9 +10,9 @@
10	<description>With this module you can use all payment methods offered by MultiSafepay</description>
11	<notes>Tested by MultiSafepay</notes>
12	<authors><author><name>MultiSafepay</name><user>MultiSafepayDev</user><email>Info@multisafepay.com</email></author></authors>
13	- <date>2015-03-23</date>
14	- <time>11:44:10</time>
15	- <contents><target name="magecommunity"><dir name="MultiSafepay"><dir name="Msp"><dir name="Block"><dir name="Adminhtml"><dir name="Servicecost"><dir name="Totals"><file name="Creditmemo.php" hash="053df3846c6391c6f2fec133c66b0afb"/><file name="Invoice.php" hash="91f8e01a2a947a04ca1587cfba8f0014"/><file name="Order.php" hash="ccb5138723f892ef68537ba302d7c4e3"/></dir></dir></dir><file name="Bno.php" hash="b2dd61062c2c27ee4406a3f3ed8ec8b7"/><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="3f68146a2f124b51ba1b866c1816c1e1"/></dir></dir></dir><file name="Default.php" hash="196e02bdf9df0195c19bcd965b70e4e3"/><file name="Gateways.php" hash="4ad012bccc09fa9d8d27cb83cc7b8a1a"/><file name="IdealIssuers.php" hash="27dd43debe5c0dfa22fee1a879c44926"/><file name="Link.php" hash="f9fd1820a8431d93139686b1b7292250"/><dir name="Servicecost"><dir name="Order"><file name="Total.php" hash="3d280bfaef4cd7a87de835406584f625"/><file name="Totals.php" hash="158ff25288db50f232fd79101d449213"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="54ae8f116772059d8826dc827281ef78"/></dir><dir name="Model"><file name="Abstract.php" hash="ba8079cb854ab74d5276bfe253a8cac0"/><dir name="Api"><file name="Creditmemo.php" hash="ba9565ef44f83496b61158bfbc2067f9"/><file name="Paylink.php" hash="342061b19cd53b3eaba607fb9255d037"/><file name="Shipment.php" hash="1b3ee4da13734ff0412da80bca4111a0"/></dir><file name="Base.php" hash="6a94b3155c9bb9c6ebc374bdc7784f4a"/><file name="Checkout.php" hash="e4ed2d1c9a3dc9c23dd2795a4876c7d0"/><dir name="Config"><dir name="Sources"><file name="Accounts.php" hash="8e1228aa67d459dbc598ecb801b7a451"/><file name="Fields.php" hash="2b2338147178664a4d29423b0bc9ab2d"/><file name="Languages.php" hash="af19ca8647d353481fad4319dfdc8d09"/><dir name="Order"><file name="Currency.php" hash="41242e8fe6257bd6e450b97a1179ef19"/><file name="Email.php" hash="cc6da2a79d873ed67086f23a70b096cf"/></dir><file name="TaxClasses.php" hash="56d52f22239542fc965fc0bbd34bcff8"/></dir></dir><dir name="Gateway"><file name="Abstract.php" hash="0e1860bd3ed1ca559848b7c49e64a340"/><file name="Amex.php" hash="ff10fce76354da776ec11a99de19606c"/><file name="Babygiftcard.php" hash="023eb1c0da2cf3c3e77d87ea429ec070"/><file name="Banktransfer.php" hash="ebcc66524bff9b674098d624b668c4c5"/><file name="Boekenbon.php" hash="cf1aef4f6007fcf488cbfdc6564398e2"/><file name="Default.php" hash="76e4d2306b681ac8f76c57eba3ee56fb"/><file name="Degrotespeelgoedwinkel.php" hash="c4e47624c833c4b18659e294ddcf85a9"/><file name="DirectDebit.php" hash="321a1ae72502d2885e04cd1c1ca43d89"/><file name="DirectEbanking.php" hash="3d90e75d9cacf8fe9344afc553104d6d"/><file name="Ebon.php" hash="1ae6cc3469bfc18e92ffa69099642d89"/><file name="Erotiekbon.php" hash="99661e6caff7e49c492d0aeac6d5c2a4"/><file name="Fashioncheque.php" hash="4ec0609a04738df2efb1adf5b4e690de"/><file name="Fastcheckout.php" hash="17c66e5c7f137081f0bb0e8d0c9c8cb3"/><file name="Gezondheidsbon.php" hash="800ef8a5628b39f42c0cb952346ee5a3"/><file name="GiroPay.php" hash="dff685719e4a0748e7c316e8c4783b51"/><file name="Ideal.php" hash="628fa1009c2c5d1ca2a75a12c424639d"/><file name="Lief.php" hash="c57189c1ab312d3ffff41c47c49b1d91"/><file name="Maestro.php" hash="a4da2619b078db9745e336be28f72f53"/><file name="Mastercard.php" hash="91a4aa8408fa87b29d8516dc70be5ece"/><file name="Mistercash.php" hash="2ffe2f02e631ba2a4b5efa584dfc1e47"/><file name="MultiSafepay.php" hash="39754875012e1bb404340f81f574dde3"/><file name="Parfumcadeaukaart.php" hash="8a04202d50a60a9a1ff0f805b5ae75c5"/><file name="Parfumnl.php" hash="9c807bbc577d0ca335bc0d74d20807ce"/><file name="Payafter.php" hash="f50d122633f14cdd03bd5192de8a253d"/><file name="Paypal.php" hash="45607135c9717d4422ae4a2b6e39cead"/><file name="Standard.php" hash="43ea744c95f898f4a9ef5fe3a80bb078"/><file name="Visa.php" hash="72e0c693dca5c94aeede4d7b2c7ed432"/><file name="Webgift.php" hash="80c03b3609ce0860a43ea7c709044cee"/><file name="Yourgift.php" hash="c6b9b7d909857d5917e06b7507f8ad8c"/></dir><dir name="Observer"><file name="Abstract.php" hash="f69ae090d64e8f30b96d22b58066247c"/><file name="Creditmemo.php" hash="02c8e5415c1051fa9a6c0fbdb55623e9"/><file name="Order.php" hash="f1d0b45172000d41a1584651a9f9543f"/><file name="Shipment.php" hash="95a962b14c3a34647b7ce52389827db6"/></dir><file name="Payment.php" hash="3d58d412cfa85b6cfc5360948dc80052"/><dir name="Service"><file name="Quote.php" hash="cfd59e48c07f4b47b7f70d23cc8f5f8a"/></dir><dir name="Servicecost"><dir name="Creditmemo"><file name="Total.php" hash="1096e0e8ac1bbfb91272658332b37a76"/></dir><dir name="Invoice"><file name="Totals.php" hash="d59b1a4ca34c91a383f08be0fa09a19a"/></dir><file name="Observer.php" hash="60bbe048424c1581630c3365e7abd5ba"/><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Servicecost.php" hash="3c84c3361b86ffd276068798b837cbf8"/></dir></dir></dir></dir><file name="Setup.php" hash="bfa4d921685eeb25724f40c7fec0f625"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="1e95a336e8a0ba327e38ed556031d7de"/><file name="MspPaymentController.php" hash="d2add60c93cb99ef9f2630466fbcbfdc"/><file name="StandardController.php" hash="5f59ef05ec187310b6652c26e732398c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="33eb71325e1e49350a81d22d8fe21731"/><file name="config.xml" hash="6319ffe0e90e1a52fdb5f975d330d917"/><file name="system.xml" hash="7922751d41455050e91fbb919078521b"/></dir><dir name="sql"><dir name="msp_setup"><file name="mysql4-upgrade-1.3.3-1.4.0.php" hash="f03b18f286e18dc61f6e7944d65ff871"/><file name="mysql4-upgrade-1.3.3-2.1.0.php" hash="2bb4226b4276a2dd7ebe76164aa205ab"/></dir></dir></dir></dir></target><target name="magemedia"><dir name="msp"><file name="button.png" hash="3f109b9ccbf7e26c3600d9b445bfab4f"/><dir name="de"><file name="Thumbs.db" hash="23c6d2fa586f60e64acf307d398dfeb2"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="5993fd5deb6e184765d690c85ae7d740"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="38dc09ac7c4d8e32dade12ef7b24ba75"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="en"><file name="Thumbs.db" hash="8631718a27c51f2a091e6e954af7f434"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="5993fd5deb6e184765d690c85ae7d740"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="177fe504ef710cf5eaf42cc9592c2215"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="es"><file name="Thumbs.db" hash="c67f35358ffef6d7986bb93f1e65eae6"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="0ba666cf841114b892667331c8aaad4e"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="3ffde6c7a1eec68da96ea11518dfde55"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="fr"><file name="Thumbs.db" hash="163c29258e74e6c5809b93399db36904"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="87bb8916f81ed310cf5cb3aed814fb9d"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="f0b641efb330c71dbdbf9eb71617605f"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="it"><file name="Thumbs.db" hash="06947336d2daae296c3aa6e0d0666a3e"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="eaf1b22dbe6ad0ad3e8c7108552359ad"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="dfb3d359a9b48c88dc71ef65af9ea356"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="nl"><file name="Thumbs.db" hash="1b02d4a7ea1014a099e3abc3fffc4902"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="404edf4cd1e16a79e2c72db944f00ae6"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="df54e38016cda0b1dbd537b4784278f7"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="msp"><file name="agreements.phtml" hash="a7f6319765ce10fbe57f3ebe33e764f3"/><file name="bno.phtml" hash="e5d90918b36fafda8e5034ffd789c43d"/><file name="default.phtml" hash="018afb6af2468b966c5a8fb832c54179"/><file name="gateways.phtml" hash="6ccde89c2c88e42bbb35698181bcfe1b"/><file name="idealissuers.phtml" hash="bbc26977250588a719b345d95eb25ac7"/><file name="link.phtml" hash="75469a2a53a7ed0350630474010b13a5"/><file name="linkText.phtml" hash="d94fba14433870541603c1b3943d6ae8"/></dir></dir><dir name="layout"><file name="msp.xml" hash="f531bd40a71ae0ce1bfb761ac18020d0"/></dir></dir></dir></dir></target><target name="mage"><dir name="lib"><dir name="multisafepay"><file name="MultiSafepay.combined.php" hash="95259400966cf9ed0a82addbad042660"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MultiSafepay_Msp.xml" hash="938ed562dccc9b8c187ffd10ba4bde7a"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="MultiSafepay_Msp.csv" hash="aefa86ba2a475430e35f8978238a4cee"/></dir><dir name="de_DE"><file name="MultiSafepay_Msp.csv" hash="6f8439c8a6a09f338593cad34e4fc301"/></dir><dir name="en_EN"><file name="MultiSafepay_Msp.csv" hash="ed854aac72b11e698c578218b6f4906e"/></dir><dir name="es_ES"><file name="MultiSafepay_Msp.csv" hash="4177d4d789972219078d32f97afe145d"/></dir><dir name="fr_FR"><file name="MultiSafepay_Msp.csv" hash="b503b8e41f888e96fe014d8f6b00621f"/></dir><dir name="it_IT"><file name="MultiSafepay_Msp.csv" hash="3044b64ddc5f542b03ec5cc6b17d98c5"/></dir></target></contents>
16	<compatible/>
17	<dependencies><required><php><min>5.2.13</min><max>5.6.6</max></php></required></dependencies>
18	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>MultiSafepay_Msp</name>
4	+ <version>2.1.2</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
7	<channel>community</channel>

10	<description>With this module you can use all payment methods offered by MultiSafepay</description>
11	<notes>Tested by MultiSafepay</notes>
12	<authors><author><name>MultiSafepay</name><user>MultiSafepayDev</user><email>Info@multisafepay.com</email></author></authors>
13	+ <date>2015-05-08</date>
14	+ <time>07:22:28</time>
15	+ <contents><target name="magecommunity"><dir name="MultiSafepay"><dir name="Msp"><dir name="Block"><dir name="Adminhtml"><dir name="Servicecost"><dir name="Totals"><file name="Creditmemo.php" hash="053df3846c6391c6f2fec133c66b0afb"/><file name="Invoice.php" hash="91f8e01a2a947a04ca1587cfba8f0014"/><file name="Order.php" hash="ccb5138723f892ef68537ba302d7c4e3"/></dir></dir></dir><file name="Bno.php" hash="b2dd61062c2c27ee4406a3f3ed8ec8b7"/><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="3f68146a2f124b51ba1b866c1816c1e1"/></dir></dir></dir><file name="Default.php" hash="196e02bdf9df0195c19bcd965b70e4e3"/><file name="Gateways.php" hash="4ad012bccc09fa9d8d27cb83cc7b8a1a"/><file name="IdealIssuers.php" hash="27dd43debe5c0dfa22fee1a879c44926"/><file name="Klarna.php" hash="2199e9a10121ca0553d9cf125d7e6e49"/><file name="Link.php" hash="f9fd1820a8431d93139686b1b7292250"/><dir name="Servicecost"><dir name="Order"><file name="Total.php" hash="3d280bfaef4cd7a87de835406584f625"/><file name="Totals.php" hash="158ff25288db50f232fd79101d449213"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="5e35168f5c0dba1e251a68264c78cc87"/></dir><dir name="Model"><file name="Abstract.php" hash="ba8079cb854ab74d5276bfe253a8cac0"/><dir name="Api"><file name="Creditmemo.php" hash="ba9565ef44f83496b61158bfbc2067f9"/><file name="Paylink.php" hash="8f6e63d8c728f4d6f09ca4b585bf8eba"/><file name="Shipment.php" hash="1b3ee4da13734ff0412da80bca4111a0"/></dir><file name="Base.php" hash="475b8d5403db22cc3ec516e6dd681baf"/><file name="Checkout.php" hash="b1289ffb46e4e7c9bcbe7e337709289f"/><dir name="Config"><dir name="Sources"><file name="Accounts.php" hash="8e1228aa67d459dbc598ecb801b7a451"/><file name="Fields.php" hash="2b2338147178664a4d29423b0bc9ab2d"/><file name="Languages.php" hash="af19ca8647d353481fad4319dfdc8d09"/><dir name="Order"><file name="Currency.php" hash="41242e8fe6257bd6e450b97a1179ef19"/><file name="Email.php" hash="cc6da2a79d873ed67086f23a70b096cf"/></dir><file name="TaxClasses.php" hash="56d52f22239542fc965fc0bbd34bcff8"/></dir></dir><dir name="Gateway"><file name="Abstract.php" hash="f13345cc23ac404ecc984b59896a2ea1"/><file name="Amex.php" hash="ff10fce76354da776ec11a99de19606c"/><file name="Babygiftcard.php" hash="023eb1c0da2cf3c3e77d87ea429ec070"/><file name="Banktransfer.php" hash="ebcc66524bff9b674098d624b668c4c5"/><file name="Boekenbon.php" hash="cf1aef4f6007fcf488cbfdc6564398e2"/><file name="Default.php" hash="76e4d2306b681ac8f76c57eba3ee56fb"/><file name="Degrotespeelgoedwinkel.php" hash="c4e47624c833c4b18659e294ddcf85a9"/><file name="DirectDebit.php" hash="321a1ae72502d2885e04cd1c1ca43d89"/><file name="DirectEbanking.php" hash="3d90e75d9cacf8fe9344afc553104d6d"/><file name="Ebon.php" hash="1ae6cc3469bfc18e92ffa69099642d89"/><file name="Erotiekbon.php" hash="99661e6caff7e49c492d0aeac6d5c2a4"/><file name="Fashioncheque.php" hash="4ec0609a04738df2efb1adf5b4e690de"/><file name="Fastcheckout.php" hash="17c66e5c7f137081f0bb0e8d0c9c8cb3"/><file name="Gezondheidsbon.php" hash="800ef8a5628b39f42c0cb952346ee5a3"/><file name="GiroPay.php" hash="dff685719e4a0748e7c316e8c4783b51"/><file name="Ideal.php" hash="628fa1009c2c5d1ca2a75a12c424639d"/><file name="Klarna.php" hash="4b094d9d08bc895e16d30e96db6ccac3"/><file name="Lief.php" hash="c57189c1ab312d3ffff41c47c49b1d91"/><file name="Maestro.php" hash="a4da2619b078db9745e336be28f72f53"/><file name="Mastercard.php" hash="91a4aa8408fa87b29d8516dc70be5ece"/><file name="Mistercash.php" hash="2ffe2f02e631ba2a4b5efa584dfc1e47"/><file name="MultiSafepay.php" hash="39754875012e1bb404340f81f574dde3"/><file name="Parfumcadeaukaart.php" hash="8a04202d50a60a9a1ff0f805b5ae75c5"/><file name="Parfumnl.php" hash="9c807bbc577d0ca335bc0d74d20807ce"/><file name="Payafter.php" hash="f50d122633f14cdd03bd5192de8a253d"/><file name="Paypal.php" hash="45607135c9717d4422ae4a2b6e39cead"/><file name="Standard.php" hash="43ea744c95f898f4a9ef5fe3a80bb078"/><file name="Visa.php" hash="72e0c693dca5c94aeede4d7b2c7ed432"/><file name="Webgift.php" hash="80c03b3609ce0860a43ea7c709044cee"/><file name="Wijncadeau.php" hash="2613b3fd6212b562588c753b403f91f9"/><file name="Yourgift.php" hash="c6b9b7d909857d5917e06b7507f8ad8c"/></dir><dir name="Observer"><file name="Abstract.php" hash="f69ae090d64e8f30b96d22b58066247c"/><file name="Creditmemo.php" hash="02c8e5415c1051fa9a6c0fbdb55623e9"/><file name="Order.php" hash="234c2a3a9e6315d4136682636db55f10"/><file name="Shipment.php" hash="7e5a0da09ec25d8326d8cfcd9ec1b085"/></dir><file name="Payment.php" hash="05d5f5e5800c1e996f60b770b1cf2ee9"/><dir name="Service"><file name="Quote.php" hash="3d7285a4c31267a5ab4ee89cb58ad98f"/></dir><dir name="Servicecost"><dir name="Creditmemo"><file name="Total.php" hash="1096e0e8ac1bbfb91272658332b37a76"/></dir><dir name="Invoice"><file name="Totals.php" hash="d59b1a4ca34c91a383f08be0fa09a19a"/></dir><file name="Observer.php" hash="60bbe048424c1581630c3365e7abd5ba"/><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Servicecost.php" hash="d0f507f1ca0da1af480b758a6401fc99"/></dir></dir></dir></dir><file name="Setup.php" hash="bfa4d921685eeb25724f40c7fec0f625"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="1e95a336e8a0ba327e38ed556031d7de"/><file name="MspPaymentController.php" hash="d2add60c93cb99ef9f2630466fbcbfdc"/><file name="StandardController.php" hash="a0e50487bbe4ea5b47741ab88bd05aa7"/></dir><dir name="etc"><file name="adminhtml.xml" hash="33eb71325e1e49350a81d22d8fe21731"/><file name="config.xml" hash="45711e68eda59661ec0608cef66c4d2f"/><file name="system.xml" hash="ba2fd587b7f7645c04f8af065f2ac306"/></dir><dir name="sql"><dir name="msp_setup"><file name="mysql4-upgrade-1.3.3-1.4.0.php" hash="f03b18f286e18dc61f6e7944d65ff871"/><file name="mysql4-upgrade-1.3.3-2.1.0.php" hash="2bb4226b4276a2dd7ebe76164aa205ab"/></dir></dir></dir></dir></target><target name="magemedia"><dir name="msp"><file name="button.png" hash="3f109b9ccbf7e26c3600d9b445bfab4f"/><dir name="de"><file name="Thumbs.db" hash="23c6d2fa586f60e64acf307d398dfeb2"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="5993fd5deb6e184765d690c85ae7d740"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="38dc09ac7c4d8e32dade12ef7b24ba75"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="en"><file name="Thumbs.db" hash="8631718a27c51f2a091e6e954af7f434"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="5993fd5deb6e184765d690c85ae7d740"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="177fe504ef710cf5eaf42cc9592c2215"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="es"><file name="Thumbs.db" hash="c67f35358ffef6d7986bb93f1e65eae6"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="0ba666cf841114b892667331c8aaad4e"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="3ffde6c7a1eec68da96ea11518dfde55"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="fr"><file name="Thumbs.db" hash="163c29258e74e6c5809b93399db36904"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="87bb8916f81ed310cf5cb3aed814fb9d"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="f0b641efb330c71dbdbf9eb71617605f"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="it"><file name="Thumbs.db" hash="06947336d2daae296c3aa6e0d0666a3e"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="eaf1b22dbe6ad0ad3e8c7108552359ad"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="dfb3d359a9b48c88dc71ef65af9ea356"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir><dir name="nl"><file name="Thumbs.db" hash="1b02d4a7ea1014a099e3abc3fffc4902"/><file name="msp_amex.png" hash="a5e66b6516f80a7d8add7d59d6bf0e9d"/><file name="msp_babygiftcard.png" hash="85cb17a943036d86402bb439938cf616"/><file name="msp_banktransfer.png" hash="404edf4cd1e16a79e2c72db944f00ae6"/><file name="msp_boekenbon.png" hash="c69a112af5220771b4d281978cd184ba"/><file name="msp_degrotespeelgoedwinkel.png" hash="e9193002f24d2ba35afb759b5c268be5"/><file name="msp_directdebit.png" hash="df54e38016cda0b1dbd537b4784278f7"/><file name="msp_directebanking.png" hash="a3e72c2e0053b8fab500bd171e516877"/><file name="msp_ebon.png" hash="e98f08cc1108106951e01f9b186a5cdb"/><file name="msp_erotiekbon.png" hash="b3d5a2793aabcf2f9761454c0bc95ad1"/><file name="msp_fashioncheque.png" hash="b11a52ef39ae97225def18778a4be4c2"/><file name="msp_giropay.png" hash="da6c83afbcf21821ef3d88e5c955fabb"/><file name="msp_ideal.png" hash="975bc03d136c0e5a37f8d5f5a710b6c7"/><file name="msp_klarna.png" hash="c319a648de78523fb01ec68748abfebb"/><file name="msp_maestro.png" hash="94cfd9498ab1c4293099b0778c899b7b"/><file name="msp_mastercard.png" hash="dedc112da93c9aafe992b68cbe4a6051"/><file name="msp_mistercash.png" hash="c429297b30437960315df5d9b36b0118"/><file name="msp_multisafepay.png" hash="4f7ad00d5eea0113a8b52fa4ece7bf8a"/><file name="msp_parfumcadeaukaart.png" hash="270bb5bfc45a036d9b761431b540e1ad"/><file name="msp_parfumnl.png" hash="a3e69d28d44938db2fbb5a2407c76c7f"/><file name="msp_payafter.png" hash="31eab2a6944a9dc181eed046ee8ec238"/><file name="msp_paypal.png" hash="6d072cdf9a82a9f3c419ad13dbc78846"/><file name="msp_visa.png" hash="88d54fe482cd1e2f8d5857829866cc18"/><file name="msp_webgift.png" hash="cbea18654cf36cc6a743316d359a6b87"/></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="msp"><file name="agreements.phtml" hash="a7f6319765ce10fbe57f3ebe33e764f3"/><file name="bno.phtml" hash="e5d90918b36fafda8e5034ffd789c43d"/><file name="default.phtml" hash="018afb6af2468b966c5a8fb832c54179"/><file name="gateways.phtml" hash="6ccde89c2c88e42bbb35698181bcfe1b"/><file name="idealissuers.phtml" hash="bbc26977250588a719b345d95eb25ac7"/><file name="klarna.phtml" hash="7843ad9629580ac7d92222c2670f5d6e"/><file name="link.phtml" hash="75469a2a53a7ed0350630474010b13a5"/><file name="linkText.phtml" hash="d94fba14433870541603c1b3943d6ae8"/></dir></dir><dir name="layout"><file name="msp.xml" hash="f531bd40a71ae0ce1bfb761ac18020d0"/></dir></dir></dir></dir></target><target name="mage"><dir name="lib"><dir name="multisafepay"><file name="MultiSafepay.combined.php" hash="424ba5e7d9d7b61eac974461599cc980"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MultiSafepay_Msp.xml" hash="938ed562dccc9b8c187ffd10ba4bde7a"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="MultiSafepay_Msp.csv" hash="4b4736b69b17e654a7f0531acb6e887a"/></dir><dir name="de_DE"><file name="MultiSafepay_Msp.csv" hash="77fb9399cf6760749311d564a24af133"/></dir><dir name="en_EN"><file name="MultiSafepay_Msp.csv" hash="ed854aac72b11e698c578218b6f4906e"/></dir><dir name="es_ES"><file name="MultiSafepay_Msp.csv" hash="f6c76aa1273e1a4e897b0e6c5aac780c"/></dir><dir name="fr_FR"><file name="MultiSafepay_Msp.csv" hash="ff58587f6c892f4de9074282a2a997f0"/></dir><dir name="it_IT"><file name="MultiSafepay_Msp.csv" hash="0332fffa252445398724d76ecb4232e0"/></dir></target></contents>
16	<compatible/>
17	<dependencies><required><php><min>5.2.13</min><max>5.6.6</max></php></required></dependencies>
18	</package>