MultiSafepay_Msp - Version 2.0.1

Version Notes

Tested by MultiSafepay

Download this release

Release Info

Developer MultiSafepay
Extension MultiSafepay_Msp
Version 2.0.1
Comparing to
See all releases


Code changes from version 2.0.0 to 2.0.1

Files changed (64) hide show
  1. app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Creditmemo.php +33 -0
  2. app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Invoice.php +27 -0
  3. app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Order.php +23 -0
  4. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Checkout/Fee.php +0 -27
  5. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Creditmemo/Totals/Frontend/Paymentfee.php +0 -32
  6. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Creditmemo/Totals/Paymentfee.php +0 -44
  7. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Invoice/Totals/Paymentfee.php +0 -41
  8. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totalbar.php +0 -38
  9. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totals/Paymentfee.php +0 -33
  10. app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totals/Tax.php +0 -47
  11. app/code/community/MultiSafepay/Msp/Block/Servicecost/Order/Total.php +65 -0
  12. app/code/community/MultiSafepay/Msp/Block/Servicecost/Order/Totals.php +25 -0
  13. app/code/community/MultiSafepay/Msp/Helper/Data.php +10 -57
  14. app/code/community/MultiSafepay/Msp/Model/Abstract.php +163 -225
  15. app/code/community/MultiSafepay/Msp/Model/Base.php +256 -88
  16. app/code/community/MultiSafepay/Msp/Model/Checkout.php +1 -1
  17. app/code/community/MultiSafepay/Msp/Model/Gateway/Abstract.php +17 -3
  18. app/code/community/MultiSafepay/Msp/Model/Gateway/Gezondheidsbon.php +14 -0
  19. app/code/community/MultiSafepay/Msp/Model/Observer/Capture-dist.php +0 -97
  20. app/code/community/MultiSafepay/Msp/Model/Observer/Capture.php +0 -97
  21. app/code/community/MultiSafepay/Msp/Model/Observer/Config.php +0 -103
  22. app/code/community/MultiSafepay/Msp/Model/Observer/Creditmemo.php +1 -0
  23. app/code/community/MultiSafepay/Msp/Model/Observer/Order.php +1 -0
  24. app/code/community/MultiSafepay/Msp/Model/Order/Invoice/Total.php +0 -75
  25. app/code/community/MultiSafepay/Msp/Model/Payment.php +151 -69
  26. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Observer.php +0 -111
  27. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Creditmemo.php +0 -19
  28. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Creditmemo/Total.php +0 -67
  29. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Invoice/Total.php +0 -75
  30. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Quote/Address/Total.php +0 -277
  31. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Refund.php +0 -169
  32. app/code/community/MultiSafepay/Msp/Model/PaymentFee/Service/Order.php +0 -25
  33. app/code/community/MultiSafepay/Msp/Model/Quote/Address/Total/Surcharge.php +0 -107
  34. app/code/community/MultiSafepay/Msp/Model/Servicecost/Creditmemo/Total.php +23 -0
  35. app/code/community/MultiSafepay/Msp/Model/Servicecost/Invoice/Totals.php +21 -0
  36. app/code/community/MultiSafepay/Msp/Model/Servicecost/Observer.php +27 -0
  37. app/code/community/MultiSafepay/Msp/Model/Servicecost/Quote/Address/Total/Servicecost.php +190 -0
  38. app/code/community/MultiSafepay/Msp/controllers/CheckoutController.php +3 -3
  39. app/code/community/MultiSafepay/Msp/controllers/StandardController.php +3 -3
  40. app/code/community/MultiSafepay/Msp/etc/config.xml +98 -164
  41. app/code/community/MultiSafepay/Msp/etc/system.xml +1280 -174
  42. app/code/community/MultiSafepay/Msp/sql/msp_setup/mysql4-upgrade-1.3.3-1.4.0.php +66 -62
  43. app/design/frontend/base/default/layout/msp.xml +1 -53
  44. app/design/frontend/base/default/template/msp/bno.phtml +1 -1
  45. app/design/frontend/base/default/template/msp/paymentFee/checkout/fee.phtml +2 -1
  46. app/locale/nl_NL/MultiSafepay_Msp.csv +115 -30
  47. lib/multisafepay/MultiSafepay.combined.php +18 -12
  48. media/msp/de/Thumbs.db +0 -0
  49. media/msp/de/msp_banktransfer.png +0 -0
  50. media/msp/de/msp_directdebit.png +0 -0
  51. media/msp/en/Thumbs.db +0 -0
  52. media/msp/en/msp_banktransfer.png +0 -0
  53. media/msp/en/msp_directdebit.png +0 -0
  54. media/msp/es/Thumbs.db +0 -0
  55. media/msp/es/msp_banktransfer.png +0 -0
  56. media/msp/es/msp_directdebit.png +0 -0
  57. media/msp/fr/Thumbs.db +0 -0
  58. media/msp/fr/msp_banktransfer.png +0 -0
  59. media/msp/fr/msp_directdebit.png +0 -0
  60. media/msp/it/Thumbs.db +0 -0
  61. media/msp/it/msp_banktransfer.png +0 -0
  62. media/msp/it/msp_directdebit.png +0 -0
  63. media/msp/nl/Thumbs.db +0 -0
  64. package.xml +5 -5
app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Creditmemo.php ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Creditmemo extends Mage_Adminhtml_Block_Sales_Order_Creditmemo_Totals {
4
+ protected function _initTotals() {
5
+ parent::_initTotals();
6
+ $order = $this->getSource()->getOrder();
7
+ $amount = $order->getServicecostPdf();
8
+ $tax = $order->getServicecostTax();
9
+
10
+ $code = $order->getPayment()->getMethod();
11
+
12
+ $method = $order->getPayment()->getMethodInstance();
13
+
14
+ if ($amount) {
15
+ $this->addTotalBefore(new Varien_Object(array(
16
+ 'code' => 'servicecost',
17
+ 'value' => $amount,
18
+ 'base_value'=> $amount,
19
+ 'label' => Mage::helper('msp')->getFeeLabel($code)
20
+ ), array('tax'))
21
+ );
22
+
23
+
24
+ $creditmemo = $this->getCreditMemo();
25
+ $creditmemo->setBaseTaxAmount($creditmemo->getBaseTaxAmount() + $tax);
26
+ $creditmemo->setTaxAmount($creditmemo->getTaxAmount() + $tax);
27
+ $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $amount + $tax);
28
+ $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $amount + $tax);
29
+ }
30
+ return $this;
31
+ }
32
+
33
+ }
app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Invoice.php ADDED
@@ -0,0 +1,27 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Invoice extends Mage_Adminhtml_Block_Sales_Order_Invoice_Totals {
4
+
5
+ protected function _initTotals() {
6
+ parent::_initTotals();
7
+
8
+ $source = $this->getSource();
9
+ $amount = $source->getOrder()->getServicecostPdf();
10
+ $method = $source->getOrder()->getPayment()->getMethodInstance();
11
+
12
+ $code = $source->getOrder()->getPayment()->getMethod();
13
+
14
+ if ($amount) {
15
+ $this->addTotalBefore(new Varien_Object(array(
16
+ 'code' => 'servicecost',
17
+ 'value' => $amount,
18
+ 'base_value'=> $amount,
19
+ 'label' => Mage::helper('msp')->getFeeLabel($code)
20
+ ), array('tax'))
21
+ );
22
+ }
23
+
24
+ return $this;
25
+ }
26
+
27
+ }
app/code/community/MultiSafepay/Msp/Block/Adminhtml/Servicecost/Totals/Order.php ADDED
@@ -0,0 +1,23 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Order extends Mage_Adminhtml_Block_Sales_Order_Totals {
4
+ protected function _initTotals() {
5
+ parent::_initTotals();
6
+
7
+ $order = $this->getSource();
8
+ $code = $order ->getPayment()->getMethod();
9
+ $amount = $order->getServicecostPdf();
10
+ $method = $order->getPayment()->getMethodInstance();
11
+ if ($amount) {
12
+ $this->addTotalBefore(new Varien_Object(array(
13
+ 'code' => 'servicecost',
14
+ 'value' => $amount,
15
+ 'base_value'=> $amount,
16
+ 'label' => Mage::helper('msp')->getFeeLabel($code)
17
+ ), array('tax'))
18
+ );
19
+
20
+ }
21
+ return $this;
22
+ }
23
+ }
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Checkout/Fee.php DELETED
@@ -1,27 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Checkout_Fee extends Mage_Checkout_Block_Total_Default
10
- {
11
- protected $_template = 'msp/paymentFee/checkout/fee.phtml';
12
-
13
- /**
14
- * Get COD fee exclude tax
15
- *
16
- * @return float
17
- */
18
- public function getPaymentFee()
19
- {
20
- $paymentFee = 0;
21
- foreach ($this->getTotal()->getAddress()->getQuote()->getAllShippingAddresses() as $address) {
22
- $paymentFee += $address->getPaymentFee();
23
- }
24
-
25
- return $paymentFee;
26
- }
27
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Creditmemo/Totals/Frontend/Paymentfee.php DELETED
@@ -1,32 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Creditmemo_Totals_Frontend_Paymentfee extends Mage_Core_Block_Abstract
10
- {
11
- /**
12
- * @return $this
13
- */
14
- public function initTotals()
15
- {
16
- $parent = $this->getParentBlock();
17
- $this->_creditmemo = $parent->getCreditmemo();
18
-
19
- $paymentmethodCode = $this->_creditmemo->getOrder()->getPayment()->getMethod();
20
- $feeLabel = Mage::helper('msp')->getfeeLabel($paymentmethodCode);
21
-
22
- $paymentFeeRefunded = new Varien_Object();
23
- $paymentFeeRefunded->setLabel($feeLabel);
24
- $paymentFeeRefunded->setValue($this->_creditmemo->getOrder()->getPaymentFeeRefunded() + $this->_creditmemo->getOrder()->getPaymentFeeTaxRefunded());
25
- $paymentFeeRefunded->setBaseValue($this->_creditmemo->getOrder()->getBasePaymentFeeRefunded() + $this->_creditmemo->getOrder()->getBasePaymentFeeTaxRefunded());
26
- $paymentFeeRefunded->setCode('payment_fee_refunded');
27
-
28
- $parent->addTotalBefore($paymentFeeRefunded, 'tax');
29
-
30
- return $this;
31
- }
32
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Creditmemo/Totals/Paymentfee.php DELETED
@@ -1,44 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Creditmemo_Totals_Paymentfee extends Mage_Core_Block_Abstract
10
- {
11
- public function initTotals()
12
- {
13
- $parent = $this->getParentBlock();
14
- $this->_creditmemo = $parent->getCreditmemo();
15
-
16
- $paymentmethodCode = $this->_creditmemo->getOrder()->getPayment()->getMethod();
17
- $feeLabel = Mage::helper('msp')->getfeeLabel($paymentmethodCode);
18
-
19
- if ($this->_creditmemo->getinvoice()) {
20
- $paymentFee = new Varien_Object();
21
- $paymentFee->setLabel($feeLabel . ' available for refund');
22
- $paymentFee->setValue($this->_creditmemo->getInvoice()->getPaymentFee() - $this->_creditmemo->getOrder()->getPaymentFeeRefunded() + ($this->_creditmemo->getInvoice()->getPaymentFeeTax() - $this->_creditmemo->getOrder()->getPaymentFeeTaxefunded()));
23
- $paymentFee->setBaseValue($this->_creditmemo->getInvoice()->getBasePaymentFee() - $this->_creditmemo->getOrder()->getBasePaymentFeeRefunded() + ($this->_creditmemo->getInvoice()->getBasePaymentFeeTax() - $this->_creditmemo->getOrder()->getBasePaymentFeeTaxRefunded()));
24
- $paymentFee->setCode('payment_fee');
25
- } else {
26
- $paymentFee = new Varien_Object();
27
- $paymentFee->setLabel($feeLabel . ' available for refund');
28
- $paymentFee->setValue($this->_creditmemo->getOrder()->getPaymentFee() - $this->_creditmemo->getOrder()->getPaymentFeeRefunded() + ($this->_creditmemo->getOrder()->getPaymentFeeTax() - $this->_creditmemo->getOrder()->getPaymentFeeTaxRefunded()));
29
- $paymentFee->setBaseValue($this->_creditmemo->getOrder()->getBasePaymentFee() - $this->_creditmemo->getOrder()->getBasePaymentFeeRefunded() + ($this->_creditmemo->getOrder()->getBasePaymentFeeTax() - $this->_creditmemo->getOrder()->getBasePaymentFeeTaxRefunded()));
30
- $paymentFee->setCode('payment_fee');
31
- }
32
-
33
- $paymentFeeRefunded = new Varien_Object();
34
- $paymentFeeRefunded->setLabel($feeLabel . ' refunded');
35
- $paymentFeeRefunded->setValue($this->_creditmemo->getOrder()->getPaymentFeeRefunded() + $this->_creditmemo->getOrder()->getPaymentFeeTaxRefunded());
36
- $paymentFeeRefunded->setBaseValue($this->_creditmemo->getOrder()->getBasePaymentFeeRefunded() + $this->_creditmemo->getOrder()->getBasePaymentFeeTaxRefunded());
37
- $paymentFeeRefunded->setCode('payment_fee_refunded');
38
-
39
- $parent->addTotalBefore($paymentFee, 'tax');
40
- $parent->addTotalBefore($paymentFeeRefunded, 'payment_fee');
41
-
42
- return $this;
43
- }
44
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Invoice/Totals/Paymentfee.php DELETED
@@ -1,41 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Invoice_Totals_Paymentfee extends Mage_Core_Block_Abstract
10
- {
11
- public function initTotals()
12
- {
13
- $parent = $this->getParentBlock();
14
- $this->_invoice = $parent->getInvoice();
15
-
16
-
17
- if(!$this->_invoice){
18
- $this->_invoice = Mage::registry('current_invoice');
19
- }
20
-
21
-
22
- if (($this->_invoice->getPaymentFee() < 0.01 || $this->_invoice->getPaymentFee() < 0.01) &&
23
- ($this->_invoice->getOrder()->getBasePaymentFee() - $this->_invoice->getOrder()->getBasePaymentFeeInvoiced()) < 0.01) {
24
-
25
- return $this;
26
- }
27
-
28
- $paymentmethodCode = $this->_invoice->getOrder()->getPayment()->getMethod();
29
- $feeLabel = Mage::helper('msp')->getfeeLabel($paymentmethodCode);
30
-
31
- $paymentFee = new Varien_Object();
32
- $paymentFee->setLabel($feeLabel);
33
- $paymentFee->setValue($this->_invoice->getPaymentFee());
34
- $paymentFee->setBaseValue($this->_invoice->getBasePaymentFee());
35
- $paymentFee->setCode('payment_fee');
36
-
37
- $parent->addTotalBefore($paymentFee, 'tax');
38
-
39
- return $this;
40
- }
41
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totalbar.php DELETED
@@ -1,38 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Totalbar extends Mage_Core_Block_Abstract
10
- {
11
- /**
12
- * @return $this
13
- */
14
- public function initTotals()
15
- {
16
- $parent = $this->getParentBlock();
17
- $this->_invoice = $parent->getInvoice();
18
-
19
- if (($this->_invoice->getPaymentFee() < 0.01 || $this->_invoice->getPaymentFee() < 0.01) &&
20
- ($this->_invoice->getOrder()->getBasePaymentFee() - $this->_invoice->getOrder()->getBasePaymentFeeInvoiced()) < 0.01) {
21
-
22
- return $this;
23
- }
24
-
25
- $paymentmethodCode = $this->_invoice->getOrder()->getPayment()->getMethod();
26
- $feeLabel = Mage::helper('msp')->getfeeLabel($this->_invoice->getOrder());
27
-
28
- $paymentFee = new Varien_Object();
29
- $paymentFee->setLabel($feeLabel);
30
- $paymentFee->setValue($this->_invoice->getPaymentFee());
31
- $paymentFee->setBaseValue($this->_invoice->getBasePaymentFee());
32
- $paymentFee->setCode('payment_fee');
33
-
34
- $parent->addTotalBefore($paymentFee, 'tax');
35
-
36
- return $this;
37
- }
38
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totals/Paymentfee.php DELETED
@@ -1,33 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Totals_Paymentfee extends Mage_Core_Block_Abstract
10
- {
11
- public function initTotals()
12
- {
13
- $parent = $this->getParentBlock();
14
- $this->_order = $parent->getOrder();
15
-
16
- if ($this->_order->getPaymentFee() < 0.01 || $this->_order->getPaymentFee() < 0.01) {
17
- return $this;
18
- }
19
-
20
- $paymentmethodCode = $this->_order->getPayment()->getMethod();
21
- $feeLabel = Mage::helper('msp')->getfeeLabel($this->_order->getPayment()->getMethod());
22
-
23
- $paymentFee = new Varien_Object();
24
- $paymentFee->setLabel($feeLabel);
25
- $paymentFee->setValue($this->_order->getPaymentFee());
26
- $paymentFee->setBaseValue($this->_order->getBasePaymentFee());
27
- $paymentFee->setCode('payment_fee');
28
-
29
- $parent->addTotalBefore($paymentFee, 'tax');
30
-
31
- return $this;
32
- }
33
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/PaymentFee/Order/Totals/Tax.php DELETED
@@ -1,47 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Block_PaymentFee_Order_Totals_Tax extends Mage_Adminhtml_Block_Sales_Order_Totals_Tax
10
- {
11
- /**
12
- * Get full information about taxes applied to order
13
- *
14
- * @return array
15
- */
16
- public function getFullTaxInfo()
17
- {
18
- /** @var $source Mage_Sales_Model_Order */
19
- $source = $this->getOrder();
20
-
21
- $taxClassAmount = array();
22
- if ($source instanceof Mage_Sales_Model_Order) {
23
- //check from what version of Magento this functin exists and add a check for it! This will give an empty order page in backend on error
24
- $taxClassAmount = Mage::helper('tax')->getCalculatedTaxes($source);
25
-
26
- if (empty($taxClassAmount)) {
27
- $rates = Mage::getModel('sales/order_tax')->getCollection()->loadByOrder($source)->toArray();
28
- $taxClassAmount = Mage::getSingleton('tax/calculation')->reproduceProcess($rates['items']);
29
- } else {
30
- $shippingTax = Mage::helper('tax')->getShippingTax($source);
31
- if ($source->getBasePaymentFeeTax()) {
32
- $paymentFeeTax = array(array(
33
- 'tax_amount' => $source->getPaymentFeeTax(),
34
- 'base_tax_amount' => $source->getBasePaymentFeeTax(),
35
- 'title' => Mage::helper('msp')->getfeeLabel($this->_order->getPayment()->getMethod()). 'Tax',
36
- 'percent' => NULL,
37
- ));
38
- $taxClassAmount = array_merge($shippingTax, $paymentFeeTax, $taxClassAmount);
39
- } else {
40
- $taxClassAmount = array_merge($shippingTax, $taxClassAmount);
41
- }
42
- }
43
- }
44
-
45
- return $taxClassAmount;
46
- }
47
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Block/Servicecost/Order/Total.php ADDED
@@ -0,0 +1,65 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class MultiSafepay_Msp_Block_Servicecost_Order_Total extends Mage_Core_Block_Template
3
+ {
4
+ /**
5
+ * Get label cell tag properties
6
+ *
7
+ * @return string
8
+ */
9
+ public function getLabelProperties()
10
+ {
11
+ return $this->getParentBlock()->getLabelProperties();
12
+ }
13
+
14
+ /**
15
+ * Get order store object
16
+ *
17
+ * @return Mage_Sales_Model_Order
18
+ */
19
+ public function getOrder()
20
+ {
21
+ return $this->getParentBlock()->getOrder();
22
+ }
23
+
24
+ /**
25
+ * Get totals source object
26
+ *
27
+ * @return Mage_Sales_Model_Order
28
+ */
29
+ public function getSource()
30
+ {
31
+ return $this->getParentBlock()->getSource();
32
+ }
33
+
34
+ /**
35
+ * Get value cell tag properties
36
+ *
37
+ * @return string
38
+ */
39
+ public function getValueProperties()
40
+ {
41
+ return $this->getParentBlock()->getValueProperties();
42
+ }
43
+
44
+ /**
45
+ * Initialize reward points totals
46
+ *
47
+ * @return Enterprise_Reward_Block_Sales_Order_Total
48
+ */
49
+ public function initTotals()
50
+ {
51
+ if ((float) $this->getOrder()->getBaseFeeAmount()) {
52
+ $source = $this->getSource();
53
+ $value = $this->getOrder()->getServicecostPdf();
54
+ $code = $this->getOrder()->getPayment()->getMethod();
55
+ $this->getParentBlock()->addTotal(new Varien_Object(array(
56
+ 'code' => 'servicecost',
57
+ 'strong' => false,
58
+ 'label' => Mage::helper('msp')->getFeeLabel($code),
59
+ 'value' => $source instanceof Mage_Sales_Model_Order_Creditmemo ? - $value : $value
60
+ )));
61
+ }
62
+
63
+ return $this;
64
+ }
65
+ }
app/code/community/MultiSafepay/Msp/Block/Servicecost/Order/Totals.php ADDED
@@ -0,0 +1,25 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Block_Servicecost_Order_Totals extends Mage_Sales_Block_Order_Totals {
4
+ protected function _initTotals() {
5
+ parent::_initTotals();
6
+
7
+ $order = $this->getSource();
8
+ $code = $this->getOrder()->getPayment()->getMethod();
9
+ $amount = $order->getServicecostPdf();
10
+ $method = $order->getPayment()->getMethodInstance();
11
+
12
+ if ($amount) {
13
+ $this->addTotalBefore(new Varien_Object(array(
14
+ 'code' => 'servicecost',
15
+ 'value' => $amount,
16
+ 'base_value'=> $amount,
17
+ 'label' => Mage::helper('msp')->getFeeLabel($code)
18
+ ), array('tax'))
19
+ );
20
+ }
21
+
22
+ return $this;
23
+ }
24
+
25
+ }
app/code/community/MultiSafepay/Msp/Helper/Data.php CHANGED
@@ -8,8 +8,6 @@
8
 
9
  class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract
10
  {
11
- const XML_PATH_MSP_FEE_DESCRIPTION = 'msp/msp_payafter/fee_description';
12
-
13
  const CONVERT_TO_CURRENCY_CODE = 'EUR';
14
 
15
  /**
@@ -35,75 +33,29 @@ class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract
35
  $iconFileUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) . $fileWithPath;
36
  $return = '<img src="' . $iconFileUrl . '" id="'. 'msp_' . $paymentCode .'" title="' . $paymentTitle . '" />&nbsp;';
37
  if ($isShowImgWithName) {
38
- //$return .= '<span class="gateway-title"> - ' . $paymentTitle . '</span>';
39
  }
40
  }
41
  }
42
- echo $return;
43
- // return $return;
44
  }
45
 
46
-
47
-
48
- public function getPadIncExcTax(){
49
-
50
- if(Mage::getStoreConfig('msp/msp_payafter/fee_incexc'))
51
- {
52
- $including = true;
53
- }else{
54
- $including = false;
55
- }
56
- return $including;
57
- }
58
-
59
- public function getCheckoutFee()
60
- {
61
- $fee = Mage::getStoreConfig('msp/msp_payafter/fee_amount', Mage::app()->getStore()->getId());
62
-
63
- $fee = str_replace(',', '.', $fee);
64
- return $fee;
65
- }
66
-
67
-
68
- /**
69
  * Get Fee Description
70
  *
71
  * @return string
72
  */
73
- public function getFeeLabel()
74
  {
75
- $feeDescription = Mage::getStoreConfig(self::XML_PATH_MSP_FEE_DESCRIPTION);
76
 
77
  return $feeDescription ? $feeDescription : $this->__('MultiSafepay servicekosten');
78
  }
 
79
 
80
- /**
81
- * @param Mage_Sales_Model_Order $order
82
- * @param Mage_Sales_Model_Order_Invoice $invoice
83
- * @return void
84
- */
85
- public function resetPaymentFeeInvoicedValues($order, $invoice)
86
- {
87
- $basePaymentFee = $invoice->getBasePaymentFee();
88
- $paymentFee = $invoice->getPaymentFee();
89
- $basePaymentFeeTax = $invoice->getBasePaymentFeeTax();
90
- $paymentFeeTax = $invoice->getPaymentFeeTax();
91
-
92
- $basePaymentFeeInvoiced = $order->getBasePaymentFeeInvoiced();
93
- $paymentFeeInvoiced = $order->getPaymentFeeInvoiced();
94
- $basePaymentFeeTaxInvoiced = $order->getBasePaymentFeeTaxInvoiced();
95
- $paymentFeeTaxInvoiced = $order->getPaymentFeeTaxInvoiced();
96
-
97
- if ($basePaymentFeeInvoiced && $basePaymentFee && $basePaymentFeeInvoiced >= $basePaymentFee) {
98
- $order->setBasePaymentFeeInvoiced($basePaymentFeeInvoiced - $basePaymentFee)
99
- ->setPaymentFeeInvoiced($paymentFeeInvoiced - $paymentFee)
100
- ->setBasePaymentFeeTaxInvoiced($basePaymentFeeTaxInvoiced - $basePaymentFeeTax)
101
- ->setBasePaymentFeeInvoiced($paymentFeeTaxInvoiced - $paymentFeeTax);
102
- $order->save();
103
- }
104
- }
105
-
106
-
107
  /**
108
  * Check are you in the Admin area
109
  *
@@ -119,6 +71,7 @@ class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract
119
  }
120
 
121
 
 
122
  /**
123
  * Check is Magento Enterprise Edition
124
  *
8
 
9
  class MultiSafepay_Msp_Helper_Data extends Mage_Core_Helper_Abstract
10
  {
 
 
11
  const CONVERT_TO_CURRENCY_CODE = 'EUR';
12
 
13
  /**
33
  $iconFileUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) . $fileWithPath;
34
  $return = '<img src="' . $iconFileUrl . '" id="'. 'msp_' . $paymentCode .'" title="' . $paymentTitle . '" />&nbsp;';
35
  if ($isShowImgWithName) {
36
+ $return .= '<span class="gateway-title"> - ' . $paymentTitle . '</span>';
37
  }
38
  }
39
  }
40
+ //echo $return;
41
+ return $return;
42
  }
43
 
44
+ /**
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
45
  * Get Fee Description
46
  *
47
  * @return string
48
  */
49
+ public function getFeeLabel($code)
50
  {
51
+ $feeDescription = Mage::getStoreConfig('msp/'.$code.'/fee_description');
52
 
53
  return $feeDescription ? $feeDescription : $this->__('MultiSafepay servicekosten');
54
  }
55
+
56
 
57
+
58
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
  /**
60
  * Check are you in the Admin area
61
  *
71
  }
72
 
73
 
74
+
75
  /**
76
  * Check is Magento Enterprise Edition
77
  *
app/code/community/MultiSafepay/Msp/Model/Abstract.php CHANGED
@@ -1,226 +1,164 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Abstract extends Mage_Payment_Model_Method_Abstract
10
- {
11
- protected $_helper = '';
12
- protected $_order = '';
13
- protected $_debugEmail = '';
14
- protected $_billingInfo = '';
15
- protected $_shippingInfo = '';
16
- protected $_session = '';
17
-
18
-
19
- /**
20
- * Retrieves instance of the last used order
21
- */
22
- protected function _loadLastOrder()
23
- {
24
- if (!empty($this->_order)) {
25
- return;
26
- }
27
-
28
- $session = Mage::getSingleton('checkout/session');
29
- $orderId = $session->getLastRealOrderId();
30
- if (!empty($orderId)) {
31
- $this->_order = Mage::getModel('sales/order')->loadByIncrementId($orderId);
32
- }
33
- }
34
-
35
- public function setHelper($helper)
36
- {
37
- $this->_helper = $helper;
38
- return $this;
39
- }
40
-
41
- public function getHelper()
42
- {
43
- return $this->_helper;
44
- }
45
-
46
- public function setOrder($order)
47
- {
48
- $this->_order = $order;
49
- return $this;
50
- }
51
-
52
- public function getOrder()
53
- {
54
- return $this->_order;
55
- }
56
-
57
- public function setLastOrder($order)
58
- {
59
- $this->_order = $order;
60
- return $this;
61
- }
62
-
63
- public function getLastOrder()
64
- {
65
- return $this->_order;
66
- }
67
-
68
- public function setDebugEmail($debugEmail)
69
- {
70
- $this->_debugEmail = $debugEmail;
71
- return $this;
72
- }
73
-
74
- public function getDebugEmail()
75
- {
76
- return $this->_debugEmail;
77
- }
78
-
79
- public function setBillingInfo($billingInfo)
80
- {
81
- $this->_billingInfo = $billingInfo;
82
- return $this;
83
- }
84
-
85
- public function getBillingInfo()
86
- {
87
- return $this->_billingInfo;
88
- }
89
-
90
- public function setShippingInfo($shippingInfo)
91
- {
92
- $this->_shippingInfo = $shippingInfo;
93
- return $this;
94
- }
95
-
96
- public function getShippingInfo()
97
- {
98
- return $this->_shippingInfo;
99
- }
100
-
101
- public function setSession($session)
102
- {
103
- $this->_session = $session;
104
- return $this;
105
- }
106
-
107
- public function getSession()
108
- {
109
- return $this->_session;
110
- }
111
-
112
- public function __construct()
113
- {
114
- return Varien_Object::__construct(func_get_args());
115
- }
116
-
117
- protected function _construct()
118
- {
119
- $this->setHelper(Mage::helper('msp'));
120
- $this->_loadLastOrder();
121
- $this->setSession(Mage::getSingleton('core/session'));
122
- $this->_setOrderBillingInfo();
123
- $this->_setOrderShippingInfo();
124
-
125
- $this->_checkExpired();
126
- }
127
-
128
- public function setOrderBillingInfo()
129
- {
130
- return $this->_setOrderBillingInfo();
131
- }
132
-
133
- /**
134
- * retrieve billing information from order
135
- *
136
- */
137
- protected function _setOrderBillingInfo()
138
- {
139
- if (empty($this->_order)) {
140
- return $this;
141
- }
142
- $billingAddress = $this->_order->getBillingAddress();
143
-
144
- $billingInfo = array(
145
- 'firstname' => $billingAddress->getFirstname(),
146
- 'lastname' => $billingAddress->getLastname(),
147
- 'city' => $billingAddress->getCity(),
148
- 'state' => $billingAddress->getState(),
149
- 'address' => $billingAddress->getStreetFull(),
150
- 'zip' => $billingAddress->getPostcode(),
151
- 'email' => $this->_order->getCustomerEmail(),
152
- 'telephone' => $billingAddress->getTelephone(),
153
- 'fax' => $billingAddress->getFax(),
154
- 'countryCode' => $billingAddress->getCountry()
155
- );
156
-
157
- return $this->setBillingInfo($billingInfo);
158
- }
159
-
160
- public function setOrderShippingInfo()
161
- {
162
- return $this->_setOrderShippingInfo();
163
- }
164
-
165
- /**
166
- * retrieve shipping information from order
167
- *
168
- */
169
- protected function _setOrderShippingInfo()
170
- {
171
- if (empty($this->_order)) {
172
- return $this;
173
- }
174
-
175
- $shippingAddress = $this->_order->getShippingAddress();
176
-
177
-
178
- $firstname = $shippingAddress->getFirstname();
179
- $lastname = $shippingAddress->getLastname();
180
- $city = $shippingAddress->getCity();
181
- $state = $shippingAddress->getState();
182
- $address = $shippingAddress->getStreetFull();
183
- $zip = $shippingAddress->getPostcode();
184
- $email = $this->_order->getCustomerEmail();
185
- $telephone = $shippingAddress->getTelephone();
186
- $fax = $shippingAddress->getFax();
187
- $countrycode = $shippingAddress->getCountry();
188
-
189
- $method = strtolower($this->_order->getShippingMethod());
190
-
191
- // COMPATIBLE WITH PAAZL
192
- if (substr($method, 0, 16) == 'paazl_pakjegemak') {
193
- $rate = Mage::getModel('sales/quote_address_rate')->load($this->_order->getShippingMethod(), 'code');
194
- $street = explode(" ", $rate->getServicePointAddress());
195
- $firstname = 'P';
196
- $lastname = 'Paazl Pakjegemak';
197
-
198
- if (count($street) > 0) {
199
- $street_last = $street[count($street)-1];
200
- $street_name = str_replace($street[count($street)-1], '', $rate->getServicePointAddress());
201
- $street_name = str_replace($street[count($street)-2], '', $street_name);
202
- $street_add = $street_last;
203
- $street_number = $street[count($street)-2];
204
- $street_name = preg_replace("/[\n\r]/","|",$street_name);
205
- $address = $street_name . ' ' . $street_number . ' ' . $street_add;
206
- }
207
-
208
- }
209
-
210
- $shippingInfo = array(
211
- 'firstname' => $firstname,
212
- 'lastname' => $lastname,
213
- 'city' => $city,
214
- 'state' => $state,
215
- 'address' => $address,
216
- 'zip' => $zip,
217
- 'email' => $email,
218
- 'telephone' => $telephone,
219
- 'fax' => $fax,
220
- 'countryCode' => $countrycode
221
- );
222
-
223
- return $this->setShippingInfo($shippingInfo);
224
- }
225
-
226
  }
1
+ <?php
2
+ /**
3
+ *
4
+ * @category MultiSafepay
5
+ * @package MultiSafepay_Msp
6
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
+ */
8
+
9
+ class MultiSafepay_Msp_Model_Abstract extends Mage_Payment_Model_Method_Abstract
10
+ {
11
+ protected $_helper = '';
12
+ protected $_order = '';
13
+ protected $_debugEmail = '';
14
+ protected $_billingInfo = '';
15
+ protected $_shippingInfo = '';
16
+ protected $_session = '';
17
+
18
+
19
+ /**
20
+ * Retrieves instance of the last used order
21
+ */
22
+ protected function _loadLastOrder()
23
+ {
24
+ if (!empty($this->_order)) {
25
+ return;
26
+ }
27
+
28
+ $session = Mage::getSingleton('checkout/session');
29
+ $orderId = $session->getLastRealOrderId();
30
+ if (!empty($orderId)) {
31
+ $this->_order = Mage::getModel('sales/order')->loadByIncrementId($orderId);
32
+ }
33
+ }
34
+
35
+ public function setHelper($helper)
36
+ {
37
+ $this->_helper = $helper;
38
+ return $this;
39
+ }
40
+
41
+ public function getHelper()
42
+ {
43
+ return $this->_helper;
44
+ }
45
+
46
+ public function setOrder($order)
47
+ {
48
+ $this->_order = $order;
49
+ return $this;
50
+ }
51
+
52
+ public function getOrder()
53
+ {
54
+ return $this->_order;
55
+ }
56
+
57
+ public function setLastOrder($order)
58
+ {
59
+ $this->_order = $order;
60
+ return $this;
61
+ }
62
+
63
+ public function getLastOrder()
64
+ {
65
+ return $this->_order;
66
+ }
67
+
68
+ public function setDebugEmail($debugEmail)
69
+ {
70
+ $this->_debugEmail = $debugEmail;
71
+ return $this;
72
+ }
73
+
74
+ public function getDebugEmail()
75
+ {
76
+ return $this->_debugEmail;
77
+ }
78
+
79
+ public function setBillingInfo($billingInfo)
80
+ {
81
+ $this->_billingInfo = $billingInfo;
82
+ return $this;
83
+ }
84
+
85
+ public function getBillingInfo()
86
+ {
87
+ return $this->_billingInfo;
88
+ }
89
+
90
+ public function setShippingInfo($shippingInfo)
91
+ {
92
+ $this->_shippingInfo = $shippingInfo;
93
+ return $this;
94
+ }
95
+
96
+ public function getShippingInfo()
97
+ {
98
+ return $this->_shippingInfo;
99
+ }
100
+
101
+ public function setSession($session)
102
+ {
103
+ $this->_session = $session;
104
+ return $this;
105
+ }
106
+
107
+ public function getSession()
108
+ {
109
+ return $this->_session;
110
+ }
111
+
112
+ public function __construct()
113
+ {
114
+ return Varien_Object::__construct(func_get_args());
115
+ }
116
+
117
+ protected function _construct()
118
+ {
119
+ $this->setHelper(Mage::helper('msp'));
120
+ $this->_loadLastOrder();
121
+ $this->setSession(Mage::getSingleton('core/session'));
122
+ $this->_setOrderBillingInfo();
123
+ $this->_setOrderShippingInfo();
124
+
125
+ $this->_checkExpired();
126
+ }
127
+
128
+ public function setOrderBillingInfo()
129
+ {
130
+ return $this->_setOrderBillingInfo();
131
+ }
132
+
133
+ /**
134
+ * retrieve billing information from order
135
+ *
136
+ */
137
+ protected function _setOrderBillingInfo()
138
+ {
139
+ if (empty($this->_order)) {
140
+ return $this;
141
+ }
142
+ $billingAddress = $this->_order->getBillingAddress();
143
+
144
+ $billingInfo = array(
145
+ 'firstname' => $billingAddress->getFirstname(),
146
+ 'lastname' => $billingAddress->getLastname(),
147
+ 'city' => $billingAddress->getCity(),
148
+ 'state' => $billingAddress->getState(),
149
+ 'address' => $billingAddress->getStreetFull(),
150
+ 'zip' => $billingAddress->getPostcode(),
151
+ 'email' => $this->_order->getCustomerEmail(),
152
+ 'telephone' => $billingAddress->getTelephone(),
153
+ 'fax' => $billingAddress->getFax(),
154
+ 'countryCode' => $billingAddress->getCountry()
155
+ );
156
+
157
+ return $this->setBillingInfo($billingInfo);
158
+ }
159
+
160
+ public function setOrderShippingInfo()
161
+ {
162
+ return $this->_setOrderShippingInfo();
163
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
164
  }
app/code/community/MultiSafepay/Msp/Model/Base.php CHANGED
@@ -196,7 +196,9 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
196
  $complete = true;
197
  $newState = Mage_Sales_Model_Order::STATE_PROCESSING;
198
  $newStatus = $statusComplete;
199
- $statusMessage = Mage::helper("msp")->__("Payment Completed");
 
 
200
  break;
201
  case "uncleared":
202
  $newState = Mage_Sales_Model_Order::STATE_NEW;
@@ -208,36 +210,59 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
208
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
209
  $statusMessage = Mage::helper("msp")->__("Transaction voided");
210
  $newStatus = $statusVoid;
211
- $order->cancel(); // this trigers stock updates
212
- $order->setState($newState, $newStatus, $statusMessage)->save();
213
- $orderSaved = true;
 
 
 
214
  break;
215
  case "declined":
216
  $cancel = true;
217
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
218
  $statusMessage = Mage::helper("msp")->__("Transaction declined");
219
  $newStatus = $statusDeclined;
220
- $order->cancel(); // this trigers stock updates
221
- $order->setState($newState, $newStatus, $statusMessage)->save();
222
- $orderSaved = true;
 
 
 
223
  break;
224
  case "expired":
225
  $cancel = true;
226
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
227
  $statusMessage = Mage::helper("msp")->__("Transaction is expired");
228
  $newStatus = $statusExpired;
229
- $order->cancel(); //this trigers stock updates
230
- $order->setState($newState, $newStatus, $statusMessage)->save();
231
- $orderSaved = true;
 
 
 
232
  break;
233
  case "canceled":
234
  $cancel = true;
235
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
236
  $statusMessage = Mage::helper("msp")->__("Transaction canceled");
237
  $newStatus = $statusVoid;
238
- $order->cancel(); //this trigers stock updates
239
- $order->setState($newState, $newStatus, $statusMessage)->save();
240
- $orderSaved = true;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
241
  default:
242
  $statusMessage = Mage::helper("msp")->__("Status not found " . $mspStatus);
243
  return false;
@@ -253,7 +278,7 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
253
 
254
  $current_state = $order->getState();
255
  $canUpdate = false;
256
-
257
 
258
  /**
259
  * TESTING UNDO CANCEL
@@ -306,88 +331,110 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
306
  }else{
307
  $is_already_invoiced = false;
308
  }*/
309
-
310
- if($order->hasInvoices())
311
  {
312
- $is_already_invoiced = true;
313
- }else{
314
- $is_already_invoiced = false;
315
- $payment = $order->getPayment();
316
- $payment->setTransactionId($mspDetails['ewallet']['id']);
317
- $transaction = $payment->addTransaction('capture', null, false, $statusMessage);
318
- $transaction->setParentTxnId($mspDetails['ewallet']['id']);
319
- $transaction->setIsClosed(0);
320
- $transaction->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $transdetails);
321
- $transaction->save();
322
-
323
- if ($complete && $autocreateInvoice)
324
  {
325
- $this->createInvoice($order);// Validate this function with 1.7.0.2 and lower
326
  $is_already_invoiced = true;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
327
  }
328
- }
329
 
330
-
331
- if ($order->getState() == Mage_Sales_Model_Order::STATE_NEW )
332
- {
333
- $canUpdate = true;
334
- }
335
-
336
- // update the status if changed
337
- if ($canUpdate && (($newState != $order->getState()) || ($newStatus != $order->getStatus())))
338
- {
339
- $order->setState($newState, $newStatus, $statusMessage);
340
-
341
- // create an invoice when the payment is completed
342
- if ($complete)
343
  {
344
- $send_update_email = $this->getConfigData("send_update_email");
345
-
346
- if($send_update_email){
347
- $order->sendOrderUpdateEmail(true);
348
- }
349
- //$this->createInvoice($order);// Validate this function with 1.7.0.2 and lower
350
  }
351
- } else {
352
- // add status to history if it's not there
353
- if (!$this->isStatusInHistory($order, $mspStatus) && (ucfirst($order->getState()) != ucfirst(Mage_Sales_Model_Order::STATE_CANCELED))) {
354
- $order->addStatusToHistory($order->getStatus(), $statusMessage);
355
- }
356
- }
357
 
358
- /**
359
- * Fix to activate new order email function to be activated
360
- */
361
- $send_order_email = $this->getConfigData("new_order_mail");
362
-
363
- if ($send_order_email == 'after_payment') {
364
- if (!$order->getEmailSent() && (ucfirst($order->getState()) == ucfirst(Mage_Sales_Model_Order::STATE_PROCESSING))) {
365
- //$order->setEmailSent(true);
366
- $order->save();
367
- $orderSaved = true;
368
- $order->sendNewOrderEmail();
369
- }
370
- } elseif($send_order_email =='after_notify_without_cancel' && (ucfirst($order->getState()) != ucfirst(Mage_Sales_Model_Order::STATE_CANCELED))) {
371
- if (!$order->getEmailSent()) {
372
- // $order->setEmailSent(true);
373
- $order->save();
374
- $orderSaved = true;
375
- $order->sendNewOrderEmail();
376
- }
377
- } elseif($send_order_email =='after_notify_with_cancel') {
378
- if (!$order->getEmailSent()) {
379
- // $order->setEmailSent(true);
380
- $order->save();
381
- $orderSaved = true;
382
- $order->sendNewOrderEmail();
383
- }
384
- }
385
 
386
- // save order if we haven't already
387
- if (!$orderSaved) {
388
- $order->save();
389
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
390
 
 
 
 
 
 
391
  // success
392
  return true;
393
  }
@@ -437,10 +484,125 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
437
  /**
438
  * Create invoice for order
439
  */
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
440
  protected function createInvoice(Mage_Sales_Model_Order $order)
441
  {
442
-
443
  $invoiceSaved = false;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
444
  if ($order->canInvoice() && !$order->getInvoiceCollection()->getSize()) {
445
  $invoice = $order->prepareInvoice();
446
 
@@ -492,7 +654,13 @@ class MultiSafepay_Msp_Model_Base extends Varien_Object
492
  }
493
 
494
  return false;
495
- }
 
 
 
 
 
 
496
 
497
  /**
498
  * Get lock file
196
  $complete = true;
197
  $newState = Mage_Sales_Model_Order::STATE_PROCESSING;
198
  $newStatus = $statusComplete;
199
+ $statusMessage = Mage::helper("msp")->__("Payment Completed");
200
+ //order is paid so set it to paid
201
+ //$order->setTotalPaid($order->getGrandTotal());
202
  break;
203
  case "uncleared":
204
  $newState = Mage_Sales_Model_Order::STATE_NEW;
210
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
211
  $statusMessage = Mage::helper("msp")->__("Transaction voided");
212
  $newStatus = $statusVoid;
213
+ if( $order->getState() != 'complete')
214
+ {
215
+ $order->cancel(); // this trigers stock updates
216
+ $order->setState($newState, $newStatus, $statusMessage)->save();
217
+ $orderSaved = true;
218
+ }
219
  break;
220
  case "declined":
221
  $cancel = true;
222
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
223
  $statusMessage = Mage::helper("msp")->__("Transaction declined");
224
  $newStatus = $statusDeclined;
225
+ if( $order->getState() != 'complete')
226
+ {
227
+ $order->cancel(); // this trigers stock updates
228
+ $order->setState($newState, $newStatus, $statusMessage)->save();
229
+ $orderSaved = true;
230
+ }
231
  break;
232
  case "expired":
233
  $cancel = true;
234
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
235
  $statusMessage = Mage::helper("msp")->__("Transaction is expired");
236
  $newStatus = $statusExpired;
237
+ if( $order->getState() != 'complete')
238
+ {
239
+ $order->cancel(); // this trigers stock updates
240
+ $order->setState($newState, $newStatus, $statusMessage)->save();
241
+ $orderSaved = true;
242
+ }
243
  break;
244
  case "canceled":
245
  $cancel = true;
246
  $newState = Mage_Sales_Model_Order::STATE_CANCELED;
247
  $statusMessage = Mage::helper("msp")->__("Transaction canceled");
248
  $newStatus = $statusVoid;
249
+ if( $order->getState() != 'complete')
250
+ {
251
+ $order->cancel(); // this trigers stock updates
252
+ $order->setState($newState, $newStatus, $statusMessage)->save();
253
+ $orderSaved = true;
254
+ }
255
+ break;
256
+ case "refunded":
257
+ $statusMessage = Mage::helper("msp")->__("Transaction refunded");
258
+ $payment = $order->getPayment();
259
+ $payment->setTransactionId($mspDetails['ewallet']['id']);
260
+ $transaction = $payment->addTransaction('refund', null, false, $statusMessage);
261
+ $transaction->setParentTxnId($mspDetails['ewallet']['id']);
262
+ $transaction->setIsClosed(1);
263
+ $transaction->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $transdetails);
264
+ $transaction->save();
265
+ break;
266
  default:
267
  $statusMessage = Mage::helper("msp")->__("Status not found " . $mspStatus);
268
  return false;
278
 
279
  $current_state = $order->getState();
280
  $canUpdate = false;
281
+
282
 
283
  /**
284
  * TESTING UNDO CANCEL
331
  }else{
332
  $is_already_invoiced = false;
333
  }*/
334
+ if (!$this->isStatusInHistory($order, $mspStatus))
 
335
  {
336
+ if($order->hasInvoices())
 
 
 
 
 
 
 
 
 
 
 
337
  {
 
338
  $is_already_invoiced = true;
339
+ }else{
340
+ $is_already_invoiced = false;
341
+
342
+ if ($complete && $autocreateInvoice)
343
+ {
344
+ $payment = $order->getPayment();
345
+ $payment->setTransactionId($mspDetails['ewallet']['id']);
346
+ $transaction = $payment->addTransaction('capture', null, false, $statusMessage);
347
+ $transaction->setParentTxnId($mspDetails['ewallet']['id']);
348
+ $transaction->setIsClosed(0);
349
+ $transaction->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $transdetails);
350
+ $transaction->save();
351
+
352
+ $this->createInvoice($order);// Validate this function with 1.7.0.2 and lower
353
+ $is_already_invoiced = true;
354
+ }elseif($complete && $order->getState() == Mage_Sales_Model_Order::STATE_NEW)
355
+ {
356
+ $payment = $order->getPayment();
357
+ $payment->setTransactionId($mspDetails['ewallet']['id']);
358
+ $transaction = $payment->addTransaction('capture', null, false, $statusMessage);
359
+ $transaction->setParentTxnId($mspDetails['ewallet']['id']);
360
+ $transaction->setIsClosed(0);
361
+ $transaction->setAdditionalInformation(Mage_Sales_Model_Order_Payment_Transaction::RAW_DETAILS, $transdetails);
362
+ $transaction->save();
363
+ $order->setTotalPaid($order->getGrandTotal());
364
+ }
365
  }
 
366
 
367
+
368
+ if ($order->getState() == Mage_Sales_Model_Order::STATE_NEW || $order->getState() != 'complete' )
 
 
 
 
 
 
 
 
 
 
 
369
  {
370
+ $canUpdate = true;
371
+ }else{
372
+
373
+ $canUpdate = false;
 
 
374
  }
375
+
 
 
 
 
 
376
 
377
+ // update the status if changed
378
+ if ($canUpdate && (($newState != $order->getState()) || ($newStatus != $order->getStatus())))
379
+ {
380
+ if (!$this->isStatusInHistory($order, $mspStatus))
381
+ {
382
+ $order->setState($newState, $newStatus, $statusMessage);
383
+ }
384
+
385
+ // create an invoice when the payment is completed
386
+ //if ($complete)
387
+ //{
388
+ $send_update_email = $this->getConfigData("send_update_email");
389
+
390
+ if($send_update_email){
391
+ $order->sendOrderUpdateEmail(true);
392
+ }
393
+ //$this->createInvoice($order);// Validate this function with 1.7.0.2 and lower
394
+ //}
395
+ } else {
396
+ // add status to history if it's not there
397
+ if (!$this->isStatusInHistory($order, $mspStatus) && (ucfirst($order->getState()) != ucfirst(Mage_Sales_Model_Order::STATE_CANCELED))) {
398
+ $order->addStatusToHistory($order->getStatus(), $statusMessage);
399
+ }
400
+ }
 
 
 
401
 
402
+ /**
403
+ * Fix to activate new order email function to be activated
404
+ */
405
+ $send_order_email = $this->getConfigData("new_order_mail");
406
+
407
+ if($order->getCanSendNewEmailFlag())
408
+ {
409
+ if ($send_order_email == 'after_payment') {
410
+ if (!$order->getEmailSent() && (ucfirst($order->getState()) == ucfirst(Mage_Sales_Model_Order::STATE_PROCESSING))) {
411
+ $order->sendNewOrderEmail();
412
+ $order->setEmailSent(true);
413
+ $order->save();
414
+ $orderSaved = true;
415
+ }
416
+ } elseif($send_order_email =='after_notify_without_cancel' && (ucfirst($order->getState()) != ucfirst(Mage_Sales_Model_Order::STATE_CANCELED))) {
417
+ if (!$order->getEmailSent()) {
418
+ $order->sendNewOrderEmail();
419
+ $order->setEmailSent(true);
420
+ $order->save();
421
+ $orderSaved = true;
422
+ }
423
+ } elseif($send_order_email =='after_notify_with_cancel') {
424
+ if (!$order->getEmailSent()) {
425
+ $order->sendNewOrderEmail();
426
+ $order->setEmailSent(true);
427
+ $order->save();
428
+ $orderSaved = true;
429
+ }
430
+ }
431
+ }
432
 
433
+ // save order if we haven't already
434
+ if (!$orderSaved) {
435
+ $order->save();
436
+ }
437
+ }
438
  // success
439
  return true;
440
  }
484
  /**
485
  * Create invoice for order
486
  */
487
+
488
+
489
+ protected function createInvoice(Mage_Sales_Model_Order $order)
490
+ {
491
+ if ($order->getState() == Mage_Sales_Model_Order::STATE_NEW)
492
+ {
493
+ try {
494
+ if(!$order->canInvoice()) {
495
+ $order->addStatusHistoryComment('MultiSafepay: Order cannot be invoiced.', false);
496
+ $order->save();
497
+ return false;
498
+ }
499
+
500
+ //START Handle Invoice
501
+ $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
502
+ $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_OFFLINE);
503
+ $invoice->register();
504
+ $invoice->getOrder()->setCustomerNoteNotify(false);
505
+ $invoice->getOrder()->setIsInProcess(true);
506
+ $order->addStatusHistoryComment('Automatically invoiced by MultiSafepay invoicer.', false);
507
+ $transactionSave = Mage::getModel('core/resource_transaction')->addObject($invoice)->addObject($invoice->getOrder());
508
+ $transactionSave->save();
509
+ //END Handle Invoice
510
+
511
+ //Send Invoice emails
512
+ $mail_invoice = $this->getConfigData("mail_invoice");
513
+ $send_bno_invoice = $this->getConfigData("bno_no_invoice");
514
+ $gateway = $order->getPayment()->getMethodInstance()->_gateway;
515
+
516
+
517
+ if ($mail_invoice && $gateway != 'PAYAFTER')
518
+ {
519
+ $invoice->setEmailSent(true);
520
+ $invoice->sendEmail();
521
+ $invoice->save();
522
+ }elseif($gateway == 'PAYAFTER' && !$send_bno_invoice && $mail_invoice)
523
+ {
524
+ $invoice->setEmailSent(true);
525
+ $invoice->sendEmail();
526
+ $invoice->save();
527
+ }
528
+
529
+
530
+ $order->setTotalPaid($order->getGrandTotal());
531
+
532
+ } catch (Exception $e) {
533
+ $order->addStatusHistoryComment('MultiSafepay invoicer: Exception occurred during the creation of the invoice. Exception message: '.$e->getMessage(), false);
534
+ $order->save();
535
+ }
536
+ }
537
+ return false;
538
+ }
539
+
540
+
541
+
542
+
543
+
544
+ /*
545
  protected function createInvoice(Mage_Sales_Model_Order $order)
546
  {
 
547
  $invoiceSaved = false;
548
+
549
+ if(!$order->hasInvoices() && $order->getTotalPaid() == 0)
550
+ {
551
+ try {
552
+ if(!$order->canInvoice())
553
+ {
554
+ Mage::throwException(Mage::helper('core')->__('Cannot create an invoice.'));
555
+ }
556
+
557
+ $invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
558
+
559
+ if (!$invoice->getTotalQty()) {
560
+ Mage::throwException(Mage::helper('core')->__('Cannot create an invoice without products.'));
561
+ }
562
+
563
+ $invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE);
564
+ //Or you can use
565
+ //$invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_OFFLINE);
566
+ $invoice->register();
567
+ $transactionSave = Mage::getModel('core/resource_transaction')->addObject($invoice)->addObject($invoice->getOrder());
568
+
569
+ $transactionSave->save();
570
+
571
+ $mail_invoice = $this->getConfigData("mail_invoice");
572
+ $send_bno_invoice = $this->getConfigData("bno_no_invoice");
573
+ $gateway = $order->getPayment()->getMethodInstance()->_gateway;
574
+
575
+ if ($mail_invoice && $gateway != 'PAYAFTER')
576
+ {
577
+ $invoice->setEmailSent(true);
578
+ $invoiceSaved = true;
579
+ $invoice->sendEmail();
580
+ }elseif($gateway == 'PAYAFTER' && $send_bno_invoice && $mail_invoice)
581
+ {
582
+ $invoice->setEmailSent(true);
583
+ $invoiceSaved = true;
584
+ $invoice->sendEmail();
585
+ }
586
+
587
+ // save invoice if we haven't already
588
+ if (!$invoiceSaved)
589
+ {
590
+ $invoice->save();
591
+ }
592
+
593
+ $order->setTotalPaid($order->getGrandTotal());
594
+ $invoice->save();
595
+ return true;
596
+ }
597
+ catch (Mage_Core_Exception $e) {
598
+ return false;
599
+ }
600
+ }
601
+ return false;
602
+
603
+ */
604
+ /*
605
+ $invoiceSaved = false;
606
  if ($order->canInvoice() && !$order->getInvoiceCollection()->getSize()) {
607
  $invoice = $order->prepareInvoice();
608
 
654
  }
655
 
656
  return false;
657
+
658
+
659
+
660
+ */
661
+
662
+
663
+ // }
664
 
665
  /**
666
  * Get lock file
app/code/community/MultiSafepay/Msp/Model/Checkout.php CHANGED
@@ -181,7 +181,7 @@ class MultiSafepay_Msp_Model_Checkout extends Mage_Payment_Model_Method_Abstract
181
  }
182
 
183
 
184
- // $this->getShipping();
185
  $this->_getShippingRates();
186
  $this->setTaxes();
187
  $this->getCustomFieldsFromFile();
181
  }
182
 
183
 
184
+ $this->getShipping();//
185
  $this->_getShippingRates();
186
  $this->setTaxes();
187
  $this->getCustomFieldsFromFile();
app/code/community/MultiSafepay/Msp/Model/Gateway/Abstract.php CHANGED
@@ -22,8 +22,10 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
22
  protected $_canCapture = true;
23
  protected $_canCapturePartial = true;
24
  protected $_canUseForMultishipping = false;
25
- protected $_canUseInternal = true;
26
-
 
 
27
  public $payment;
28
 
29
  public function __construct()
@@ -115,9 +117,20 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
115
  // get store id
116
  if (!$storeId)
117
  {
 
118
  $storeId = Mage::app()->getStore()->getStoreId();
 
 
 
 
 
 
 
 
119
  }
120
 
 
 
121
  // basic settings
122
  $configSettings = array();
123
  if ($this->_loadSettingsConfig)
@@ -270,7 +283,8 @@ abstract class MultiSafepay_Msp_Model_Gateway_Abstract extends Mage_Payment_Mode
270
  public function getConfigData($field, $storeId = null)
271
  {
272
  if (null === $storeId) {
273
- $storeId = Mage::app()->getStore()->getStoreId();//$this->getStore();
 
274
  }
275
  $path = $this->_module . "/" . $this->_code . '/' . $field;
276
 
22
  protected $_canCapture = true;
23
  protected $_canCapturePartial = true;
24
  protected $_canUseForMultishipping = false;
25
+ protected $_canUseInternal = true;
26
+ /* protected $_canRefund = true;
27
+ protected $_canRefundInvoicePartial = true;
28
+ protected $_isInitializeNeeded = true;*/
29
  public $payment;
30
 
31
  public function __construct()
117
  // get store id
118
  if (!$storeId)
119
  {
120
+ //$storeId = $this->getStore();
121
  $storeId = Mage::app()->getStore()->getStoreId();
122
+
123
+ }
124
+
125
+ $orderId = Mage::app()->getRequest()->getQuery('transactionid');
126
+
127
+ if($orderId)
128
+ {
129
+ $storeId = Mage::getSingleton('sales/order')->loadByIncrementId($orderId)->getStoreId();
130
  }
131
 
132
+
133
+
134
  // basic settings
135
  $configSettings = array();
136
  if ($this->_loadSettingsConfig)
283
  public function getConfigData($field, $storeId = null)
284
  {
285
  if (null === $storeId) {
286
+ //$storeId = Mage::app()->getStore()->getStoreId();//$this->getStore();
287
+ $storeId = $this->getStore();
288
  }
289
  $path = $this->_module . "/" . $this->_code . '/' . $field;
290
 
app/code/community/MultiSafepay/Msp/Model/Gateway/Gezondheidsbon.php ADDED
@@ -0,0 +1,14 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ *
4
+ * @category MultiSafepay
5
+ * @package MultiSafepay_Msp
6
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
+ */
8
+
9
+ class MultiSafepay_Msp_Model_Gateway_Gezondheidsbon extends MultiSafepay_Msp_Model_Gateway_Abstract
10
+ {
11
+ protected $_code = "msp_gezondheidsbon";
12
+ public $_model = "gezondheidsbon";
13
+ public $_gateway = "GEZONDHEIDSBON";
14
+ }
app/code/community/MultiSafepay/Msp/Model/Observer/Capture-dist.php DELETED
@@ -1,97 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Observer_Capture extends Mage_Core_Model_Abstract
10
- {
11
- public function sales_order_invoice_register(Varien_Event_Observer $observer)
12
- {
13
- //to prevent the script from running twice
14
- if (Mage::registry('captureStarted')) {
15
- Mage::unregister('captureStarted');
16
- return $this;
17
- }
18
-
19
- return $this->_capture($observer->getOrder(), $observer->getInvoice());
20
- }
21
-
22
- public function sales_order_payment_capture(Varien_Event_Observer $observer)
23
- {
24
- Mage::register('captureStarted', 1);
25
-
26
- return $this->_capture($observer->getInvoice()->getOrder(), $observer->getInvoice());
27
- }
28
-
29
- public function sales_order_invoice_save_before(Varien_Event_Observer $observer)
30
- {
31
- $invoice = $observer->getInvoice();
32
-
33
- if (!$invoice->getTransactionId() && $invoice->getOrder()->getMspOrderReference()) {
34
- $invoice->setTransactionId($invoice->getOrder()->getMspOrderReference());
35
- }
36
-
37
- return $this;
38
- }
39
-
40
- protected function _capture($order, $invoice)
41
- {
42
- try {
43
- if ($this->_captureIsAllowed($order, $invoice) !== true) {
44
- return $this;
45
- }
46
-
47
- $captureRequest = Mage::getModel('msp/request_capture');
48
- $captureRequest->setOrder($order)
49
- ->setMethod($order->getPayment()->getMethod())
50
- ->setInvoice($invoice);
51
-
52
- $result = $captureRequest->sendCaptureRequest();
53
- } catch (Exception $e) {
54
- Mage::helper('msp')->resetPaymentFeeInvoicedValues($order, $invoice);
55
- $invoice->cancel()->save();
56
-
57
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
58
- Mage::throwException($e->getMessage());
59
- }
60
-
61
- if ($result === false) {
62
- Mage::helper('msp')->resetPaymentFeeInvoicedValues($order, $invoice);
63
- $invoice->cancel()->save();
64
-
65
- Mage::throwException('Unable to capture this invoice');
66
- }
67
-
68
- return $this;
69
- }
70
-
71
- /**
72
- * @param $order Mage_Sales_Model_Quote
73
- * @param $invoice Mage_Sales_Model_Order_Invoice
74
- * @return bool
75
- */
76
- protected function _captureIsAllowed($order, $invoice)
77
- {
78
- if (!Mage::getStoreConfigFlag('msp/msp_capture/capture_mode', $order->getStoreId())) {
79
- return false;
80
- }
81
-
82
- if ($invoice->getBaseGrandTotal() - $order->getBaseGrandTotal() > 0.01 ||
83
- $invoice->getBaseGrandTotal() - $order->getBaseGrandTotal() < -0.01) {
84
-
85
- Mage::throwException('Can only capture full invoices. Partial invoices cannot be captured by MultiSafepay.');
86
- return false;
87
- }
88
-
89
- if ((isset($_POST['invoice']) && isset($_POST['invoice']['capture_case'])) &&
90
- $_POST['invoice']['capture_case'] != 'online') {
91
-
92
- return false;
93
- }
94
-
95
- return true;
96
- }
97
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Observer/Capture.php DELETED
@@ -1,97 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Observer_Capture extends Mage_Core_Model_Abstract
10
- {
11
- public function sales_order_invoice_register(Varien_Event_Observer $observer)
12
- {
13
- //to prevent the script from running twice
14
- if (Mage::registry('captureStarted')) {
15
- Mage::unregister('captureStarted');
16
- return $this;
17
- }
18
-
19
- return $this->_capture($observer->getOrder(), $observer->getInvoice());
20
- }
21
-
22
- public function sales_order_payment_capture(Varien_Event_Observer $observer)
23
- {
24
- Mage::register('captureStarted', 1);
25
-
26
- return $this->_capture($observer->getInvoice()->getOrder(), $observer->getInvoice());
27
- }
28
-
29
- public function sales_order_invoice_save_before(Varien_Event_Observer $observer)
30
- {
31
- $invoice = $observer->getInvoice();
32
-
33
- if (!$invoice->getTransactionId() && $invoice->getOrder()->getMspOrderReference()) {
34
- $invoice->setTransactionId($invoice->getOrder()->getMspOrderReference());
35
- }
36
-
37
- return $this;
38
- }
39
-
40
- protected function _capture($order, $invoice)
41
- {
42
- try {
43
- if ($this->_captureIsAllowed($order, $invoice) !== true) {
44
- return $this;
45
- }
46
-
47
- $captureRequest = Mage::getModel('msp/request_capture');
48
- $captureRequest->setOrder($order)
49
- ->setMethod($order->getPayment()->getMethod())
50
- ->setInvoice($invoice);
51
-
52
- $result = $captureRequest->sendCaptureRequest();
53
- } catch (Exception $e) {
54
- Mage::helper('msp')->resetPaymentFeeInvoicedValues($order, $invoice);
55
- $invoice->cancel()->save();
56
-
57
- Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
58
- Mage::throwException($e->getMessage());
59
- }
60
-
61
- if ($result === false) {
62
- Mage::helper('msp')->resetPaymentFeeInvoicedValues($order, $invoice);
63
- $invoice->cancel()->save();
64
-
65
- Mage::throwException('Unable to capture this invoice');
66
- }
67
-
68
- return $this;
69
- }
70
-
71
- /**
72
- * @param $order Mage_Sales_Model_Quote
73
- * @param $invoice Mage_Sales_Model_Order_Invoice
74
- * @return bool
75
- */
76
- protected function _captureIsAllowed($order, $invoice)
77
- {
78
- if (!Mage::getStoreConfigFlag('msp/msp_capture/capture_mode', $order->getStoreId())) {
79
- return false;
80
- }
81
-
82
- if ($invoice->getBaseGrandTotal() - $order->getBaseGrandTotal() > 0.01 ||
83
- $invoice->getBaseGrandTotal() - $order->getBaseGrandTotal() < -0.01) {
84
-
85
- Mage::throwException('Can only capture full invoices. Partial invoices cannot be captured by MultiSafepay.');
86
- return false;
87
- }
88
-
89
- if ((isset($_POST['invoice']) && isset($_POST['invoice']['capture_case'])) &&
90
- $_POST['invoice']['capture_case'] != 'online') {
91
-
92
- return false;
93
- }
94
-
95
- return true;
96
- }
97
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Observer/Config.php DELETED
@@ -1,103 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Observer_Config extends Mage_Core_Model_Abstract
10
- {
11
- /**
12
- * This will check if the saved tax classes are not stored in more than 1 field
13
- */
14
- public function admin_system_config_section_save_after(Varien_Event_Observer $observer)
15
- {
16
- $this->_checkVatClassesAllowed();
17
- $this->_saveData($observer);
18
-
19
- return $this;
20
- }
21
-
22
- protected function _checkVatClassesAllowed()
23
- {
24
- $postArray = Mage::getSingleton('core/app')->getRequest()->getPost();
25
-
26
- if (!array_key_exists('msp_msp_tax', $postArray['config_state'])) {
27
- return $this;
28
- }
29
-
30
- $highVat = $postArray['groups']['msp_tax']['fields']['high']['value'];
31
- $lowVat = $postArray['groups']['msp_tax']['fields']['low']['value'];
32
- $zeroVat = $postArray['groups']['msp_tax']['fields']['zero']['value'];
33
- $noVat = $postArray['groups']['msp_tax']['fields']['no']['value'];
34
-
35
- foreach ($highVat as $classId) {
36
- if ($classId === '') {
37
- continue;
38
- }
39
-
40
- if (in_array($classId, $lowVat) || in_array($classId, $zeroVat) || in_array($classId, $noVat)) {
41
- Mage::throwException('Tax classes may not be selected for more than 1 VAT group');
42
- }
43
- }
44
-
45
- foreach ($lowVat as $classId) {
46
- if ($classId === '') {
47
- continue;
48
- }
49
- if (in_array($classId, $highVat) || in_array($classId, $zeroVat) || in_array($classId, $noVat)) {
50
- Mage::throwException('Tax classes may not be selected for more than 1 VAT group');
51
- }
52
- }
53
-
54
- foreach ($zeroVat as $classId) {
55
- if ($classId === '') {
56
- continue;
57
- }
58
- if (in_array($classId, $lowVat) || in_array($classId, $highVat) || in_array($classId, $noVat)) {
59
- Mage::throwException('Tax classes may not be selected for more than 1 VAT group');
60
- }
61
- }
62
-
63
- foreach ($noVat as $classId) {
64
- if ($classId === '') {
65
- continue;
66
- }
67
- if (in_array($classId, $lowVat) || in_array($classId, $zeroVat) || in_array($classId, $highVat)) {
68
- Mage::throwException('Tax classes may not be selected for more than 1 VAT group');
69
- }
70
- }
71
- }
72
-
73
- protected function _saveData(Varien_Event_Observer $observer)
74
- {
75
- //get all activated payment methods
76
- $payments = Mage::getSingleton('payment/config')->getActiveMethods();
77
- foreach ($payments as $payment) {
78
- $code = $payment->getCode();
79
-
80
- }
81
- }
82
-
83
- protected function _saveDataForPayment($code, $payment)
84
- {
85
- foreach (Mage::app()->getStores() as $eachStore => $storeVal) {
86
- $sortOrder = Mage::getStoreConfig('msp/msp_' . $code . '/sort_order', Mage::app()->getStore($eachStore)->getId());
87
-
88
- if ($sortOrder) {
89
- //set the sort_order as the new path
90
- Mage::getModel('core/config')->saveConfig('payment/' . $code . '/sort_order', $sortOrder, 'stores', Mage::app()->getStore($eachStore)->getId());
91
- }
92
-
93
- //saving title is purely to prevent conflicts with modules that look at payment/payment_code/title, rather than using the
94
- //payment method's getTitle() method
95
- $title = Mage::getStoreConfig('msp/msp_' . $code . '/portfolio_label', Mage::app()->getStore($eachStore)->getId());
96
-
97
- if ($title) {
98
- //set the title as the new path
99
- Mage::getModel('core/config')->saveConfig('payment/' . $code . '/title', $title, 'stores', Mage::app()->getStore($eachStore)->getId());
100
- }
101
- }
102
- }
103
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Observer/Creditmemo.php CHANGED
@@ -38,6 +38,7 @@ class MultiSafepay_Msp_Model_Observer_Creditmemo extends MultiSafepay_Msp_Model_
38
  'msp_directebanking',
39
  'msp_directdebit',
40
  'msp_fastcheckout',
 
41
  );
42
 
43
  public function sales_order_creditmemo_save_after(Varien_Event_Observer $observer)
38
  'msp_directebanking',
39
  'msp_directdebit',
40
  'msp_fastcheckout',
41
+ 'msp_amex',
42
  );
43
 
44
  public function sales_order_creditmemo_save_after(Varien_Event_Observer $observer)
app/code/community/MultiSafepay/Msp/Model/Observer/Order.php CHANGED
@@ -43,6 +43,7 @@ class MultiSafepay_Msp_Model_Observer_Order extends MultiSafepay_Msp_Model_Obser
43
 
44
  public function sales_order_save_after(Varien_Event_Observer $observer)
45
  {
 
46
  /** @var $event Varien_Event */
47
  $event = $observer->getEvent();
48
 
43
 
44
  public function sales_order_save_after(Varien_Event_Observer $observer)
45
  {
46
+ return true;
47
  /** @var $event Varien_Event */
48
  $event = $observer->getEvent();
49
 
app/code/community/MultiSafepay/Msp/Model/Order/Invoice/Total.php DELETED
@@ -1,75 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Order_Invoice_Total extends Mage_Sales_Model_Order_Invoice_Total_Abstract
10
- {
11
- /**
12
- * Retrieves Payment Fee values, calculates the amount that needs to be invoiced
13
- *
14
- * @param Mage_Sales_Model_Order_Invoice $invoice
15
- */
16
- public function collect(Mage_Sales_Model_Order_Invoice $invoice)
17
- {
18
- $order = $invoice->getOrder();
19
-
20
- //retrieve all base fee-related values from order
21
- $basePaymentFee = $order->getBasePaymentFee();
22
- $basePaymentFeeInvoiced = $order->getBasePaymentFeeInvoiced();
23
- $basePaymentFeeTax = $order->getBasePaymentFeeTax();
24
- $basePaymentFeeTaxInvoiced = $order->getBasePaymentFeeTaxInvoiced();
25
-
26
- //retrieve all fee-related values from order
27
- $paymentFee = $order->getPaymentFee();
28
- $paymentFeeInvoiced = $order->getPaymentFeeInvoiced();
29
- $paymentFeeTax = $order->getPaymentFeeTax();
30
- $paymentFeeTaxInvoiced = $order->getPaymentFeeTaxInvoiced();
31
-
32
- //get current invoice totals
33
- $baseInvoiceTotal = $invoice->getBaseGrandTotal();
34
- $invoiceTotal = $invoice->getGrandTotal();
35
-
36
- $baseTaxAmountTotal = $invoice->getBaseTaxAmount();
37
- $taxAmountTotal = $invoice->getTaxAmount();
38
-
39
- //calculate how much needs to be invoiced
40
- $basePaymentFeeToInvoice = $basePaymentFee - $basePaymentFeeInvoiced;
41
- $paymentFeeToInvoice = $paymentFee - $paymentFeeInvoiced;
42
-
43
- $basePaymentFeeTaxToInvoice = $basePaymentFeeTax - $basePaymentFeeTaxInvoiced;
44
- $paymentFeeTaxToInvoice = $paymentFeeTax - $paymentFeeTaxInvoiced;
45
-
46
- $basePaymentFeeTaxToInvoice -= $basePaymentFeeTaxInvoiced;
47
- $paymentFeeTaxToInvoice -= $paymentFeeTaxInvoiced;
48
-
49
- $baseInvoiceTotal += $basePaymentFeeToInvoice;
50
- $invoiceTotal += $paymentFeeToInvoice;
51
-
52
- $invoice->setBaseGrandTotal($baseInvoiceTotal);
53
- $invoice->setGrandTotal($invoiceTotal);
54
-
55
- //fix for issue where invoice totals is sometimes missing paymentfee tax
56
- //underlying cause currently unknown
57
- if ($invoice->getBaseGrandTotal() < $order->getBaseGrandTotal() &&
58
- $invoice->getBaseGrandTotal() + $basePaymentFeeTaxToInvoice == $order->getBaseGrandTotal()) {
59
-
60
- $invoice->setBaseGrandTotal($baseInvoiceTotal + $basePaymentFeeTaxToInvoice);
61
- $invoice->setGrandTotal($invoiceTotal + $paymentFeeTaxToInvoice);
62
- }
63
-
64
- $invoice->setBaseTaxAmount($baseTaxAmountTotal);
65
- $invoice->setTaxAmount($taxAmountTotal);
66
-
67
- $invoice->setBasePaymentFee($basePaymentFeeToInvoice);
68
- $invoice->setPaymentFee($paymentFeeToInvoice);
69
-
70
- $invoice->setBasePaymentFeeTax($basePaymentFeeTaxToInvoice);
71
- $invoice->setPaymentFeeTax($paymentFeeTaxToInvoice);
72
-
73
- return $this;
74
- }
75
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Payment.php CHANGED
@@ -234,8 +234,8 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
234
  $currencyCode = $baseCurrencyCode;
235
  }
236
 
237
- $amount = intval((string)($amount * 100));
238
- $amount = round($amount * $this->pay_factor);
239
 
240
  $storename = Mage::app()->getStore()->getName();
241
  $billing = $this->getOrder()->getBillingAddress();
@@ -271,8 +271,8 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
271
  $this->api->test = $isTestMode;
272
  $this->api->merchant['notification_url'] = $this->_notification_url . "?type=initial";
273
  $this->api->merchant['cancel_url'] = $this->_cancel_url;
274
- // $this->api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url : '';
275
- $this->api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url.'?transactionid='.$orderId : '';
276
  $this->api->parseCustomerAddress($billing->getStreet(1));
277
 
278
  if ($this->api->customer['housenumber'] == '') {
@@ -339,6 +339,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
339
  $this->api->transaction['gateway'] = $this->_gateway;
340
  $this->api->transaction['issuer'] = $this->_issuer;
341
  $this->api->transaction['items'] = $items;
 
342
  $this->api->setDefaultTaxZones();
343
 
344
  $this->getItems($this->getOrder(), $currencyCode);
@@ -356,7 +357,8 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
356
  $this->api->cart->AddItem($c_item);
357
  }
358
 
359
- $taxClass = Mage::getStoreConfig('msp/msp_payafter/fee_tax_class');
 
360
 
361
  if ($taxClass == 0) {
362
  $this->_rate = 1;
@@ -402,6 +404,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
402
  $this->api->cart->AddItem($c_item);
403
  }
404
 
 
405
  //add none taxtable
406
  $table = new MspAlternateTaxTable();
407
  $table->name = 'none';
@@ -477,13 +480,18 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
477
  }
478
 
479
  $send_order_email = $this->getConfigData("new_order_mail");
480
- if ($send_order_email == 'after_confirmation') {
481
- if (!$this->getOrder()->getEmailSent()) {
482
- // $this->getOrder()->setEmailSent(true);
483
- $this->getOrder()->save();
484
- $this->getOrder()->sendNewOrderEmail();
485
- }
486
- }
 
 
 
 
 
487
 
488
  return $url;
489
  }
@@ -491,7 +499,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
491
  /**
492
  * @return bool
493
  */
494
- protected function _isTestPayAfterDelivery()
495
  {
496
  $isTest = ($this->getConfigData('test_api_pad') == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
497
  if ($isTest) {
@@ -624,12 +632,15 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
624
  return Mage::getModel('customer/group')->load($customerGroup)->getTaxClassId();
625
  }
626
 
627
- protected function getItems($order, $targetCurrencyCode)
628
  {
629
  $items = $order->getAllItems();
 
 
630
  foreach ($items as $item) {
631
  $product_id = $item->getProductId();
632
-
 
633
  foreach ($order->getAllItems() as $order_item) {
634
  $order_product_id = $order_item->getProductId();
635
  if ($order_product_id == $product_id) {
@@ -666,19 +677,54 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
666
  $itemName .= $optionString;
667
  $itemName .= ')';
668
  }
669
-
 
670
  $currentCurrencyCode = Mage::app()->getStore()->getCurrentCurrencyCode();
671
- $price = number_format($this->_convertCurrency($item->getPrice(), $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
672
  //$quantity = round($item->getQtyOrdered(), 2);
673
-
674
- // create item
675
- $c_item = new MspItem($itemName, $item->getDescription(), $quantity, $price, 'KG', $item->getWeight());
676
- $c_item->SetMerchantItemId($item->getSku());
677
- $c_item->SetTaxTableSelector($taxClass);
678
- $this->api->cart->AddItem($c_item);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
679
  }
680
  }
681
 
 
682
  /**
683
  * Send a transaction request to MultiSafepay and return the payment_url
684
  */
@@ -701,12 +747,24 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
701
  $quote_grand_total = $quote->getGrandTotal();
702
  $order_grand_total = $order->getGrandTotal();
703
 
704
- if ($quote_base_grand_total == $order_base_grand_total) {
 
 
 
 
 
 
 
 
705
  $checked_amount = $order_base_grand_total;
706
  $checked_amount_current = $order_grand_total;
707
  } else {
708
  Mage::throwException(Mage::helper("msp")->__("The cart total is not the same as the order total! Creation of the transaction is halted."));
709
- }
 
 
 
 
710
 
711
  // currency check
712
  $isAllowConvert = Mage::getStoreConfigFlag('msp/settings/allow_convert_currency');
@@ -735,9 +793,9 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
735
  $amount = $checked_amount;
736
  $currencyCode = Mage::app()->getBaseCurrencyCode();
737
  }
738
-
739
- $amount = intval((string)($amount * 100));
740
- $amount = round($amount * $this->pay_factor);
741
 
742
  $storename = Mage::app()->getStore()->getName();
743
  $billing = $this->getOrder()->getBillingAddress();
@@ -755,25 +813,28 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
755
  $this->api->test = ($this->getConfigData("test_api") == 'test');
756
  $api->merchant['notification_url'] = $this->_notification_url . "?type=initial";
757
  $api->merchant['cancel_url'] = $this->_cancel_url;
758
- // $api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url : '';
759
- $api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url.'?transactionid='.$orderId : '';
760
-
761
- if ($this->getConfigData('use_redirect')) {
762
- $this->api->customer['housenumber']= $billing->getStreet(2);
763
- $this->api->customer['address1'] = $billing->getStreet(1);
764
- } else {
765
- $api->parseCustomerAddress($billing->getStreet(1));
766
- }
767
-
768
  $api->customer['locale'] = Mage::app()->getLocale()->getLocaleCode();//Mage::app()->getLocale()->getDefaultLocale();
769
- $api->customer['firstname'] = $billing->getFirstname();
770
- $api->customer['lastname'] = $billing->getLastname();
771
- //$api->customer['address2'] = $billing->getStreet(2);
772
- $api->customer['zipcode'] = $billing->getPostcode();
773
- $api->customer['city'] = $billing->getCity();
774
- $api->customer['state'] = $billing->getState();
775
- $api->customer['country'] = $billing->getCountry();
776
- $api->customer['phone'] = $billing->getTelephone();
 
 
 
 
 
 
 
 
 
 
 
777
  $api->customer['email'] = $this->getOrder()->getCustomerEmail();
778
  if(isset($_SERVER['HTTP_REFERER'])){
779
  $api->customer['referrer'] = $_SERVER['HTTP_REFERER'];
@@ -789,7 +850,7 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
789
  $api->transaction['var3'] = Mage::app()->getStore()->getStoreId();
790
  $api->transaction['description'] = 'Order #' . $orderId . ' at ' . $storename;
791
  $api->transaction['items'] = $items;
792
- $api->transaction['gateway'] = $this->_gateway;
793
  if($api->transaction['gateway'] == ''){
794
  $api->transaction['gateway'] = 'connect';
795
  }
@@ -896,6 +957,13 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
896
  //ALL data available? Then request the transaction link
897
  */
898
 
 
 
 
 
 
 
 
899
  if ($this->_gateway == 'IDEAL' && (isset($_REQUEST['bank']) && !empty($_REQUEST['bank']))) {
900
  $api->extravars = $_REQUEST['bank'];
901
  $url = $api->startDirectXMLTransaction();
@@ -924,17 +992,29 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
924
 
925
  // add error status history
926
  $this->getOrder()->addStatusToHistory($this->getOrder()->getStatus(), Mage::helper("msp")->__("Error creating transaction").'<br/>'.$api->error_code . " - " . $api->error);
927
- $this->getOrder()->save();
928
-
929
- // raise error
930
- //Mage::throwException(Mage::helper("msp")->__("An error occured: ") . $api->error_code . " - " . $api->error);
931
- $errorMessage= Mage::helper("msp")->__("An error occured: ") . $api->error_code . " - " . $api->error. '<br />'.Mage::helper("msp")->__("Please retry placing your order and select a different payment method.");
932
- Mage::log($errorMessage);
933
 
934
- Mage::getSingleton('checkout/session')->addError($errorMessage);
935
- session_write_close();
936
- Mage::app()->getFrontController()->getResponse()->setRedirect(Mage::getUrl('checkout/cart'));
937
- Mage::app()->getResponse()->sendResponse();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
938
  exit;
939
  }
940
 
@@ -945,13 +1025,16 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
945
  }
946
 
947
  $send_order_email = $this->getConfigData("new_order_mail");
948
- if ($send_order_email == 'after_confirmation') {
949
- if (!$this->getOrder()->getEmailSent()) {
950
- // $this->getOrder()->setEmailSent(true);
951
- $this->getOrder()->save();
952
- $this->getOrder()->sendNewOrderEmail();
953
- }
954
- }
 
 
 
955
 
956
  return $url;
957
  }
@@ -964,22 +1047,21 @@ class MultiSafepay_Msp_Model_Payment extends Varien_Object
964
 
965
  $base = $this->getBase($orderId);
966
 
967
- //TEMP locking disabled because of check on redirect url
968
  // check lock
969
- /* if ($base->isLocked()) {
970
  $base->preventLockDelete();
971
 
972
  if ($initial) {
973
  return;
974
  } else {
975
- echo 'locked';
976
- exit();
977
  }
978
  }
979
 
980
  // lock
981
  $base->lock();
982
- */
983
  $orderexist = $order->getIncrementId();
984
 
985
 
234
  $currencyCode = $baseCurrencyCode;
235
  }
236
 
237
+ $amount = intval((string)(round($amount * 100)));
238
+ $amount = round($amount * $this->pay_factor);
239
 
240
  $storename = Mage::app()->getStore()->getName();
241
  $billing = $this->getOrder()->getBillingAddress();
271
  $this->api->test = $isTestMode;
272
  $this->api->merchant['notification_url'] = $this->_notification_url . "?type=initial";
273
  $this->api->merchant['cancel_url'] = $this->_cancel_url;
274
+ $this->api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url : '';
275
+ //$this->api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url.'?transactionid='.$orderId : '';
276
  $this->api->parseCustomerAddress($billing->getStreet(1));
277
 
278
  if ($this->api->customer['housenumber'] == '') {
339
  $this->api->transaction['gateway'] = $this->_gateway;
340
  $this->api->transaction['issuer'] = $this->_issuer;
341
  $this->api->transaction['items'] = $items;
342
+ $this->api->transaction['daysactive'] = $this->getConfigData("pad_daysactive" . $suffix);
343
  $this->api->setDefaultTaxZones();
344
 
345
  $this->getItems($this->getOrder(), $currencyCode);
357
  $this->api->cart->AddItem($c_item);
358
  }
359
 
360
+
361
+ $taxClass = Mage::getStoreConfig('msp/msp_payafter/fee_tax_class');
362
 
363
  if ($taxClass == 0) {
364
  $this->_rate = 1;
404
  $this->api->cart->AddItem($c_item);
405
  }
406
 
407
+
408
  //add none taxtable
409
  $table = new MspAlternateTaxTable();
410
  $table->name = 'none';
480
  }
481
 
482
  $send_order_email = $this->getConfigData("new_order_mail");
483
+
484
+
485
+ if($this->getOrder()->getCanSendNewEmailFlag())
486
+ {
487
+ if ($send_order_email == 'after_confirmation') {
488
+ if (!$this->getOrder()->getEmailSent()) {
489
+ $this->getOrder()->sendNewOrderEmail();
490
+ $this->getOrder()->setEmailSent(true);
491
+ $this->getOrder()->save();
492
+ }
493
+ }
494
+ }
495
 
496
  return $url;
497
  }
499
  /**
500
  * @return bool
501
  */
502
+ protected function _isTestPayAfterDelivery()
503
  {
504
  $isTest = ($this->getConfigData('test_api_pad') == MultiSafepay_Msp_Model_Config_Sources_Accounts::TEST_MODE);
505
  if ($isTest) {
632
  return Mage::getModel('customer/group')->load($customerGroup)->getTaxClassId();
633
  }
634
 
635
+ protected function getItems($order, $targetCurrencyCode)
636
  {
637
  $items = $order->getAllItems();
638
+
639
+
640
  foreach ($items as $item) {
641
  $product_id = $item->getProductId();
642
+
643
+
644
  foreach ($order->getAllItems() as $order_item) {
645
  $order_product_id = $order_item->getProductId();
646
  if ($order_product_id == $product_id) {
677
  $itemName .= $optionString;
678
  $itemName .= ')';
679
  }
680
+
681
+ $proddata = Mage::getModel('catalog/product')->load($product_id);
682
  $currentCurrencyCode = Mage::app()->getStore()->getCurrentCurrencyCode();
683
+
684
  //$quantity = round($item->getQtyOrdered(), 2);
685
+
686
+ $ndata = $item->getData();
687
+ if($ndata['price'] != 0)
688
+ {
689
+ //Test-> Magento rounds at 2 decimals so the recalculation goes wrong with large quantities.
690
+ $price_with_tax = $ndata['price_incl_tax'];
691
+ $tax_rate =$rate;
692
+ $divided_value = 1+($tax_rate);
693
+ $price_without_tax = $price_with_tax/$divided_value;
694
+ $price = round($price_without_tax,4);
695
+ $price = number_format($this->_convertCurrency($price, $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
696
+
697
+ $tierprices = $proddata->getTierPrice();
698
+ if(count($tierprices) > 0)
699
+ {
700
+ $product_tier_prices = (object)$tierprices;
701
+ $product_price = array();
702
+ foreach($product_tier_prices as $key=>$value){
703
+ $value = (object)$value;
704
+ $product_price[] = $value->price;
705
+ if($item->getQtyOrdered() >= $value->price_qty)
706
+
707
+ $price_with_tax = $value->price;
708
+ $tax_rate =$rate;
709
+ $divided_value = 1+($tax_rate);
710
+ $price_without_tax = $price_with_tax/$divided_value;
711
+ $price = round($price_without_tax,4);
712
+ $price = number_format($this->_convertCurrency($price, $currentCurrencyCode, $targetCurrencyCode), 4, '.', '');
713
+
714
+ }
715
+ }
716
+
717
+
718
+ // create item
719
+ $c_item = new MspItem($itemName, $item->getDescription(), $quantity, $price, 'KG', $item->getWeight());
720
+ $c_item->SetMerchantItemId($item->getSku());
721
+ $c_item->SetTaxTableSelector($taxClass);
722
+ $this->api->cart->AddItem($c_item);
723
+ }
724
  }
725
  }
726
 
727
+
728
  /**
729
  * Send a transaction request to MultiSafepay and return the payment_url
730
  */
747
  $quote_grand_total = $quote->getGrandTotal();
748
  $order_grand_total = $order->getGrandTotal();
749
 
750
+
751
+ $checked_amount = $order_base_grand_total;
752
+ $checked_amount_current = $order_grand_total;
753
+
754
+
755
+ /*
756
+ Code below is disabled because this check causes error with different thirt party modules. Also this was more meant for BNO, so in stratPayAfterTransaction it remains.
757
+
758
+ if ($quote_base_grand_total == $order_base_grand_total) {
759
  $checked_amount = $order_base_grand_total;
760
  $checked_amount_current = $order_grand_total;
761
  } else {
762
  Mage::throwException(Mage::helper("msp")->__("The cart total is not the same as the order total! Creation of the transaction is halted."));
763
+ }*/
764
+
765
+ $gateway_data = $quote->getPayment()->getData();
766
+ $gateway = strtoupper(str_replace("msp_", '', $gateway_data['method']));
767
+
768
 
769
  // currency check
770
  $isAllowConvert = Mage::getStoreConfigFlag('msp/settings/allow_convert_currency');
793
  $amount = $checked_amount;
794
  $currencyCode = Mage::app()->getBaseCurrencyCode();
795
  }
796
+
797
+ $amount = intval((string)(round($amount * 100)));
798
+ $amount = round($amount * $this->pay_factor);
799
 
800
  $storename = Mage::app()->getStore()->getName();
801
  $billing = $this->getOrder()->getBillingAddress();
813
  $this->api->test = ($this->getConfigData("test_api") == 'test');
814
  $api->merchant['notification_url'] = $this->_notification_url . "?type=initial";
815
  $api->merchant['cancel_url'] = $this->_cancel_url;
816
+ $api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url : '';
817
+ //$api->merchant['redirect_url'] = ($this->getConfigData('use_redirect')) ? $this->_return_url.'?transactionid='.$orderId : '';
 
 
 
 
 
 
 
 
818
  $api->customer['locale'] = Mage::app()->getLocale()->getLocaleCode();//Mage::app()->getLocale()->getDefaultLocale();
819
+
820
+ if(is_object($billing))
821
+ {
822
+ $this->api->parseCustomerAddress($billing->getStreet(1));
823
+
824
+ if ($this->api->customer['housenumber'] == '') {
825
+ $this->api->customer['housenumber'] = $billing->getStreet(2);
826
+ $this->api->customer['address1'] = $billing->getStreet(1);
827
+ }
828
+
829
+ $api->customer['firstname'] = $billing->getFirstname();
830
+ $api->customer['lastname'] = $billing->getLastname();
831
+ //$api->customer['address2'] = $billing->getStreet(2);
832
+ $api->customer['zipcode'] = $billing->getPostcode();
833
+ $api->customer['city'] = $billing->getCity();
834
+ $api->customer['state'] = $billing->getState();
835
+ $api->customer['country'] = $billing->getCountry();
836
+ $api->customer['phone'] = $billing->getTelephone();
837
+ }
838
  $api->customer['email'] = $this->getOrder()->getCustomerEmail();
839
  if(isset($_SERVER['HTTP_REFERER'])){
840
  $api->customer['referrer'] = $_SERVER['HTTP_REFERER'];
850
  $api->transaction['var3'] = Mage::app()->getStore()->getStoreId();
851
  $api->transaction['description'] = 'Order #' . $orderId . ' at ' . $storename;
852
  $api->transaction['items'] = $items;
853
+ $api->transaction['gateway'] = $gateway;
854
  if($api->transaction['gateway'] == ''){
855
  $api->transaction['gateway'] = 'connect';
856
  }
957
  //ALL data available? Then request the transaction link
958
  */
959
 
960
+
961
+ if($this->_gateway == 'BANKTRANS')
962
+ {
963
+ $api->transaction['gateway'] = 'BANKTRANS';
964
+ }
965
+
966
+
967
  if ($this->_gateway == 'IDEAL' && (isset($_REQUEST['bank']) && !empty($_REQUEST['bank']))) {
968
  $api->extravars = $_REQUEST['bank'];
969
  $url = $api->startDirectXMLTransaction();
992
 
993
  // add error status history
994
  $this->getOrder()->addStatusToHistory($this->getOrder()->getStatus(), Mage::helper("msp")->__("Error creating transaction").'<br/>'.$api->error_code . " - " . $api->error);
 
 
 
 
 
 
995
 
996
+ if($orderId =! '')
997
+ {
998
+ $this->getOrder()->save();
999
+ // raise error
1000
+ //Mage::throwException(Mage::helper("msp")->__("An error occured: ") . $api->error_code . " - " . $api->error);
1001
+ $errorMessage= Mage::helper("msp")->__("An error occured: ") . $api->error_code . " - " . $api->error. '<br />'.Mage::helper("msp")->__("Please retry placing your order and select a different payment method.");
1002
+ Mage::log($errorMessage);
1003
+
1004
+ Mage::getSingleton('checkout/session')->addError($errorMessage);
1005
+ session_write_close();
1006
+ Mage::app()->getFrontController()->getResponse()->setRedirect(Mage::getUrl('checkout/cart'));
1007
+ Mage::app()->getResponse()->sendResponse();
1008
+ }else{
1009
+ //Mage::throwException(Mage::helper("msp")->__("An error occured: ") . $api->error_code . " - " . $api->error);
1010
+ $errorMessage= Mage::helper("msp")->__("An error occured: "). '<br />'.Mage::helper("msp")->__("Please retry placing your order and select a different payment method.");
1011
+ Mage::log($errorMessage);
1012
+
1013
+ Mage::getSingleton('checkout/session')->addError($errorMessage);
1014
+ session_write_close();
1015
+ Mage::app()->getFrontController()->getResponse()->setRedirect(Mage::getUrl('checkout/cart'));
1016
+ Mage::app()->getResponse()->sendResponse();
1017
+ }
1018
  exit;
1019
  }
1020
 
1025
  }
1026
 
1027
  $send_order_email = $this->getConfigData("new_order_mail");
1028
+ if($this->getOrder()->getCanSendNewEmailFlag())
1029
+ {
1030
+ if ($send_order_email == 'after_confirmation') {
1031
+ if (!$this->getOrder()->getEmailSent()) {
1032
+ $this->getOrder()->sendNewOrderEmail();
1033
+ $this->getOrder()->setEmailSent(true);
1034
+ $this->getOrder()->save();
1035
+ }
1036
+ }
1037
+ }
1038
 
1039
  return $url;
1040
  }
1047
 
1048
  $base = $this->getBase($orderId);
1049
 
 
1050
  // check lock
1051
+ if ($base->isLocked()) {
1052
  $base->preventLockDelete();
1053
 
1054
  if ($initial) {
1055
  return;
1056
  } else {
1057
+
1058
+ return false;
1059
  }
1060
  }
1061
 
1062
  // lock
1063
  $base->lock();
1064
+
1065
  $orderexist = $order->getIncrementId();
1066
 
1067
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Observer.php DELETED
@@ -1,111 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Observer extends Mage_Core_Model_Abstract
10
- {
11
- /**
12
- * Collects paymentFee from quote/addresses to quote
13
- *
14
- * @param Varien_Event_Observer $observer
15
- */
16
- public function sales_quote_collect_totals_after(Varien_Event_Observer $observer)
17
- {
18
- $quote = $observer->getEvent()->getQuote();
19
- $quote->setPaymentFee(0);
20
- $quote->setBasePaymentFee(0);
21
- $quote->setPaymentFeeTax(0);
22
- $quote->setBasePaymentFeeTax(0);
23
-
24
- foreach ($quote->getAllAddresses() as $address) {
25
- if (!$quote->getPaymentFee()) {
26
- $quote->setPaymentFee((float) $address->getPaymentFee());
27
- }
28
- if (!$quote->getBasePaymentFee()) {
29
- $quote->setBasePaymentFee((float) $address->getBasePaymentFee());
30
- }
31
- if (!$quote->getPaymentFeeTax()) {
32
- $quote->setPaymentFeeTax((float) $address->getPaymentFeeTax());
33
- }
34
- if (!$quote->getBasePaymentFeeTax()) {
35
- $quote->setBasePaymentFeeTax((float) $address->getBasePaymentFeeTax());
36
- }
37
- }
38
-
39
- $quote->save();
40
- }
41
-
42
- /**
43
- * Adds PaymentFee to order
44
- *
45
- * @param Varien_Event_Observer $observer
46
- */
47
- public function sales_order_payment_place_end(Varien_Event_Observer $observer)
48
- {
49
- $payment = $observer->getPayment();
50
-
51
- $order = $payment->getOrder();
52
- $quote = Mage::getSingleton('checkout/session')->getQuote();
53
-
54
- if (!$quote->getId()) {
55
- $quote = Mage::getSingleton('adminhtml/session_quote')->getQuote();
56
- }
57
-
58
- $order->setBasePaymentFee($quote->getBasePaymentFee());
59
- $order->setPaymentFee($quote->getPaymentFee());
60
-
61
- $order->setBasePaymentFeeTax($quote->getBasePaymentFeeTax());
62
- $order->setPaymentFeeTax($quote->getPaymentFeeTax());
63
-
64
- $order->setBaseTaxAmount($order->getBaseTaxAmount());
65
- $order->setTaxAmount($order->getTaxAmount());
66
-
67
- $order->save();
68
-
69
- $info = $payment->getMethodInstance()->getInfoInstance();
70
-
71
- $info->setAdditionalInformation('payment_fee', $quote->getPaymentFee());
72
- $info->setAdditionalInformation('base_payment_fee', $quote->getBasePaymentFee());
73
-
74
- $info->setAdditionalInformation('payment_fee_tax', $quote->getPaymentFeeTax());
75
- $info->setAdditionalInformation('base_payment_fee_tax', $quote->getBasePaymentFeeTax());
76
-
77
- $info->save();
78
- }
79
-
80
- /**
81
- * Adds the payment fee to the creditmemo
82
- *
83
- * @param Varien_Event_Observer $observer
84
- */
85
- public function paymentfee_order_creditmemo_refund_before(Varien_Event_Observer $observer)
86
- {
87
- $creditmemo = $observer->getCreditmemo();
88
-
89
- $paymentFee = Mage::getModel('msp/paymentFee_refund', $creditmemo);
90
- $creditmemo = $paymentFee->paymentFeeRefund();
91
- }
92
-
93
- /**
94
- * Updates the order with the newly invoiced values
95
- *
96
- * @param Varien_Event_Observer $observer
97
- */
98
- public function sales_order_invoice_register(Varien_Event_Observer $observer)
99
- {
100
- $invoice = $observer->getInvoice();
101
- $order = $invoice->getOrder();
102
-
103
- $order->setBasePaymentFeeInvoiced($invoice->getBasePaymentFee());
104
- $order->setPaymentFeeInvoiced($invoice->getPaymentFee());
105
-
106
- $order->setBasePaymentFeeTaxInvoiced($invoice->getBasePaymentFeeTax());
107
- $order->setPaymentFeeTaxInvoiced($invoice->getPaymentFeeTax());
108
-
109
- $order->save();
110
- }
111
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Creditmemo.php DELETED
@@ -1,19 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Order_Creditmemo extends Mage_Sales_Model_Order_Creditmemo
10
- {
11
- /**
12
- * @return $this|void
13
- */
14
- public function refund()
15
- {
16
- Mage::dispatchEvent('paymentfee_order_creditmemo_refund_before', array($this->_eventObject => $this));
17
- parent::refund();
18
- }
19
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Creditmemo/Total.php DELETED
@@ -1,67 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Order_Creditmemo_Total extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
10
- {
11
- /**
12
- * Retrieves Payment Fee values, calculates the amount that can be refunded
13
- *
14
- * @param Mage_Sales_Model_Order_Creditmemo $invoice
15
- */
16
- public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
17
- {
18
- $order = $creditmemo->getOrder();
19
-
20
- //retreive all base fee-related values from order
21
- $basePaymentFee = $order->getBasePaymentFeeInvoiced();
22
- $basePaymentFeeRefunded = $order->getBasePaymentFeeRefunded();
23
- $basePaymentFeeTax = $order->getBasePaymentFeeTaxInvoiced();
24
- $basePaymentFeeTaxRefunded = $order->getBasePaymentFeeTaxRefunded();
25
-
26
- //retreive all fee-related values from order
27
- $paymentFee = $order->getPaymentFeeInvoiced();
28
- $paymentFeeRefunded = $order->getPaymentFeeRefunded();
29
- $paymentFeeTax = $order->getPaymentFeeTaxInvoiced();
30
- $paymentFeeTaxRefunded = $order->getPaymentFeeTaxRefunded();
31
-
32
- //get current creditmemo totals
33
- $baseRefundTotal = $creditmemo->getBaseGrandTotal();
34
- $creditmemoTotal = $creditmemo->getGrandTotal();
35
-
36
- $baseTaxAmountTotal = $creditmemo->getBaseTaxAmount();
37
- $taxAmountTotal = $creditmemo->getTaxAmount();
38
-
39
- //calculate how much needs to be creditmemod
40
- $basePaymentFeeToRefund = $basePaymentFee - $basePaymentFeeRefunded;
41
- $paymentFeeToRefund = $paymentFee - $paymentFeeRefunded;
42
-
43
- $basePaymentFeeTaxToRefund = $basePaymentFeeTax - $basePaymentFeeTaxRefunded;
44
- $paymentFeeTaxToRefund = $paymentFeeTax - $paymentFeeTaxRefunded;
45
-
46
- $baseRefundTotal += $basePaymentFeeToRefund;
47
- $creditmemoTotal += $paymentFeeToRefund;
48
-
49
- $baseTaxAmountTotal += $basePaymentFeeTaxToRefund;
50
- $taxAmountTotal += $paymentFeeTaxToRefund;
51
-
52
- //set the new creditmemod values
53
- $creditmemo->setBaseGrandTotal($baseRefundTotal + $basePaymentFeeTaxToRefund);
54
- $creditmemo->setGrandTotal($creditmemoTotal + $paymentFeeTaxToRefund);
55
-
56
- $creditmemo->setBaseTaxAmount($baseTaxAmountTotal);
57
- $creditmemo->setTaxAmount($taxAmountTotal);
58
-
59
- $creditmemo->setBasePaymentFee($basePaymentFeeToRefund);
60
- $creditmemo->setPaymentFee($paymentFeeToRefund);
61
-
62
- $creditmemo->setBasePaymentFeeTax($basePaymentFeeTax);
63
- $creditmemo->setPaymentFeeTax($paymentFeeTax);
64
-
65
- return $this;
66
- }
67
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Order/Invoice/Total.php DELETED
@@ -1,75 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Order_Invoice_Total extends Mage_Sales_Model_Order_Invoice_Total_Abstract
10
- {
11
- /**
12
- * Retrieves Payment Fee values, calculates the amount that needs to be invoiced
13
- *
14
- * @param Mage_Sales_Model_Order_Invoice $invoice
15
- */
16
- public function collect(Mage_Sales_Model_Order_Invoice $invoice)
17
- {
18
- $order = $invoice->getOrder();
19
-
20
- //retrieve all base fee-related values from order
21
- $basePaymentFee = $order->getBasePaymentFee();
22
- $basePaymentFeeInvoiced = $order->getBasePaymentFeeInvoiced();
23
- $basePaymentFeeTax = $order->getBasePaymentFeeTax();
24
- $basePaymentFeeTaxInvoiced = $order->getBasePaymentFeeTaxInvoiced();
25
-
26
- //retrieve all fee-related values from order
27
- $paymentFee = $order->getPaymentFee();
28
- $paymentFeeInvoiced = $order->getPaymentFeeInvoiced();
29
- $paymentFeeTax = $order->getPaymentFeeTax();
30
- $paymentFeeTaxInvoiced = $order->getPaymentFeeTaxInvoiced();
31
-
32
- //get current invoice totals
33
- $baseInvoiceTotal = $invoice->getBaseGrandTotal();
34
- $invoiceTotal = $invoice->getGrandTotal();
35
-
36
- $baseTaxAmountTotal = $invoice->getBaseTaxAmount();
37
- $taxAmountTotal = $invoice->getTaxAmount();
38
-
39
- //calculate how much needs to be invoiced
40
- $basePaymentFeeToInvoice = $basePaymentFee - $basePaymentFeeInvoiced;
41
- $paymentFeeToInvoice = $paymentFee - $paymentFeeInvoiced;
42
-
43
- $basePaymentFeeTaxToInvoice = $basePaymentFeeTax - $basePaymentFeeTaxInvoiced;
44
- $paymentFeeTaxToInvoice = $paymentFeeTax - $paymentFeeTaxInvoiced;
45
-
46
- $basePaymentFeeTaxToInvoice -= $basePaymentFeeTaxInvoiced;
47
- $paymentFeeTaxToInvoice -= $paymentFeeTaxInvoiced;
48
-
49
- $baseInvoiceTotal += $basePaymentFeeToInvoice;
50
- $invoiceTotal += $paymentFeeToInvoice;
51
-
52
- $invoice->setBaseGrandTotal($baseInvoiceTotal);
53
- $invoice->setGrandTotal($invoiceTotal);
54
-
55
- //fix for issue where invoice totals is sometimes missing paymentfee tax
56
- //underlying cause currently unknown
57
- if ($invoice->getBaseGrandTotal() < $order->getBaseGrandTotal() &&
58
- $invoice->getBaseGrandTotal() + $basePaymentFeeTaxToInvoice == $order->getBaseGrandTotal()) {
59
-
60
- $invoice->setBaseGrandTotal($baseInvoiceTotal + $basePaymentFeeTaxToInvoice);
61
- $invoice->setGrandTotal($invoiceTotal + $paymentFeeTaxToInvoice);
62
- }
63
-
64
- $invoice->setBaseTaxAmount($baseTaxAmountTotal);
65
- $invoice->setTaxAmount($taxAmountTotal);
66
-
67
- $invoice->setBasePaymentFee($basePaymentFeeToInvoice);
68
- $invoice->setPaymentFee($paymentFeeToInvoice);
69
-
70
- $invoice->setBasePaymentFeeTax($basePaymentFeeTaxToInvoice);
71
- $invoice->setPaymentFeeTax($paymentFeeTaxToInvoice);
72
-
73
- return $this;
74
- }
75
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Quote/Address/Total.php DELETED
@@ -1,277 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Quote_Address_Total extends Mage_Sales_Model_Quote_Address_Total_Abstract
10
- {
11
- protected $_code = 'paymentFee';
12
- protected $_tempAddress = '';
13
- protected $_method = '';
14
- protected $_rate = '';
15
- protected $_collection = '';
16
-
17
- /**
18
- *
19
- */
20
- protected function _construct()
21
- {
22
- $this->setCode('paymentFee');
23
- }
24
-
25
- /**
26
- * @param Mage_Sales_Model_Quote_Address $address
27
- * @return $this|Mage_Sales_Model_Quote_Address_Total_Abstract
28
- */
29
- public function collect(Mage_Sales_Model_Quote_Address $address)
30
- {
31
- if(Mage::app()->getFrontController()->getRequest()->isSecure())
32
- $protocol ='https://';
33
- else{
34
- $protocol ='http://';
35
- }
36
-
37
- //$protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']), 'https') === FALSE ? 'http://' : 'https://';
38
- $currentUrl = $protocol . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
39
-
40
- if ($currentUrl != Mage::helper('checkout/cart')->getCartUrl()) {
41
- // $gateway_data = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getData();
42
- // $gateway_data = $address->getQuote()->getPayment()->getData();
43
-
44
- /** @var $quote Mage_Sales_Model_Quote */
45
- $quote = $address->getQuote();
46
- $code = $quote->getPayment()->getMethod();
47
-
48
-
49
- if($code == '')
50
- {
51
- if(isset($_POST['payment']['method']))
52
- {
53
- $code = $_POST['payment']['method'];
54
- }
55
- }
56
-
57
- if (!empty($code)) {
58
- if ($code == 'msp_payafter') {
59
- if (Mage::getStoreConfig('msp/msp_payafter/fee', $quote->getStoreId())) {
60
- if ($address->getBasePaymentFee() == 0)
61
- {
62
- $this->_tempAddress = $address;
63
- $this->_method = $this->_tempAddress->getQuote()->getPayment()->getMethod();
64
- $this->_tempAddress->setBasePaymentFee(0);
65
- $this->_tempAddress->setPaymentFee(0);
66
- $this->_tempAddress->setBasePaymentFeeTax(0);
67
- $this->_tempAddress->setPaymentFeeTax(0);
68
-
69
- $items = $address->getAllItems();
70
- if (!count($items)) {
71
- return $this;
72
- }
73
-
74
- $baseFee = $this->_getBaseFee();
75
- $fee = $this->_getFee();
76
-
77
- if ($baseFee == 0) {
78
- return $this;
79
- }
80
-
81
- $baseFeeTax = $this->_calulateTaxForFee($baseFee, true);
82
- $feeTax = $this->_calulateTaxForFee($baseFee);
83
-
84
- $this->_tempAddress->setBasePaymentFee($baseFee - $baseFeeTax);
85
- $this->_tempAddress->setPaymentFee($fee - $feeTax);
86
- $this->_tempAddress->getPaymentFee();
87
- $this->_tempAddress->setBasePaymentFeeTax($baseFeeTax);
88
- $this->_tempAddress->setPaymentFeeTax($feeTax);
89
-
90
- /* if (Mage::helper('msp')->isEnterprise()) {
91
- $this->_tempAddress->setBaseGrandTotal($this->_tempAddress->getBaseGrandTotal() + $baseFee);
92
- $this->_tempAddress->setGrandTotal($this->_tempAddress->getGrandTotal() + $fee);
93
- }*/
94
-
95
- $this->_tempAddress->setTaxAmount($this->_tempAddress->getTaxAmount() + $feeTax);
96
- $this->_tempAddress->setBaseTaxAmount($this->_tempAddress->getBaseTaxAmount() + $baseFeeTax);
97
-
98
- $this->_setAddress($this->_tempAddress);
99
- $this->_setBaseAmount($baseFee);
100
- $this->_setAmount($fee);
101
-
102
- //if (Mage::getStoreConfig('msp/msp_payafter/fee_duplicate', $quote->getStoreId())) {
103
- $this->_tempAddress->setGrandTotal($this->_tempAddress->getGrandTotal() + $fee);
104
- $this->_tempAddress->setBaseGrandTotal($this->_tempAddress->getBaseGrandTotal() + $fee);
105
- // }
106
-
107
- $this->_addFeeTaxToAppliedTaxes(
108
- $address,
109
- $feeTax,
110
- $baseFeeTax,
111
- $this->_getRate()
112
- );
113
-
114
- return $this;
115
- }
116
- }
117
- }
118
- }
119
- }
120
- }
121
-
122
- /**
123
- * @param Mage_Sales_Model_Quote_Address $address
124
- * @return $this|array
125
- */
126
- public function fetch(Mage_Sales_Model_Quote_Address $address)
127
- {
128
- if($address->getBasePaymentFee() >= '0.00') {
129
- $this->_method = $address->getQuote()->getPayment()->getMethod();
130
- if(Mage::app()->getFrontController()->getRequest()->isSecure())
131
- $protocol ='https://';
132
- else{
133
- $protocol ='http://';
134
- }
135
- //$protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']), 'https') === FALSE ? 'http://' : 'https://';
136
-
137
- $currentUrl = $protocol . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
138
-
139
-
140
- if (($address->getShippingAmount() != 0 || $address->getShippingDescription()) && $address->getBasePaymentFee() > 0.01 && $currentUrl != Mage::helper('checkout/cart')->getCartUrl())
141
- {
142
- $label = Mage::helper('msp')->getFeeLabel($this->_method);
143
-
144
- //$gateway_data = Mage::getSingleton('checkout/session')->getQuote()->getPayment()->getData();
145
- if($this->_method == 'msp_payafter')
146
- {
147
- $address->addTotal(
148
- array(
149
- 'code' => 'paymentFee',
150
- 'title' => $label,
151
- 'value' => $address->getBasePaymentFee(),
152
- )
153
- );
154
- }
155
- }
156
- return $this;
157
- }
158
- }
159
-
160
- /**
161
- * @return float
162
- */
163
- private function _getBaseFee()
164
- {
165
- $fee = Mage::getStoreConfig('msp/msp_payafter/fee_amount');
166
- $fee = str_replace(',', '.', $fee);
167
-
168
- if (strpos($fee, '%') !== false) {
169
- $feePercentage = str_replace('%', '', $fee);
170
-
171
- $quote = Mage::getModel('sales/quote');
172
- $quote->load($this->_tempAddress->getQuote()->getId());
173
-
174
- //calculate the fee. If the fee has already been added, remove it to prevent it from being taken into account in the calculation
175
- if ($quote->getBasePaymentFee()) {
176
- $fee = ($quote->getBaseGrandTotal() - $quote->getBasePaymentFee()) * ($feePercentage / 100);
177
- } elseif (!$quote->getBaseGrandTotal()) {
178
- $grandTotal = Mage::registry('msp_quote_basegrandtotal');
179
- $fee = $grandTotal * ($feePercentage / 100);
180
- } else {
181
- $fee = $quote->getBaseGrandTotal() * ($feePercentage / 100);
182
- }
183
- }
184
-
185
- return (float) $fee;
186
- }
187
-
188
- /**
189
- * @return float
190
- */
191
- private function _getFee()
192
- {
193
- $baseFee = $this->_getBaseFee();
194
- $quoteConvertRate = $this->_tempAddress->getQuote()->getBaseToQuoteRate();
195
- $fee = $baseFee * $quoteConvertRate;
196
-
197
- return (float) $fee;
198
- }
199
-
200
- protected function _getRate()
201
- {
202
- $quote = $this->_tempAddress->getQuote();
203
- $taxClass = Mage::getStoreConfig('msp/msp_payafter/fee_tax_class');
204
- if ($taxClass == 0) {
205
- $this->_rate = 1;
206
- return;
207
- }
208
-
209
- $taxCalculationModel = Mage::getSingleton('tax/calculation');
210
-
211
- $request = $taxCalculationModel->getRateRequest(
212
- $quote->getShippingAddress(),
213
- $quote->getBillingAddress(),
214
- $quote->getCustomerTaxClassId(),
215
- Mage::app()->getStore()->getId()
216
- );
217
- $request->setStore(Mage::app()->getStore())->setProductClassId($taxClass);
218
-
219
- $rate = $taxCalculationModel->getRate($request);
220
-
221
- return $rate;
222
- }
223
-
224
- private function _calulateTaxForFee($fee, $isBase = false)
225
- {
226
- $bigfee = 100 + $this->_getRate();
227
- // $tax = $fee * ($this->_getRate())- $fee;
228
-
229
- $tax = (Mage::getStoreConfig('msp/msp_payafter/fee_amount')/$bigfee)*$this->_getRate();
230
-
231
- if (!$isBase) {
232
- $quoteconvertRate = $this->_tempAddress->getQuote()->getBaseToQuoteRate();
233
- $tax *= $quoteconvertRate;
234
- }
235
-
236
- return $tax;
237
- }
238
-
239
- protected function _addFeeTaxToAppliedTaxes(Mage_Sales_Model_Quote_Address $address, $amount, $baseAmount, $taxRate)
240
- {
241
- $previouslyAppliedTaxes = $address->getAppliedTaxes();
242
- $applied = false;
243
-
244
- foreach ($previouslyAppliedTaxes as &$row) {
245
- foreach ($row['rates'] as $rate) {
246
- if ($rate['percent'] == $taxRate) {
247
- $row['amount'] += $amount;
248
- $row['base_amount'] += $baseAmount;
249
- $applied = true;
250
- break 2;
251
- } else {
252
- continue;
253
- }
254
- }
255
- }
256
-
257
- if (false === $applied) {
258
- $previouslyAppliedTaxes['PaymentFeeTax'] = array(
259
- 'rates' => array(array(
260
- 'code' => 'PaymentFeeTax',
261
- 'title' => 'MultiSafepay Servicekosten Tax',
262
- 'percent' => (float) $taxRate,
263
- 'position' => '0',
264
- 'priority' => '1',
265
- 'rule_id' => '2',
266
- )),
267
- 'percent' => (float) $taxRate,
268
- 'id' => 'PaymentFeeTax',
269
- 'process' => 0,
270
- 'amount' => $amount,
271
- 'base_amount' => $baseAmount,
272
- );
273
- }
274
-
275
- $address->setAppliedTaxes($previouslyAppliedTaxes);
276
- }
277
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Refund.php DELETED
@@ -1,169 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Refund extends Mage_Core_Model_Abstract
10
- {
11
- private $_creditmemo;
12
-
13
- protected $_order;
14
- protected $_invoice;
15
-
16
- public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo)
17
- {
18
- $this->_creditmemo = $creditmemo;
19
- }
20
-
21
- public function getCreditmemo()
22
- {
23
- return $this->_creditmemo;
24
- }
25
-
26
- public function setOrder(Mage_Sales_Model_Order $order)
27
- {
28
- $this->_order = $order;
29
- }
30
-
31
- public function getOrder()
32
- {
33
- return $this->_order;
34
- }
35
-
36
- public function setInvoice(Mage_Sales_Model_Order_Invoice $invoice)
37
- {
38
- $this->_invoice = $invoice;
39
- }
40
-
41
- public function getInvoice()
42
- {
43
- return $this->_invoice;
44
- }
45
-
46
- protected function _setOrderFromCreditmemo()
47
- {
48
- $order = $this->_creditmemo->getOrder();
49
- $this->setOrder($order);
50
- }
51
-
52
- protected function _setInvoiceFromCreditmemo()
53
- {
54
- $invoice = $this->_creditmemo->getInvoice();
55
- $this->setInvoice($invoice);
56
- }
57
-
58
- public function __construct(Mage_Sales_Model_Order_Creditmemo $creditmemo)
59
- {
60
- $this->setCreditmemo($creditmemo);
61
- $this->_setOrderFromCreditmemo();
62
- //$this->_setInvoiceFromCreditmemo();
63
- }
64
-
65
- /**
66
- * @return mixed
67
- */
68
- public function paymentFeeRefund()
69
- {
70
- $quoteConvertRate = $this->_order->getBaseToQuoteRate();
71
-
72
- if (empty($quoteConvertRate)) {
73
- $quoteConvertRate = 1;
74
- }
75
-
76
- // get amounts that are to be refunded
77
- $basePaymentFeeToRefund = (float) $this->_creditmemo->getPaymentFeeToRefund();
78
-
79
- // in order to prevent rounding errors from causing errors
80
- if ($basePaymentFeeToRefund > $this->_order->getBasePaymentFee() &&
81
- $basePaymentFeeToRefund == round($this->_order->getBasePaymentFee(), 2)) {
82
- $basePaymentFeeToRefund = $this->_order->getBasePaymentFee();
83
- }
84
-
85
- $paymentFeeToRefund = (float) $basePaymentFeeToRefund * $quoteConvertRate;
86
- $basePaymentFeeTaxToRefund = (float) $this->_calculatePaymentFeeTaxToRefund($basePaymentFeeToRefund, true);
87
- $paymentFeeTaxToRefund = (float) $this->_calculatePaymentFeeTaxToRefund($paymentFeeToRefund);
88
-
89
- $paymentFeeToRefund -= $paymentFeeTaxToRefund;
90
- $basePaymentFeeToRefund -= $basePaymentFeeTaxToRefund;
91
-
92
- if ($this->_invoice) {
93
- //get the amounts that are available to refund (cant refund more than is available)
94
- $paymentFeeAvailableForRefund = $this->_invoice->getPaymentFee() - $this->_order->getPaymentFeeRefunded() + ($this->_invoice->getPaymentFeeTax() - $this->_order->getPaymentFeeTaxRefunded());
95
- $basePaymentFeeAvailableForRefund = $this->_invoice->getBasePaymentFee() - $this->_order->getBasePaymentFeeRefunded() + ($this->_invoice->getBasePaymentFeeTax() - $this->_order->getBasePaymentFeeTaxRefunded());
96
-
97
- $paymentFeeTaxAvailableForRefund = $this->_invoice->getPaymentFeeTax() - $this->_order->getPaymentFeeTaxRefunded();
98
- $basePaymentFeeTaxAvailableForRefund = $this->_invoice->getBasePaymentFeeTax() - $this->_order->getBasePaymentFeeTaxRefunded();
99
- } else {
100
- //get the amounts that are available to refund (cant refund more than is available)
101
- $paymentFeeAvailableForRefund = $this->_order->getPaymentFee() - $this->_order->getPaymentFeeRefunded() + ($this->_order->getPaymentFeeTax() - $this->_order->getPaymentFeeTaxRefunded());
102
- $basePaymentFeeAvailableForRefund = $this->_order->getBasePaymentFee() - $this->_order->getBasePaymentFeeRefunded() + ($this->_order->getBasePaymentFeeTax() - $this->_order->getBasePaymentFeeTaxRefunded());
103
-
104
- $paymentFeeTaxAvailableForRefund = $this->_order->getPaymentFeeTax() - $this->_order->getPaymentFeeTaxRefunded();
105
- $basePaymentFeeTaxAvailableForRefund = $this->_order->getBasePaymentFeeTax() - $this->_order->getBasePaymentFeeTaxRefunded();
106
- }
107
-
108
- //check if the amount that is to be invoiced exceeds the available amount
109
- // if (
110
- // $paymentFeeAvailableForRefund < $paymentFeeToRefund
111
- // || $basePaymentFeeAvailableForRefund < $basePaymentFeeToRefund
112
- // || $paymentFeeTaxAvailableForRefund < $paymentFeeTaxToRefund
113
- // || $basePaymentFeeTaxAvailableForRefund < $basePaymentFeeTaxToRefund
114
- // )
115
- // {
116
- // Mage::getSingleton('adminhtml/session')->addError(
117
- // Mage::helper('afterpay')->__(
118
- // 'You cannot refund a larger amount than is available. Maximum Payment Fee available for refund: '
119
- // ) . $paymentFeeAvailableForRefund
120
- // );
121
- // Mage::throwException();
122
- // }
123
-
124
- $this->_order->setPaymentFeeRefunded($this->_order->getPaymentFeeRefunded() + $paymentFeeToRefund);
125
- $this->_order->setBasePaymentFeeRefunded($this->_order->getBasePaymentFeeRefunded() + $basePaymentFeeToRefund);
126
-
127
- $this->_order->setPaymentFeeTaxRefunded($this->_order->getPaymentFeeTaxRefunded() + $paymentFeeTaxToRefund);
128
- $this->_order->setBasePaymentFeeTaxRefunded($this->_order->getBasePaymentFeeTaxRefunded() + $basePaymentFeeTaxToRefund);
129
-
130
- $this->_creditmemo->setGrandTotal($this->_creditmemo->getGrandTotal() - ($this->_creditmemo->getPaymentFee() + $this->_creditmemo->getPaymentFeeTax()) + ($paymentFeeToRefund + $paymentFeeTaxToRefund));
131
- $this->_creditmemo->setBaseGrandTotal($this->_creditmemo->getBaseGrandTotal() - ($this->_creditmemo->getBasePaymentFee() + $this->_creditmemo->getBasePaymentFeeTax()) + ($basePaymentFeeToRefund + $basePaymentFeeTaxToRefund));
132
-
133
- $this->_creditmemo->setBasePaymentFee($basePaymentFeeToRefund);
134
- $this->_creditmemo->setPaymentFee($paymentFeeToRefund);
135
-
136
- $this->_creditmemo->setBasePaymentFeeTax($basePaymentFeeTaxToRefund);
137
- $this->_creditmemo->setPaymentFeeTax($paymentFeeTaxToRefund);
138
-
139
- $this->_creditmemo->setTaxAmount($this->_creditmemo->getTaxAmount() + $paymentFeeTaxToRefund);
140
- $this->_creditmemo->setBaseTaxAmount($this->_creditmemo->getBaseTaxAmount() + $basePaymentFeeTaxToRefund);
141
-
142
- return $this->_creditmemo;
143
- }
144
-
145
- /**
146
- * @param $feeToRefund
147
- * @param bool $base
148
- * @return int
149
- */
150
- protected function _calculatePaymentFeeTaxToRefund($feeToRefund, $base = false)
151
- {
152
- if ($base === true) {
153
- $fee = $this->_order->getBasePaymentFeeInvoiced() - $this->_order->getBasePaymentFeeRefunded() + ($this->_order->getBasePaymentFeeTaxInvoiced() - $this->_order->getBasePaymentFeeTaxRefunded());
154
- $tax = $this->_order->getBasePaymentFeeTaxInvoiced() - $this->_order->getBasePaymentFeeTaxRefunded();
155
- } else {
156
- $fee = $this->_order->getPaymentFeeInvoiced() - $this->_order->getPaymentFeeRefunded() + ($this->_order->getPaymentFeeTaxInvoiced() - $this->_order->getPaymentFeeTaxRefunded());
157
- $tax = $this->_order->getPaymentFeeTaxInvoiced() - $this->_order->getPaymentFeeTaxRefunded();
158
- }
159
-
160
- if ($fee == 0) {
161
- return 0;
162
- }
163
-
164
- $ratio = $feeToRefund / $fee;
165
- $taxToRefund = $tax * $ratio;
166
-
167
- return $taxToRefund;
168
- }
169
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/PaymentFee/Service/Order.php DELETED
@@ -1,25 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_PaymentFee_Service_Order extends Mage_Sales_Model_Service_Order
10
- {
11
- /**
12
- * Initialize creditmemo state based on requested parameters
13
- *
14
- * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
15
- * @param array $data
16
- */
17
- protected function _initCreditmemoData($creditmemo, $data)
18
- {
19
- if (isset($data['paymentfee'])) {
20
- $creditmemo->setPaymentFeeToRefund($data['paymentfee']);
21
- }
22
-
23
- return parent::_initCreditmemoData($creditmemo, $data);
24
- }
25
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Quote/Address/Total/Surcharge.php DELETED
@@ -1,107 +0,0 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- class MultiSafepay_Msp_Model_Quote_Address_Total_Surcharge extends Mage_Sales_Model_Quote_Address_Total_Abstract
10
- {
11
- /**
12
- *
13
- */
14
- public function __construct()
15
- {
16
- $this->setCode('msp');
17
- }
18
-
19
- public function collect(Mage_Sales_Model_Quote_Address $address)
20
- {
21
- $amount = $address->getShippingAmount();
22
- if ($amount != 0 || $address->getShippingDescription()) {
23
-
24
- $address->setSurchargeAmount($this->getSurchargeAmount());
25
- $address->setSurchargeTaxAmount($this->getSurchargeTaxAmount());
26
-
27
- $address->setSurcharge($this->getSurchargeAmount());
28
- $address->getQuote()->setData('surcharge', $this->getSurchargeAmount());
29
- $address->getQuote()->setData('surcharge_tax', $this->getSurchargeTaxAmount());
30
-
31
- $address->setTaxAmount($address->getTaxAmount() + $address->getSurchargeTaxAmount());
32
- $address->setBaseTaxAmount(
33
- $address->getBaseTaxAmount() + $address->getSurchargeTaxAmount()
34
- );
35
- $address->setSubtotal($address->getSubtotal() + $this->getSurchargeAmount(true));
36
- $address->setBaseSubtotal(
37
- $address->getBaseSubtotal() + $this->getSurchargeAmount(true)
38
- );
39
- $address->setGrandTotal($address->getGrandTotal() + $address->getSurchargeAmount());
40
- $address->setBaseGrandTotal($address->getBaseGrandTotal() + $address->getSurchargeAmount());
41
- }
42
-
43
- return $this;
44
- }
45
-
46
- /**
47
- * @param Mage_Sales_Model_Quote_Address $address
48
- * @return $this|array
49
- */
50
- public function fetch(Mage_Sales_Model_Quote_Address $address)
51
- {
52
- $amount = $address->getShippingAmount();
53
- if ($amount != 0 || $address->getShippingDescription()) {
54
- if ($address->getSurchargeAmount()) {
55
- $address->addTotal(array(
56
- 'code' => $this->getCode(),
57
- 'title' => $this->getSurchargeTitle(),
58
- 'value' => $address->getSurchargeAmount()
59
- ));
60
- }
61
- }
62
-
63
- return $this;
64
- }
65
-
66
- /**
67
- * @return string
68
- */
69
- public function getSurchargeTitle()
70
- {
71
- $title = "Payment Fee";
72
- return $title;
73
- }
74
-
75
- /**
76
- * @return float
77
- */
78
- public function getSurchargeAmount()
79
- {
80
- $amount = 0.0;
81
-
82
- /** @var $quote Mage_Sales_Model_Quote */
83
- $quote = Mage::getSingleton('checkout/session')->getQuote();
84
- $code = $quote->getPayment()->getMethod();
85
-
86
- if (!empty($code)) {
87
- if ($code == 'msp_payafter') {
88
- if (Mage::getStoreConfig('msp/msp_payafter/fee', $quote->getStoreId())) {
89
- $amount = floatval(Mage::getStoreConfig('msp/msp_payafter/fee_amount', $quote->getStoreId()));
90
- }
91
- }
92
- }
93
-
94
- return $amount;
95
- }
96
-
97
- /**
98
- * @return float
99
- */
100
- public function getSurchargeTaxAmount()
101
- {
102
- $taxpercent = (float)21;
103
- $tax = ($this->getSurchargeAmount()/100)*$taxpercent;
104
-
105
- return $tax;
106
- }
107
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/MultiSafepay/Msp/Model/Servicecost/Creditmemo/Total.php ADDED
@@ -0,0 +1,23 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class MultiSafepay_Msp_Model_Servicecost_Creditmemo_Total extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
3
+ {
4
+ public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
5
+ {
6
+ $order = $creditmemo->getOrder();
7
+ $amount = $order->getServicecostInvoiced() - $order->getServicecostRefunded();
8
+ $baseamount = $order->getBaseServicecostInvoiced() - $order->getBaseServicecostRefunded();
9
+ $taxamount = $order->getServicecostTaxInvoiced() - $order->getServicecostTaxRefunded();
10
+ $basetaxamount = $order->getBaseServicecostTaxInvoiced() - $order->getBaseServicecostTaxRefunded();
11
+
12
+ if ($baseamount > 0) {
13
+ $creditmemo->setServicecost($amount);
14
+ $creditmemo->setBaseServicecost($baseamount);
15
+ $creditmemo->setServicecostTax($order->getServicecostTaxRefunded());
16
+ $creditmemo->setBaseServicecostTax($order->getBaseServicecostTaxRefunded());
17
+ $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $amount + $taxamount - $order->getServicecostTax() );
18
+ $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $baseamount + $basetaxamount - $order->getServicecostTax());
19
+
20
+ }
21
+ return $this;
22
+ }
23
+ }
app/code/community/MultiSafepay/Msp/Model/Servicecost/Invoice/Totals.php ADDED
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Model_Servicecost_Invoice_Totals extends Mage_Sales_Model_Order_Invoice_Total_Subtotal {
4
+
5
+ public function collect(Mage_Sales_Model_Order_Invoice $invoice) {
6
+ $order = $invoice->getOrder();
7
+ $invoice->setServicecost($order->getServicecost());
8
+ $invoice->setBaseServicecost($order->getBaseServicecost());
9
+ $invoice->setServicecostTax($order->getServicecostTax());
10
+ $invoice->setBaseServicecostTax($order->getBaseServicecostTax());
11
+
12
+ $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() +$invoice->getServicecost()- $invoice->getServicecostTax());
13
+ $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getServicecost()- $invoice->getServicecostTax());
14
+ $invoice->setSubtotalInclTax($invoice->getSubtotalInclTax() - $invoice->getServicecostTax());
15
+ $invoice->setBaseSubtotalInclTax($invoice->getBaseSubtotalInclTax() - $invoice->getServicecostTax());
16
+ $invoice->setServicecostPdf($order->getServicecostPdf());
17
+
18
+
19
+ return $this;
20
+ }
21
+ }
app/code/community/MultiSafepay/Msp/Model/Servicecost/Observer.php ADDED
@@ -0,0 +1,27 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ class MultiSafepay_Msp_Model_Servicecost_Observer{
3
+ public function invoiceSaveAfter(Varien_Event_Observer $observer)
4
+ {
5
+ $invoice = $observer->getEvent()->getInvoice();
6
+ if ($invoice->getServicecost()) {
7
+ $order = $invoice->getOrder();
8
+ $order->setServicecostInvoiced($invoice->getServicecost());
9
+ $order->setBaseServicecostInvoiced($invoice->getBaseServicecost());
10
+ $order->setServicecostTaxInvoiced($invoice->getServicecostTax());
11
+ $order->setBaseServicecostTaxInvoiced($invoice->getBaseServicecostTax());
12
+ }
13
+ return $this;
14
+ }
15
+ public function creditmemoSaveAfter(Varien_Event_Observer $observer)
16
+ {
17
+ $creditmemo = $observer->getEvent()->getCreditmemo();
18
+ if ($creditmemo->getServicecost()) {
19
+ $order = $creditmemo->getOrder();
20
+ $order->setServicecostRefunded($creditmemo->getServicecost());
21
+ $order->setBaseServicecostRefunded($creditmemo->getBaseServicecost());
22
+ $order->setServicecostTaxRefunded($creditmemo->getServicecostTax());
23
+ $order->setBaseServicecostTaxRefunded($creditmemo->getBaseServicecostTax());
24
+ }
25
+ return $this;
26
+ }
27
+ }
app/code/community/MultiSafepay/Msp/Model/Servicecost/Quote/Address/Total/Servicecost.php ADDED
@@ -0,0 +1,190 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ class MultiSafepay_Msp_Model_Servicecost_Quote_Address_Total_Servicecost extends Mage_Sales_Model_Quote_Address_Total_Abstract
4
+ {
5
+
6
+ protected $_method = '';
7
+ protected $_rate = '';
8
+ protected $_collection = '';
9
+ public $availablePaymentMethodCodes = array(
10
+ 'msp',
11
+ 'mspcheckout',
12
+ 'msp_ideal',
13
+ 'msp_payafter',
14
+ 'msp_mistercash',
15
+ 'msp_visa',
16
+ 'msp_mastercard',
17
+ 'msp_banktransfer',
18
+ 'msp_maestro',
19
+ 'msp_paypal',
20
+ 'msp_amex',
21
+ 'msp_webgift',
22
+ 'msp_ebon',
23
+ 'msp_babygiftcard',
24
+ 'msp_boekenbon',
25
+ 'msp_erotiekbon',
26
+ 'msp_fijncadeau',
27
+ 'msp_parfumnl',
28
+ 'msp_parfumcadeaukaart',
29
+ 'msp_degrotespeelgoedwinkel',
30
+ 'msp_giropay',
31
+ 'msp_multisafepay',
32
+ 'msp_directebanking',
33
+ 'msp_directdebit',
34
+ 'msp_fastcheckout',
35
+ );
36
+
37
+
38
+
39
+ public function __construct()
40
+ {
41
+ $this->setCode('servicecost');
42
+ }
43
+
44
+
45
+
46
+
47
+ public function collect(Mage_Sales_Model_Quote_Address $address)
48
+ {
49
+ if(Mage::app()->getFrontController()->getRequest()->isSecure())
50
+ $protocol ='https://';
51
+ else{
52
+ $protocol ='http://';
53
+ }
54
+ $currentUrl = $protocol . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
55
+
56
+ if ($currentUrl != Mage::helper('checkout/cart')->getCartUrl()) {
57
+ $quote = $address->getQuote();
58
+ $quoteData= $quote->getData();
59
+ $grandTotal=$quoteData['grand_total'];
60
+ $code = $quote->getPayment()->getMethod();
61
+
62
+
63
+ if($code == '')
64
+ {
65
+ if(isset($_POST['payment']['method']))
66
+ {
67
+ $code = $_POST['payment']['method'];
68
+ }
69
+ }
70
+
71
+ if (!empty($code)) {
72
+ if (in_array($code, $this->availablePaymentMethodCodes)) {
73
+ if (Mage::getStoreConfig('msp/'.$code.'/fee', $quote->getStoreId())) {
74
+ $amount = $address->getShippingAmount();
75
+ if ($amount != 0 || $address->getShippingDescription()) {
76
+
77
+ $address->setServicecostAmount($this->getServicecostAmount($code, $address));
78
+ $address->setServicecostTaxAmount($this->getServicecostTaxAmount($code, $address));
79
+ $address->setBaseServicecost($this->getServicecostAmount($code, $address));
80
+ $address->setBaseServicecostTaxAmount($this->getServicecostTaxAmount($code, $address));
81
+
82
+
83
+ $address->getQuote()->setData('servicecost', $this->getServicecostAmount($code, $address));
84
+ $address->getQuote()->setData('base_servicecost', $this->getServicecostAmount($code , $address));
85
+ $address->getQuote()->setData('servicecost_tax', $this->getServicecostTaxAmount($code, $address));
86
+ $address->getQuote()->setData('base_servicecost_tax', $this->getServicecostTaxAmount($code, $address));
87
+
88
+ if (!Mage::getStoreConfig('msp/'.$code.'/fee_incexc', $quote->getStoreId())) {
89
+
90
+ $address->getQuote()->setData('servicecost_pdf', $this->getServicecostAmount($code, $address) - $this->getServicecostTaxAmount($code, $address));
91
+ $address->setServicecostPdf($this->getServicecostAmount($code, $address) - $this->getServicecostTaxAmount($code, $address));
92
+ }else{
93
+ $address->getQuote()->setData('servicecost_pdf', $this->getServicecostAmount($code, $address) );
94
+ $address->setServicecostPdf($this->getServicecostAmount($code, $address));
95
+
96
+ }
97
+
98
+ $address->setTaxAmount($address->getTaxAmount() + $address->getServicecostTaxAmount());
99
+ $address->setBaseTaxAmount($address->getBaseTaxAmount() + $address->getServicecostTaxAmount());
100
+ $address->setGrandTotal($address->getGrandTotal() + $this->getServicecostAmount($code, $address));
101
+ $address->setBaseGrandTotal($address->getBaseGrandTotal() + $this->getServicecostAmount($code, $address));
102
+
103
+
104
+ }
105
+ }
106
+ return $this;
107
+ }
108
+ }
109
+ }
110
+ }
111
+
112
+
113
+
114
+
115
+ public function fetch(Mage_Sales_Model_Quote_Address $address)
116
+ {
117
+ $this->_method = $address->getQuote()->getPayment()->getMethod();
118
+ $label = Mage::helper('msp')->getFeeLabel($this->_method);
119
+ $quote = $address->getQuote();
120
+ $code = $quote->getPayment()->getMethod();
121
+
122
+ $amount = $address->getShippingAmount();
123
+ if ($amount != 0 || $address->getShippingDescription()) {
124
+ if ($address->getServicecostAmount()) {
125
+ $address->addTotal(array(
126
+ 'code' => $this->getCode(),
127
+ 'title' => $label,
128
+ 'value' => $address->getServicecostPdf()
129
+ ));
130
+ }
131
+ }
132
+ return $this;
133
+ }
134
+
135
+
136
+ public function getServicecostAmount($code, $address)
137
+ {
138
+ $fee = Mage::getStoreConfig('msp/'.$code.'/fee_amount');
139
+
140
+ $fee = str_replace(',', '.', $fee);
141
+
142
+ if (strpos($fee, '%') !== false) {
143
+ $feePercentage = str_replace('%', '', $fee);
144
+
145
+ $quote = Mage::getModel('sales/quote');
146
+ $quote->load($this->_tempAddress->getQuote()->getId());
147
+
148
+ //calculate the fee. If the fee has already been added, remove it to prevent it from being taken into account in the calculation
149
+ if ($quote->getBasePaymentFee()) {
150
+ $fee = ($quote->getBaseGrandTotal() - $quote->getBaseServicecost()) * ($feePercentage / 100);
151
+ } elseif (!$quote->getBaseGrandTotal()) {
152
+ $grandTotal = Mage::registry('msp_quote_basegrandtotal');
153
+ $fee = $grandTotal * ($feePercentage / 100);
154
+ } else {
155
+ $fee = $quote->getBaseGrandTotal() * ($feePercentage / 100);
156
+ }
157
+ }
158
+
159
+ return (float) $fee; }
160
+
161
+ public function getServicecostTaxAmount($code, $address)
162
+ {
163
+ $quote = $address->getQuote();
164
+ $taxClass = Mage::getStoreConfig('msp/'.$code.'/fee_tax_class');
165
+ if ($taxClass == 0) {
166
+ $this->_rate = 1;
167
+ return;
168
+ }
169
+
170
+ $taxCalculationModel = Mage::getSingleton('tax/calculation');
171
+
172
+ $request = $taxCalculationModel->getRateRequest(
173
+ $quote->getShippingAddress(),
174
+ $quote->getBillingAddress(),
175
+ $quote->getCustomerTaxClassId(),
176
+ Mage::app()->getStore()->getId()
177
+ );
178
+ $request->setStore(Mage::app()->getStore())->setProductClassId($taxClass);
179
+
180
+ $rate = $taxCalculationModel->getRate($request);
181
+
182
+ $bigfee = 100 + $rate;
183
+
184
+ $tax = (Mage::getStoreConfig('msp/'.$code.'/fee_amount')/$bigfee)*$rate;
185
+
186
+
187
+ return $tax;
188
+ }
189
+ }
190
+
app/code/community/MultiSafepay/Msp/controllers/CheckoutController.php CHANGED
@@ -176,11 +176,11 @@ class MultiSafepay_Msp_CheckoutController extends Mage_Core_Controller_Front_Act
176
  $done = $checkout->notification($transactionId, $isInitial);
177
 
178
  if(!$return){
179
- if ($initial)
180
  {
181
- $returnUrl = Mage::getUrl("msp/checkout/return", array("_secure" => true)) . '?transactionid=' . $transactionid;
182
 
183
- $storeId = Mage::getModel('sales/quote')->load($transactionid)->getStoreId();
184
  $storeName = Mage::app()->getGroup($storeId)->getName();
185
 
186
  // display return message
176
  $done = $checkout->notification($transactionId, $isInitial);
177
 
178
  if(!$return){
179
+ if ($isInitial)
180
  {
181
+ $returnUrl = Mage::getUrl("msp/checkout/return", array("_secure" => true)) . '?transactionid=' . $transactionId;
182
 
183
+ $storeId = Mage::getModel('sales/quote')->load($transactionId)->getStoreId();
184
  $storeName = Mage::app()->getGroup($storeId)->getName();
185
 
186
  // display return message
app/code/community/MultiSafepay/Msp/controllers/StandardController.php CHANGED
@@ -98,7 +98,7 @@ class MultiSafepay_Msp_StandardController extends Mage_Core_Controller_Front_Act
98
  */
99
  public function returnAction()
100
  {
101
- $this->notificationAction(true);
102
 
103
  // Fix for emptying cart after success
104
  // $this->getOnepage()->getQuote()->setIsActive(false);
@@ -233,7 +233,7 @@ class MultiSafepay_Msp_StandardController extends Mage_Core_Controller_Front_Act
233
  $storeName = Mage::app()->getGroup($storeId)->getName();
234
 
235
  // display return message
236
- echo 'Return to <a href="' . $returnUrl . '">' . $storeName . '</a>';
237
 
238
  }else{
239
  if ($done)
@@ -264,7 +264,7 @@ class MultiSafepay_Msp_StandardController extends Mage_Core_Controller_Front_Act
264
  $storename = $order->getStoreGroupName();
265
 
266
  // display return message
267
- $this->getResponse()->setBody('Return to <a href="' . $returnUrl . '">' . $storename . '</a>');
268
  }else{
269
  if ($done)
270
  {
98
  */
99
  public function returnAction()
100
  {
101
+ //$this->notificationAction(true);
102
 
103
  // Fix for emptying cart after success
104
  // $this->getOnepage()->getQuote()->setIsActive(false);
233
  $storeName = Mage::app()->getGroup($storeId)->getName();
234
 
235
  // display return message
236
+ echo 'Return to <a href="' . $returnUrl . '?transactionid='.$orderId.'">' . $storeName . '</a>';
237
 
238
  }else{
239
  if ($done)
264
  $storename = $order->getStoreGroupName();
265
 
266
  // display return message
267
+ $this->getResponse()->setBody('Return to <a href="' . $returnUrl . '?transactionid='.$orderId.'">' . $storename . '</a>');
268
  }else{
269
  if ($done)
270
  {
app/code/community/MultiSafepay/Msp/etc/config.xml CHANGED
@@ -10,7 +10,7 @@
10
  <config>
11
  <modules>
12
  <MultiSafepay_Msp>
13
- <version>2.0.0</version>
14
  </MultiSafepay_Msp>
15
  </modules>
16
  <global>
@@ -24,14 +24,60 @@
24
  <deprecatedNode>msp_mysql4</deprecatedNode>
25
  <entities />
26
  </msp_resource>
27
- <sales>
28
  <rewrite>
29
  <service_quote>MultiSafepay_Msp_Model_Service_Quote</service_quote>
30
- <order_creditmemo>MultiSafepay_Msp_Model_PaymentFee_Order_Creditmemo</order_creditmemo>
31
- <service_order>MultiSafepay_Msp_Model_PaymentFee_Service_Order</service_order>
32
  </rewrite>
33
  </sales>
34
  </models>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  <resources>
36
  <msp_setup>
37
  <setup>
@@ -57,145 +103,34 @@
57
  <msp>
58
  <class>MultiSafepay_Msp_Block</class>
59
  </msp>
60
- <adminhtml>
61
- <rewrite>
62
- <sales_order_totals_tax>MultiSafepay_Msp_Block_PaymentFee_Order_Totals_Tax</sales_order_totals_tax>
63
- </rewrite>
64
- </adminhtml>
 
 
 
 
 
 
 
 
 
65
  <checkout>
66
  <rewrite>
67
  <onepage_payment_methods>MultiSafepay_Msp_Block_Checkout_Onepage_Payment_Methods</onepage_payment_methods>
 
68
  </rewrite>
69
  </checkout>
70
- <!-- <payment>
71
- <class>MultiSafepay_Msp_Block</class>
72
- <class>Mage_Payment_Block</class>
73
- </payment> -->
74
  </blocks>
75
  <helpers>
76
  <msp>
77
  <class>MultiSafepay_Msp_Helper</class>
78
  </msp>
79
  </helpers>
80
- <sales>
81
- <quote>
82
- <totals>
83
- <paymentFee>
84
- <class>MultiSafepay_Msp_Model_PaymentFee_Quote_Address_Total</class>
85
- <renderer>msp/paymentFee_checkout_fee</renderer>
86
- <after>tax</after>
87
- </paymentFee>
88
- </totals>
89
- </quote>
90
- <order_invoice>
91
- <totals>
92
- <msp>
93
- <class>MultiSafepay_Msp_Model_PaymentFee_Order_Invoice_Total</class>
94
- <after>tax</after>
95
- </msp>
96
- </totals>
97
- </order_invoice>
98
- <order>
99
- <totalbar>
100
- <msp>
101
- <class>msp/paymentFee_order_totalbar</class>
102
- <after>tax</after>
103
- </msp>
104
- </totalbar>
105
- </order>
106
- <order_creditmemo>
107
- <totals>
108
- <msp>
109
- <class>MultiSafepay_Msp_Model_PaymentFee_Order_Creditmemo_Total</class>
110
- <after>tax</after>
111
- </msp>
112
- </totals>
113
- </order_creditmemo>
114
- </sales>
115
- <fieldsets>
116
- <sales_convert_quote>
117
- <surcharge><to_order>*</to_order></surcharge>
118
- <surcharge_tax><to_order>*</to_order></surcharge_tax>
119
- <paymentfee>
120
- <to_order>*</to_order>
121
- <base_payment_fee><to_order>*</to_order></base_payment_fee>
122
- </paymentfee>
123
- <sales_convert_quote_address>
124
- <payment_fee><to_order>*</to_order></payment_fee>
125
- <base_payment_fee><to_order>*</to_order></base_payment_fee>
126
- </sales_convert_quote_address>
127
- </sales_convert_quote>
128
- </fieldsets>
129
- <events>
130
- <admin_system_config_section_save_after>
131
- <observers>
132
- <msp_tax>
133
- <type>model</type>
134
- <class>msp/observer_config</class>
135
- <method>admin_system_config_section_save_after</method>
136
- </msp_tax>
137
- </observers>
138
- </admin_system_config_section_save_after>
139
- <sales_quote_collect_totals_after>
140
- <observers>
141
- <paymentfee>
142
- <type>singleton</type>
143
- <class>MultiSafepay_Msp_Model_PaymentFee_Observer</class>
144
- <method>sales_quote_collect_totals_after</method>
145
- </paymentfee>
146
- </observers>
147
- </sales_quote_collect_totals_after>
148
- <sales_order_payment_place_end>
149
- <observers>
150
- <paymentfee>
151
- <type>singleton</type>
152
- <class>MultiSafepay_Msp_Model_PaymentFee_Observer</class>
153
- <method>sales_order_payment_place_end</method>
154
- </paymentfee>
155
- </observers>
156
- </sales_order_payment_place_end>
157
- <paymentfee_order_creditmemo_refund_before>
158
- <observers>
159
- <paymentfee>
160
- <type>singleton</type>
161
- <class>MultiSafepay_Msp_Model_PaymentFee_Observer</class>
162
- <method>paymentfee_order_creditmemo_refund_before</method>
163
- </paymentfee>
164
- </observers>
165
- </paymentfee_order_creditmemo_refund_before>
166
- <sales_order_invoice_register>
167
- <observers>
168
- <paymentfee>
169
- <type>singleton</type>
170
- <class>MultiSafepay_Msp_Model_PaymentFee_Observer</class>
171
- <method>sales_order_invoice_register</method>
172
- </paymentfee>
173
- <!--<msp_request_capture>
174
- <type>Model</type>
175
- <class>msp/observer_capture</class>
176
- <method>sales_order_invoice_register</method>
177
- </msp_request_capture>-->
178
- </observers>
179
- </sales_order_invoice_register>
180
- <!--<sales_order_payment_capture>
181
- <observers>
182
- <msp_request_capture>
183
- <type>Model</type>
184
- <class>msp/observer_capture</class>
185
- <method>sales_order_payment_capture</method>
186
- </msp_request_capture>
187
- </observers>
188
- </sales_order_payment_capture>-->
189
- <!--<sales_order_invoice_save_before>
190
- <observers>
191
- <msp_request_capture>
192
- <type>Model</type>
193
- <class>msp/observer_capture</class>
194
- <method>sales_order_invoice_save_before</method>
195
- </msp_request_capture>
196
- </observers>
197
- </sales_order_invoice_save_before>-->
198
- <sales_order_creditmemo_save_after>
199
  <observers>
200
  <msp_creditmemo_save_after>
201
  <type>singleton</type>
@@ -213,38 +148,30 @@
213
  </msp_shipment_save_after>
214
  </observers>
215
  </sales_order_shipment_save_after>
216
- <!--<sales_order_save_after>
 
 
217
  <observers>
218
- <msp_order_save_after>
219
- <type>singleton</type>
220
- <class>msp/observer_order</class>
221
- <method>sales_order_save_after</method>
222
- </msp_order_save_after>
223
  </observers>
224
- </sales_order_save_after>-->
 
 
 
 
 
 
 
 
225
 
226
- </events>
227
- <pdf>
228
- <totals>
229
- <paymentfee translate="title">
230
- <title>Payment Fee</title>
231
- <source_field>PaymentFee</source_field>
232
- <font_size>7</font_size>
233
- <display_zero>0</display_zero>
234
- <sort_order>650</sort_order>
235
- <amount_prefix></amount_prefix>
236
- </paymentfee>
237
- </totals>
238
- </pdf>
239
  </global>
240
  <adminhtml>
241
- <layout>
242
- <updates>
243
- <msp>
244
- <file>msp_fee.xml</file>
245
- </msp>
246
- </updates>
247
- </layout>
248
  <translate>
249
  <modules>
250
  <MultiSafepay_Msp>
@@ -283,11 +210,6 @@
283
  </layout>
284
  </frontend>
285
  <default>
286
- <sales>
287
- <totals_sort>
288
- <paymentFee>31</paymentFee>
289
- </totals_sort>
290
- </sales>
291
  <!-- begin: Main Settings ('Payment Methods' tab) -->
292
  <payment>
293
  <msp>
@@ -383,6 +305,11 @@
383
  <model>msp/gateway_babygiftcard</model>
384
  <title>MSP Baby giftcard</title>
385
  </msp_babygiftcard>
 
 
 
 
 
386
  <msp_boekenbon>
387
  <active>1</active>
388
  <model>msp/gateway_boekenbon</model>
@@ -554,6 +481,13 @@
554
  <allowed_currency>EUR</allowed_currency>
555
  <lang>nl</lang>
556
  </msp_babygiftcard>
 
 
 
 
 
 
 
557
  <msp_boekenbon translate="title" module="msp">
558
  <active>0</active>
559
  <model>msp/gateway_boekenbon</model>
10
  <config>
11
  <modules>
12
  <MultiSafepay_Msp>
13
+ <version>2.0.1</version>
14
  </MultiSafepay_Msp>
15
  </modules>
16
  <global>
24
  <deprecatedNode>msp_mysql4</deprecatedNode>
25
  <entities />
26
  </msp_resource>
27
+ <sales>
28
  <rewrite>
29
  <service_quote>MultiSafepay_Msp_Model_Service_Quote</service_quote>
 
 
30
  </rewrite>
31
  </sales>
32
  </models>
33
+ <sales>
34
+ <quote>
35
+ <totals>
36
+ <servicecost>
37
+ <class>MultiSafepay_Msp_Model_Servicecost_Quote_Address_Total_Servicecost</class>
38
+ <after>subtotal,discount,shipping,tax</after>
39
+ <before>grand_total</before>
40
+ </servicecost>
41
+ </totals>
42
+ </quote>
43
+ <order_invoice>
44
+ <totals>
45
+ <servicecost>
46
+ <class>MultiSafepay_Msp_Model_Servicecost_Invoice_Totals</class>
47
+ <after>subtotal,discount,shipping,tax</after>
48
+ <before>grand_total</before>
49
+ </servicecost>
50
+ </totals>
51
+ </order_invoice>
52
+ <order_creditmemo>
53
+ <totals>
54
+ <servicecost>
55
+ <class>MultiSafepay_Msp_Model_Servicecost_Creditmemo_Total</class>
56
+ </servicecost>
57
+ </totals>
58
+ </order_creditmemo>
59
+ </sales>
60
+ <fieldsets>
61
+ <sales_convert_quote>
62
+ <servicecost><to_order>*</to_order></servicecost>
63
+ <base_servicecost><to_order>*</to_order></base_servicecost>
64
+ <servicecost_tax><to_order>*</to_order></servicecost_tax>
65
+ <base_servicecost_tax><to_order>*</to_order></base_servicecost_tax>
66
+ <servicecost_pdf><to_order>*</to_order></servicecost_pdf>
67
+ </sales_convert_quote>
68
+ </fieldsets>
69
+ <pdf>
70
+ <totals>
71
+ <servicecost translate="title">
72
+ <title>MultiSafepay Fee</title>
73
+ <source_field>servicecost_pdf</source_field>
74
+ <font_size>7</font_size>
75
+ <display_zero>0</display_zero>
76
+ <sort_order>650</sort_order>
77
+ <amount_prefix></amount_prefix>
78
+ </servicecost>
79
+ </totals>
80
+ </pdf>
81
  <resources>
82
  <msp_setup>
83
  <setup>
103
  <msp>
104
  <class>MultiSafepay_Msp_Block</class>
105
  </msp>
106
+ <adminhtml>
107
+ <rewrite>
108
+ <sales_order_totals>MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Order</sales_order_totals>
109
+ <sales_order_invoice_totals>MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Invoice</sales_order_invoice_totals>
110
+ <sales_order_creditmemo_totals>MultiSafepay_Msp_Block_Adminhtml_Servicecost_Totals_Creditmemo</sales_order_creditmemo_totals>
111
+ </rewrite>
112
+ </adminhtml>
113
+ <sales>
114
+ <rewrite>
115
+ <order_totals>MultiSafepay_Msp_Block_Servicecost_Order_Totals</order_totals>
116
+ <order_invoice_totals>MultiSafepay_Msp_Block_Servicecost_Order_Totals</order_invoice_totals>
117
+ </rewrite>
118
+ </sales>
119
+
120
  <checkout>
121
  <rewrite>
122
  <onepage_payment_methods>MultiSafepay_Msp_Block_Checkout_Onepage_Payment_Methods</onepage_payment_methods>
123
+
124
  </rewrite>
125
  </checkout>
 
 
 
 
126
  </blocks>
127
  <helpers>
128
  <msp>
129
  <class>MultiSafepay_Msp_Helper</class>
130
  </msp>
131
  </helpers>
132
+ <events>
133
+ <sales_order_creditmemo_save_after>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
134
  <observers>
135
  <msp_creditmemo_save_after>
136
  <type>singleton</type>
148
  </msp_shipment_save_after>
149
  </observers>
150
  </sales_order_shipment_save_after>
151
+
152
+
153
+ <sales_order_invoice_save_after>
154
  <observers>
155
+ <sales_order_invoice_save_after>
156
+ <class>msp/servicecost_observer</class>
157
+ <method>invoiceSaveAfter</method>
158
+ </sales_order_invoice_save_after>
 
159
  </observers>
160
+ </sales_order_invoice_save_after>
161
+ <sales_order_creditmemo_save_after>
162
+ <observers>
163
+ <sales_order_creditmemo_save_after>
164
+ <class>msp/servicecost_observer</class>
165
+ <method>creditmemoSaveAfter</method>
166
+ </sales_order_creditmemo_save_after>
167
+ </observers>
168
+ </sales_order_creditmemo_save_after>
169
 
170
+
171
+
172
+ </events>
 
 
 
 
 
 
 
 
 
 
173
  </global>
174
  <adminhtml>
 
 
 
 
 
 
 
175
  <translate>
176
  <modules>
177
  <MultiSafepay_Msp>
210
  </layout>
211
  </frontend>
212
  <default>
 
 
 
 
 
213
  <!-- begin: Main Settings ('Payment Methods' tab) -->
214
  <payment>
215
  <msp>
305
  <model>msp/gateway_babygiftcard</model>
306
  <title>MSP Baby giftcard</title>
307
  </msp_babygiftcard>
308
+ <msp_gezondheidsbon>
309
+ <active>1</active>
310
+ <model>msp/gateway_gezondheidsbon</model>
311
+ <title>MSP Gezondheidsbon</title>
312
+ </msp_gezondheidsbon>
313
  <msp_boekenbon>
314
  <active>1</active>
315
  <model>msp/gateway_boekenbon</model>
481
  <allowed_currency>EUR</allowed_currency>
482
  <lang>nl</lang>
483
  </msp_babygiftcard>
484
+ <msp_gezondheidsbon translate="title" module="msp">
485
+ <active>0</active>
486
+ <model>msp/gateway_gezondheidsbon</model>
487
+ <title>Gezondheidsbon</title>
488
+ <allowed_currency>EUR</allowed_currency>
489
+ <lang>nl</lang>
490
+ </msp_gezondheidsbon>
491
  <msp_boekenbon translate="title" module="msp">
492
  <active>0</active>
493
  <model>msp/gateway_boekenbon</model>
app/code/community/MultiSafepay/Msp/etc/system.xml CHANGED
@@ -13,7 +13,7 @@
13
  <payment>
14
  <groups>
15
  <msp translate="label" module="msp">
16
- <label>MultiSafepay</label>
17
  <sort_order>671</sort_order>
18
  <show_in_default>1</show_in_default>
19
  <show_in_website>1</show_in_website>
@@ -37,9 +37,9 @@
37
  <show_in_store>1</show_in_store>
38
  </title>
39
  <test_api translate="label comment">
40
- <label>Type account</label>
41
  <frontend_type>select</frontend_type>
42
- <comment><![CDATA[<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Sign up for a free test account</a>]]></comment>
43
  <source_model>msp/config_sources_accounts</source_model>
44
  <sort_order>30</sort_order>
45
  <show_in_default>1</show_in_default>
@@ -89,8 +89,8 @@
89
  <show_in_store>1</show_in_store>
90
  </use_refund_credit_memo>
91
  <use_redirect translate="label comment">
92
- <label>Auto redirect</label>
93
- <comment>Automatically redirects the customer back to the webshop after payment. (Skips the 'Transaction Complete' screen)</comment>
94
  <frontend_type>select</frontend_type>
95
  <source_model>adminhtml/system_config_source_yesno</source_model>
96
  <sort_order>70</sort_order>
@@ -127,7 +127,7 @@
127
  <show_in_store>1</show_in_store>
128
  </autocreate_invoice>
129
  <mail_invoice translate="label comment">
130
- <label>Mail invoice to customer</label>
131
  <frontend_type>select</frontend_type>
132
  <source_model>adminhtml/system_config_source_yesno</source_model>
133
  <sort_order>91</sort_order>
@@ -136,7 +136,7 @@
136
  <show_in_store>1</show_in_store>
137
  </mail_invoice>
138
  <send_update_email translate="label comment">
139
- <label>Send the order update e-mail to customer?</label>
140
  <frontend_type>select</frontend_type>
141
  <source_model>adminhtml/system_config_source_yesno</source_model>
142
  <sort_order>92</sort_order>
@@ -146,7 +146,7 @@
146
  </send_update_email>
147
  <keep_cart translate="label comment">
148
  <label>Keep the cart</label>
149
- <comment>Cart is active when client goes back or cancelles the order </comment>
150
  <frontend_type>select</frontend_type>
151
  <source_model>adminhtml/system_config_source_yesno</source_model>
152
  <sort_order>93</sort_order>
@@ -155,7 +155,7 @@
155
  <show_in_store>1</show_in_store>
156
  </keep_cart>
157
  <new_order_mail translate="label comment">
158
- <label>New order mail</label>
159
  <frontend_type>select</frontend_type>
160
  <source_model>msp/config_sources_order_email</source_model>
161
  <sort_order>77</sort_order>
@@ -163,7 +163,7 @@
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>1</show_in_store>
165
  </new_order_mail>
166
- <allowed_currency translate="label comment">
167
  <label>Allowed Currency</label>
168
  <frontend_type>multiselect</frontend_type>
169
  <source_model>msp/config_sources_order_currency</source_model>
@@ -174,8 +174,8 @@
174
  <show_in_store>1</show_in_store>
175
  </allowed_currency>
176
  <allow_convert_currency translate="label comment">
177
- <label>Allow convert currency to EUR</label>
178
- <comment>If store currency is not allowed by settings</comment>
179
  <frontend_type>select</frontend_type>
180
  <source_model>adminhtml/system_config_source_yesno</source_model>
181
  <sort_order>15</sort_order>
@@ -290,7 +290,7 @@
290
  <show_in_store>1</show_in_store>
291
  </expired_status>
292
  <allowspecific translate="label">
293
- <label>Payment from applicable countries</label>
294
  <frontend_type>allowspecific</frontend_type>
295
  <sort_order>300</sort_order>
296
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -299,7 +299,7 @@
299
  <show_in_store>1</show_in_store>
300
  </allowspecific>
301
  <specificcountry translate="label">
302
- <label>Payment from Specific countries</label>
303
  <frontend_type>multiselect</frontend_type>
304
  <sort_order>310</sort_order>
305
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -331,7 +331,7 @@
331
  <!-- end: Main Settings (Payment Methods tab) -->
332
  <!-- begin: MSP Gateways -->
333
  <msp translate="label" module="msp">
334
- <label>MultiSafepay - Gateways</label>
335
  <tab>sales</tab>
336
  <frontend_type>text</frontend_type>
337
  <sort_order>1000</sort_order>
@@ -347,9 +347,9 @@
347
  <show_in_store>1</show_in_store>
348
  <fields>
349
  <test_api translate="label comment">
350
- <label>Type account</label>
351
  <frontend_type>select</frontend_type>
352
- <comment><![CDATA[<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Sign up for a free test account</a>]]></comment>
353
  <source_model>msp/config_sources_accounts</source_model>
354
  <sort_order>30</sort_order>
355
  <show_in_default>1</show_in_default>
@@ -399,7 +399,7 @@
399
  <show_in_store>1</show_in_store>
400
  </use_refund_credit_memo>
401
  <allow_convert_currency translate="label comment">
402
- <label>Allow convert currency to EUR</label>
403
  <comment>If store currency is not allowed by settings. Used for each gateways.</comment>
404
  <frontend_type>select</frontend_type>
405
  <source_model>adminhtml/system_config_source_yesno</source_model>
@@ -409,8 +409,8 @@
409
  <show_in_store>1</show_in_store>
410
  </allow_convert_currency>
411
  <use_redirect translate="label comment">
412
- <label>Auto redirect</label>
413
- <comment>Automatically redirects the customer back to the webshop after payment. (Skips the 'Transaction Complete' screen)</comment>
414
  <frontend_type>select</frontend_type>
415
  <source_model>adminhtml/system_config_source_yesno</source_model>
416
  <sort_order>70</sort_order>
@@ -438,7 +438,7 @@
438
  <show_in_store>1</show_in_store>
439
  </autocreate_invoice>
440
  <mail_invoice translate="label comment">
441
- <label>Mail invoice to customer</label>
442
  <frontend_type>select</frontend_type>
443
  <source_model>adminhtml/system_config_source_yesno</source_model>
444
  <sort_order>76</sort_order>
@@ -456,7 +456,7 @@
456
  <show_in_store>1</show_in_store>
457
  </new_order_mail>
458
  <send_update_email translate="label comment">
459
- <label>Send the order update e-mail to customer?</label>
460
  <frontend_type>select</frontend_type>
461
  <source_model>adminhtml/system_config_source_yesno</source_model>
462
  <sort_order>78</sort_order>
@@ -465,7 +465,7 @@
465
  <show_in_store>1</show_in_store>
466
  </send_update_email>
467
  <keep_cart translate="label comment">
468
- <label>Keep the cart?(Cart is active when client goes back or cancels the order)</label>
469
  <frontend_type>select</frontend_type>
470
  <source_model>adminhtml/system_config_source_yesno</source_model>
471
  <sort_order>79</sort_order>
@@ -474,7 +474,7 @@
474
  <show_in_store>1</show_in_store>
475
  </keep_cart>
476
  <show_gateway_images translate="label comment">
477
- <label>Show the gateway image if it exists?</label>
478
  <frontend_type>select</frontend_type>
479
  <source_model>adminhtml/system_config_source_yesno</source_model>
480
  <sort_order>80</sort_order>
@@ -483,7 +483,7 @@
483
  <show_in_store>1</show_in_store>
484
  </show_gateway_images>
485
  <show_gateway_title_combi translate="label comment">
486
- <label>Show the gateway image if it exists in front of the title?</label>
487
  <frontend_type>select</frontend_type>
488
  <source_model>adminhtml/system_config_source_yesno</source_model>
489
  <sort_order>81</sort_order>
@@ -595,7 +595,7 @@
595
  </fields>
596
  </settings>
597
  <msp_ideal translate="label" module="msp">
598
- <label>iDeal</label>
599
  <sort_order>680</sort_order>
600
  <show_in_default>1</show_in_default>
601
  <show_in_website>1</show_in_website>
@@ -612,7 +612,7 @@
612
  </active>
613
 
614
  <bank_select translate='label'>
615
- <label>Show banklist in checkout</label>
616
  <frontend_type>select</frontend_type>
617
  <source_model>adminhtml/system_config_source_yesno</source_model>
618
  <sort_order>2</sort_order>
@@ -629,7 +629,7 @@
629
  <show_in_store>1</show_in_store>
630
  </title>
631
  <allowspecific translate="label">
632
- <label>Payment from applicable countries</label>
633
  <frontend_type>allowspecific</frontend_type>
634
  <sort_order>13</sort_order>
635
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -648,7 +648,7 @@
648
  <show_in_store>1</show_in_store>
649
  </allowed_currency>
650
  <specificcountry translate="label">
651
- <label>Payment from Specific countries</label>
652
  <frontend_type>multiselect</frontend_type>
653
  <sort_order>14</sort_order>
654
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -675,7 +675,7 @@
675
  <max_order_total translate="label">
676
  <label>Maximum Order Total</label>
677
  <frontend_type>text</frontend_type>
678
- <sort_order>63</sort_order>
679
  <show_in_default>1</show_in_default>
680
  <show_in_website>1</show_in_website>
681
  <show_in_store>5</show_in_store>
@@ -683,15 +683,60 @@
683
  <min_order_total translate="label">
684
  <label>Minimum Order Total</label>
685
  <frontend_type>text</frontend_type>
686
- <sort_order>64</sort_order>
687
  <show_in_default>1</show_in_default>
688
  <show_in_website>1</show_in_website>
689
  <show_in_store>4</show_in_store>
690
  </min_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
691
  </fields>
692
  </msp_ideal>
693
  <msp_payafter translate="label" module="msp">
694
- <label>Betaal na Ontvangst</label>
695
  <sort_order>681</sort_order>
696
  <show_in_default>1</show_in_default>
697
  <show_in_website>1</show_in_website>
@@ -707,7 +752,7 @@
707
  <show_in_store>1</show_in_store>
708
  </active>
709
  <test_api_pad translate="label comment">
710
- <label>Type account</label>
711
  <frontend_type>select</frontend_type>
712
  <comment><![CDATA[<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Sign up for a free test account</a>]]></comment>
713
  <source_model>msp/config_sources_accounts</source_model>
@@ -741,7 +786,7 @@
741
  <show_in_store>1</show_in_store>
742
  </secure_code_pad>
743
  <account_id_pad_test translate="label">
744
- <label>Account ID (for Test Account)</label>
745
  <frontend_type>text</frontend_type>
746
  <sort_order>53</sort_order>
747
  <show_in_default>1</show_in_default>
@@ -749,7 +794,7 @@
749
  <show_in_store>1</show_in_store>
750
  </account_id_pad_test>
751
  <site_id_pad_test translate="label">
752
- <label>Site ID (for Test Account)</label>
753
  <frontend_type>text</frontend_type>
754
  <sort_order>56</sort_order>
755
  <show_in_default>1</show_in_default>
@@ -757,7 +802,7 @@
757
  <show_in_store>1</show_in_store>
758
  </site_id_pad_test>
759
  <secure_code_pad_test translate="label">
760
- <label>Site Code (for Test Account)</label>
761
  <frontend_type>text</frontend_type>
762
  <sort_order>58</sort_order>
763
  <show_in_default>1</show_in_default>
@@ -772,51 +817,15 @@
772
  <show_in_website>1</show_in_website>
773
  <show_in_store>1</show_in_store>
774
  </title>
775
- <fee translate="label">
776
- <label>Enable fee (inc. Tax)</label>
777
- <frontend_type>select</frontend_type>
778
- <source_model>adminhtml/system_config_source_yesno</source_model>
779
- <sort_order>70</sort_order>
780
- <show_in_default>1</show_in_default>
781
- <show_in_website>1</show_in_website>
782
- <show_in_store>1</show_in_store>
783
- </fee>
784
- <fee_amount translate="label">
785
- <label>Fee amount</label>
786
- <frontend_type>text</frontend_type>
787
- <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
788
- <sort_order>80</sort_order>
789
- <show_in_default>1</show_in_default>
790
- <show_in_website>1</show_in_website>
791
- <show_in_store>1</show_in_store>
792
- </fee_amount>
793
- <fee_incexc translate="label">
794
- <label>Show incl tax during checkout</label>
795
- <frontend_type>select</frontend_type>
796
- <source_model>adminhtml/system_config_source_yesno</source_model>
797
- <sort_order>81</sort_order>
798
- <show_in_default>1</show_in_default>
799
- <show_in_website>1</show_in_website>
800
- <show_in_store>1</show_in_store>
801
- </fee_incexc>
802
- <fee_tax_class>
803
- <label>Tax class for Payment Fee</label>
804
- <comment>Select which tax class should be used for the Payment Fee</comment>
805
- <frontend_type>select</frontend_type>
806
- <source_model>msp/config_sources_taxClasses</source_model>
807
- <sort_order>90</sort_order>
808
- <show_in_default>1</show_in_default>
809
- <show_in_website>1</show_in_website>
810
- <show_in_store>1</show_in_store>
811
- </fee_tax_class>
812
- <fee_description translate="label">
813
- <label>Fee description, visible in order totals</label>
814
  <frontend_type>text</frontend_type>
815
- <sort_order>100</sort_order>
816
  <show_in_default>1</show_in_default>
817
  <show_in_website>1</show_in_website>
818
  <show_in_store>1</show_in_store>
819
- </fee_description>
 
820
  <min_order_total translate="label">
821
  <label>Minimum Order Total</label>
822
  <frontend_type>text</frontend_type>
@@ -834,7 +843,7 @@
834
  <show_in_store>5</show_in_store>
835
  </max_order_total>
836
  <bno_no_invoice translate="label">
837
- <label>Enable the invoice email for this payment method?</label>
838
  <frontend_type>select</frontend_type>
839
  <source_model>adminhtml/system_config_source_yesno</source_model>
840
  <sort_order>121</sort_order>
@@ -842,16 +851,7 @@
842
  <show_in_website>1</show_in_website>
843
  <show_in_store>1</show_in_store>
844
  </bno_no_invoice>
845
- <!--<fee_duplicate translate="label">
846
- <label>Solve Fee Bug</label>
847
- <comment>Set to Yes if the Fee isn't added, set to NO when the Fee is added twice (Solves bug with some installations)</comment>
848
- <frontend_type>select</frontend_type>
849
- <source_model>adminhtml/system_config_source_yesno</source_model>
850
- <sort_order>14</sort_order>
851
- <show_in_default>1</show_in_default>
852
- <show_in_website>1</show_in_website>
853
- <show_in_store>1</show_in_store>
854
- </fee_duplicate>-->
855
  <allowed_currency translate="label comment">
856
  <label>Allowed Currency</label>
857
  <frontend_type>multiselect</frontend_type>
@@ -863,7 +863,7 @@
863
  <show_in_store>1</show_in_store>
864
  </allowed_currency>
865
  <allowspecific translate="label">
866
- <label>Payment from applicable countries</label>
867
  <frontend_type>allowspecific</frontend_type>
868
  <sort_order>123</sort_order>
869
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -872,7 +872,7 @@
872
  <show_in_store>1</show_in_store>
873
  </allowspecific>
874
  <specificcountry translate="label">
875
- <label>Payment from Specific countries</label>
876
  <frontend_type>multiselect</frontend_type>
877
  <sort_order>124</sort_order>
878
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -898,7 +898,7 @@
898
  <show_in_store>1</show_in_store>
899
  </ip_check>
900
  <ip_filter translate="label comment">
901
- <label>Only visible for IP address</label>
902
  <frontend_type>text</frontend_type>
903
  <comment>You can add multiple addresses seperated by ;</comment>
904
  <sort_order>127</sort_order>
@@ -907,7 +907,7 @@
907
  <show_in_store>1</show_in_store>
908
  </ip_filter>
909
  <ip_filter_test translate="label comment">
910
- <label>Only visible for IP address (for Test Account)</label>
911
  <frontend_type>text</frontend_type>
912
  <comment>You can add multiple addresses seperated by ;</comment>
913
  <sort_order>128</sort_order>
@@ -925,9 +925,9 @@
925
  <show_in_store>1</show_in_store>
926
  </ip_filter_test_for_live_mode>
927
  <send_request_after_shipping translate="label comment">
928
- <label>Send request after complete order</label>
929
  <frontend_type>select</frontend_type>
930
- <comment>Request will be send after update statuse to Complete for PAD only</comment>
931
  <source_model>adminhtml/system_config_source_yesno</source_model>
932
  <sort_order>130</sort_order>
933
  <show_in_default>1</show_in_default>
@@ -942,6 +942,51 @@
942
  <show_in_website>1</show_in_website>
943
  <show_in_store>1</show_in_store>
944
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
945
  </fields>
946
  </msp_payafter>
947
  <msp_mistercash translate="label" module="msp">
@@ -979,7 +1024,7 @@
979
  <show_in_store>1</show_in_store>
980
  </allowed_currency>
981
  <allowspecific translate="label">
982
- <label>Payment from applicable countries</label>
983
  <frontend_type>allowspecific</frontend_type>
984
  <sort_order>13</sort_order>
985
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -988,7 +1033,7 @@
988
  <show_in_store>1</show_in_store>
989
  </allowspecific>
990
  <specificcountry translate="label">
991
- <label>Payment from Specific countries</label>
992
  <frontend_type>multiselect</frontend_type>
993
  <sort_order>14</sort_order>
994
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1020,6 +1065,52 @@
1020
  <show_in_website>1</show_in_website>
1021
  <show_in_store>5</show_in_store>
1022
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1023
  </fields>
1024
  </msp_mistercash>
1025
  <msp_amex translate="label" module="msp">
@@ -1057,7 +1148,7 @@
1057
  <show_in_store>1</show_in_store>
1058
  </allowed_currency>
1059
  <allowspecific translate="label">
1060
- <label>Payment from applicable countries</label>
1061
  <frontend_type>allowspecific</frontend_type>
1062
  <sort_order>13</sort_order>
1063
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1066,7 +1157,7 @@
1066
  <show_in_store>1</show_in_store>
1067
  </allowspecific>
1068
  <specificcountry translate="label">
1069
- <label>Payment from Specific countries</label>
1070
  <frontend_type>multiselect</frontend_type>
1071
  <sort_order>14</sort_order>
1072
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1098,6 +1189,51 @@
1098
  <show_in_website>1</show_in_website>
1099
  <show_in_store>5</show_in_store>
1100
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1101
  </fields>
1102
  </msp_amex>
1103
  <msp_visa translate="label" module="msp">
@@ -1135,7 +1271,7 @@
1135
  <show_in_store>1</show_in_store>
1136
  </allowed_currency>
1137
  <allowspecific translate="label">
1138
- <label>Payment from applicable countries</label>
1139
  <frontend_type>allowspecific</frontend_type>
1140
  <sort_order>13</sort_order>
1141
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1144,7 +1280,7 @@
1144
  <show_in_store>1</show_in_store>
1145
  </allowspecific>
1146
  <specificcountry translate="label">
1147
- <label>Payment from Specific countries</label>
1148
 
1149
  <frontend_type>multiselect</frontend_type>
1150
  <sort_order>14</sort_order>
@@ -1177,6 +1313,51 @@
1177
  <show_in_website>1</show_in_website>
1178
  <show_in_store>5</show_in_store>
1179
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1180
  </fields>
1181
  </msp_visa>
1182
  <msp_mastercard translate="label" module="msp">
@@ -1214,7 +1395,7 @@
1214
  <show_in_store>1</show_in_store>
1215
  </allowed_currency>
1216
  <allowspecific translate="label">
1217
- <label>Payment from applicable countries</label>
1218
  <frontend_type>allowspecific</frontend_type>
1219
  <sort_order>13</sort_order>
1220
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1223,7 +1404,7 @@
1223
  <show_in_store>1</show_in_store>
1224
  </allowspecific>
1225
  <specificcountry translate="label">
1226
- <label>Payment from Specific countries</label>
1227
  <frontend_type>multiselect</frontend_type>
1228
  <sort_order>14</sort_order>
1229
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1255,14 +1436,59 @@
1255
  <show_in_website>1</show_in_website>
1256
  <show_in_store>5</show_in_store>
1257
  </max_order_total>
1258
- </fields>
1259
- </msp_mastercard>
1260
- <msp_banktransfer translate="label" module="msp">
1261
- <label>Banktransfer</label>
1262
- <sort_order>720</sort_order>
1263
- <show_in_default>1</show_in_default>
1264
- <show_in_website>1</show_in_website>
1265
- <show_in_store>1</show_in_store>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1266
  <fields>
1267
  <active translate="label">
1268
  <label>Enabled</label>
@@ -1301,7 +1527,7 @@
1301
  <show_in_store>1</show_in_store>
1302
  </allowed_currency>
1303
  <allowspecific translate="label">
1304
- <label>Payment from applicable countries</label>
1305
  <frontend_type>allowspecific</frontend_type>
1306
  <sort_order>13</sort_order>
1307
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1310,7 +1536,7 @@
1310
  <show_in_store>1</show_in_store>
1311
  </allowspecific>
1312
  <specificcountry translate="label">
1313
- <label>Payment from Specific countries</label>
1314
  <frontend_type>multiselect</frontend_type>
1315
  <sort_order>14</sort_order>
1316
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1342,6 +1568,51 @@
1342
  <show_in_website>1</show_in_website>
1343
  <show_in_store>5</show_in_store>
1344
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1345
  </fields>
1346
  </msp_banktransfer>
1347
  <msp_maestro translate="label" module="msp">
@@ -1379,7 +1650,7 @@
1379
  <show_in_store>1</show_in_store>
1380
  </allowed_currency>
1381
  <allowspecific translate="label">
1382
- <label>Payment from applicable countries</label>
1383
  <frontend_type>allowspecific</frontend_type>
1384
  <sort_order>13</sort_order>
1385
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1388,7 +1659,7 @@
1388
  <show_in_store>1</show_in_store>
1389
  </allowspecific>
1390
  <specificcountry translate="label">
1391
- <label>Payment from Specific countries</label>
1392
  <frontend_type>multiselect</frontend_type>
1393
  <sort_order>14</sort_order>
1394
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1420,6 +1691,51 @@
1420
  <show_in_website>1</show_in_website>
1421
  <show_in_store>5</show_in_store>
1422
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1423
  </fields>
1424
  </msp_maestro>
1425
  <msp_paypal translate="label" module="msp">
@@ -1456,7 +1772,7 @@
1456
  <show_in_store>1</show_in_store>
1457
  </allowed_currency>
1458
  <allowspecific translate="label">
1459
- <label>Payment from applicable countries</label>
1460
  <frontend_type>allowspecific</frontend_type>
1461
  <sort_order>13</sort_order>
1462
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1465,7 +1781,7 @@
1465
  <show_in_store>1</show_in_store>
1466
  </allowspecific>
1467
  <specificcountry translate="label">
1468
- <label>Payment from Specific countries</label>
1469
  <frontend_type>multiselect</frontend_type>
1470
  <sort_order>14</sort_order>
1471
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1497,6 +1813,51 @@
1497
  <show_in_website>1</show_in_website>
1498
  <show_in_store>5</show_in_store>
1499
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1500
  </fields>
1501
  </msp_paypal>
1502
  <msp_webgift translate="label" module="msp">
@@ -1534,7 +1895,7 @@
1534
  <show_in_store>1</show_in_store>
1535
  </allowed_currency>
1536
  <allowspecific translate="label">
1537
- <label>Payment from applicable countries</label>
1538
  <frontend_type>allowspecific</frontend_type>
1539
  <sort_order>13</sort_order>
1540
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1543,7 +1904,7 @@
1543
  <show_in_store>1</show_in_store>
1544
  </allowspecific>
1545
  <specificcountry translate="label">
1546
- <label>Payment from Specific countries</label>
1547
  <frontend_type>multiselect</frontend_type>
1548
  <sort_order>14</sort_order>
1549
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1567,6 +1928,51 @@
1567
  <show_in_website>1</show_in_website>
1568
  <show_in_store>1</show_in_store>
1569
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1570
  </fields>
1571
  </msp_webgift>
1572
  <msp_ebon translate="label" module="msp">
@@ -1604,7 +2010,7 @@
1604
  <show_in_store>1</show_in_store>
1605
  </allowed_currency>
1606
  <allowspecific translate="label">
1607
- <label>Payment from applicable countries</label>
1608
  <frontend_type>allowspecific</frontend_type>
1609
  <sort_order>13</sort_order>
1610
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1613,7 +2019,7 @@
1613
  <show_in_store>1</show_in_store>
1614
  </allowspecific>
1615
  <specificcountry translate="label">
1616
- <label>Payment from Specific countries</label>
1617
  <frontend_type>multiselect</frontend_type>
1618
  <sort_order>14</sort_order>
1619
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1637,6 +2043,51 @@
1637
  <show_in_website>1</show_in_website>
1638
  <show_in_store>1</show_in_store>
1639
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1640
  </fields>
1641
  </msp_ebon>
1642
  <msp_lief translate="label" module="msp">
@@ -1674,7 +2125,7 @@
1674
  <show_in_store>1</show_in_store>
1675
  </allowed_currency>
1676
  <allowspecific translate="label">
1677
- <label>Payment from applicable countries</label>
1678
  <frontend_type>allowspecific</frontend_type>
1679
  <sort_order>13</sort_order>
1680
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1683,7 +2134,7 @@
1683
  <show_in_store>1</show_in_store>
1684
  </allowspecific>
1685
  <specificcountry translate="label">
1686
- <label>Payment from Specific countries</label>
1687
  <frontend_type>multiselect</frontend_type>
1688
  <sort_order>14</sort_order>
1689
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1707,28 +2158,73 @@
1707
  <show_in_website>1</show_in_website>
1708
  <show_in_store>1</show_in_store>
1709
  </instructions>
1710
- </fields>
1711
- </msp_lief>
1712
- <msp_babygiftcard translate="label" module="msp">
1713
- <label>Baby giftcard</label>
1714
- <sort_order>739</sort_order>
1715
- <show_in_default>1</show_in_default>
1716
- <show_in_website>1</show_in_website>
1717
- <show_in_store>1</show_in_store>
1718
- <fields>
1719
- <active translate="label">
1720
- <label>Enabled</label>
1721
  <frontend_type>select</frontend_type>
1722
  <source_model>adminhtml/system_config_source_yesno</source_model>
1723
- <sort_order>1</sort_order>
1724
  <show_in_default>1</show_in_default>
1725
  <show_in_website>1</show_in_website>
1726
  <show_in_store>1</show_in_store>
1727
- </active>
1728
- <title translate="label">
1729
- <label>Title</label>
1730
  <frontend_type>text</frontend_type>
1731
- <sort_order>2</sort_order>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1732
  <show_in_default>1</show_in_default>
1733
  <show_in_website>1</show_in_website>
1734
  <show_in_store>1</show_in_store>
@@ -1744,7 +2240,7 @@
1744
  <show_in_store>1</show_in_store>
1745
  </allowed_currency>
1746
  <allowspecific translate="label">
1747
- <label>Payment from applicable countries</label>
1748
  <frontend_type>allowspecific</frontend_type>
1749
  <sort_order>13</sort_order>
1750
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1753,7 +2249,7 @@
1753
  <show_in_store>1</show_in_store>
1754
  </allowspecific>
1755
  <specificcountry translate="label">
1756
- <label>Payment from Specific countries</label>
1757
  <frontend_type>multiselect</frontend_type>
1758
  <sort_order>14</sort_order>
1759
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1777,8 +2273,168 @@
1777
  <show_in_website>1</show_in_website>
1778
  <show_in_store>1</show_in_store>
1779
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1780
  </fields>
1781
  </msp_babygiftcard>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1782
  <msp_boekenbon translate="label" module="msp">
1783
  <label>Boekenbon</label>
1784
  <sort_order>740</sort_order>
@@ -1814,7 +2470,7 @@
1814
  <show_in_store>1</show_in_store>
1815
  </allowed_currency>
1816
  <allowspecific translate="label">
1817
- <label>Payment from applicable countries</label>
1818
  <frontend_type>allowspecific</frontend_type>
1819
  <sort_order>13</sort_order>
1820
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1823,7 +2479,7 @@
1823
  <show_in_store>1</show_in_store>
1824
  </allowspecific>
1825
  <specificcountry translate="label">
1826
- <label>Payment from Specific countries</label>
1827
  <frontend_type>multiselect</frontend_type>
1828
  <sort_order>14</sort_order>
1829
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1847,6 +2503,51 @@
1847
  <show_in_website>1</show_in_website>
1848
  <show_in_store>1</show_in_store>
1849
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1850
  </fields>
1851
  </msp_boekenbon>
1852
  <msp_erotiekbon translate="label" module="msp">
@@ -1884,7 +2585,7 @@
1884
  <show_in_store>1</show_in_store>
1885
  </allowed_currency>
1886
  <allowspecific translate="label">
1887
- <label>Payment from applicable countries</label>
1888
  <frontend_type>allowspecific</frontend_type>
1889
  <sort_order>13</sort_order>
1890
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1893,7 +2594,7 @@
1893
  <show_in_store>1</show_in_store>
1894
  </allowspecific>
1895
  <specificcountry translate="label">
1896
- <label>Payment from Specific countries</label>
1897
  <frontend_type>multiselect</frontend_type>
1898
  <sort_order>14</sort_order>
1899
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1917,6 +2618,51 @@
1917
  <show_in_website>1</show_in_website>
1918
  <show_in_store>1</show_in_store>
1919
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1920
  </fields>
1921
  </msp_erotiekbon>
1922
  <msp_parfumnl translate="label" module="msp">
@@ -1954,7 +2700,7 @@
1954
  <show_in_store>1</show_in_store>
1955
  </allowed_currency>
1956
  <allowspecific translate="label">
1957
- <label>Payment from applicable countries</label>
1958
  <frontend_type>allowspecific</frontend_type>
1959
  <sort_order>13</sort_order>
1960
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -1963,7 +2709,7 @@
1963
  <show_in_store>1</show_in_store>
1964
  </allowspecific>
1965
  <specificcountry translate="label">
1966
- <label>Payment from Specific countries</label>
1967
  <frontend_type>multiselect</frontend_type>
1968
  <sort_order>14</sort_order>
1969
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -1987,6 +2733,51 @@
1987
  <show_in_website>1</show_in_website>
1988
  <show_in_store>1</show_in_store>
1989
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1990
  </fields>
1991
  </msp_parfumnl>
1992
  <msp_parfumcadeaukaart translate="label" module="msp">
@@ -2024,7 +2815,7 @@
2024
  <show_in_store>1</show_in_store>
2025
  </allowed_currency>
2026
  <allowspecific translate="label">
2027
- <label>Payment from applicable countries</label>
2028
  <frontend_type>allowspecific</frontend_type>
2029
  <sort_order>13</sort_order>
2030
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2033,30 +2824,75 @@
2033
  <show_in_store>1</show_in_store>
2034
  </allowspecific>
2035
  <specificcountry translate="label">
2036
- <label>Payment from Specific countries</label>
2037
  <frontend_type>multiselect</frontend_type>
2038
  <sort_order>14</sort_order>
2039
  <source_model>adminhtml/system_config_source_country</source_model>
2040
  <show_in_default>1</show_in_default>
2041
  <show_in_website>1</show_in_website>
2042
  <show_in_store>1</show_in_store>
2043
- </specificcountry>
2044
- <sort_order translate="label">
2045
- <label>Sort order</label>
2046
- <frontend_type>text</frontend_type>
2047
- <sort_order>100</sort_order>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2048
  <show_in_default>1</show_in_default>
2049
  <show_in_website>1</show_in_website>
2050
  <show_in_store>1</show_in_store>
2051
- </sort_order>
2052
- <instructions translate="label">
2053
- <label>Instructions</label>
2054
- <frontend_type>textarea</frontend_type>
2055
- <sort_order>62</sort_order>
 
 
 
 
 
 
 
 
 
2056
  <show_in_default>1</show_in_default>
2057
  <show_in_website>1</show_in_website>
2058
  <show_in_store>1</show_in_store>
2059
- </instructions>
2060
  </fields>
2061
  </msp_parfumcadeaukaart>
2062
  <msp_fashioncheque translate="label" module="msp">
@@ -2094,7 +2930,7 @@
2094
  <show_in_store>1</show_in_store>
2095
  </allowed_currency>
2096
  <allowspecific translate="label">
2097
- <label>Payment from applicable countries</label>
2098
  <frontend_type>allowspecific</frontend_type>
2099
  <sort_order>13</sort_order>
2100
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2103,7 +2939,7 @@
2103
  <show_in_store>1</show_in_store>
2104
  </allowspecific>
2105
  <specificcountry translate="label">
2106
- <label>Payment from Specific countries</label>
2107
  <frontend_type>multiselect</frontend_type>
2108
  <sort_order>14</sort_order>
2109
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2127,6 +2963,51 @@
2127
  <show_in_website>1</show_in_website>
2128
  <show_in_store>1</show_in_store>
2129
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2130
  </fields>
2131
  </msp_fashioncheque>
2132
  <msp_degrotespeelgoedwinkel translate="label" module="msp">
@@ -2164,7 +3045,7 @@
2164
  <show_in_store>1</show_in_store>
2165
  </allowed_currency>
2166
  <allowspecific translate="label">
2167
- <label>Payment from applicable countries</label>
2168
  <frontend_type>allowspecific</frontend_type>
2169
  <sort_order>13</sort_order>
2170
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2173,7 +3054,7 @@
2173
  <show_in_store>1</show_in_store>
2174
  </allowspecific>
2175
  <specificcountry translate="label">
2176
- <label>Payment from Specific countries</label>
2177
  <frontend_type>multiselect</frontend_type>
2178
  <sort_order>14</sort_order>
2179
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2197,6 +3078,51 @@
2197
  <show_in_website>1</show_in_website>
2198
  <show_in_store>1</show_in_store>
2199
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2200
  </fields>
2201
  </msp_degrotespeelgoedwinkel>
2202
  <msp_giropay translate="label" module="msp">
@@ -2234,7 +3160,7 @@
2234
  <show_in_store>1</show_in_store>
2235
  </allowed_currency>
2236
  <allowspecific translate="label">
2237
- <label>Payment from applicable countries</label>
2238
  <frontend_type>allowspecific</frontend_type>
2239
  <sort_order>13</sort_order>
2240
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2243,7 +3169,7 @@
2243
  <show_in_store>1</show_in_store>
2244
  </allowspecific>
2245
  <specificcountry translate="label">
2246
- <label>Payment from Specific countries</label>
2247
  <frontend_type>multiselect</frontend_type>
2248
  <sort_order>14</sort_order>
2249
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2275,6 +3201,51 @@
2275
  <show_in_website>1</show_in_website>
2276
  <show_in_store>5</show_in_store>
2277
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2278
  </fields>
2279
  </msp_giropay>
2280
  <msp_multisafepay translate="label" module="msp">
@@ -2312,7 +3283,7 @@
2312
  <show_in_store>1</show_in_store>
2313
  </allowed_currency>
2314
  <allowspecific translate="label">
2315
- <label>Payment from applicable countries</label>
2316
  <frontend_type>allowspecific</frontend_type>
2317
  <sort_order>13</sort_order>
2318
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2321,7 +3292,7 @@
2321
  <show_in_store>1</show_in_store>
2322
  </allowspecific>
2323
  <specificcountry translate="label">
2324
- <label>Payment from Specific countries</label>
2325
  <frontend_type>multiselect</frontend_type>
2326
  <sort_order>14</sort_order>
2327
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2345,6 +3316,51 @@
2345
  <show_in_website>1</show_in_website>
2346
  <show_in_store>1</show_in_store>
2347
  </instructions>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2348
  </fields>
2349
  </msp_multisafepay>
2350
  <msp_directebanking translate="label" module="msp">
@@ -2382,7 +3398,7 @@
2382
  <show_in_store>1</show_in_store>
2383
  </allowed_currency>
2384
  <allowspecific translate="label">
2385
- <label>Payment from applicable countries</label>
2386
  <frontend_type>allowspecific</frontend_type>
2387
  <sort_order>13</sort_order>
2388
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2391,7 +3407,7 @@
2391
  <show_in_store>1</show_in_store>
2392
  </allowspecific>
2393
  <specificcountry translate="label">
2394
- <label>Payment from Specific countries</label>
2395
  <frontend_type>multiselect</frontend_type>
2396
  <sort_order>14</sort_order>
2397
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2423,6 +3439,51 @@
2423
  <show_in_website>1</show_in_website>
2424
  <show_in_store>5</show_in_store>
2425
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2426
  </fields>
2427
  </msp_directebanking>
2428
  <msp_directdebit translate="label" module="msp">
@@ -2460,7 +3521,7 @@
2460
  <show_in_store>1</show_in_store>
2461
  </allowed_currency>
2462
  <allowspecific translate="label">
2463
- <label>Payment from applicable countries</label>
2464
  <frontend_type>allowspecific</frontend_type>
2465
  <sort_order>13</sort_order>
2466
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2469,7 +3530,7 @@
2469
  <show_in_store>1</show_in_store>
2470
  </allowspecific>
2471
  <specificcountry translate="label">
2472
- <label>Payment from Specific countries</label>
2473
  <frontend_type>multiselect</frontend_type>
2474
  <sort_order>14</sort_order>
2475
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2501,6 +3562,51 @@
2501
  <show_in_website>1</show_in_website>
2502
  <show_in_store>5</show_in_store>
2503
  </max_order_total>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2504
  </fields>
2505
  </msp_directdebit>
2506
  <msp_fastcheckout translate="label" module="msp">
@@ -2528,7 +3634,7 @@
2528
  <show_in_store>1</show_in_store>
2529
  </title>
2530
  <allowspecific translate="label">
2531
- <label>Payment from applicable countries</label>
2532
  <frontend_type>allowspecific</frontend_type>
2533
  <sort_order>13</sort_order>
2534
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
@@ -2537,7 +3643,7 @@
2537
  <show_in_store>1</show_in_store>
2538
  </allowspecific>
2539
  <specificcountry translate="label">
2540
- <label>Payment from Specific countries</label>
2541
  <frontend_type>multiselect</frontend_type>
2542
  <sort_order>14</sort_order>
2543
  <source_model>adminhtml/system_config_source_country</source_model>
@@ -2568,7 +3674,7 @@
2568
  <!-- end: MSP Gateways -->
2569
  <!-- begin: MSP Fast Checkout -->
2570
  <mspcheckout translate="label" module="msp">
2571
- <label>MultiSafepay - Fast Checkout</label>
2572
  <tab>sales</tab>
2573
  <frontend_type>text</frontend_type>
2574
  <sort_order>1001</sort_order>
13
  <payment>
14
  <groups>
15
  <msp translate="label" module="msp">
16
+ <label>MultiSafepay - 2.0.1</label>
17
  <sort_order>671</sort_order>
18
  <show_in_default>1</show_in_default>
19
  <show_in_website>1</show_in_website>
37
  <show_in_store>1</show_in_store>
38
  </title>
39
  <test_api translate="label comment">
40
+ <label>Account type</label>
41
  <frontend_type>select</frontend_type>
42
+ <comment><![CDATA[<a href='https://www.multisafepay.com/en/Open-a-test-account.html' target='_blank'>Sign up for a free test account</a>]]></comment>
43
  <source_model>msp/config_sources_accounts</source_model>
44
  <sort_order>30</sort_order>
45
  <show_in_default>1</show_in_default>
89
  <show_in_store>1</show_in_store>
90
  </use_refund_credit_memo>
91
  <use_redirect translate="label comment">
92
+ <label>Auto. redirect</label>
93
+ <comment>Automatically redirects a customer back to the webshop after a succesful payment. (Skips MultiSafepay's 'Transaction Complete' screen)</comment>
94
  <frontend_type>select</frontend_type>
95
  <source_model>adminhtml/system_config_source_yesno</source_model>
96
  <sort_order>70</sort_order>
127
  <show_in_store>1</show_in_store>
128
  </autocreate_invoice>
129
  <mail_invoice translate="label comment">
130
+ <label>E-mail invoice to customer</label>
131
  <frontend_type>select</frontend_type>
132
  <source_model>adminhtml/system_config_source_yesno</source_model>
133
  <sort_order>91</sort_order>
136
  <show_in_store>1</show_in_store>
137
  </mail_invoice>
138
  <send_update_email translate="label comment">
139
+ <label>Send the order update e-mail to customer</label>
140
  <frontend_type>select</frontend_type>
141
  <source_model>adminhtml/system_config_source_yesno</source_model>
142
  <sort_order>92</sort_order>
146
  </send_update_email>
147
  <keep_cart translate="label comment">
148
  <label>Keep the cart</label>
149
+ <comment>Cart remains active when the customer returns to the webshop or cancels an order.</comment>
150
  <frontend_type>select</frontend_type>
151
  <source_model>adminhtml/system_config_source_yesno</source_model>
152
  <sort_order>93</sort_order>
155
  <show_in_store>1</show_in_store>
156
  </keep_cart>
157
  <new_order_mail translate="label comment">
158
+ <label>New order e-mail</label>
159
  <frontend_type>select</frontend_type>
160
  <source_model>msp/config_sources_order_email</source_model>
161
  <sort_order>77</sort_order>
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>1</show_in_store>
165
  </new_order_mail>
166
+ <allowed_currency translate="label">
167
  <label>Allowed Currency</label>
168
  <frontend_type>multiselect</frontend_type>
169
  <source_model>msp/config_sources_order_currency</source_model>
174
  <show_in_store>1</show_in_store>
175
  </allowed_currency>
176
  <allow_convert_currency translate="label comment">
177
+ <label>Allow currency conversion to Euro</label>
178
+ <comment>If store currency is not allowed by settings. Used for each gateway.</comment>
179
  <frontend_type>select</frontend_type>
180
  <source_model>adminhtml/system_config_source_yesno</source_model>
181
  <sort_order>15</sort_order>
290
  <show_in_store>1</show_in_store>
291
  </expired_status>
292
  <allowspecific translate="label">
293
+ <label>Receive payments from applicable countries</label>
294
  <frontend_type>allowspecific</frontend_type>
295
  <sort_order>300</sort_order>
296
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
299
  <show_in_store>1</show_in_store>
300
  </allowspecific>
301
  <specificcountry translate="label">
302
+ <label>Receive payments from specific countries</label>
303
  <frontend_type>multiselect</frontend_type>
304
  <sort_order>310</sort_order>
305
  <source_model>adminhtml/system_config_source_country</source_model>
331
  <!-- end: Main Settings (Payment Methods tab) -->
332
  <!-- begin: MSP Gateways -->
333
  <msp translate="label" module="msp">
334
+ <label>MultiSafepay - Gateways - 2.0.1</label>
335
  <tab>sales</tab>
336
  <frontend_type>text</frontend_type>
337
  <sort_order>1000</sort_order>
347
  <show_in_store>1</show_in_store>
348
  <fields>
349
  <test_api translate="label comment">
350
+ <label>Account type</label>
351
  <frontend_type>select</frontend_type>
352
+ <comment><![CDATA[<a href='https://www.multisafepay.com/en/Open-a-test-account.html' target='_blank'>Sign up for a free test account</a>]]></comment>
353
  <source_model>msp/config_sources_accounts</source_model>
354
  <sort_order>30</sort_order>
355
  <show_in_default>1</show_in_default>
399
  <show_in_store>1</show_in_store>
400
  </use_refund_credit_memo>
401
  <allow_convert_currency translate="label comment">
402
+ <label>Allow currency conversion to Euro</label>
403
  <comment>If store currency is not allowed by settings. Used for each gateways.</comment>
404
  <frontend_type>select</frontend_type>
405
  <source_model>adminhtml/system_config_source_yesno</source_model>
409
  <show_in_store>1</show_in_store>
410
  </allow_convert_currency>
411
  <use_redirect translate="label comment">
412
+ <label>Auto. redirect</label>
413
+ <comment>Automatically redirects a customer back to the webshop after a succesful payment. (Skips MultiSafepay's 'Transaction Complete' screen)</comment>
414
  <frontend_type>select</frontend_type>
415
  <source_model>adminhtml/system_config_source_yesno</source_model>
416
  <sort_order>70</sort_order>
438
  <show_in_store>1</show_in_store>
439
  </autocreate_invoice>
440
  <mail_invoice translate="label comment">
441
+ <label>E-mail invoice to customer</label>
442
  <frontend_type>select</frontend_type>
443
  <source_model>adminhtml/system_config_source_yesno</source_model>
444
  <sort_order>76</sort_order>
456
  <show_in_store>1</show_in_store>
457
  </new_order_mail>
458
  <send_update_email translate="label comment">
459
+ <label>Send the order update e-mail to customer</label>
460
  <frontend_type>select</frontend_type>
461
  <source_model>adminhtml/system_config_source_yesno</source_model>
462
  <sort_order>78</sort_order>
465
  <show_in_store>1</show_in_store>
466
  </send_update_email>
467
  <keep_cart translate="label comment">
468
+ <label>Cart remains active when the customer returns to the webshop or cancels an order</label>
469
  <frontend_type>select</frontend_type>
470
  <source_model>adminhtml/system_config_source_yesno</source_model>
471
  <sort_order>79</sort_order>
474
  <show_in_store>1</show_in_store>
475
  </keep_cart>
476
  <show_gateway_images translate="label comment">
477
+ <label>Show the gateway image if it exists</label>
478
  <frontend_type>select</frontend_type>
479
  <source_model>adminhtml/system_config_source_yesno</source_model>
480
  <sort_order>80</sort_order>
483
  <show_in_store>1</show_in_store>
484
  </show_gateway_images>
485
  <show_gateway_title_combi translate="label comment">
486
+ <label>Show the gateway image if it exists in front of the title</label>
487
  <frontend_type>select</frontend_type>
488
  <source_model>adminhtml/system_config_source_yesno</source_model>
489
  <sort_order>81</sort_order>
595
  </fields>
596
  </settings>
597
  <msp_ideal translate="label" module="msp">
598
+ <label>iDEAL</label>
599
  <sort_order>680</sort_order>
600
  <show_in_default>1</show_in_default>
601
  <show_in_website>1</show_in_website>
612
  </active>
613
 
614
  <bank_select translate='label'>
615
+ <label>Show iDEAL banklist in checkout</label>
616
  <frontend_type>select</frontend_type>
617
  <source_model>adminhtml/system_config_source_yesno</source_model>
618
  <sort_order>2</sort_order>
629
  <show_in_store>1</show_in_store>
630
  </title>
631
  <allowspecific translate="label">
632
+ <label>Receive payments from applicable countries</label>
633
  <frontend_type>allowspecific</frontend_type>
634
  <sort_order>13</sort_order>
635
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
648
  <show_in_store>1</show_in_store>
649
  </allowed_currency>
650
  <specificcountry translate="label">
651
+ <label>Receive payments from specific countries</label>
652
  <frontend_type>multiselect</frontend_type>
653
  <sort_order>14</sort_order>
654
  <source_model>adminhtml/system_config_source_country</source_model>
675
  <max_order_total translate="label">
676
  <label>Maximum Order Total</label>
677
  <frontend_type>text</frontend_type>
678
+ <sort_order>64</sort_order>
679
  <show_in_default>1</show_in_default>
680
  <show_in_website>1</show_in_website>
681
  <show_in_store>5</show_in_store>
683
  <min_order_total translate="label">
684
  <label>Minimum Order Total</label>
685
  <frontend_type>text</frontend_type>
686
+ <sort_order>63</sort_order>
687
  <show_in_default>1</show_in_default>
688
  <show_in_website>1</show_in_website>
689
  <show_in_store>4</show_in_store>
690
  </min_order_total>
691
+ <fee translate="label">
692
+ <label>Enable fee (inc. Tax)</label>
693
+ <frontend_type>select</frontend_type>
694
+ <source_model>adminhtml/system_config_source_yesno</source_model>
695
+ <sort_order>70</sort_order>
696
+ <show_in_default>1</show_in_default>
697
+ <show_in_website>1</show_in_website>
698
+ <show_in_store>1</show_in_store>
699
+ </fee>
700
+ <fee_amount translate="label">
701
+ <label>Payment fee amount</label>
702
+ <frontend_type>text</frontend_type>
703
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
704
+ <sort_order>80</sort_order>
705
+ <show_in_default>1</show_in_default>
706
+ <show_in_website>1</show_in_website>
707
+ <show_in_store>1</show_in_store>
708
+ </fee_amount>
709
+ <fee_tax_class>
710
+ <label>Tax class for payment fee</label>
711
+ <comment>Select which tax class should be used for the payment fee</comment>
712
+ <frontend_type>select</frontend_type>
713
+ <source_model>msp/config_sources_taxClasses</source_model>
714
+ <sort_order>90</sort_order>
715
+ <show_in_default>1</show_in_default>
716
+ <show_in_website>1</show_in_website>
717
+ <show_in_store>1</show_in_store>
718
+ </fee_tax_class>
719
+ <fee_incexc translate="label">
720
+ <label>Show payment fee incl. tax during checkout</label>
721
+ <frontend_type>select</frontend_type>
722
+ <source_model>adminhtml/system_config_source_yesno</source_model>
723
+ <sort_order>81</sort_order>
724
+ <show_in_default>1</show_in_default>
725
+ <show_in_website>1</show_in_website>
726
+ <show_in_store>1</show_in_store>
727
+ </fee_incexc>
728
+ <fee_description translate="label">
729
+ <label>Payment fee description, visible in order totals</label>
730
+ <frontend_type>text</frontend_type>
731
+ <sort_order>100</sort_order>
732
+ <show_in_default>1</show_in_default>
733
+ <show_in_website>1</show_in_website>
734
+ <show_in_store>1</show_in_store>
735
+ </fee_description>
736
  </fields>
737
  </msp_ideal>
738
  <msp_payafter translate="label" module="msp">
739
+ <label>Pay after Delivery</label>
740
  <sort_order>681</sort_order>
741
  <show_in_default>1</show_in_default>
742
  <show_in_website>1</show_in_website>
752
  <show_in_store>1</show_in_store>
753
  </active>
754
  <test_api_pad translate="label comment">
755
+ <label>Account type</label>
756
  <frontend_type>select</frontend_type>
757
  <comment><![CDATA[<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Sign up for a free test account</a>]]></comment>
758
  <source_model>msp/config_sources_accounts</source_model>
786
  <show_in_store>1</show_in_store>
787
  </secure_code_pad>
788
  <account_id_pad_test translate="label">
789
+ <label>Account ID (for Test Accounts)</label>
790
  <frontend_type>text</frontend_type>
791
  <sort_order>53</sort_order>
792
  <show_in_default>1</show_in_default>
794
  <show_in_store>1</show_in_store>
795
  </account_id_pad_test>
796
  <site_id_pad_test translate="label">
797
+ <label>Site ID (for Test Accounts)</label>
798
  <frontend_type>text</frontend_type>
799
  <sort_order>56</sort_order>
800
  <show_in_default>1</show_in_default>
802
  <show_in_store>1</show_in_store>
803
  </site_id_pad_test>
804
  <secure_code_pad_test translate="label">
805
+ <label>Site Code (for Test Accounts)</label>
806
  <frontend_type>text</frontend_type>
807
  <sort_order>58</sort_order>
808
  <show_in_default>1</show_in_default>
817
  <show_in_website>1</show_in_website>
818
  <show_in_store>1</show_in_store>
819
  </title>
820
+ <pad_daysactive translate="label">
821
+ <label>Days active before requests expires?</label>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
822
  <frontend_type>text</frontend_type>
823
+ <sort_order>61</sort_order>
824
  <show_in_default>1</show_in_default>
825
  <show_in_website>1</show_in_website>
826
  <show_in_store>1</show_in_store>
827
+ </pad_daysactive>
828
+
829
  <min_order_total translate="label">
830
  <label>Minimum Order Total</label>
831
  <frontend_type>text</frontend_type>
843
  <show_in_store>5</show_in_store>
844
  </max_order_total>
845
  <bno_no_invoice translate="label">
846
+ <label>Enable the invoice e-mail for this payment method?</label>
847
  <frontend_type>select</frontend_type>
848
  <source_model>adminhtml/system_config_source_yesno</source_model>
849
  <sort_order>121</sort_order>
851
  <show_in_website>1</show_in_website>
852
  <show_in_store>1</show_in_store>
853
  </bno_no_invoice>
854
+
 
 
 
 
 
 
 
 
 
855
  <allowed_currency translate="label comment">
856
  <label>Allowed Currency</label>
857
  <frontend_type>multiselect</frontend_type>
863
  <show_in_store>1</show_in_store>
864
  </allowed_currency>
865
  <allowspecific translate="label">
866
+ <label>Receive payments from applicable countries</label>
867
  <frontend_type>allowspecific</frontend_type>
868
  <sort_order>123</sort_order>
869
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
872
  <show_in_store>1</show_in_store>
873
  </allowspecific>
874
  <specificcountry translate="label">
875
+ <label>Receive payments from specific countries</label>
876
  <frontend_type>multiselect</frontend_type>
877
  <sort_order>124</sort_order>
878
  <source_model>adminhtml/system_config_source_country</source_model>
898
  <show_in_store>1</show_in_store>
899
  </ip_check>
900
  <ip_filter translate="label comment">
901
+ <label>Only visible for the following IP address</label>
902
  <frontend_type>text</frontend_type>
903
  <comment>You can add multiple addresses seperated by ;</comment>
904
  <sort_order>127</sort_order>
907
  <show_in_store>1</show_in_store>
908
  </ip_filter>
909
  <ip_filter_test translate="label comment">
910
+ <label>Only visible for the following IP address (for Test Account)</label>
911
  <frontend_type>text</frontend_type>
912
  <comment>You can add multiple addresses seperated by ;</comment>
913
  <sort_order>128</sort_order>
925
  <show_in_store>1</show_in_store>
926
  </ip_filter_test_for_live_mode>
927
  <send_request_after_shipping translate="label comment">
928
+ <label>Send shipped status after complete order</label>
929
  <frontend_type>select</frontend_type>
930
+ <comment>Order status will be set to shipped at MultiSafepay</comment>
931
  <source_model>adminhtml/system_config_source_yesno</source_model>
932
  <sort_order>130</sort_order>
933
  <show_in_default>1</show_in_default>
942
  <show_in_website>1</show_in_website>
943
  <show_in_store>1</show_in_store>
944
  </instructions>
945
+ <fee translate="label">
946
+ <label>Enable fee (inc. Tax)</label>
947
+ <frontend_type>select</frontend_type>
948
+ <source_model>adminhtml/system_config_source_yesno</source_model>
949
+ <sort_order>70</sort_order>
950
+ <show_in_default>1</show_in_default>
951
+ <show_in_website>1</show_in_website>
952
+ <show_in_store>1</show_in_store>
953
+ </fee>
954
+ <fee_amount translate="label">
955
+ <label>Payment fee amount</label>
956
+ <frontend_type>text</frontend_type>
957
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
958
+ <sort_order>80</sort_order>
959
+ <show_in_default>1</show_in_default>
960
+ <show_in_website>1</show_in_website>
961
+ <show_in_store>1</show_in_store>
962
+ </fee_amount>
963
+ <fee_tax_class>
964
+ <label>Tax class for payment fee</label>
965
+ <comment>Select which tax class should be used for the payment fee</comment>
966
+ <frontend_type>select</frontend_type>
967
+ <source_model>msp/config_sources_taxClasses</source_model>
968
+ <sort_order>90</sort_order>
969
+ <show_in_default>1</show_in_default>
970
+ <show_in_website>1</show_in_website>
971
+ <show_in_store>1</show_in_store>
972
+ </fee_tax_class>
973
+ <fee_incexc translate="label">
974
+ <label>Show payment fee incl. tax during checkout</label>
975
+ <frontend_type>select</frontend_type>
976
+ <source_model>adminhtml/system_config_source_yesno</source_model>
977
+ <sort_order>81</sort_order>
978
+ <show_in_default>1</show_in_default>
979
+ <show_in_website>1</show_in_website>
980
+ <show_in_store>1</show_in_store>
981
+ </fee_incexc>
982
+ <fee_description translate="label">
983
+ <label>Payment fee description, visible in order totals</label>
984
+ <frontend_type>text</frontend_type>
985
+ <sort_order>100</sort_order>
986
+ <show_in_default>1</show_in_default>
987
+ <show_in_website>1</show_in_website>
988
+ <show_in_store>1</show_in_store>
989
+ </fee_description>
990
  </fields>
991
  </msp_payafter>
992
  <msp_mistercash translate="label" module="msp">
1024
  <show_in_store>1</show_in_store>
1025
  </allowed_currency>
1026
  <allowspecific translate="label">
1027
+ <label>Receive payments from applicable countries</label>
1028
  <frontend_type>allowspecific</frontend_type>
1029
  <sort_order>13</sort_order>
1030
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1033
  <show_in_store>1</show_in_store>
1034
  </allowspecific>
1035
  <specificcountry translate="label">
1036
+ <label>Receive payments from specific countries</label>
1037
  <frontend_type>multiselect</frontend_type>
1038
  <sort_order>14</sort_order>
1039
  <source_model>adminhtml/system_config_source_country</source_model>
1065
  <show_in_website>1</show_in_website>
1066
  <show_in_store>5</show_in_store>
1067
  </max_order_total>
1068
+ <fee translate="label">
1069
+ <label>Enable fee (inc. Tax)</label>
1070
+ <frontend_type>select</frontend_type>
1071
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1072
+ <sort_order>70</sort_order>
1073
+ <show_in_default>1</show_in_default>
1074
+ <show_in_website>1</show_in_website>
1075
+ <show_in_store>1</show_in_store>
1076
+ </fee>
1077
+ <fee_amount translate="label">
1078
+ <label>Payment fee amount</label>
1079
+ <frontend_type>text</frontend_type>
1080
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1081
+ <sort_order>80</sort_order>
1082
+ <show_in_default>1</show_in_default>
1083
+ <show_in_website>1</show_in_website>
1084
+ <show_in_store>1</show_in_store>
1085
+ </fee_amount>
1086
+ <fee_tax_class>
1087
+ <label>Tax class for payment fee</label>
1088
+ <comment>Select which tax class should be used for the payment fee</comment>
1089
+ <frontend_type>select</frontend_type>
1090
+ <source_model>msp/config_sources_taxClasses</source_model>
1091
+ <sort_order>90</sort_order>
1092
+ <show_in_default>1</show_in_default>
1093
+ <show_in_website>1</show_in_website>
1094
+ <show_in_store>1</show_in_store>
1095
+ </fee_tax_class>
1096
+ <fee_incexc translate="label">
1097
+ <label>Show payment fee incl. tax during checkout</label>
1098
+ <frontend_type>select</frontend_type>
1099
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1100
+ <sort_order>81</sort_order>
1101
+ <show_in_default>1</show_in_default>
1102
+ <show_in_website>1</show_in_website>
1103
+ <show_in_store>1</show_in_store>
1104
+ </fee_incexc>
1105
+ <fee_description translate="label">
1106
+ <label>Payment fee description, visible in order totals</label>
1107
+ <frontend_type>text</frontend_type>
1108
+ <sort_order>100</sort_order>
1109
+ <show_in_default>1</show_in_default>
1110
+ <show_in_website>1</show_in_website>
1111
+ <show_in_store>1</show_in_store>
1112
+ </fee_description>
1113
+
1114
  </fields>
1115
  </msp_mistercash>
1116
  <msp_amex translate="label" module="msp">
1148
  <show_in_store>1</show_in_store>
1149
  </allowed_currency>
1150
  <allowspecific translate="label">
1151
+ <label>Receive payments from applicable countries</label>
1152
  <frontend_type>allowspecific</frontend_type>
1153
  <sort_order>13</sort_order>
1154
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1157
  <show_in_store>1</show_in_store>
1158
  </allowspecific>
1159
  <specificcountry translate="label">
1160
+ <label>Receive payments from specific countries</label>
1161
  <frontend_type>multiselect</frontend_type>
1162
  <sort_order>14</sort_order>
1163
  <source_model>adminhtml/system_config_source_country</source_model>
1189
  <show_in_website>1</show_in_website>
1190
  <show_in_store>5</show_in_store>
1191
  </max_order_total>
1192
+ <fee translate="label">
1193
+ <label>Enable fee (inc. Tax)</label>
1194
+ <frontend_type>select</frontend_type>
1195
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1196
+ <sort_order>70</sort_order>
1197
+ <show_in_default>1</show_in_default>
1198
+ <show_in_website>1</show_in_website>
1199
+ <show_in_store>1</show_in_store>
1200
+ </fee>
1201
+ <fee_amount translate="label">
1202
+ <label>Payment fee amount</label>
1203
+ <frontend_type>text</frontend_type>
1204
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1205
+ <sort_order>80</sort_order>
1206
+ <show_in_default>1</show_in_default>
1207
+ <show_in_website>1</show_in_website>
1208
+ <show_in_store>1</show_in_store>
1209
+ </fee_amount>
1210
+ <fee_tax_class>
1211
+ <label>Tax class for payment fee</label>
1212
+ <comment>Select which tax class should be used for the payment fee</comment>
1213
+ <frontend_type>select</frontend_type>
1214
+ <source_model>msp/config_sources_taxClasses</source_model>
1215
+ <sort_order>90</sort_order>
1216
+ <show_in_default>1</show_in_default>
1217
+ <show_in_website>1</show_in_website>
1218
+ <show_in_store>1</show_in_store>
1219
+ </fee_tax_class>
1220
+ <fee_incexc translate="label">
1221
+ <label>Show payment fee incl. tax during checkout</label>
1222
+ <frontend_type>select</frontend_type>
1223
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1224
+ <sort_order>81</sort_order>
1225
+ <show_in_default>1</show_in_default>
1226
+ <show_in_website>1</show_in_website>
1227
+ <show_in_store>1</show_in_store>
1228
+ </fee_incexc>
1229
+ <fee_description translate="label">
1230
+ <label>Payment fee description, visible in order totals</label>
1231
+ <frontend_type>text</frontend_type>
1232
+ <sort_order>100</sort_order>
1233
+ <show_in_default>1</show_in_default>
1234
+ <show_in_website>1</show_in_website>
1235
+ <show_in_store>1</show_in_store>
1236
+ </fee_description>
1237
  </fields>
1238
  </msp_amex>
1239
  <msp_visa translate="label" module="msp">
1271
  <show_in_store>1</show_in_store>
1272
  </allowed_currency>
1273
  <allowspecific translate="label">
1274
+ <label>Receive payments from applicable countries</label>
1275
  <frontend_type>allowspecific</frontend_type>
1276
  <sort_order>13</sort_order>
1277
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1280
  <show_in_store>1</show_in_store>
1281
  </allowspecific>
1282
  <specificcountry translate="label">
1283
+ <label>Receive payments from specific countries</label>
1284
 
1285
  <frontend_type>multiselect</frontend_type>
1286
  <sort_order>14</sort_order>
1313
  <show_in_website>1</show_in_website>
1314
  <show_in_store>5</show_in_store>
1315
  </max_order_total>
1316
+ <fee translate="label">
1317
+ <label>Enable fee (inc. Tax)</label>
1318
+ <frontend_type>select</frontend_type>
1319
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1320
+ <sort_order>70</sort_order>
1321
+ <show_in_default>1</show_in_default>
1322
+ <show_in_website>1</show_in_website>
1323
+ <show_in_store>1</show_in_store>
1324
+ </fee>
1325
+ <fee_amount translate="label">
1326
+ <label>Payment fee amount</label>
1327
+ <frontend_type>text</frontend_type>
1328
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1329
+ <sort_order>80</sort_order>
1330
+ <show_in_default>1</show_in_default>
1331
+ <show_in_website>1</show_in_website>
1332
+ <show_in_store>1</show_in_store>
1333
+ </fee_amount>
1334
+ <fee_tax_class>
1335
+ <label>Tax class for payment fee</label>
1336
+ <comment>Select which tax class should be used for the payment fee</comment>
1337
+ <frontend_type>select</frontend_type>
1338
+ <source_model>msp/config_sources_taxClasses</source_model>
1339
+ <sort_order>90</sort_order>
1340
+ <show_in_default>1</show_in_default>
1341
+ <show_in_website>1</show_in_website>
1342
+ <show_in_store>1</show_in_store>
1343
+ </fee_tax_class>
1344
+ <fee_incexc translate="label">
1345
+ <label>Show payment fee incl. tax during checkout</label>
1346
+ <frontend_type>select</frontend_type>
1347
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1348
+ <sort_order>81</sort_order>
1349
+ <show_in_default>1</show_in_default>
1350
+ <show_in_website>1</show_in_website>
1351
+ <show_in_store>1</show_in_store>
1352
+ </fee_incexc>
1353
+ <fee_description translate="label">
1354
+ <label>Payment fee description, visible in order totals</label>
1355
+ <frontend_type>text</frontend_type>
1356
+ <sort_order>100</sort_order>
1357
+ <show_in_default>1</show_in_default>
1358
+ <show_in_website>1</show_in_website>
1359
+ <show_in_store>1</show_in_store>
1360
+ </fee_description>
1361
  </fields>
1362
  </msp_visa>
1363
  <msp_mastercard translate="label" module="msp">
1395
  <show_in_store>1</show_in_store>
1396
  </allowed_currency>
1397
  <allowspecific translate="label">
1398
+ <label>Receive payments from applicable countries</label>
1399
  <frontend_type>allowspecific</frontend_type>
1400
  <sort_order>13</sort_order>
1401
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1404
  <show_in_store>1</show_in_store>
1405
  </allowspecific>
1406
  <specificcountry translate="label">
1407
+ <label>Receive payments from specific countries</label>
1408
  <frontend_type>multiselect</frontend_type>
1409
  <sort_order>14</sort_order>
1410
  <source_model>adminhtml/system_config_source_country</source_model>
1436
  <show_in_website>1</show_in_website>
1437
  <show_in_store>5</show_in_store>
1438
  </max_order_total>
1439
+ <fee translate="label">
1440
+ <label>Enable fee (inc. Tax)</label>
1441
+ <frontend_type>select</frontend_type>
1442
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1443
+ <sort_order>70</sort_order>
1444
+ <show_in_default>1</show_in_default>
1445
+ <show_in_website>1</show_in_website>
1446
+ <show_in_store>1</show_in_store>
1447
+ </fee>
1448
+ <fee_amount translate="label">
1449
+ <label>Payment fee amount</label>
1450
+ <frontend_type>text</frontend_type>
1451
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1452
+ <sort_order>80</sort_order>
1453
+ <show_in_default>1</show_in_default>
1454
+ <show_in_website>1</show_in_website>
1455
+ <show_in_store>1</show_in_store>
1456
+ </fee_amount>
1457
+ <fee_tax_class>
1458
+ <label>Tax class for payment fee</label>
1459
+ <comment>Select which tax class should be used for the payment fee</comment>
1460
+ <frontend_type>select</frontend_type>
1461
+ <source_model>msp/config_sources_taxClasses</source_model>
1462
+ <sort_order>90</sort_order>
1463
+ <show_in_default>1</show_in_default>
1464
+ <show_in_website>1</show_in_website>
1465
+ <show_in_store>1</show_in_store>
1466
+ </fee_tax_class>
1467
+ <fee_incexc translate="label">
1468
+ <label>Show payment fee incl. tax during checkout</label>
1469
+ <frontend_type>select</frontend_type>
1470
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1471
+ <sort_order>81</sort_order>
1472
+ <show_in_default>1</show_in_default>
1473
+ <show_in_website>1</show_in_website>
1474
+ <show_in_store>1</show_in_store>
1475
+ </fee_incexc>
1476
+ <fee_description translate="label">
1477
+ <label>Payment fee description, visible in order totals</label>
1478
+ <frontend_type>text</frontend_type>
1479
+ <sort_order>100</sort_order>
1480
+ <show_in_default>1</show_in_default>
1481
+ <show_in_website>1</show_in_website>
1482
+ <show_in_store>1</show_in_store>
1483
+ </fee_description>
1484
+ </fields>
1485
+ </msp_mastercard>
1486
+ <msp_banktransfer translate="label" module="msp">
1487
+ <label>Banktransfer</label>
1488
+ <sort_order>720</sort_order>
1489
+ <show_in_default>1</show_in_default>
1490
+ <show_in_website>1</show_in_website>
1491
+ <show_in_store>1</show_in_store>
1492
  <fields>
1493
  <active translate="label">
1494
  <label>Enabled</label>
1527
  <show_in_store>1</show_in_store>
1528
  </allowed_currency>
1529
  <allowspecific translate="label">
1530
+ <label>Receive payments from applicable countries</label>
1531
  <frontend_type>allowspecific</frontend_type>
1532
  <sort_order>13</sort_order>
1533
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1536
  <show_in_store>1</show_in_store>
1537
  </allowspecific>
1538
  <specificcountry translate="label">
1539
+ <label>Receive payments from specific countries</label>
1540
  <frontend_type>multiselect</frontend_type>
1541
  <sort_order>14</sort_order>
1542
  <source_model>adminhtml/system_config_source_country</source_model>
1568
  <show_in_website>1</show_in_website>
1569
  <show_in_store>5</show_in_store>
1570
  </max_order_total>
1571
+ <fee translate="label">
1572
+ <label>Enable fee (inc. Tax)</label>
1573
+ <frontend_type>select</frontend_type>
1574
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1575
+ <sort_order>70</sort_order>
1576
+ <show_in_default>1</show_in_default>
1577
+ <show_in_website>1</show_in_website>
1578
+ <show_in_store>1</show_in_store>
1579
+ </fee>
1580
+ <fee_amount translate="label">
1581
+ <label>Payment fee amount</label>
1582
+ <frontend_type>text</frontend_type>
1583
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1584
+ <sort_order>80</sort_order>
1585
+ <show_in_default>1</show_in_default>
1586
+ <show_in_website>1</show_in_website>
1587
+ <show_in_store>1</show_in_store>
1588
+ </fee_amount>
1589
+ <fee_tax_class>
1590
+ <label>Tax class for payment fee</label>
1591
+ <comment>Select which tax class should be used for the payment fee</comment>
1592
+ <frontend_type>select</frontend_type>
1593
+ <source_model>msp/config_sources_taxClasses</source_model>
1594
+ <sort_order>90</sort_order>
1595
+ <show_in_default>1</show_in_default>
1596
+ <show_in_website>1</show_in_website>
1597
+ <show_in_store>1</show_in_store>
1598
+ </fee_tax_class>
1599
+ <fee_incexc translate="label">
1600
+ <label>Show payment fee incl. tax during checkout</label>
1601
+ <frontend_type>select</frontend_type>
1602
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1603
+ <sort_order>81</sort_order>
1604
+ <show_in_default>1</show_in_default>
1605
+ <show_in_website>1</show_in_website>
1606
+ <show_in_store>1</show_in_store>
1607
+ </fee_incexc>
1608
+ <fee_description translate="label">
1609
+ <label>Payment fee description, visible in order totals</label>
1610
+ <frontend_type>text</frontend_type>
1611
+ <sort_order>100</sort_order>
1612
+ <show_in_default>1</show_in_default>
1613
+ <show_in_website>1</show_in_website>
1614
+ <show_in_store>1</show_in_store>
1615
+ </fee_description>
1616
  </fields>
1617
  </msp_banktransfer>
1618
  <msp_maestro translate="label" module="msp">
1650
  <show_in_store>1</show_in_store>
1651
  </allowed_currency>
1652
  <allowspecific translate="label">
1653
+ <label>Receive payments from applicable countries</label>
1654
  <frontend_type>allowspecific</frontend_type>
1655
  <sort_order>13</sort_order>
1656
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1659
  <show_in_store>1</show_in_store>
1660
  </allowspecific>
1661
  <specificcountry translate="label">
1662
+ <label>Receive payments from specific countries</label>
1663
  <frontend_type>multiselect</frontend_type>
1664
  <sort_order>14</sort_order>
1665
  <source_model>adminhtml/system_config_source_country</source_model>
1691
  <show_in_website>1</show_in_website>
1692
  <show_in_store>5</show_in_store>
1693
  </max_order_total>
1694
+ <fee translate="label">
1695
+ <label>Enable fee (inc. Tax)</label>
1696
+ <frontend_type>select</frontend_type>
1697
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1698
+ <sort_order>70</sort_order>
1699
+ <show_in_default>1</show_in_default>
1700
+ <show_in_website>1</show_in_website>
1701
+ <show_in_store>1</show_in_store>
1702
+ </fee>
1703
+ <fee_amount translate="label">
1704
+ <label>Payment fee amount</label>
1705
+ <frontend_type>text</frontend_type>
1706
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1707
+ <sort_order>80</sort_order>
1708
+ <show_in_default>1</show_in_default>
1709
+ <show_in_website>1</show_in_website>
1710
+ <show_in_store>1</show_in_store>
1711
+ </fee_amount>
1712
+ <fee_tax_class>
1713
+ <label>Tax class for payment fee</label>
1714
+ <comment>Select which tax class should be used for the payment fee</comment>
1715
+ <frontend_type>select</frontend_type>
1716
+ <source_model>msp/config_sources_taxClasses</source_model>
1717
+ <sort_order>90</sort_order>
1718
+ <show_in_default>1</show_in_default>
1719
+ <show_in_website>1</show_in_website>
1720
+ <show_in_store>1</show_in_store>
1721
+ </fee_tax_class>
1722
+ <fee_incexc translate="label">
1723
+ <label>Show payment fee incl. tax during checkout</label>
1724
+ <frontend_type>select</frontend_type>
1725
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1726
+ <sort_order>81</sort_order>
1727
+ <show_in_default>1</show_in_default>
1728
+ <show_in_website>1</show_in_website>
1729
+ <show_in_store>1</show_in_store>
1730
+ </fee_incexc>
1731
+ <fee_description translate="label">
1732
+ <label>Payment fee description, visible in order totals</label>
1733
+ <frontend_type>text</frontend_type>
1734
+ <sort_order>100</sort_order>
1735
+ <show_in_default>1</show_in_default>
1736
+ <show_in_website>1</show_in_website>
1737
+ <show_in_store>1</show_in_store>
1738
+ </fee_description>
1739
  </fields>
1740
  </msp_maestro>
1741
  <msp_paypal translate="label" module="msp">
1772
  <show_in_store>1</show_in_store>
1773
  </allowed_currency>
1774
  <allowspecific translate="label">
1775
+ <label>Receive payments from applicable countries</label>
1776
  <frontend_type>allowspecific</frontend_type>
1777
  <sort_order>13</sort_order>
1778
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1781
  <show_in_store>1</show_in_store>
1782
  </allowspecific>
1783
  <specificcountry translate="label">
1784
+ <label>Receive payments from specific countries</label>
1785
  <frontend_type>multiselect</frontend_type>
1786
  <sort_order>14</sort_order>
1787
  <source_model>adminhtml/system_config_source_country</source_model>
1813
  <show_in_website>1</show_in_website>
1814
  <show_in_store>5</show_in_store>
1815
  </max_order_total>
1816
+ <fee translate="label">
1817
+ <label>Enable fee (inc. Tax)</label>
1818
+ <frontend_type>select</frontend_type>
1819
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1820
+ <sort_order>70</sort_order>
1821
+ <show_in_default>1</show_in_default>
1822
+ <show_in_website>1</show_in_website>
1823
+ <show_in_store>1</show_in_store>
1824
+ </fee>
1825
+ <fee_amount translate="label">
1826
+ <label>Payment fee amount</label>
1827
+ <frontend_type>text</frontend_type>
1828
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1829
+ <sort_order>80</sort_order>
1830
+ <show_in_default>1</show_in_default>
1831
+ <show_in_website>1</show_in_website>
1832
+ <show_in_store>1</show_in_store>
1833
+ </fee_amount>
1834
+ <fee_tax_class>
1835
+ <label>Tax class for payment fee</label>
1836
+ <comment>Select which tax class should be used for the payment fee</comment>
1837
+ <frontend_type>select</frontend_type>
1838
+ <source_model>msp/config_sources_taxClasses</source_model>
1839
+ <sort_order>90</sort_order>
1840
+ <show_in_default>1</show_in_default>
1841
+ <show_in_website>1</show_in_website>
1842
+ <show_in_store>1</show_in_store>
1843
+ </fee_tax_class>
1844
+ <fee_incexc translate="label">
1845
+ <label>Show payment fee incl. tax during checkout</label>
1846
+ <frontend_type>select</frontend_type>
1847
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1848
+ <sort_order>81</sort_order>
1849
+ <show_in_default>1</show_in_default>
1850
+ <show_in_website>1</show_in_website>
1851
+ <show_in_store>1</show_in_store>
1852
+ </fee_incexc>
1853
+ <fee_description translate="label">
1854
+ <label>Payment fee description, visible in order totals</label>
1855
+ <frontend_type>text</frontend_type>
1856
+ <sort_order>100</sort_order>
1857
+ <show_in_default>1</show_in_default>
1858
+ <show_in_website>1</show_in_website>
1859
+ <show_in_store>1</show_in_store>
1860
+ </fee_description>
1861
  </fields>
1862
  </msp_paypal>
1863
  <msp_webgift translate="label" module="msp">
1895
  <show_in_store>1</show_in_store>
1896
  </allowed_currency>
1897
  <allowspecific translate="label">
1898
+ <label>Receive payments from applicable countries</label>
1899
  <frontend_type>allowspecific</frontend_type>
1900
  <sort_order>13</sort_order>
1901
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
1904
  <show_in_store>1</show_in_store>
1905
  </allowspecific>
1906
  <specificcountry translate="label">
1907
+ <label>Receive payments from specific countries</label>
1908
  <frontend_type>multiselect</frontend_type>
1909
  <sort_order>14</sort_order>
1910
  <source_model>adminhtml/system_config_source_country</source_model>
1928
  <show_in_website>1</show_in_website>
1929
  <show_in_store>1</show_in_store>
1930
  </instructions>
1931
+ <fee translate="label">
1932
+ <label>Enable fee (inc. Tax)</label>
1933
+ <frontend_type>select</frontend_type>
1934
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1935
+ <sort_order>70</sort_order>
1936
+ <show_in_default>1</show_in_default>
1937
+ <show_in_website>1</show_in_website>
1938
+ <show_in_store>1</show_in_store>
1939
+ </fee>
1940
+ <fee_amount translate="label">
1941
+ <label>Payment fee amount</label>
1942
+ <frontend_type>text</frontend_type>
1943
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
1944
+ <sort_order>80</sort_order>
1945
+ <show_in_default>1</show_in_default>
1946
+ <show_in_website>1</show_in_website>
1947
+ <show_in_store>1</show_in_store>
1948
+ </fee_amount>
1949
+ <fee_tax_class>
1950
+ <label>Tax class for payment fee</label>
1951
+ <comment>Select which tax class should be used for the payment fee</comment>
1952
+ <frontend_type>select</frontend_type>
1953
+ <source_model>msp/config_sources_taxClasses</source_model>
1954
+ <sort_order>90</sort_order>
1955
+ <show_in_default>1</show_in_default>
1956
+ <show_in_website>1</show_in_website>
1957
+ <show_in_store>1</show_in_store>
1958
+ </fee_tax_class>
1959
+ <fee_incexc translate="label">
1960
+ <label>Show payment fee incl. tax during checkout</label>
1961
+ <frontend_type>select</frontend_type>
1962
+ <source_model>adminhtml/system_config_source_yesno</source_model>
1963
+ <sort_order>81</sort_order>
1964
+ <show_in_default>1</show_in_default>
1965
+ <show_in_website>1</show_in_website>
1966
+ <show_in_store>1</show_in_store>
1967
+ </fee_incexc>
1968
+ <fee_description translate="label">
1969
+ <label>Payment fee description, visible in order totals</label>
1970
+ <frontend_type>text</frontend_type>
1971
+ <sort_order>100</sort_order>
1972
+ <show_in_default>1</show_in_default>
1973
+ <show_in_website>1</show_in_website>
1974
+ <show_in_store>1</show_in_store>
1975
+ </fee_description>
1976
  </fields>
1977
  </msp_webgift>
1978
  <msp_ebon translate="label" module="msp">
2010
  <show_in_store>1</show_in_store>
2011
  </allowed_currency>
2012
  <allowspecific translate="label">
2013
+ <label>Receive payments from applicable countries</label>
2014
  <frontend_type>allowspecific</frontend_type>
2015
  <sort_order>13</sort_order>
2016
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2019
  <show_in_store>1</show_in_store>
2020
  </allowspecific>
2021
  <specificcountry translate="label">
2022
+ <label>Receive payments from specific countries</label>
2023
  <frontend_type>multiselect</frontend_type>
2024
  <sort_order>14</sort_order>
2025
  <source_model>adminhtml/system_config_source_country</source_model>
2043
  <show_in_website>1</show_in_website>
2044
  <show_in_store>1</show_in_store>
2045
  </instructions>
2046
+ <fee translate="label">
2047
+ <label>Enable fee (inc. Tax)</label>
2048
+ <frontend_type>select</frontend_type>
2049
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2050
+ <sort_order>70</sort_order>
2051
+ <show_in_default>1</show_in_default>
2052
+ <show_in_website>1</show_in_website>
2053
+ <show_in_store>1</show_in_store>
2054
+ </fee>
2055
+ <fee_amount translate="label">
2056
+ <label>Payment fee amount</label>
2057
+ <frontend_type>text</frontend_type>
2058
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2059
+ <sort_order>80</sort_order>
2060
+ <show_in_default>1</show_in_default>
2061
+ <show_in_website>1</show_in_website>
2062
+ <show_in_store>1</show_in_store>
2063
+ </fee_amount>
2064
+ <fee_tax_class>
2065
+ <label>Tax class for payment fee</label>
2066
+ <comment>Select which tax class should be used for the payment fee</comment>
2067
+ <frontend_type>select</frontend_type>
2068
+ <source_model>msp/config_sources_taxClasses</source_model>
2069
+ <sort_order>90</sort_order>
2070
+ <show_in_default>1</show_in_default>
2071
+ <show_in_website>1</show_in_website>
2072
+ <show_in_store>1</show_in_store>
2073
+ </fee_tax_class>
2074
+ <fee_incexc translate="label">
2075
+ <label>Show payment fee incl. tax during checkout</label>
2076
+ <frontend_type>select</frontend_type>
2077
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2078
+ <sort_order>81</sort_order>
2079
+ <show_in_default>1</show_in_default>
2080
+ <show_in_website>1</show_in_website>
2081
+ <show_in_store>1</show_in_store>
2082
+ </fee_incexc>
2083
+ <fee_description translate="label">
2084
+ <label>Payment fee description, visible in order totals</label>
2085
+ <frontend_type>text</frontend_type>
2086
+ <sort_order>100</sort_order>
2087
+ <show_in_default>1</show_in_default>
2088
+ <show_in_website>1</show_in_website>
2089
+ <show_in_store>1</show_in_store>
2090
+ </fee_description>
2091
  </fields>
2092
  </msp_ebon>
2093
  <msp_lief translate="label" module="msp">
2125
  <show_in_store>1</show_in_store>
2126
  </allowed_currency>
2127
  <allowspecific translate="label">
2128
+ <label>Receive payments from applicable countries</label>
2129
  <frontend_type>allowspecific</frontend_type>
2130
  <sort_order>13</sort_order>
2131
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2134
  <show_in_store>1</show_in_store>
2135
  </allowspecific>
2136
  <specificcountry translate="label">
2137
+ <label>Receive payments from specific countries</label>
2138
  <frontend_type>multiselect</frontend_type>
2139
  <sort_order>14</sort_order>
2140
  <source_model>adminhtml/system_config_source_country</source_model>
2158
  <show_in_website>1</show_in_website>
2159
  <show_in_store>1</show_in_store>
2160
  </instructions>
2161
+ <fee translate="label">
2162
+ <label>Enable fee (inc. Tax)</label>
 
 
 
 
 
 
 
 
 
2163
  <frontend_type>select</frontend_type>
2164
  <source_model>adminhtml/system_config_source_yesno</source_model>
2165
+ <sort_order>70</sort_order>
2166
  <show_in_default>1</show_in_default>
2167
  <show_in_website>1</show_in_website>
2168
  <show_in_store>1</show_in_store>
2169
+ </fee>
2170
+ <fee_amount translate="label">
2171
+ <label>Payment fee amount</label>
2172
  <frontend_type>text</frontend_type>
2173
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2174
+ <sort_order>80</sort_order>
2175
+ <show_in_default>1</show_in_default>
2176
+ <show_in_website>1</show_in_website>
2177
+ <show_in_store>1</show_in_store>
2178
+ </fee_amount>
2179
+ <fee_tax_class>
2180
+ <label>Tax class for payment fee</label>
2181
+ <comment>Select which tax class should be used for the payment fee</comment>
2182
+ <frontend_type>select</frontend_type>
2183
+ <source_model>msp/config_sources_taxClasses</source_model>
2184
+ <sort_order>90</sort_order>
2185
+ <show_in_default>1</show_in_default>
2186
+ <show_in_website>1</show_in_website>
2187
+ <show_in_store>1</show_in_store>
2188
+ </fee_tax_class>
2189
+ <fee_incexc translate="label">
2190
+ <label>Show payment fee incl. tax during checkout</label>
2191
+ <frontend_type>select</frontend_type>
2192
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2193
+ <sort_order>81</sort_order>
2194
+ <show_in_default>1</show_in_default>
2195
+ <show_in_website>1</show_in_website>
2196
+ <show_in_store>1</show_in_store>
2197
+ </fee_incexc>
2198
+ <fee_description translate="label">
2199
+ <label>Payment fee description, visible in order totals</label>
2200
+ <frontend_type>text</frontend_type>
2201
+ <sort_order>100</sort_order>
2202
+ <show_in_default>1</show_in_default>
2203
+ <show_in_website>1</show_in_website>
2204
+ <show_in_store>1</show_in_store>
2205
+ </fee_description>
2206
+ </fields>
2207
+ </msp_lief>
2208
+ <msp_babygiftcard translate="label" module="msp">
2209
+ <label>Baby giftcard</label>
2210
+ <sort_order>739</sort_order>
2211
+ <show_in_default>1</show_in_default>
2212
+ <show_in_website>1</show_in_website>
2213
+ <show_in_store>1</show_in_store>
2214
+ <fields>
2215
+ <active translate="label">
2216
+ <label>Enabled</label>
2217
+ <frontend_type>select</frontend_type>
2218
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2219
+ <sort_order>1</sort_order>
2220
+ <show_in_default>1</show_in_default>
2221
+ <show_in_website>1</show_in_website>
2222
+ <show_in_store>1</show_in_store>
2223
+ </active>
2224
+ <title translate="label">
2225
+ <label>Title</label>
2226
+ <frontend_type>text</frontend_type>
2227
+ <sort_order>2</sort_order>
2228
  <show_in_default>1</show_in_default>
2229
  <show_in_website>1</show_in_website>
2230
  <show_in_store>1</show_in_store>
2240
  <show_in_store>1</show_in_store>
2241
  </allowed_currency>
2242
  <allowspecific translate="label">
2243
+ <label>Receive payments from applicable countries</label>
2244
  <frontend_type>allowspecific</frontend_type>
2245
  <sort_order>13</sort_order>
2246
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2249
  <show_in_store>1</show_in_store>
2250
  </allowspecific>
2251
  <specificcountry translate="label">
2252
+ <label>Receive payments from specific countries</label>
2253
  <frontend_type>multiselect</frontend_type>
2254
  <sort_order>14</sort_order>
2255
  <source_model>adminhtml/system_config_source_country</source_model>
2273
  <show_in_website>1</show_in_website>
2274
  <show_in_store>1</show_in_store>
2275
  </instructions>
2276
+ <fee translate="label">
2277
+ <label>Enable fee (inc. Tax)</label>
2278
+ <frontend_type>select</frontend_type>
2279
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2280
+ <sort_order>70</sort_order>
2281
+ <show_in_default>1</show_in_default>
2282
+ <show_in_website>1</show_in_website>
2283
+ <show_in_store>1</show_in_store>
2284
+ </fee>
2285
+ <fee_amount translate="label">
2286
+ <label>Payment fee amount</label>
2287
+ <frontend_type>text</frontend_type>
2288
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2289
+ <sort_order>80</sort_order>
2290
+ <show_in_default>1</show_in_default>
2291
+ <show_in_website>1</show_in_website>
2292
+ <show_in_store>1</show_in_store>
2293
+ </fee_amount>
2294
+ <fee_tax_class>
2295
+ <label>Tax class for payment fee</label>
2296
+ <comment>Select which tax class should be used for the payment fee</comment>
2297
+ <frontend_type>select</frontend_type>
2298
+ <source_model>msp/config_sources_taxClasses</source_model>
2299
+ <sort_order>90</sort_order>
2300
+ <show_in_default>1</show_in_default>
2301
+ <show_in_website>1</show_in_website>
2302
+ <show_in_store>1</show_in_store>
2303
+ </fee_tax_class>
2304
+ <fee_incexc translate="label">
2305
+ <label>Show payment fee incl. tax during checkout</label>
2306
+ <frontend_type>select</frontend_type>
2307
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2308
+ <sort_order>81</sort_order>
2309
+ <show_in_default>1</show_in_default>
2310
+ <show_in_website>1</show_in_website>
2311
+ <show_in_store>1</show_in_store>
2312
+ </fee_incexc>
2313
+ <fee_description translate="label">
2314
+ <label>Payment fee description, visible in order totals</label>
2315
+ <frontend_type>text</frontend_type>
2316
+ <sort_order>100</sort_order>
2317
+ <show_in_default>1</show_in_default>
2318
+ <show_in_website>1</show_in_website>
2319
+ <show_in_store>1</show_in_store>
2320
+ </fee_description>
2321
  </fields>
2322
  </msp_babygiftcard>
2323
+ <msp_gezondheidsbon translate="label" module="msp">
2324
+ <label>Gezondheidsbon</label>
2325
+ <sort_order>739</sort_order>
2326
+ <show_in_default>1</show_in_default>
2327
+ <show_in_website>1</show_in_website>
2328
+ <show_in_store>1</show_in_store>
2329
+ <fields>
2330
+ <active translate="label">
2331
+ <label>Enabled</label>
2332
+ <frontend_type>select</frontend_type>
2333
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2334
+ <sort_order>1</sort_order>
2335
+ <show_in_default>1</show_in_default>
2336
+ <show_in_website>1</show_in_website>
2337
+ <show_in_store>1</show_in_store>
2338
+ </active>
2339
+ <title translate="label">
2340
+ <label>Title</label>
2341
+ <frontend_type>text</frontend_type>
2342
+ <sort_order>2</sort_order>
2343
+ <show_in_default>1</show_in_default>
2344
+ <show_in_website>1</show_in_website>
2345
+ <show_in_store>1</show_in_store>
2346
+ </title>
2347
+ <allowed_currency translate="label comment">
2348
+ <label>Allowed Currency</label>
2349
+ <frontend_type>multiselect</frontend_type>
2350
+ <source_model>msp/config_sources_order_currency</source_model>
2351
+ <!--<source_model>msp/config_sources_order_email</source_model>-->
2352
+ <sort_order>3</sort_order>
2353
+ <show_in_default>1</show_in_default>
2354
+ <show_in_website>1</show_in_website>
2355
+ <show_in_store>1</show_in_store>
2356
+ </allowed_currency>
2357
+ <allowspecific translate="label">
2358
+ <label>Receive payments from applicable countries</label>
2359
+ <frontend_type>allowspecific</frontend_type>
2360
+ <sort_order>13</sort_order>
2361
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2362
+ <show_in_default>1</show_in_default>
2363
+ <show_in_website>1</show_in_website>
2364
+ <show_in_store>1</show_in_store>
2365
+ </allowspecific>
2366
+ <specificcountry translate="label">
2367
+ <label>Receive payments from specific countries</label>
2368
+ <frontend_type>multiselect</frontend_type>
2369
+ <sort_order>14</sort_order>
2370
+ <source_model>adminhtml/system_config_source_country</source_model>
2371
+ <show_in_default>1</show_in_default>
2372
+ <show_in_website>1</show_in_website>
2373
+ <show_in_store>1</show_in_store>
2374
+ </specificcountry>
2375
+ <sort_order translate="label">
2376
+ <label>Sort order</label>
2377
+ <frontend_type>text</frontend_type>
2378
+ <sort_order>100</sort_order>
2379
+ <show_in_default>1</show_in_default>
2380
+ <show_in_website>1</show_in_website>
2381
+ <show_in_store>1</show_in_store>
2382
+ </sort_order>
2383
+ <instructions translate="label">
2384
+ <label>Instructions</label>
2385
+ <frontend_type>textarea</frontend_type>
2386
+ <sort_order>62</sort_order>
2387
+ <show_in_default>1</show_in_default>
2388
+ <show_in_website>1</show_in_website>
2389
+ <show_in_store>1</show_in_store>
2390
+ </instructions>
2391
+ <fee translate="label">
2392
+ <label>Enable fee (inc. Tax)</label>
2393
+ <frontend_type>select</frontend_type>
2394
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2395
+ <sort_order>70</sort_order>
2396
+ <show_in_default>1</show_in_default>
2397
+ <show_in_website>1</show_in_website>
2398
+ <show_in_store>1</show_in_store>
2399
+ </fee>
2400
+ <fee_amount translate="label">
2401
+ <label>Payment fee amount</label>
2402
+ <frontend_type>text</frontend_type>
2403
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2404
+ <sort_order>80</sort_order>
2405
+ <show_in_default>1</show_in_default>
2406
+ <show_in_website>1</show_in_website>
2407
+ <show_in_store>1</show_in_store>
2408
+ </fee_amount>
2409
+ <fee_tax_class>
2410
+ <label>Tax class for payment fee</label>
2411
+ <comment>Select which tax class should be used for the payment fee</comment>
2412
+ <frontend_type>select</frontend_type>
2413
+ <source_model>msp/config_sources_taxClasses</source_model>
2414
+ <sort_order>90</sort_order>
2415
+ <show_in_default>1</show_in_default>
2416
+ <show_in_website>1</show_in_website>
2417
+ <show_in_store>1</show_in_store>
2418
+ </fee_tax_class>
2419
+ <fee_incexc translate="label">
2420
+ <label>Show payment fee incl. tax during checkout</label>
2421
+ <frontend_type>select</frontend_type>
2422
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2423
+ <sort_order>81</sort_order>
2424
+ <show_in_default>1</show_in_default>
2425
+ <show_in_website>1</show_in_website>
2426
+ <show_in_store>1</show_in_store>
2427
+ </fee_incexc>
2428
+ <fee_description translate="label">
2429
+ <label>Payment fee description, visible in order totals</label>
2430
+ <frontend_type>text</frontend_type>
2431
+ <sort_order>100</sort_order>
2432
+ <show_in_default>1</show_in_default>
2433
+ <show_in_website>1</show_in_website>
2434
+ <show_in_store>1</show_in_store>
2435
+ </fee_description>
2436
+ </fields>
2437
+ </msp_gezondheidsbon>
2438
  <msp_boekenbon translate="label" module="msp">
2439
  <label>Boekenbon</label>
2440
  <sort_order>740</sort_order>
2470
  <show_in_store>1</show_in_store>
2471
  </allowed_currency>
2472
  <allowspecific translate="label">
2473
+ <label>Receive payments from applicable countries</label>
2474
  <frontend_type>allowspecific</frontend_type>
2475
  <sort_order>13</sort_order>
2476
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2479
  <show_in_store>1</show_in_store>
2480
  </allowspecific>
2481
  <specificcountry translate="label">
2482
+ <label>Receive payments from specific countries</label>
2483
  <frontend_type>multiselect</frontend_type>
2484
  <sort_order>14</sort_order>
2485
  <source_model>adminhtml/system_config_source_country</source_model>
2503
  <show_in_website>1</show_in_website>
2504
  <show_in_store>1</show_in_store>
2505
  </instructions>
2506
+ <fee translate="label">
2507
+ <label>Enable fee (inc. Tax)</label>
2508
+ <frontend_type>select</frontend_type>
2509
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2510
+ <sort_order>70</sort_order>
2511
+ <show_in_default>1</show_in_default>
2512
+ <show_in_website>1</show_in_website>
2513
+ <show_in_store>1</show_in_store>
2514
+ </fee>
2515
+ <fee_amount translate="label">
2516
+ <label>Payment fee amount</label>
2517
+ <frontend_type>text</frontend_type>
2518
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2519
+ <sort_order>80</sort_order>
2520
+ <show_in_default>1</show_in_default>
2521
+ <show_in_website>1</show_in_website>
2522
+ <show_in_store>1</show_in_store>
2523
+ </fee_amount>
2524
+ <fee_tax_class>
2525
+ <label>Tax class for payment fee</label>
2526
+ <comment>Select which tax class should be used for the payment fee</comment>
2527
+ <frontend_type>select</frontend_type>
2528
+ <source_model>msp/config_sources_taxClasses</source_model>
2529
+ <sort_order>90</sort_order>
2530
+ <show_in_default>1</show_in_default>
2531
+ <show_in_website>1</show_in_website>
2532
+ <show_in_store>1</show_in_store>
2533
+ </fee_tax_class>
2534
+ <fee_incexc translate="label">
2535
+ <label>Show payment fee incl. tax during checkout</label>
2536
+ <frontend_type>select</frontend_type>
2537
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2538
+ <sort_order>81</sort_order>
2539
+ <show_in_default>1</show_in_default>
2540
+ <show_in_website>1</show_in_website>
2541
+ <show_in_store>1</show_in_store>
2542
+ </fee_incexc>
2543
+ <fee_description translate="label">
2544
+ <label>Payment fee description, visible in order totals</label>
2545
+ <frontend_type>text</frontend_type>
2546
+ <sort_order>100</sort_order>
2547
+ <show_in_default>1</show_in_default>
2548
+ <show_in_website>1</show_in_website>
2549
+ <show_in_store>1</show_in_store>
2550
+ </fee_description>
2551
  </fields>
2552
  </msp_boekenbon>
2553
  <msp_erotiekbon translate="label" module="msp">
2585
  <show_in_store>1</show_in_store>
2586
  </allowed_currency>
2587
  <allowspecific translate="label">
2588
+ <label>Receive payments from applicable countries</label>
2589
  <frontend_type>allowspecific</frontend_type>
2590
  <sort_order>13</sort_order>
2591
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2594
  <show_in_store>1</show_in_store>
2595
  </allowspecific>
2596
  <specificcountry translate="label">
2597
+ <label>Receive payments from specific countries</label>
2598
  <frontend_type>multiselect</frontend_type>
2599
  <sort_order>14</sort_order>
2600
  <source_model>adminhtml/system_config_source_country</source_model>
2618
  <show_in_website>1</show_in_website>
2619
  <show_in_store>1</show_in_store>
2620
  </instructions>
2621
+ <fee translate="label">
2622
+ <label>Enable fee (inc. Tax)</label>
2623
+ <frontend_type>select</frontend_type>
2624
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2625
+ <sort_order>70</sort_order>
2626
+ <show_in_default>1</show_in_default>
2627
+ <show_in_website>1</show_in_website>
2628
+ <show_in_store>1</show_in_store>
2629
+ </fee>
2630
+ <fee_amount translate="label">
2631
+ <label>Payment fee amount</label>
2632
+ <frontend_type>text</frontend_type>
2633
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2634
+ <sort_order>80</sort_order>
2635
+ <show_in_default>1</show_in_default>
2636
+ <show_in_website>1</show_in_website>
2637
+ <show_in_store>1</show_in_store>
2638
+ </fee_amount>
2639
+ <fee_tax_class>
2640
+ <label>Tax class for payment fee</label>
2641
+ <comment>Select which tax class should be used for the payment fee</comment>
2642
+ <frontend_type>select</frontend_type>
2643
+ <source_model>msp/config_sources_taxClasses</source_model>
2644
+ <sort_order>90</sort_order>
2645
+ <show_in_default>1</show_in_default>
2646
+ <show_in_website>1</show_in_website>
2647
+ <show_in_store>1</show_in_store>
2648
+ </fee_tax_class>
2649
+ <fee_incexc translate="label">
2650
+ <label>Show payment fee incl. tax during checkout</label>
2651
+ <frontend_type>select</frontend_type>
2652
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2653
+ <sort_order>81</sort_order>
2654
+ <show_in_default>1</show_in_default>
2655
+ <show_in_website>1</show_in_website>
2656
+ <show_in_store>1</show_in_store>
2657
+ </fee_incexc>
2658
+ <fee_description translate="label">
2659
+ <label>Payment fee description, visible in order totals</label>
2660
+ <frontend_type>text</frontend_type>
2661
+ <sort_order>100</sort_order>
2662
+ <show_in_default>1</show_in_default>
2663
+ <show_in_website>1</show_in_website>
2664
+ <show_in_store>1</show_in_store>
2665
+ </fee_description>
2666
  </fields>
2667
  </msp_erotiekbon>
2668
  <msp_parfumnl translate="label" module="msp">
2700
  <show_in_store>1</show_in_store>
2701
  </allowed_currency>
2702
  <allowspecific translate="label">
2703
+ <label>Receive payments from applicable countries</label>
2704
  <frontend_type>allowspecific</frontend_type>
2705
  <sort_order>13</sort_order>
2706
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2709
  <show_in_store>1</show_in_store>
2710
  </allowspecific>
2711
  <specificcountry translate="label">
2712
+ <label>Receive payments from specific countries</label>
2713
  <frontend_type>multiselect</frontend_type>
2714
  <sort_order>14</sort_order>
2715
  <source_model>adminhtml/system_config_source_country</source_model>
2733
  <show_in_website>1</show_in_website>
2734
  <show_in_store>1</show_in_store>
2735
  </instructions>
2736
+ <fee translate="label">
2737
+ <label>Enable fee (inc. Tax)</label>
2738
+ <frontend_type>select</frontend_type>
2739
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2740
+ <sort_order>70</sort_order>
2741
+ <show_in_default>1</show_in_default>
2742
+ <show_in_website>1</show_in_website>
2743
+ <show_in_store>1</show_in_store>
2744
+ </fee>
2745
+ <fee_amount translate="label">
2746
+ <label>Payment fee amount</label>
2747
+ <frontend_type>text</frontend_type>
2748
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2749
+ <sort_order>80</sort_order>
2750
+ <show_in_default>1</show_in_default>
2751
+ <show_in_website>1</show_in_website>
2752
+ <show_in_store>1</show_in_store>
2753
+ </fee_amount>
2754
+ <fee_tax_class>
2755
+ <label>Tax class for payment fee</label>
2756
+ <comment>Select which tax class should be used for the payment fee</comment>
2757
+ <frontend_type>select</frontend_type>
2758
+ <source_model>msp/config_sources_taxClasses</source_model>
2759
+ <sort_order>90</sort_order>
2760
+ <show_in_default>1</show_in_default>
2761
+ <show_in_website>1</show_in_website>
2762
+ <show_in_store>1</show_in_store>
2763
+ </fee_tax_class>
2764
+ <fee_incexc translate="label">
2765
+ <label>Show payment fee incl. tax during checkout</label>
2766
+ <frontend_type>select</frontend_type>
2767
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2768
+ <sort_order>81</sort_order>
2769
+ <show_in_default>1</show_in_default>
2770
+ <show_in_website>1</show_in_website>
2771
+ <show_in_store>1</show_in_store>
2772
+ </fee_incexc>
2773
+ <fee_description translate="label">
2774
+ <label>Payment fee description, visible in order totals</label>
2775
+ <frontend_type>text</frontend_type>
2776
+ <sort_order>100</sort_order>
2777
+ <show_in_default>1</show_in_default>
2778
+ <show_in_website>1</show_in_website>
2779
+ <show_in_store>1</show_in_store>
2780
+ </fee_description>
2781
  </fields>
2782
  </msp_parfumnl>
2783
  <msp_parfumcadeaukaart translate="label" module="msp">
2815
  <show_in_store>1</show_in_store>
2816
  </allowed_currency>
2817
  <allowspecific translate="label">
2818
+ <label>Receive payments from applicable countries</label>
2819
  <frontend_type>allowspecific</frontend_type>
2820
  <sort_order>13</sort_order>
2821
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2824
  <show_in_store>1</show_in_store>
2825
  </allowspecific>
2826
  <specificcountry translate="label">
2827
+ <label>Receive payments from specific countries</label>
2828
  <frontend_type>multiselect</frontend_type>
2829
  <sort_order>14</sort_order>
2830
  <source_model>adminhtml/system_config_source_country</source_model>
2831
  <show_in_default>1</show_in_default>
2832
  <show_in_website>1</show_in_website>
2833
  <show_in_store>1</show_in_store>
2834
+ </specificcountry>
2835
+ <sort_order translate="label">
2836
+ <label>Sort order</label>
2837
+ <frontend_type>text</frontend_type>
2838
+ <sort_order>100</sort_order>
2839
+ <show_in_default>1</show_in_default>
2840
+ <show_in_website>1</show_in_website>
2841
+ <show_in_store>1</show_in_store>
2842
+ </sort_order>
2843
+ <instructions translate="label">
2844
+ <label>Instructions</label>
2845
+ <frontend_type>textarea</frontend_type>
2846
+ <sort_order>62</sort_order>
2847
+ <show_in_default>1</show_in_default>
2848
+ <show_in_website>1</show_in_website>
2849
+ <show_in_store>1</show_in_store>
2850
+ </instructions>
2851
+ <fee translate="label">
2852
+ <label>Enable fee (inc. Tax)</label>
2853
+ <frontend_type>select</frontend_type>
2854
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2855
+ <sort_order>70</sort_order>
2856
+ <show_in_default>1</show_in_default>
2857
+ <show_in_website>1</show_in_website>
2858
+ <show_in_store>1</show_in_store>
2859
+ </fee>
2860
+ <fee_amount translate="label">
2861
+ <label>Payment fee amount</label>
2862
+ <frontend_type>text</frontend_type>
2863
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2864
+ <sort_order>80</sort_order>
2865
+ <show_in_default>1</show_in_default>
2866
+ <show_in_website>1</show_in_website>
2867
+ <show_in_store>1</show_in_store>
2868
+ </fee_amount>
2869
+ <fee_tax_class>
2870
+ <label>Tax class for payment fee</label>
2871
+ <comment>Select which tax class should be used for the payment fee</comment>
2872
+ <frontend_type>select</frontend_type>
2873
+ <source_model>msp/config_sources_taxClasses</source_model>
2874
+ <sort_order>90</sort_order>
2875
  <show_in_default>1</show_in_default>
2876
  <show_in_website>1</show_in_website>
2877
  <show_in_store>1</show_in_store>
2878
+ </fee_tax_class>
2879
+ <fee_incexc translate="label">
2880
+ <label>Show payment fee incl. tax during checkout</label>
2881
+ <frontend_type>select</frontend_type>
2882
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2883
+ <sort_order>81</sort_order>
2884
+ <show_in_default>1</show_in_default>
2885
+ <show_in_website>1</show_in_website>
2886
+ <show_in_store>1</show_in_store>
2887
+ </fee_incexc>
2888
+ <fee_description translate="label">
2889
+ <label>Payment fee description, visible in order totals</label>
2890
+ <frontend_type>text</frontend_type>
2891
+ <sort_order>100</sort_order>
2892
  <show_in_default>1</show_in_default>
2893
  <show_in_website>1</show_in_website>
2894
  <show_in_store>1</show_in_store>
2895
+ </fee_description>
2896
  </fields>
2897
  </msp_parfumcadeaukaart>
2898
  <msp_fashioncheque translate="label" module="msp">
2930
  <show_in_store>1</show_in_store>
2931
  </allowed_currency>
2932
  <allowspecific translate="label">
2933
+ <label>Receive payments from applicable countries</label>
2934
  <frontend_type>allowspecific</frontend_type>
2935
  <sort_order>13</sort_order>
2936
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
2939
  <show_in_store>1</show_in_store>
2940
  </allowspecific>
2941
  <specificcountry translate="label">
2942
+ <label>Receive payments from specific countries</label>
2943
  <frontend_type>multiselect</frontend_type>
2944
  <sort_order>14</sort_order>
2945
  <source_model>adminhtml/system_config_source_country</source_model>
2963
  <show_in_website>1</show_in_website>
2964
  <show_in_store>1</show_in_store>
2965
  </instructions>
2966
+ <fee translate="label">
2967
+ <label>Enable fee (inc. Tax)</label>
2968
+ <frontend_type>select</frontend_type>
2969
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2970
+ <sort_order>70</sort_order>
2971
+ <show_in_default>1</show_in_default>
2972
+ <show_in_website>1</show_in_website>
2973
+ <show_in_store>1</show_in_store>
2974
+ </fee>
2975
+ <fee_amount translate="label">
2976
+ <label>Payment fee amount</label>
2977
+ <frontend_type>text</frontend_type>
2978
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
2979
+ <sort_order>80</sort_order>
2980
+ <show_in_default>1</show_in_default>
2981
+ <show_in_website>1</show_in_website>
2982
+ <show_in_store>1</show_in_store>
2983
+ </fee_amount>
2984
+ <fee_tax_class>
2985
+ <label>Tax class for payment fee</label>
2986
+ <comment>Select which tax class should be used for the payment fee</comment>
2987
+ <frontend_type>select</frontend_type>
2988
+ <source_model>msp/config_sources_taxClasses</source_model>
2989
+ <sort_order>90</sort_order>
2990
+ <show_in_default>1</show_in_default>
2991
+ <show_in_website>1</show_in_website>
2992
+ <show_in_store>1</show_in_store>
2993
+ </fee_tax_class>
2994
+ <fee_incexc translate="label">
2995
+ <label>Show payment fee incl. tax during checkout</label>
2996
+ <frontend_type>select</frontend_type>
2997
+ <source_model>adminhtml/system_config_source_yesno</source_model>
2998
+ <sort_order>81</sort_order>
2999
+ <show_in_default>1</show_in_default>
3000
+ <show_in_website>1</show_in_website>
3001
+ <show_in_store>1</show_in_store>
3002
+ </fee_incexc>
3003
+ <fee_description translate="label">
3004
+ <label>Payment fee description, visible in order totals</label>
3005
+ <frontend_type>text</frontend_type>
3006
+ <sort_order>100</sort_order>
3007
+ <show_in_default>1</show_in_default>
3008
+ <show_in_website>1</show_in_website>
3009
+ <show_in_store>1</show_in_store>
3010
+ </fee_description>
3011
  </fields>
3012
  </msp_fashioncheque>
3013
  <msp_degrotespeelgoedwinkel translate="label" module="msp">
3045
  <show_in_store>1</show_in_store>
3046
  </allowed_currency>
3047
  <allowspecific translate="label">
3048
+ <label>Receive payments from applicable countries</label>
3049
  <frontend_type>allowspecific</frontend_type>
3050
  <sort_order>13</sort_order>
3051
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3054
  <show_in_store>1</show_in_store>
3055
  </allowspecific>
3056
  <specificcountry translate="label">
3057
+ <label>Receive payments from specific countries</label>
3058
  <frontend_type>multiselect</frontend_type>
3059
  <sort_order>14</sort_order>
3060
  <source_model>adminhtml/system_config_source_country</source_model>
3078
  <show_in_website>1</show_in_website>
3079
  <show_in_store>1</show_in_store>
3080
  </instructions>
3081
+ <fee translate="label">
3082
+ <label>Enable fee (inc. Tax)</label>
3083
+ <frontend_type>select</frontend_type>
3084
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3085
+ <sort_order>70</sort_order>
3086
+ <show_in_default>1</show_in_default>
3087
+ <show_in_website>1</show_in_website>
3088
+ <show_in_store>1</show_in_store>
3089
+ </fee>
3090
+ <fee_amount translate="label">
3091
+ <label>Payment fee amount</label>
3092
+ <frontend_type>text</frontend_type>
3093
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
3094
+ <sort_order>80</sort_order>
3095
+ <show_in_default>1</show_in_default>
3096
+ <show_in_website>1</show_in_website>
3097
+ <show_in_store>1</show_in_store>
3098
+ </fee_amount>
3099
+ <fee_tax_class>
3100
+ <label>Tax class for payment fee</label>
3101
+ <comment>Select which tax class should be used for the payment fee</comment>
3102
+ <frontend_type>select</frontend_type>
3103
+ <source_model>msp/config_sources_taxClasses</source_model>
3104
+ <sort_order>90</sort_order>
3105
+ <show_in_default>1</show_in_default>
3106
+ <show_in_website>1</show_in_website>
3107
+ <show_in_store>1</show_in_store>
3108
+ </fee_tax_class>
3109
+ <fee_incexc translate="label">
3110
+ <label>Show payment fee incl. tax during checkout</label>
3111
+ <frontend_type>select</frontend_type>
3112
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3113
+ <sort_order>81</sort_order>
3114
+ <show_in_default>1</show_in_default>
3115
+ <show_in_website>1</show_in_website>
3116
+ <show_in_store>1</show_in_store>
3117
+ </fee_incexc>
3118
+ <fee_description translate="label">
3119
+ <label>Payment fee description, visible in order totals</label>
3120
+ <frontend_type>text</frontend_type>
3121
+ <sort_order>100</sort_order>
3122
+ <show_in_default>1</show_in_default>
3123
+ <show_in_website>1</show_in_website>
3124
+ <show_in_store>1</show_in_store>
3125
+ </fee_description>
3126
  </fields>
3127
  </msp_degrotespeelgoedwinkel>
3128
  <msp_giropay translate="label" module="msp">
3160
  <show_in_store>1</show_in_store>
3161
  </allowed_currency>
3162
  <allowspecific translate="label">
3163
+ <label>Receive payments from applicable countries</label>
3164
  <frontend_type>allowspecific</frontend_type>
3165
  <sort_order>13</sort_order>
3166
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3169
  <show_in_store>1</show_in_store>
3170
  </allowspecific>
3171
  <specificcountry translate="label">
3172
+ <label>Receive payments from specific countries</label>
3173
  <frontend_type>multiselect</frontend_type>
3174
  <sort_order>14</sort_order>
3175
  <source_model>adminhtml/system_config_source_country</source_model>
3201
  <show_in_website>1</show_in_website>
3202
  <show_in_store>5</show_in_store>
3203
  </max_order_total>
3204
+ <fee translate="label">
3205
+ <label>Enable fee (inc. Tax)</label>
3206
+ <frontend_type>select</frontend_type>
3207
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3208
+ <sort_order>70</sort_order>
3209
+ <show_in_default>1</show_in_default>
3210
+ <show_in_website>1</show_in_website>
3211
+ <show_in_store>1</show_in_store>
3212
+ </fee>
3213
+ <fee_amount translate="label">
3214
+ <label>Payment fee amount</label>
3215
+ <frontend_type>text</frontend_type>
3216
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
3217
+ <sort_order>80</sort_order>
3218
+ <show_in_default>1</show_in_default>
3219
+ <show_in_website>1</show_in_website>
3220
+ <show_in_store>1</show_in_store>
3221
+ </fee_amount>
3222
+ <fee_tax_class>
3223
+ <label>Tax class for payment fee</label>
3224
+ <comment>Select which tax class should be used for the payment fee</comment>
3225
+ <frontend_type>select</frontend_type>
3226
+ <source_model>msp/config_sources_taxClasses</source_model>
3227
+ <sort_order>90</sort_order>
3228
+ <show_in_default>1</show_in_default>
3229
+ <show_in_website>1</show_in_website>
3230
+ <show_in_store>1</show_in_store>
3231
+ </fee_tax_class>
3232
+ <fee_incexc translate="label">
3233
+ <label>Show payment fee incl. tax during checkout</label>
3234
+ <frontend_type>select</frontend_type>
3235
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3236
+ <sort_order>81</sort_order>
3237
+ <show_in_default>1</show_in_default>
3238
+ <show_in_website>1</show_in_website>
3239
+ <show_in_store>1</show_in_store>
3240
+ </fee_incexc>
3241
+ <fee_description translate="label">
3242
+ <label>Payment fee description, visible in order totals</label>
3243
+ <frontend_type>text</frontend_type>
3244
+ <sort_order>100</sort_order>
3245
+ <show_in_default>1</show_in_default>
3246
+ <show_in_website>1</show_in_website>
3247
+ <show_in_store>1</show_in_store>
3248
+ </fee_description>
3249
  </fields>
3250
  </msp_giropay>
3251
  <msp_multisafepay translate="label" module="msp">
3283
  <show_in_store>1</show_in_store>
3284
  </allowed_currency>
3285
  <allowspecific translate="label">
3286
+ <label>Receive payments from applicable countries</label>
3287
  <frontend_type>allowspecific</frontend_type>
3288
  <sort_order>13</sort_order>
3289
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3292
  <show_in_store>1</show_in_store>
3293
  </allowspecific>
3294
  <specificcountry translate="label">
3295
+ <label>Receive payments from specific countries</label>
3296
  <frontend_type>multiselect</frontend_type>
3297
  <sort_order>14</sort_order>
3298
  <source_model>adminhtml/system_config_source_country</source_model>
3316
  <show_in_website>1</show_in_website>
3317
  <show_in_store>1</show_in_store>
3318
  </instructions>
3319
+ <fee translate="label">
3320
+ <label>Enable fee (inc. Tax)</label>
3321
+ <frontend_type>select</frontend_type>
3322
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3323
+ <sort_order>70</sort_order>
3324
+ <show_in_default>1</show_in_default>
3325
+ <show_in_website>1</show_in_website>
3326
+ <show_in_store>1</show_in_store>
3327
+ </fee>
3328
+ <fee_amount translate="label">
3329
+ <label>Payment fee amount</label>
3330
+ <frontend_type>text</frontend_type>
3331
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
3332
+ <sort_order>80</sort_order>
3333
+ <show_in_default>1</show_in_default>
3334
+ <show_in_website>1</show_in_website>
3335
+ <show_in_store>1</show_in_store>
3336
+ </fee_amount>
3337
+ <fee_tax_class>
3338
+ <label>Tax class for payment fee</label>
3339
+ <comment>Select which tax class should be used for the payment fee</comment>
3340
+ <frontend_type>select</frontend_type>
3341
+ <source_model>msp/config_sources_taxClasses</source_model>
3342
+ <sort_order>90</sort_order>
3343
+ <show_in_default>1</show_in_default>
3344
+ <show_in_website>1</show_in_website>
3345
+ <show_in_store>1</show_in_store>
3346
+ </fee_tax_class>
3347
+ <fee_incexc translate="label">
3348
+ <label>Show payment fee incl. tax during checkout</label>
3349
+ <frontend_type>select</frontend_type>
3350
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3351
+ <sort_order>81</sort_order>
3352
+ <show_in_default>1</show_in_default>
3353
+ <show_in_website>1</show_in_website>
3354
+ <show_in_store>1</show_in_store>
3355
+ </fee_incexc>
3356
+ <fee_description translate="label">
3357
+ <label>Payment fee description, visible in order totals</label>
3358
+ <frontend_type>text</frontend_type>
3359
+ <sort_order>100</sort_order>
3360
+ <show_in_default>1</show_in_default>
3361
+ <show_in_website>1</show_in_website>
3362
+ <show_in_store>1</show_in_store>
3363
+ </fee_description>
3364
  </fields>
3365
  </msp_multisafepay>
3366
  <msp_directebanking translate="label" module="msp">
3398
  <show_in_store>1</show_in_store>
3399
  </allowed_currency>
3400
  <allowspecific translate="label">
3401
+ <label>Receive payments from applicable countries</label>
3402
  <frontend_type>allowspecific</frontend_type>
3403
  <sort_order>13</sort_order>
3404
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3407
  <show_in_store>1</show_in_store>
3408
  </allowspecific>
3409
  <specificcountry translate="label">
3410
+ <label>Receive payments from specific countries</label>
3411
  <frontend_type>multiselect</frontend_type>
3412
  <sort_order>14</sort_order>
3413
  <source_model>adminhtml/system_config_source_country</source_model>
3439
  <show_in_website>1</show_in_website>
3440
  <show_in_store>5</show_in_store>
3441
  </max_order_total>
3442
+ <fee translate="label">
3443
+ <label>Enable fee (inc. Tax)</label>
3444
+ <frontend_type>select</frontend_type>
3445
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3446
+ <sort_order>70</sort_order>
3447
+ <show_in_default>1</show_in_default>
3448
+ <show_in_website>1</show_in_website>
3449
+ <show_in_store>1</show_in_store>
3450
+ </fee>
3451
+ <fee_amount translate="label">
3452
+ <label>Payment fee amount</label>
3453
+ <frontend_type>text</frontend_type>
3454
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
3455
+ <sort_order>80</sort_order>
3456
+ <show_in_default>1</show_in_default>
3457
+ <show_in_website>1</show_in_website>
3458
+ <show_in_store>1</show_in_store>
3459
+ </fee_amount>
3460
+ <fee_tax_class>
3461
+ <label>Tax class for payment fee</label>
3462
+ <comment>Select which tax class should be used for the payment fee</comment>
3463
+ <frontend_type>select</frontend_type>
3464
+ <source_model>msp/config_sources_taxClasses</source_model>
3465
+ <sort_order>90</sort_order>
3466
+ <show_in_default>1</show_in_default>
3467
+ <show_in_website>1</show_in_website>
3468
+ <show_in_store>1</show_in_store>
3469
+ </fee_tax_class>
3470
+ <fee_incexc translate="label">
3471
+ <label>Show payment fee incl. tax during checkout</label>
3472
+ <frontend_type>select</frontend_type>
3473
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3474
+ <sort_order>81</sort_order>
3475
+ <show_in_default>1</show_in_default>
3476
+ <show_in_website>1</show_in_website>
3477
+ <show_in_store>1</show_in_store>
3478
+ </fee_incexc>
3479
+ <fee_description translate="label">
3480
+ <label>Payment fee description, visible in order totals</label>
3481
+ <frontend_type>text</frontend_type>
3482
+ <sort_order>100</sort_order>
3483
+ <show_in_default>1</show_in_default>
3484
+ <show_in_website>1</show_in_website>
3485
+ <show_in_store>1</show_in_store>
3486
+ </fee_description>
3487
  </fields>
3488
  </msp_directebanking>
3489
  <msp_directdebit translate="label" module="msp">
3521
  <show_in_store>1</show_in_store>
3522
  </allowed_currency>
3523
  <allowspecific translate="label">
3524
+ <label>Receive payments from applicable countries</label>
3525
  <frontend_type>allowspecific</frontend_type>
3526
  <sort_order>13</sort_order>
3527
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3530
  <show_in_store>1</show_in_store>
3531
  </allowspecific>
3532
  <specificcountry translate="label">
3533
+ <label>Receive payments from specific countries</label>
3534
  <frontend_type>multiselect</frontend_type>
3535
  <sort_order>14</sort_order>
3536
  <source_model>adminhtml/system_config_source_country</source_model>
3562
  <show_in_website>1</show_in_website>
3563
  <show_in_store>5</show_in_store>
3564
  </max_order_total>
3565
+ <fee translate="label">
3566
+ <label>Enable fee (inc. Tax)</label>
3567
+ <frontend_type>select</frontend_type>
3568
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3569
+ <sort_order>70</sort_order>
3570
+ <show_in_default>1</show_in_default>
3571
+ <show_in_website>1</show_in_website>
3572
+ <show_in_store>1</show_in_store>
3573
+ </fee>
3574
+ <fee_amount translate="label">
3575
+ <label>Payment fee amount</label>
3576
+ <frontend_type>text</frontend_type>
3577
+ <comment>Fee in EURO. Example 2.95 (2.95 is the maximum)</comment>
3578
+ <sort_order>80</sort_order>
3579
+ <show_in_default>1</show_in_default>
3580
+ <show_in_website>1</show_in_website>
3581
+ <show_in_store>1</show_in_store>
3582
+ </fee_amount>
3583
+ <fee_tax_class>
3584
+ <label>Tax class for payment fee</label>
3585
+ <comment>Select which tax class should be used for the payment fee</comment>
3586
+ <frontend_type>select</frontend_type>
3587
+ <source_model>msp/config_sources_taxClasses</source_model>
3588
+ <sort_order>90</sort_order>
3589
+ <show_in_default>1</show_in_default>
3590
+ <show_in_website>1</show_in_website>
3591
+ <show_in_store>1</show_in_store>
3592
+ </fee_tax_class>
3593
+ <fee_incexc translate="label">
3594
+ <label>Show payment fee incl. tax during checkout</label>
3595
+ <frontend_type>select</frontend_type>
3596
+ <source_model>adminhtml/system_config_source_yesno</source_model>
3597
+ <sort_order>81</sort_order>
3598
+ <show_in_default>1</show_in_default>
3599
+ <show_in_website>1</show_in_website>
3600
+ <show_in_store>1</show_in_store>
3601
+ </fee_incexc>
3602
+ <fee_description translate="label">
3603
+ <label>Payment fee description, visible in order totals</label>
3604
+ <frontend_type>text</frontend_type>
3605
+ <sort_order>100</sort_order>
3606
+ <show_in_default>1</show_in_default>
3607
+ <show_in_website>1</show_in_website>
3608
+ <show_in_store>1</show_in_store>
3609
+ </fee_description>
3610
  </fields>
3611
  </msp_directdebit>
3612
  <msp_fastcheckout translate="label" module="msp">
3634
  <show_in_store>1</show_in_store>
3635
  </title>
3636
  <allowspecific translate="label">
3637
+ <label>Receive payments from applicable countries</label>
3638
  <frontend_type>allowspecific</frontend_type>
3639
  <sort_order>13</sort_order>
3640
  <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
3643
  <show_in_store>1</show_in_store>
3644
  </allowspecific>
3645
  <specificcountry translate="label">
3646
+ <label>Receive payments from specific countries</label>
3647
  <frontend_type>multiselect</frontend_type>
3648
  <sort_order>14</sort_order>
3649
  <source_model>adminhtml/system_config_source_country</source_model>
3674
  <!-- end: MSP Gateways -->
3675
  <!-- begin: MSP Fast Checkout -->
3676
  <mspcheckout translate="label" module="msp">
3677
+ <label>MultiSafepay - Fast Checkout - 2.0.1</label>
3678
  <tab>sales</tab>
3679
  <frontend_type>text</frontend_type>
3680
  <sort_order>1001</sort_order>
app/code/community/MultiSafepay/Msp/sql/msp_setup/mysql4-upgrade-1.3.3-1.4.0.php CHANGED
@@ -1,63 +1,67 @@
1
- <?php
2
- /**
3
- *
4
- * @category MultiSafepay
5
- * @package MultiSafepay_Msp
6
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
- */
8
-
9
- /** @var $this MultiSafepay_Msp_Model_Setup */
10
- $this->startSetup();
11
-
12
- /** @var $conn Varien_Db_Adapter_Pdo_Mysql */
13
- $conn = $this->getConnection();
14
-
15
- $additionalColumns = array(
16
- $this->getTable('sales/order') => array(
17
- 'payment_fee',
18
- 'base_payment_fee',
19
- 'payment_fee_invoiced',
20
- 'base_payment_fee_invoiced',
21
- 'payment_fee_tax',
22
- 'base_payment_fee_tax',
23
- 'payment_fee_tax_invoiced',
24
- 'base_payment_fee_tax_invoiced',
25
- 'payment_fee_refunded',
26
- 'base_payment_fee_refunded',
27
- 'payment_fee_tax_refunded',
28
- 'base_payment_fee_tax_refunded',
29
- ),
30
- $this->getTable('sales/invoice') => array(
31
- 'payment_fee',
32
- 'base_payment_fee',
33
- 'payment_fee_tax',
34
- 'base_payment_fee_tax',
35
- ),
36
- $this->getTable('sales/quote') => array(
37
- 'payment_fee',
38
- 'base_payment_fee',
39
- 'payment_fee_tax',
40
- 'base_payment_fee_tax',
41
- ),
42
- $this->getTable('sales/creditmemo') => array(
43
- 'payment_fee',
44
- 'base_payment_fee',
45
- 'payment_fee_tax',
46
- 'base_payment_fee_tax',
47
- ),
48
- );
49
-
50
- foreach ($additionalColumns as $table => $columns) {
51
- foreach ($columns as $column) {
52
- $conn->addColumn($table, $column, array(
53
- 'type' => Varien_Db_Ddl_Table::TYPE_DECIMAL,
54
- 'precision' => 12,
55
- 'scale' => 4,
56
- 'nullable' => true,
57
- 'default' => null,
58
- 'comment' => ucwords(str_replace('_', ' ', $column)),
59
- ));
60
- }
61
- }
62
-
 
 
 
 
63
  $this->endSetup();
1
+ <?php
2
+ /**
3
+ *
4
+ * @category MultiSafepay
5
+ * @package MultiSafepay_Msp
6
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
7
+ */
8
+
9
+ /** @var $this MultiSafepay_Msp_Model_Setup */
10
+ $this->startSetup();
11
+
12
+ /** @var $conn Varien_Db_Adapter_Pdo_Mysql */
13
+ $conn = $this->getConnection();
14
+
15
+ $additionalColumns = array(
16
+ $this->getTable('sales/order') => array(
17
+ 'servicecost',
18
+ 'base_servicecost',
19
+ 'servicecost_invoiced',
20
+ 'base_servicecost_invoiced',
21
+ 'servicecost_tax',
22
+ 'base_servicecost_tax',
23
+ 'servicecost_tax_invoiced',
24
+ 'base_servicecost_tax_invoiced',
25
+ 'servicecost_refunded',
26
+ 'base_servicecost_refunded',
27
+ 'servicecost_tax_refunded',
28
+ 'base_servicecost_tax_refunded',
29
+ 'servicecost_pdf',
30
+ ),
31
+ $this->getTable('sales/invoice') => array(
32
+ 'servicecost',
33
+ 'base_servicecost',
34
+ 'servicecost_tax',
35
+ 'base_servicecost_tax',
36
+ 'servicecost_pdf',
37
+ ),
38
+ $this->getTable('sales/quote') => array(
39
+ 'servicecost',
40
+ 'base_servicecost',
41
+ 'servicecost_tax',
42
+ 'base_servicecost_tax',
43
+ 'servicecost_pdf',
44
+ ),
45
+ $this->getTable('sales/creditmemo') => array(
46
+ 'servicecost',
47
+ 'base_servicecost',
48
+ 'servicecost_tax',
49
+ 'base_servicecost_tax',
50
+ 'servicecost_pdf',
51
+ ),
52
+ );
53
+
54
+ foreach ($additionalColumns as $table => $columns) {
55
+ foreach ($columns as $column) {
56
+ $conn->addColumn($table, $column, array(
57
+ 'type' => Varien_Db_Ddl_Table::TYPE_DECIMAL,
58
+ 'precision' => 12,
59
+ 'scale' => 4,
60
+ 'nullable' => true,
61
+ 'default' => null,
62
+ 'comment' => ucwords(str_replace('_', ' ', $column)),
63
+ ));
64
+ }
65
+ }
66
+
67
  $this->endSetup();
app/design/frontend/base/default/layout/msp.xml CHANGED
@@ -27,57 +27,5 @@
27
  </reference>
28
  </checkout_cart_index>
29
 
30
- <sales_order_view>
31
- <reference name="order_totals">
32
- <block name="payment_fee" type="msp/paymentFee_order_totals_paymentfee" before="tax"/>
33
- </reference>
34
- </sales_order_view>
35
-
36
- <sales_order_invoice>
37
- <reference name="invoice_totals">
38
- <block name="payment_fee" type="msp/paymentFee_order_invoice_totals_paymentfee" before="tax"/>
39
- </reference>
40
- </sales_order_invoice>
41
-
42
- <sales_order_creditmemo>
43
- <reference name="creditmemo_totals">
44
- <block name="payment_fee" type="msp/paymentFee_order_creditmemo_totals_frontend_paymentfee" before="tax"/>
45
- </reference>
46
- </sales_order_creditmemo>
47
-
48
- <sales_order_print>
49
- <reference name="order_totals">
50
- <block name="payment_fee" type="msp/paymentFee_order_totals_paymentfee" before="tax"/>
51
- </reference>
52
- </sales_order_print>
53
-
54
- <sales_order_printinvoice>
55
- <reference name="invoice_totals">
56
- <block name="payment_fee" type="msp/paymentFee_order_invoice_totals_paymentfee" before="tax"/>
57
- </reference>
58
- </sales_order_printinvoice>
59
-
60
- <sales_order_printcreditmemo>
61
- <reference name="creditmemo_totals">
62
- <block name="payment_fee" type="msp/paymentFee_order_creditmemo_totals_frontend_paymentfee" before="tax"/>
63
- </reference>
64
- </sales_order_printcreditmemo>
65
-
66
- <sales_email_order_items>
67
- <reference name="order_totals">
68
- <block name="payment_fee" type="msp/paymentFee_order_totals_paymentfee" before="tax"/>
69
- </reference>
70
- </sales_email_order_items>
71
-
72
- <sales_email_order_invoice_items>
73
- <reference name="invoice_totals">
74
- <block name="payment_fee" type="msp/paymentFee_order_invoice_totals_paymentfee" before="tax"/>
75
- </reference>
76
- </sales_email_order_invoice_items>
77
-
78
- <sales_email_order_creditmemo_items>
79
- <reference name="creditmemo_totals">
80
- <block name="payment_fee" type="msp/paymentFee_order_creditmemo_totals_frontend_paymentfee" before="tax"/>
81
- </reference>
82
- </sales_email_order_creditmemo_items>
83
  </layout>
27
  </reference>
28
  </checkout_cart_index>
29
 
30
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
  </layout>
app/design/frontend/base/default/template/msp/bno.phtml CHANGED
@@ -1,7 +1,7 @@
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_banktransfer'){?>
5
  <input name='payment[birthday]' value="" id="birthday"/> <label for="birthday" style="width:200px!important;">Geboortedatum (dd-mm-yyyy):</label><br />
6
  <input name='payment[accountnumber]' value="" id="accountnumber"/> <label for="accountnumber" style="width:200px!important;">Rekeningnummer:</label><br />
7
  <?php }?>
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_payafter'){?>
5
  <input name='payment[birthday]' value="" id="birthday"/> <label for="birthday" style="width:200px!important;">Geboortedatum (dd-mm-yyyy):</label><br />
6
  <input name='payment[accountnumber]' value="" id="accountnumber"/> <label for="accountnumber" style="width:200px!important;">Rekeningnummer:</label><br />
7
  <?php }?>
app/design/frontend/base/default/template/msp/paymentFee/checkout/fee.phtml CHANGED
@@ -16,7 +16,8 @@
16
  <?php
17
  if(Mage::helper("msp")->getPadIncExcTax())
18
  {
19
- echo Mage::helper("msp")->getCheckoutFee();
 
20
  }else{
21
  echo $this->helper('checkout')->formatPrice($this->getPaymentFee());
22
  }
16
  <?php
17
  if(Mage::helper("msp")->getPadIncExcTax())
18
  {
19
+ //echo Mage::helper("msp")->getCheckoutFee();
20
+ echo $this->helper('checkout')->formatPrice(Mage::helper("msp")->getCheckoutFee());
21
  }else{
22
  echo $this->helper('checkout')->formatPrice($this->getPaymentFee());
23
  }
app/locale/nl_NL/MultiSafepay_Msp.csv CHANGED
@@ -1,30 +1,115 @@
1
- "Dutch","Nederlands"
2
- "English","Engels"
3
- "German","Duits"
4
- "French","Frans"
5
- "Spanish","Spaans"
6
- "Interface language","Taal betaalomgeving"
7
- "New order status","Status nieuwe bestelling"
8
- "Payment complete status","Status betaalde bestelling"
9
- "Create invoice after payment","Maak factuur aan na betaling"
10
- "Mail invoice to customer", "Mail factuur naar consument"
11
- "Gateway selection","Gateway selectie"
12
- "Auto redirect","Automatische redirect"
13
- "Bank selection","Bank selectie"
14
- "Direct Debit","Automatische incasso"
15
- "Bank Transfer","Overboeking"
16
- "Banktransfer","Overboeking"
17
- "Sign up for a free test account", "Maak gratis een testaccount aan"
18
- "<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Sign up for a free test account</a>","<a href='http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html' target='_blank'>Maak gratis een testaccount aan</a>"
19
- "Automatically redirects the customer back to the webshop after payment. (Skips the 'Transaction Complete' screen)","Stuurt de consument na betaling automatisch terug naar de webshop. (Slaat het 'Transaction Complete' scherm over)"
20
- "- Or use -","- Of kies voor -"
21
- "New order mail","Nieuw order mail"
22
- "After notification","Na notificatie"
23
- "After payment complete","Na betaling"
24
- "Force accept agreements","Algemene voorwaarden"
25
- "If enabled the customer must accept the terms and conditions in the fast checkout process","Wanneer ingeschakeld dient de consument akkoord te gaan met de algemene voorwaarden"
26
- "Alternate Agreements URL","Alternatieve URL voorwaarden"
27
- "Leave this empty for the standard URL for the agreements","Leeg laten voor de default URL"
28
- "Add company name field","Voeg bedrijfsnaam veld toe"
29
- "Company name cannot be empty","Maak bedrijfsnaam veld verplicht"
30
- "This will enable the Table Rates method configured at Shipping Methods -> Table Rates","Dit schakeld de Table Rates verzendmethode in zoals ingesteld bij Verzendmethoden -> Table rates"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ "Dutch","Nederlands"
2
+ "English","Engels"
3
+ "German","Duits"
4
+ "French","Frans"
5
+ "Spanish","Spaans"
6
+ "Interface language","Taal betaalomgeving"
7
+ "New order status","Status nieuwe bestelling"
8
+ "Payment complete status","Status betaalde bestelling"
9
+ "Create invoice after payment","Maak factuur aan na betaling"
10
+ "Mail invoice to customer", "Mail factuur naar consument"
11
+ "Gateway selection","Gateway selectie"
12
+ "Auto redirect","Automatische redirect"
13
+ "Bank selection","Bank selectie"
14
+ "Direct Debit","Automatische incasso"
15
+ "Bank Transfer","Overboeking"
16
+ "Banktransfer","Overboeking"
17
+ "Sign up for a free test account", "Maak gratis een testaccount aan"
18
+ "<a href=\'http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html\' target=\'_blank\'>Sign up for a free test account</a>","<a href=\'http://www.multisafepay.com/nl/klantenservice-zakelijk/open-een-testaccount.html\' target=\'_blank\'>Maak gratis een testaccount aan</a>"
19
+ "Automatically redirects the customer back to the webshop after payment. (Skips the 'Transaction Complete' screen)","Stuurt de consument na betaling automatisch terug naar de webshop. (Slaat het 'Transaction Complete' scherm over)"
20
+ "- Or use -","- Of kies voor -"
21
+ "New order mail","Nieuw order mail"
22
+ "After notification","Na notificatie"
23
+ "After payment complete","Na betaling"
24
+ "Force accept agreements","Algemene voorwaarden"
25
+ "If enabled the customer must accept the terms and conditions in the fast checkout process","Wanneer ingeschakeld dient de consument akkoord te gaan met de algemene voorwaarden"
26
+ "Alternate Agreements URL","Alternatieve URL voorwaarden"
27
+ "Leave this empty for the standard URL for the agreements","Leeg laten voor de default URL"
28
+ "Add company name field","Voeg bedrijfsnaam veld toe"
29
+ "Company name cannot be empty","Maak bedrijfsnaam veld verplicht"
30
+ "This will enable the Table Rates method configured at Shipping Methods -> Table Rates","Dit schakeld de Table Rates verzendmethode in zoals ingesteld bij Verzendmethoden -> Table rates"
31
+ "Allowed Currency", "Toegestane valuta"
32
+ "Allow currency conversion to Euro", "Sta valuta converie naar Euro toe"
33
+ "If store currency is not allowed by settings. Used for each gateway.", "Wanneer de winkel valuta niet is toegestaan voor de gekozen betaalmethoden dan vindt er een conversie plaats naar Euro"
34
+ "New order mail", "Nieuwe order email"
35
+ "E-mail invoice to customer", "Email de factuur naar de consument"
36
+ "Send the order update e-mail to customer", "Verstuur een order update email naar de consument"
37
+ "Keep the cart", "Bewaar de winkelwagen"
38
+ "Cart remains active when the customer returns to the webshop or cancels an order.", "De winkelwagen is actief na het annuleren van een transactie"
39
+ "Are you using the One Step Checkout Module?", "Gebruikt u de one step checkout module van onestepcheckout.com?"
40
+ "<![CDATA[<a href='https://www.multisafepay.com/en/Open-a-test-account.html' target='_blank'>Sign up for a free test account</a>]]>", "<![CDATA[<a href='https://www.multisafepay.com/en/Open-a-test-account.html' target='_blank'>Een test account aanmaken</a>]]>"
41
+ "Automatically redirects a customer back to the webshop after a succesful payment. (Skips MultiSafepay's 'Transaction Complete' screen)", "Redirect de consument terug naar de website na een geslaagde transactie?"
42
+ "Receive payments from applicable countries", "Voor welke landen staan we betalingen toe?"
43
+ "Sort order", "Volgorde"
44
+ "New order e-mail", "Nieuwe order e-mail"
45
+ "Receive payments from specific countries", "Specificeer de landen die de betaalmethode kunnen gebruiken"
46
+ "After order confirmation", "Na het plaatsen van de order"
47
+ "After notification, including cancelled order", "Na een status update, inclusief een geannuleerde transactie"
48
+ "After notification, excluding cancelled order", "Na een status update, exclusief een geannuleerde transactie"
49
+ "If store currency is not allowed by settings. Used for each gateways.", "Wanneer de winkel valuta niet is toegestaan voor de gekozen betaalmethoden dan vindt er een conversie plaats naar Euro"
50
+ "Cart remains active when the customer returns to the webshop or cancels an order.", "De winkelwagen blijft actief wanneer de consument de transactie afbreekt en terugkeert naar de webshop"
51
+ "Show the gateway image if it exists", "Toon het logo van de betaalmethode wanneer deze bestaat"
52
+ "Show the gateway image if it exists in front of the title", "Toon het logo van de betaalmethode voor de title"
53
+ "Show iDEAL banklist in checkout", "Toon de keuze van de bank binnen de website"
54
+ "Account ID (for Test Accounts)", "Account ID voor de test omgeving"
55
+ "Site ID (for Test Accounts)", "Site ID voor de test omgeving"
56
+ "Site Code (for Test Accounts)", "Site Secure Code voor de test omgeving"
57
+ "Days active before requests expires?", "Dagen voordat een transactie verloopt?"
58
+ "Enable the invoice e-mail for this payment method?", "Mag deze betaalmethoden een factuur e-mail versturen?"
59
+ "Payment fee description, visible in order totals", "Omschrijfing van de betaalmethode toeslag, zichtbaar bij de order totalen."
60
+ "Enable IP validation", "IP validatie activeren?"
61
+ "Only visible for the following IP address", "De betaalmethoden is alleen zichtbaar voor deze IP adressen"
62
+ "You can add multiple addresses seperated by ;", "U kunt meerdere IP adressen toevoegen, gescheiden door een ;"
63
+ "Only visible for the following IP address (for Test Account)", "Alleen zichtbaar voor de volgende IP adressen (voor de test omgeving)"
64
+ "Enable Test Account for these IP(s) when enabled Live Account", "Activeer de test instellingen voor deze IP adressen wanneer het live account actief is"
65
+ "You can add multiple addresses separated by ;. Feature enabled only when \'Type account\' set \'Live account\'", "U kunt meerdere ip adressen toevoegen, gescheiden door een ;."
66
+ "Send request after complete order", "Verstuur vezoek na een complete order"
67
+ "Request will be send after update statuse to Complete for PAD only", "Verzoek zal verstuurd worden nadat de status is aangepast naar Complete, alleen voor Betaal na Ontvangst"
68
+ "Use for refund?", "Refunds toestaan bij het aanmaken van een creditmemo?"
69
+ "Enable direct banktransfer (no MultiSafepay page)"", "Activeer de directe bankoverschrijving, de consument zien geen MultiSafepay pagina"
70
+ "Send new account email", "Verstuur nieuw account e-mail"
71
+ "Send the new account email when a customer account is created after using Fast Checkout", "Verstuur een nieuw account email wanneer een account binnen Magento is aangemaakt door Fast Checkout"
72
+ "Automatic login", "Klant automatisch inloggen?"
73
+ "Login the customer after returning from Fast Checkout ", "Log de consument in na het terugkeren via Fast Checkout?"
74
+ "Let the customer redirect to their account page", "Redirect de consument naar zijn account pagina na een transactie?"
75
+ "Company name", "Bedrijfsnaam"
76
+ "Birthday", "Geboortedatum"
77
+ "Chamber of Commerce (CoC/KvK)", "Kamer van Koophandel"
78
+ "VAT number", "B.T.W. nummer"
79
+ "Passport number", "Paspoort nummer"
80
+ "Drivers license", "Rijbewijs nummer"
81
+ "Sex", "Geslacht"
82
+ "Cart remains active when the customer returns to the webshop or cancels an order", "De winkelwagen is actief na het annuleren van een transactie"
83
+ "Fee in EURO. Example 2.95 (2.95 is the maximum)", "Toeslag in Euro. Bijvoorbeeld 2.95 (2.95 is het maximaal toegestane)"
84
+ "Enable fee (inc. Tax)", "Toeslag activeren (Inclusief B.T.W.)"
85
+ "Payment fee amount", "Toeslag bedrag"
86
+ "Show payment fee incl. tax during checkout", "Toon de toeslag inclusief B.T.W tijdens de checkout"
87
+ "Tax class for payment fee", "B.T.W klasse voor de toeslag"
88
+ "Select which tax class should be used for the payment fee", "Selecteer de juiste B.T.W. klasse die gebruikt zal worden bij de toeslag"
89
+ "Title", "Titel"
90
+ "Enabled", "Activeren"
91
+ "Instructions", "Instructies"
92
+ "Maximum Order Total", "Maximum Order Totaal"
93
+ "Payment fee description, visible in order totals", "Toeslag, zichtbaar in de order totalen"
94
+ "Sort order", "Volgorde"
95
+ "API Key", "API Sleutel"
96
+ "One Step Checkout", "One step checkout"
97
+ "Account type", "Account type"
98
+ "Minimum Order Total", "Minimum order totaal"
99
+ "Send shipped status after complete order", "Zet de transactie status op verzonden zodra de order compleet is"
100
+ "Enable", "Activeren"
101
+ "Account", "Account"
102
+ "Newsletter", "Nieuwsbrief"
103
+ "Comment", "Commentaar"
104
+ "Type account", "Type account"
105
+
106
+
107
+
108
+
109
+
110
+
111
+
112
+
113
+
114
+
115
+
lib/multisafepay/MultiSafepay.combined.php CHANGED
@@ -292,7 +292,7 @@ class MultiSafepay {
292
  return false;
293
 
294
  // return payment url
295
- $this->payment_url = $this->xmlUnescape($rootNode['transaction']['payment_url']['VALUE']);
296
  if(isset($rootNode['transaction']['payment_url']['VALUE']))
297
  {
298
  $this->payment_url = $this->xmlUnescape($rootNode['transaction']['payment_url']['VALUE']);
@@ -530,7 +530,7 @@ class MultiSafepay {
530
  if (!empty($this->issuer)){
531
  $issuer =' issuer="'.$this->xmlEscape($this->issuer).'"';
532
  }
533
-
534
  $request = '<?xml version="1.0" encoding="UTF-8"?>
535
  <redirecttransaction ua="' . $this->plugin_name . ' ' . $this->version . '">
536
  <merchant>
@@ -595,7 +595,7 @@ class MultiSafepay {
595
  </transaction>
596
  <signature>' . $this->xmlEscape($this->signature) . '</signature>
597
  </redirecttransaction>';
598
-
599
  return $request;
600
  }
601
  function createDirectXMLTransactionRequest(){
@@ -971,8 +971,12 @@ function createDirectXMLTransactionRequest(){
971
 
972
  $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
973
  preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $ip, $matches);
974
-
975
- $this->customer['forwardedip'] = $matches[0];
 
 
 
 
976
  }
977
  }
978
 
@@ -1110,8 +1114,10 @@ function createDirectXMLTransactionRequest(){
1110
  function xmlEscape($str){
1111
  $ts = array("/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/");
1112
  $tn = array("A","AE","C","E","I","D","N","O","X","U","Y","a","ae","c","e","i","d","n","o","x","u","y");
1113
-
1114
  $str = preg_replace($ts,$tn, $str);
 
 
1115
  return htmlspecialchars($str,ENT_COMPAT, "UTF-8");
1116
  }
1117
 
@@ -3194,14 +3200,14 @@ class msp_gc_XmlBuilder {
3194
  *
3195
  */
3196
  function xmlEscape($str){
3197
- $string = htmlspecialchars($str,ENT_COMPAT, "UTF-8");
3198
-
3199
-
3200
 
3201
- return htmlentities($string , ENT_COMPAT, "UTF-8", true);
3202
-
 
 
3203
  }
3204
-
3205
 
3206
 
3207
 
292
  return false;
293
 
294
  // return payment url
295
+ //$this->payment_url = $this->xmlUnescape($rootNode['transaction']['payment_url']['VALUE']);
296
  if(isset($rootNode['transaction']['payment_url']['VALUE']))
297
  {
298
  $this->payment_url = $this->xmlUnescape($rootNode['transaction']['payment_url']['VALUE']);
530
  if (!empty($this->issuer)){
531
  $issuer =' issuer="'.$this->xmlEscape($this->issuer).'"';
532
  }
533
+
534
  $request = '<?xml version="1.0" encoding="UTF-8"?>
535
  <redirecttransaction ua="' . $this->plugin_name . ' ' . $this->version . '">
536
  <merchant>
595
  </transaction>
596
  <signature>' . $this->xmlEscape($this->signature) . '</signature>
597
  </redirecttransaction>';
598
+
599
  return $request;
600
  }
601
  function createDirectXMLTransactionRequest(){
971
 
972
  $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
973
  preg_match("/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/", $ip, $matches);
974
+
975
+ if($matches[0] != ''){
976
+ $this->customer['forwardedip'] = $matches[0];
977
+ }else{
978
+ $this->customer['forwardedip'] = '127.0.0.1';
979
+ }
980
  }
981
  }
982
 
1114
  function xmlEscape($str){
1115
  $ts = array("/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/");
1116
  $tn = array("A","AE","C","E","I","D","N","O","X","U","Y","a","ae","c","e","i","d","n","o","x","u","y");
1117
+
1118
  $str = preg_replace($ts,$tn, $str);
1119
+ $str = mb_convert_encoding($str, 'UTF-8');
1120
+ //$str = htmlspecialchars($string, ENT_QUOTES);
1121
  return htmlspecialchars($str,ENT_COMPAT, "UTF-8");
1122
  }
1123
 
3200
  *
3201
  */
3202
  function xmlEscape($str){
3203
+ $ts = array("/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-�]/","/[�-�]/","/�/","/�/","/[�-��]/","/�/","/[�-�]/","/[�-�]/");
3204
+ $tn = array("A","AE","C","E","I","D","N","O","X","U","Y","a","ae","c","e","i","d","n","o","x","u","y");
 
3205
 
3206
+ $str = preg_replace($ts,$tn, $str);
3207
+ $str = mb_convert_encoding($str, 'UTF-8');
3208
+ //$str = htmlspecialchars($string, ENT_QUOTES);
3209
+ return htmlspecialchars($str,ENT_COMPAT, "UTF-8");
3210
  }
 
3211
 
3212
 
3213
 
media/msp/de/Thumbs.db ADDED
Binary file
media/msp/de/msp_banktransfer.png CHANGED
Binary file
media/msp/de/msp_directdebit.png CHANGED
Binary file
media/msp/en/Thumbs.db ADDED
Binary file
media/msp/en/msp_banktransfer.png CHANGED
Binary file
media/msp/en/msp_directdebit.png CHANGED
Binary file
media/msp/es/Thumbs.db ADDED
Binary file
media/msp/es/msp_banktransfer.png CHANGED
Binary file
media/msp/es/msp_directdebit.png CHANGED
Binary file
media/msp/fr/Thumbs.db ADDED
Binary file
media/msp/fr/msp_banktransfer.png CHANGED
Binary file
media/msp/fr/msp_directdebit.png CHANGED
Binary file
media/msp/it/Thumbs.db ADDED
Binary file
media/msp/it/msp_banktransfer.png CHANGED
Binary file
media/msp/it/msp_directdebit.png CHANGED
Binary file
media/msp/nl/Thumbs.db ADDED
Binary file
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MultiSafepay_Msp</name>
4
- <version>2.0.0</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>plugingroup@multisafepay.com</email></author></authors>
13
- <date>2014-05-19</date>
14
- <time>06:57:06</time>
15
- <contents><target name="magecommunity"><dir name="MultiSafepay"><dir name="Msp"><dir name="Block"><file name="Bno.php" hash="cdf6550ebbd77b608fa352a2f8c06eca"/><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="ff2378688f2e6231883d3576815c2c7b"/></dir></dir></dir><file name="Default.php" hash="f383347428dc9bf17123c4174e1982d7"/><file name="Gateways.php" hash="4ad012bccc09fa9d8d27cb83cc7b8a1a"/><file name="IdealIssuers.php" hash="367c60c20daf991ba910afc2e197fab0"/><file name="Link.php" hash="a1cd20870390cf4ad7defee853da36d9"/><dir name="PaymentFee"><dir name="Checkout"><file name="Fee.php" hash="78ae2f68d6c1e6aa6aeb9f79221b40c4"/></dir><dir name="Order"><dir name="Creditmemo"><dir name="Totals"><dir name="Frontend"><file name="Paymentfee.php" hash="06a6ed81bf530733c9b1407e33957fe5"/></dir><file name="Paymentfee.php" hash="1d3a8777c2e43895ae3a0e96b3bd792f"/></dir></dir><dir name="Invoice"><dir name="Totals"><file name="Paymentfee.php" hash="d05a0fc34d6c287c3f6fbdd1a764ec0f"/></dir></dir><file name="Totalbar.php" hash="ad8037e3f2162685dc1b550e8ba7bc68"/><dir name="Totals"><file name="Paymentfee.php" hash="0cff4ef51b89759c11eea34d743ca0f6"/><file name="Tax.php" hash="30e2009652318d6e4ca62db9435b859e"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="5f0eec8506b79ab273ce6d5652dab437"/></dir><dir name="Model"><file name="Abstract.php" hash="06af831fb8c0e4b4e14a414514aba992"/><dir name="Api"><file name="Creditmemo.php" hash="ba9565ef44f83496b61158bfbc2067f9"/><file name="Paylink.php" hash="3265b8e1738b23b11d14c40fdd6e4340"/><file name="Shipment.php" hash="65c2c119a88a668912e1352fedc5d1fb"/></dir><file name="Base.php" hash="9aa2f705beb8fedc1dc5a0b92228fa52"/><file name="Checkout.php" hash="13f6ba819bf9e1eb790c14701d323a17"/><dir name="Config"><dir name="Sources"><file name="Accounts.php" hash="f740fa1cc557eb964df2942bc6cb64d5"/><file name="Fields.php" hash="0fe5705f7a9f4846a537cf6b5a37aa2b"/><file name="Languages.php" hash="6e49f351f10279ec77f9408a65728863"/><dir name="Order"><file name="Currency.php" hash="83226cbe1c661dd48d8eded35b92fd04"/><file name="Email.php" hash="92f58c9dbafecabdf595568395a309b5"/></dir><file name="TaxClasses.php" hash="abf11c71e30cb513b416dca63474e664"/></dir></dir><dir name="Gateway"><file name="Abstract.php" hash="52b864fbb7531adc63de5315ea31a864"/><file name="Amex.php" hash="fe588eacbb914d099014131c64a687be"/><file name="Babygiftcard.php" hash="ad8930a208061d0292329606a7734455"/><file name="Banktransfer.php" hash="fa3db52d4b90907f9d30d9c94675a879"/><file name="Boekenbon.php" hash="6ced7b0d6b2638a60c943d5e0e46cd8d"/><file name="Default.php" hash="18144ab0f6ba9aca9d06aca2960e8464"/><file name="Degrotespeelgoedwinkel.php" hash="e2c4f3baeea295891f0c57f486b1a7fc"/><file name="DirectDebit.php" hash="c796eb275ba19806793280ba526a0cc2"/><file name="DirectEbanking.php" hash="d4a5fd453c5ce46b008c6ed5d6c3e904"/><file name="Ebon.php" hash="b0abcd38296d8ce6ff3dae82b0de5a3e"/><file name="Erotiekbon.php" hash="31bb29adba08fc7e69e55d1a713bef19"/><file name="Fashioncheque.php" hash="837144ade2d10fa3edd5adeb25ab4efa"/><file name="Fastcheckout.php" hash="a434d38bc91d6d1bd9b8b240fb93b4fe"/><file name="GiroPay.php" hash="c298c0b950bff6e1df5e4637abd3cfce"/><file name="Ideal.php" hash="7e54b8dc2904416e3482bdead954b5b4"/><file name="Lief.php" hash="45655795ad4bacb97a3357ca11a32271"/><file name="Maestro.php" hash="114e0a52de7158a0ee8b2484765e6102"/><file name="Mastercard.php" hash="56dffa304e96306f30d52cde05c18e6d"/><file name="Mistercash.php" hash="7833569406d5263873b525e00d80e050"/><file name="MultiSafepay.php" hash="769e8062b52587f3b591cb9d839c05a8"/><file name="Parfumcadeaukaart.php" hash="7b58fb6ac8932ff273dd712a312102b1"/><file name="Parfumnl.php" hash="ffee0bc5bb2b1bd1d52f37457c1e3b26"/><file name="Payafter.php" hash="4444afa6481115f12143247f7e709858"/><file name="Paypal.php" hash="26823a0c53c43877e1a17a0eb1cc6cf1"/><file name="Standard.php" hash="63e560d58d932a03d443fec37d08f2f6"/><file name="Visa.php" hash="29a99720ad0d6c4e02cb31e4eda1469d"/><file name="Webgift.php" hash="2d6d11e975b9f946ab01fca3198bf9b9"/></dir><dir name="Observer"><file name="Abstract.php" hash="06e0e7736a6981fe368f550d144af358"/><file name="Capture-dist.php" hash="874af8e94ded84c7d6c21fc1edd09717"/><file name="Capture.php" hash="874af8e94ded84c7d6c21fc1edd09717"/><file name="Config.php" hash="c72940b7a2e1bb631508afd5671b5950"/><file name="Creditmemo.php" hash="473481db3767656896d64950e7bc9913"/><file name="Order.php" hash="c1fe3cc10ed6f5563214dab34f2da44b"/><file name="Shipment.php" hash="528dc20d651a7357aefd7f5b084afc40"/></dir><dir name="Order"><dir name="Invoice"><file name="Total.php" hash="0f2687e32e9cd8c1a001353e817c5c10"/></dir></dir><file name="Payment.php" hash="54901e17b30e9504b24b6b6f5bb755a5"/><dir name="PaymentFee"><file name="Observer.php" hash="b400f18c776e8e953eae371a26e5163b"/><dir name="Order"><dir name="Creditmemo"><file name="Total.php" hash="8af3537270348b3457d2ef94850c56c6"/></dir><file name="Creditmemo.php" hash="1bdf9d74128b3130497e94f1322d6f5b"/><dir name="Invoice"><file name="Total.php" hash="a45e8d6c8415ea376ac59b09da31d8df"/></dir></dir><dir name="Quote"><dir name="Address"><file name="Total.php" hash="1a00f5eaccc87738ee7d3b42279a25ba"/></dir></dir><file name="Refund.php" hash="ee8c06f1bff433283e7a82d02de68f9d"/><dir name="Service"><file name="Order.php" hash="a4f4178f50d4646ef97358538e543582"/></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Surcharge.php" hash="8df482cea0c4883e9e62c9845e7d4292"/></dir></dir></dir><dir name="Service"><file name="Quote.php" hash="1d4101ccf3932f4c58be3a8a5ae004bd"/></dir><file name="Setup.php" hash="8c5969ad1ffe25cc8cd65d62d3e06300"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="2418f6a2e1aec14d57dbd02d12c1734b"/><file name="MspPaymentController.php" hash="44a4467fc3fb28c033c278c22f05fd3e"/><file name="StandardController.php" hash="aa493bcf10fe2dac84d0de8d10828163"/></dir><dir name="etc"><file name="adminhtml.xml" hash="d2152b4d830385e427fce8d36a56cba6"/><file name="config.xml" hash="7d1d714c24da721f472258d2bf521e0e"/><file name="system.xml" hash="e86f180693eee3f600c80b69c9d719b0"/></dir><dir name="sql"><dir name="msp_setup"><file name="mysql4-upgrade-1.3.3-1.4.0.php" hash="85bd73274c15a920a7e6673fb5426a11"/></dir></dir></dir></dir></target><target name="magemedia"><dir name="msp"><file name="button.png" hash="3f109b9ccbf7e26c3600d9b445bfab4f"/><dir name="de"><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="58542fd356d03353f4aee5d4d60590ac"/><file name="bno.phtml" hash="020b94cf39c05490b1590d6db9f09cad"/><file name="default.phtml" hash="be9554f94b75fc463a4af89a73a57cd3"/><file name="gateways.phtml" hash="6ccde89c2c88e42bbb35698181bcfe1b"/><file name="idealissuers.phtml" hash="4b3f1ae74889f7cbb01fd7bac261b09f"/><file name="link.phtml" hash="8c9ad5857d781e46dfc63a5f1ddecd7f"/><file name="linkText.phtml" hash="1146e6323f40228a7b17131dc5f38cf4"/><dir name="paymentFee"><dir name="checkout"><file name="fee.phtml" hash="6080e846c3f3f9ada30fbada99e4c8d0"/></dir></dir></dir></dir><dir name="layout"><file name="msp.xml" hash="1f3bb4e8ad440026f2db7cbf01091425"/></dir></dir></dir></dir></target><target name="mage"><dir name="lib"><dir name="multisafepay"><file name="MultiSafepay.combined.php" hash="ed103411f27e3a89c17eb2a9242fc8d1"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MultiSafepay_Msp.xml" hash="683763d13d6cb6576fb11800071afdb8"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="MultiSafepay_Msp.csv" hash="080adc635a9d2ad61296455cd4c145d6"/></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.13</min><max>5.4.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MultiSafepay_Msp</name>
4
+ <version>2.0.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
  <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>plugingroup@multisafepay.com</email></author></authors>
13
+ <date>2014-09-12</date>
14
+ <time>09:23: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="12b90552f4ec41d644f0b737dd43f2da"/><file name="Invoice.php" hash="3cb5fc394aa646e7e665bc88ffefd1fd"/><file name="Order.php" hash="3db720695fb7b9423e9043c97897c288"/></dir></dir></dir><file name="Bno.php" hash="cdf6550ebbd77b608fa352a2f8c06eca"/><dir name="Checkout"><dir name="Onepage"><dir name="Payment"><file name="Methods.php" hash="ff2378688f2e6231883d3576815c2c7b"/></dir></dir></dir><file name="Default.php" hash="f383347428dc9bf17123c4174e1982d7"/><file name="Gateways.php" hash="4ad012bccc09fa9d8d27cb83cc7b8a1a"/><file name="IdealIssuers.php" hash="367c60c20daf991ba910afc2e197fab0"/><file name="Link.php" hash="a1cd20870390cf4ad7defee853da36d9"/><dir name="Servicecost"><dir name="Order"><file name="Total.php" hash="3f1fac77895b673c81f053323aa6565c"/><file name="Totals.php" hash="f58a5db2b722110f5b586c6c9aa6e334"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="57db8077943501cb76686c0379674bba"/></dir><dir name="Model"><file name="Abstract.php" hash="c6746b850356831657e0680da7b30ced"/><dir name="Api"><file name="Creditmemo.php" hash="ba9565ef44f83496b61158bfbc2067f9"/><file name="Paylink.php" hash="3265b8e1738b23b11d14c40fdd6e4340"/><file name="Shipment.php" hash="65c2c119a88a668912e1352fedc5d1fb"/></dir><file name="Base.php" hash="a73b3ce86228a97cb1e879fe9f36097b"/><file name="Checkout.php" hash="2507c14d43cfef06cf9cbe3522f67244"/><dir name="Config"><dir name="Sources"><file name="Accounts.php" hash="f740fa1cc557eb964df2942bc6cb64d5"/><file name="Fields.php" hash="0fe5705f7a9f4846a537cf6b5a37aa2b"/><file name="Languages.php" hash="6e49f351f10279ec77f9408a65728863"/><dir name="Order"><file name="Currency.php" hash="83226cbe1c661dd48d8eded35b92fd04"/><file name="Email.php" hash="92f58c9dbafecabdf595568395a309b5"/></dir><file name="TaxClasses.php" hash="abf11c71e30cb513b416dca63474e664"/></dir></dir><dir name="Gateway"><file name="Abstract.php" hash="b5eaae2c0e74e6ca8987ce1aeb76b538"/><file name="Amex.php" hash="fe588eacbb914d099014131c64a687be"/><file name="Babygiftcard.php" hash="ad8930a208061d0292329606a7734455"/><file name="Banktransfer.php" hash="fa3db52d4b90907f9d30d9c94675a879"/><file name="Boekenbon.php" hash="6ced7b0d6b2638a60c943d5e0e46cd8d"/><file name="Default.php" hash="18144ab0f6ba9aca9d06aca2960e8464"/><file name="Degrotespeelgoedwinkel.php" hash="e2c4f3baeea295891f0c57f486b1a7fc"/><file name="DirectDebit.php" hash="c796eb275ba19806793280ba526a0cc2"/><file name="DirectEbanking.php" hash="d4a5fd453c5ce46b008c6ed5d6c3e904"/><file name="Ebon.php" hash="b0abcd38296d8ce6ff3dae82b0de5a3e"/><file name="Erotiekbon.php" hash="31bb29adba08fc7e69e55d1a713bef19"/><file name="Fashioncheque.php" hash="837144ade2d10fa3edd5adeb25ab4efa"/><file name="Fastcheckout.php" hash="a434d38bc91d6d1bd9b8b240fb93b4fe"/><file name="Gezondheidsbon.php" hash="9d7ea2edb570f7859dbbbca8d108cb30"/><file name="GiroPay.php" hash="c298c0b950bff6e1df5e4637abd3cfce"/><file name="Ideal.php" hash="7e54b8dc2904416e3482bdead954b5b4"/><file name="Lief.php" hash="45655795ad4bacb97a3357ca11a32271"/><file name="Maestro.php" hash="114e0a52de7158a0ee8b2484765e6102"/><file name="Mastercard.php" hash="56dffa304e96306f30d52cde05c18e6d"/><file name="Mistercash.php" hash="7833569406d5263873b525e00d80e050"/><file name="MultiSafepay.php" hash="769e8062b52587f3b591cb9d839c05a8"/><file name="Parfumcadeaukaart.php" hash="7b58fb6ac8932ff273dd712a312102b1"/><file name="Parfumnl.php" hash="ffee0bc5bb2b1bd1d52f37457c1e3b26"/><file name="Payafter.php" hash="4444afa6481115f12143247f7e709858"/><file name="Paypal.php" hash="26823a0c53c43877e1a17a0eb1cc6cf1"/><file name="Standard.php" hash="63e560d58d932a03d443fec37d08f2f6"/><file name="Visa.php" hash="29a99720ad0d6c4e02cb31e4eda1469d"/><file name="Webgift.php" hash="2d6d11e975b9f946ab01fca3198bf9b9"/></dir><dir name="Observer"><file name="Abstract.php" hash="06e0e7736a6981fe368f550d144af358"/><file name="Creditmemo.php" hash="02c8e5415c1051fa9a6c0fbdb55623e9"/><file name="Order.php" hash="337054f28bcabd84d58a5fbc925960b4"/><file name="Shipment.php" hash="528dc20d651a7357aefd7f5b084afc40"/></dir><file name="Payment.php" hash="61bb6faa4869cbe21346a10fedcb561d"/><dir name="Service"><file name="Quote.php" hash="1d4101ccf3932f4c58be3a8a5ae004bd"/></dir><dir name="Servicecost"><dir name="Creditmemo"><file name="Total.php" hash="8cb31e0e32e942d1bd3ab355a53e71cb"/></dir><dir name="Invoice"><file name="Totals.php" hash="2d104523c81471eec8b29250755e2a2c"/></dir><file name="Observer.php" hash="038daeee378ca6dde9322dd544a5db8c"/><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Servicecost.php" hash="a0e1201e6ef2b6414555ea3c4d69f418"/></dir></dir></dir></dir><file name="Setup.php" hash="8c5969ad1ffe25cc8cd65d62d3e06300"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="88968cc7d0405848377e276c4175fe6c"/><file name="MspPaymentController.php" hash="44a4467fc3fb28c033c278c22f05fd3e"/><file name="StandardController.php" hash="d7c8a205382736fbf099be095f230466"/></dir><dir name="etc"><file name="adminhtml.xml" hash="d2152b4d830385e427fce8d36a56cba6"/><file name="config.xml" hash="7aaf148ae7bce525104f9ae36a158935"/><file name="system.xml" hash="44c00c9b473a4e192a0fefbaf4791b34"/></dir><dir name="sql"><dir name="msp_setup"><file name="mysql4-upgrade-1.3.3-1.4.0.php" hash="f03b18f286e18dc61f6e7944d65ff871"/></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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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_fijncadeau.png" hash="06547020ecc8b2fef352b516b6a4537c"/><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="58542fd356d03353f4aee5d4d60590ac"/><file name="bno.phtml" hash="545e7d7cba9acb1a8e6fbb2cdd0375d2"/><file name="default.phtml" hash="be9554f94b75fc463a4af89a73a57cd3"/><file name="gateways.phtml" hash="6ccde89c2c88e42bbb35698181bcfe1b"/><file name="idealissuers.phtml" hash="4b3f1ae74889f7cbb01fd7bac261b09f"/><file name="link.phtml" hash="8c9ad5857d781e46dfc63a5f1ddecd7f"/><file name="linkText.phtml" hash="1146e6323f40228a7b17131dc5f38cf4"/><dir name="paymentFee"><dir name="checkout"><file name="fee.phtml" hash="4a5a68dbd5700b7d8d9312ddd98db89f"/></dir></dir></dir></dir><dir name="layout"><file name="msp.xml" hash="dd0c1df88dbc8d930d3137a60e3dd0ce"/></dir></dir></dir></dir></target><target name="mage"><dir name="lib"><dir name="multisafepay"><file name="MultiSafepay.combined.php" hash="aa05f95ad18666c359d66226ff75f5c9"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="MultiSafepay_Msp.xml" hash="683763d13d6cb6576fb11800071afdb8"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="MultiSafepay_Msp.csv" hash="e0d714d496d4bc38870dc99291135d7b"/></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.13</min><max>5.5.12</max></php></required></dependencies>
18
  </package>