Cardgate_Cgp - Version 1.1.6

Version Notes

- Added payment-fee as percentage

Download this release

Release Info

Developer Cardgate BV
Extension Cardgate_Cgp
Version 1.1.6
Comparing to
See all releases


Code changes from version 1.1.5 to 1.1.6

Files changed (5) hide show
  1. app/code/local/Cardgate/Cgp/Helper/Paymentfee.php +11 -17
  2. app/code/local/Cardgate/Cgp/Model/Paymentfee/Quote/Total.php +4 -2
  3. app/code/local/Cardgate/Cgp/etc/system.xml +20 -20
  4. app/locale/nl_NL/Cardgate_Cgp.csv +1 -1
  5. package.xml +5 -5
app/code/local/Cardgate/Cgp/Helper/Paymentfee.php CHANGED
@@ -17,6 +17,7 @@ class Cardgate_Cgp_Helper_Paymentfee extends Mage_Payment_Helper_Data
17
  */
18
  public function getPaymentFeeArray ( $paymentcode, $quote )
19
  {
 
20
  $inctax = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee_inc_ex' );
21
  $paymentfee = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee' );
22
  $paymentfee_taxclass = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee_tax' );
@@ -26,18 +27,13 @@ class Cardgate_Cgp_Helper_Paymentfee extends Mage_Payment_Helper_Data
26
  return;
27
  }
28
 
29
- if ( Mage::getSingleton( 'core/session' )->getCgpTotal() > 0 ) {
30
- if ( $quote->getGrandTotal() > 0 &&
31
- Mage::getSingleton( 'core/session' )->getCgpTotal() != $quote->getGrandTotal() ) {
32
- Mage::getSingleton( 'core/session' )->setCgpTotal( $quote->getGrandTotal() );
33
- $order_total = Mage::getSingleton( 'core/session' )->getCgpTotal();
34
- }
35
- $order_total = Mage::getSingleton( 'core/session' )->getCgpTotal();
36
- } else {
37
- Mage::getSingleton( 'core/session' )->setCgpTotal( $quote->getGrandTotal() );
38
- $order_total = $quote->getGrandTotal();
39
  }
40
 
 
41
  if ( strpos( $paymentfee, ';' ) > 0 ) {
42
  $fees = explode( ";", $paymentfee );
43
  $charge = 0;
@@ -50,13 +46,11 @@ class Cardgate_Cgp_Helper_Paymentfee extends Mage_Payment_Helper_Data
50
  $charge += $fees[1];
51
  else
52
  $charge += $order_total * ( ( $fees[1] * - 1 ) / 100.0 );
53
- } else
54
- if ( $paymentfee > 0 ) {
55
- $charge = $paymentfee;
56
- } else
57
- if ( $paymentfee < 0 ) {
58
- $charge = $order_total * ( ( $paymentfee * - 1 ) / 100.0 );
59
- }
60
 
61
  $address = $quote->getShippingAddress();
62
  $taxClassId = $quote->getCustomerTaxClassId();
17
  */
18
  public function getPaymentFeeArray ( $paymentcode, $quote )
19
  {
20
+
21
  $inctax = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee_inc_ex' );
22
  $paymentfee = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee' );
23
  $paymentfee_taxclass = Mage::getStoreConfig( 'cgp/' . $paymentcode . '/payment_fee_tax' );
27
  return;
28
  }
29
 
30
+ $order_total = 0;
31
+ foreach ( $quote->getAllAddresses() as $address ) {
32
+ // YYY : getDiscountAmount is negative..
33
+ $order_total+= ( $address->getSubtotalInclTax() + $address->getDiscountAmount() );
 
 
 
 
 
 
34
  }
35
 
36
+ $paymentfee = str_replace(",", ".", $paymentfee);
37
  if ( strpos( $paymentfee, ';' ) > 0 ) {
38
  $fees = explode( ";", $paymentfee );
39
  $charge = 0;
46
  $charge += $fees[1];
47
  else
48
  $charge += $order_total * ( ( $fees[1] * - 1 ) / 100.0 );
49
+ } elseif ( $paymentfee > 0 ) {
50
+ $charge = $paymentfee;
51
+ } elseif ( $paymentfee < 0 ) {
52
+ $charge = $order_total * ( ( $paymentfee * - 1 ) / 100.0 );
53
+ }
 
 
54
 
55
  $address = $quote->getShippingAddress();
56
  $taxClassId = $quote->getCustomerTaxClassId();
app/code/local/Cardgate/Cgp/Model/Paymentfee/Quote/Total.php CHANGED
@@ -44,7 +44,7 @@ class Cardgate_Cgp_Model_Paymentfee_Quote_Total extends Mage_Sales_Model_Quote_A
44
  return $this;
45
  }
46
 
47
- $this->address = $address;
48
  $this->quote = $address->getQuote();
49
  $this->payment = $this->quote->getPayment();
50
 
@@ -66,9 +66,10 @@ class Cardgate_Cgp_Model_Paymentfee_Quote_Total extends Mage_Sales_Model_Quote_A
66
  if ( is_a( $this->payment->getMethodInstance(),'Cardgate_Cgp_Model_Gateway_Abstract' ) ) {
67
  $this->paymentMethod = $this->payment->getMethodInstance();
68
  if ( substr( $this->paymentMethod->getCode(), 0, 3 ) == 'cgp' ) {
69
- $this->_initInvoiceFee();
70
  }
71
  }
 
72
  }
73
 
74
  /**
@@ -109,6 +110,7 @@ class Cardgate_Cgp_Model_Paymentfee_Quote_Total extends Mage_Sales_Model_Quote_A
109
  // Add our invoice fee to the address totals
110
  $this->address->setBaseGrandTotal( $this->address->getBaseGrandTotal() + $fee['base_incl'] );
111
  $this->address->setGrandTotal( $this->address->getGrandTotal() + $fee['incl'] );
 
112
  }
113
 
114
  /**
44
  return $this;
45
  }
46
 
47
+ $this->address = &$address;
48
  $this->quote = $address->getQuote();
49
  $this->payment = $this->quote->getPayment();
50
 
66
  if ( is_a( $this->payment->getMethodInstance(),'Cardgate_Cgp_Model_Gateway_Abstract' ) ) {
67
  $this->paymentMethod = $this->payment->getMethodInstance();
68
  if ( substr( $this->paymentMethod->getCode(), 0, 3 ) == 'cgp' ) {
69
+ $this->_initInvoiceFee();
70
  }
71
  }
72
+
73
  }
74
 
75
  /**
110
  // Add our invoice fee to the address totals
111
  $this->address->setBaseGrandTotal( $this->address->getBaseGrandTotal() + $fee['base_incl'] );
112
  $this->address->setGrandTotal( $this->address->getGrandTotal() + $fee['incl'] );
113
+
114
  }
115
 
116
  /**
app/code/local/Cardgate/Cgp/etc/system.xml CHANGED
@@ -291,7 +291,7 @@
291
  <show_in_default>1</show_in_default>
292
  <show_in_website>1</show_in_website>
293
  <show_in_store>1</show_in_store>
294
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
295
  </payment_fee>
296
  <payment_fee_tax translate="label">
297
  <label>Payment fee tax class</label>
@@ -380,7 +380,7 @@
380
  <show_in_default>1</show_in_default>
381
  <show_in_website>1</show_in_website>
382
  <show_in_store>1</show_in_store>
383
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
384
  </payment_fee>
385
  <payment_fee_tax translate="label">
386
  <label>Payment fee tax class</label>
@@ -469,7 +469,7 @@
469
  <show_in_default>1</show_in_default>
470
  <show_in_website>1</show_in_website>
471
  <show_in_store>1</show_in_store>
472
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
473
  </payment_fee>
474
  <payment_fee_tax translate="label">
475
  <label>Payment fee tax class</label>
@@ -558,7 +558,7 @@
558
  <show_in_default>1</show_in_default>
559
  <show_in_website>1</show_in_website>
560
  <show_in_store>1</show_in_store>
561
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
562
  </payment_fee>
563
  <payment_fee_tax translate="label">
564
  <label>Payment fee tax class</label>
@@ -647,7 +647,7 @@
647
  <show_in_default>1</show_in_default>
648
  <show_in_website>1</show_in_website>
649
  <show_in_store>1</show_in_store>
650
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
651
  </payment_fee>
652
  <payment_fee_tax translate="label">
653
  <label>Payment fee tax class</label>
@@ -736,7 +736,7 @@
736
  <show_in_default>1</show_in_default>
737
  <show_in_website>1</show_in_website>
738
  <show_in_store>1</show_in_store>
739
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
740
  </payment_fee>
741
  <payment_fee_tax translate="label">
742
  <label>Payment fee tax class</label>
@@ -825,7 +825,7 @@
825
  <show_in_default>1</show_in_default>
826
  <show_in_website>1</show_in_website>
827
  <show_in_store>1</show_in_store>
828
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
829
  </payment_fee>
830
  <payment_fee_tax translate="label">
831
  <label>Payment fee tax class</label>
@@ -914,7 +914,7 @@
914
  <show_in_default>1</show_in_default>
915
  <show_in_website>1</show_in_website>
916
  <show_in_store>1</show_in_store>
917
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
918
  </payment_fee>
919
  <payment_fee_tax translate="label">
920
  <label>Payment fee tax class</label>
@@ -1003,7 +1003,7 @@
1003
  <show_in_default>1</show_in_default>
1004
  <show_in_website>1</show_in_website>
1005
  <show_in_store>1</show_in_store>
1006
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1007
  </payment_fee>
1008
  <payment_fee_tax translate="label">
1009
  <label>Payment fee tax class</label>
@@ -1092,7 +1092,7 @@
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
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1096
  </payment_fee>
1097
  <payment_fee_tax translate="label">
1098
  <label>Payment fee tax class</label>
@@ -1181,7 +1181,7 @@
1181
  <show_in_default>1</show_in_default>
1182
  <show_in_website>1</show_in_website>
1183
  <show_in_store>1</show_in_store>
1184
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1185
  </payment_fee>
1186
  <payment_fee_tax translate="label">
1187
  <label>Payment fee tax class</label>
@@ -1270,7 +1270,7 @@
1270
  <show_in_default>1</show_in_default>
1271
  <show_in_website>1</show_in_website>
1272
  <show_in_store>1</show_in_store>
1273
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1274
  </payment_fee>
1275
  <payment_fee_tax translate="label">
1276
  <label>Payment fee tax class</label>
@@ -1368,7 +1368,7 @@
1368
  <show_in_default>1</show_in_default>
1369
  <show_in_website>1</show_in_website>
1370
  <show_in_store>1</show_in_store>
1371
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1372
  </payment_fee>
1373
  <payment_fee_tax translate="label">
1374
  <label>Payment fee tax class</label>
@@ -1465,7 +1465,7 @@
1465
  <show_in_default>1</show_in_default>
1466
  <show_in_website>1</show_in_website>
1467
  <show_in_store>1</show_in_store>
1468
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1469
  </payment_fee>
1470
  <payment_fee_tax translate="label">
1471
  <label>Payment fee tax class</label>
@@ -1554,7 +1554,7 @@
1554
  <show_in_default>1</show_in_default>
1555
  <show_in_website>1</show_in_website>
1556
  <show_in_store>1</show_in_store>
1557
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1558
  </payment_fee>
1559
  <payment_fee_tax translate="label">
1560
  <label>Payment fee tax class</label>
@@ -1651,7 +1651,7 @@
1651
  <show_in_default>1</show_in_default>
1652
  <show_in_website>1</show_in_website>
1653
  <show_in_store>1</show_in_store>
1654
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1655
  </payment_fee>
1656
  <payment_fee_tax translate="label">
1657
  <label>Payment fee tax class</label>
@@ -1740,7 +1740,7 @@
1740
  <show_in_default>1</show_in_default>
1741
  <show_in_website>1</show_in_website>
1742
  <show_in_store>1</show_in_store>
1743
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1744
  </payment_fee>
1745
  <payment_fee_tax translate="label">
1746
  <label>Payment fee tax class</label>
@@ -1829,7 +1829,7 @@
1829
  <show_in_default>1</show_in_default>
1830
  <show_in_website>1</show_in_website>
1831
  <show_in_store>1</show_in_store>
1832
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1833
  </payment_fee>
1834
  <payment_fee_tax translate="label">
1835
  <label>Payment fee tax class</label>
@@ -1918,7 +1918,7 @@
1918
  <show_in_default>1</show_in_default>
1919
  <show_in_website>1</show_in_website>
1920
  <show_in_store>1</show_in_store>
1921
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
1922
  </payment_fee>
1923
  <payment_fee_tax translate="label">
1924
  <label>Payment fee tax class</label>
@@ -2007,7 +2007,7 @@
2007
  <show_in_default>1</show_in_default>
2008
  <show_in_website>1</show_in_website>
2009
  <show_in_store>1</show_in_store>
2010
- <comment>Payment fee amount (eg 0.35 or 1)</comment>
2011
  </payment_fee>
2012
  <payment_fee_tax translate="label">
2013
  <label>Payment fee tax class</label>
291
  <show_in_default>1</show_in_default>
292
  <show_in_website>1</show_in_website>
293
  <show_in_store>1</show_in_store>
294
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
295
  </payment_fee>
296
  <payment_fee_tax translate="label">
297
  <label>Payment fee tax class</label>
380
  <show_in_default>1</show_in_default>
381
  <show_in_website>1</show_in_website>
382
  <show_in_store>1</show_in_store>
383
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
384
  </payment_fee>
385
  <payment_fee_tax translate="label">
386
  <label>Payment fee tax class</label>
469
  <show_in_default>1</show_in_default>
470
  <show_in_website>1</show_in_website>
471
  <show_in_store>1</show_in_store>
472
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
473
  </payment_fee>
474
  <payment_fee_tax translate="label">
475
  <label>Payment fee tax class</label>
558
  <show_in_default>1</show_in_default>
559
  <show_in_website>1</show_in_website>
560
  <show_in_store>1</show_in_store>
561
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
562
  </payment_fee>
563
  <payment_fee_tax translate="label">
564
  <label>Payment fee tax class</label>
647
  <show_in_default>1</show_in_default>
648
  <show_in_website>1</show_in_website>
649
  <show_in_store>1</show_in_store>
650
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
651
  </payment_fee>
652
  <payment_fee_tax translate="label">
653
  <label>Payment fee tax class</label>
736
  <show_in_default>1</show_in_default>
737
  <show_in_website>1</show_in_website>
738
  <show_in_store>1</show_in_store>
739
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
740
  </payment_fee>
741
  <payment_fee_tax translate="label">
742
  <label>Payment fee tax class</label>
825
  <show_in_default>1</show_in_default>
826
  <show_in_website>1</show_in_website>
827
  <show_in_store>1</show_in_store>
828
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
829
  </payment_fee>
830
  <payment_fee_tax translate="label">
831
  <label>Payment fee tax class</label>
914
  <show_in_default>1</show_in_default>
915
  <show_in_website>1</show_in_website>
916
  <show_in_store>1</show_in_store>
917
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
918
  </payment_fee>
919
  <payment_fee_tax translate="label">
920
  <label>Payment fee tax class</label>
1003
  <show_in_default>1</show_in_default>
1004
  <show_in_website>1</show_in_website>
1005
  <show_in_store>1</show_in_store>
1006
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1007
  </payment_fee>
1008
  <payment_fee_tax translate="label">
1009
  <label>Payment fee tax class</label>
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
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1096
  </payment_fee>
1097
  <payment_fee_tax translate="label">
1098
  <label>Payment fee tax class</label>
1181
  <show_in_default>1</show_in_default>
1182
  <show_in_website>1</show_in_website>
1183
  <show_in_store>1</show_in_store>
1184
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1185
  </payment_fee>
1186
  <payment_fee_tax translate="label">
1187
  <label>Payment fee tax class</label>
1270
  <show_in_default>1</show_in_default>
1271
  <show_in_website>1</show_in_website>
1272
  <show_in_store>1</show_in_store>
1273
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1274
  </payment_fee>
1275
  <payment_fee_tax translate="label">
1276
  <label>Payment fee tax class</label>
1368
  <show_in_default>1</show_in_default>
1369
  <show_in_website>1</show_in_website>
1370
  <show_in_store>1</show_in_store>
1371
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1372
  </payment_fee>
1373
  <payment_fee_tax translate="label">
1374
  <label>Payment fee tax class</label>
1465
  <show_in_default>1</show_in_default>
1466
  <show_in_website>1</show_in_website>
1467
  <show_in_store>1</show_in_store>
1468
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1469
  </payment_fee>
1470
  <payment_fee_tax translate="label">
1471
  <label>Payment fee tax class</label>
1554
  <show_in_default>1</show_in_default>
1555
  <show_in_website>1</show_in_website>
1556
  <show_in_store>1</show_in_store>
1557
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1558
  </payment_fee>
1559
  <payment_fee_tax translate="label">
1560
  <label>Payment fee tax class</label>
1651
  <show_in_default>1</show_in_default>
1652
  <show_in_website>1</show_in_website>
1653
  <show_in_store>1</show_in_store>
1654
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1655
  </payment_fee>
1656
  <payment_fee_tax translate="label">
1657
  <label>Payment fee tax class</label>
1740
  <show_in_default>1</show_in_default>
1741
  <show_in_website>1</show_in_website>
1742
  <show_in_store>1</show_in_store>
1743
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1744
  </payment_fee>
1745
  <payment_fee_tax translate="label">
1746
  <label>Payment fee tax class</label>
1829
  <show_in_default>1</show_in_default>
1830
  <show_in_website>1</show_in_website>
1831
  <show_in_store>1</show_in_store>
1832
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1833
  </payment_fee>
1834
  <payment_fee_tax translate="label">
1835
  <label>Payment fee tax class</label>
1918
  <show_in_default>1</show_in_default>
1919
  <show_in_website>1</show_in_website>
1920
  <show_in_store>1</show_in_store>
1921
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
1922
  </payment_fee>
1923
  <payment_fee_tax translate="label">
1924
  <label>Payment fee tax class</label>
2007
  <show_in_default>1</show_in_default>
2008
  <show_in_website>1</show_in_website>
2009
  <show_in_store>1</show_in_store>
2010
+ <comment>Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.</comment>
2011
  </payment_fee>
2012
  <payment_fee_tax translate="label">
2013
  <label>Payment fee tax class</label>
app/locale/nl_NL/Cardgate_Cgp.csv CHANGED
@@ -74,7 +74,7 @@
74
  "Your payment is being evaluated by the bank. Please do not attempt to pay again, until your payment is either confirmed or denied by the bank.","Uw betaling wordt beoordeeld door de bank. Probeer niet nogmaals te betalen, totdat de betaling goed- of afgekeurd is door de bank."
75
  "Your payment has failed. If you wish, you can try using a different payment method.","Uw betaling is niet geslaagd. Indien gewenst, kunt u een andere betaalmethode proberen."
76
  "Payment fee","Betaaltoeslag"
77
- "Payment fee amount (eg 0.35 or 1)","Betaaltoeslag bedrag"
78
  "Payment fee tax class","Betaaltoeslag BTW tarief"
79
  "Choose the fee's tax class","Kies een BTW tarief voor de toeslag"
80
  "Including/Excluding Tax","Inclusief/Exclusief BTW"
74
  "Your payment is being evaluated by the bank. Please do not attempt to pay again, until your payment is either confirmed or denied by the bank.","Uw betaling wordt beoordeeld door de bank. Probeer niet nogmaals te betalen, totdat de betaling goed- of afgekeurd is door de bank."
75
  "Your payment has failed. If you wish, you can try using a different payment method.","Uw betaling is niet geslaagd. Indien gewenst, kunt u een andere betaalmethode proberen."
76
  "Payment fee","Betaaltoeslag"
77
+ "Payment fee amount. A positive amount will be used as a fixed amount, a negative amount as percentage. Using both is also possible by separation with a semicolon. Eg. 0.30;-1.2 results in 30 cents + 1.2% of the order amount.","Betaaltoeslag bedrag. Een positief getal wordt als vast bedrag gebruikt, een negatief getal als percentage. Beide opgeven is ook mogelijk door deze te scheiden met een punt-comma. Voorbeeld: 0.30;-1.2 resulteert in 30 cent + 1.2% van het orderbedrag."
78
  "Payment fee tax class","Betaaltoeslag BTW tarief"
79
  "Choose the fee's tax class","Kies een BTW tarief voor de toeslag"
80
  "Including/Excluding Tax","Inclusief/Exclusief BTW"
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cardgate_Cgp</name>
4
- <version>1.1.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Card Gate Payment Module</summary>
10
  <description>Card Gate is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
11
- <notes>- Fixed order statusupdates when order stays in pending state</notes>
12
  <authors><author><name>Cardgate BV</name><user>cardgateplus</user><email>support@cardgate.com</email></author></authors>
13
- <date>2016-03-11</date>
14
- <time>11:24:06</time>
15
- <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="cardgate_cgp.css" hash="bebfc13fca1b36867c17864ae70fdabd"/><dir name="images"><dir name="cardgate"><file name="cardgate_cgp.png" hash="b97b15baba0b27042733c8ea4b4fb6bc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="nl_NL"><file name="Cardgate_Cgp.csv" hash="51e395dce79d3c6f8c908a12091a5085"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzCardgate_Cgp.xml" hash="c7a72af045f4b737b50cc6c360d4300d"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="cardgate"><dir name="cgp"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir><dir name="form"><file name="banktransfer.phtml" hash="ff7a2a827a7b7a5ed9bcb5d484c30c68"/><file name="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="e2876171abf8e94d7b77a47ce9279561"/><file name="klarnaaccount.phtml" hash="419f88941703c8562369844bb6a1d692"/></dir><file name="redirect.phtml" hash="ecb2b0a854cd6358adeba535f8889046"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Cardgate"><dir name="Cgp"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Version.php" hash="73d6f00aa532e14d021c6a142ba549fd"/></dir></dir></dir></dir><dir name="Form"><file name="Banktransfer.php" hash="be49e1b58910ee33b329badaa9fc85ce"/><file name="Ideal.php" hash="868520be00ae55a3f4958a48f0d152cc"/><file name="Klarna.php" hash="c66cbcc135151dcc4337d22fc0552a46"/><file name="Klarnaaccount.php" hash="77e35328922bfb232f93896b77367c1e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="7f4fb8293923e064ecbd77451c52afd9"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="07e72679dc8ddd5f7e2db9e24bb76aa6"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="87021e3b682c1abf1ae95e173730023a"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="40c399761dccfd494d7cfb439447c5e3"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="0cde857c2b7f33cdb5927143a98f0958"/></dir></dir></dir><file name="Redirect.php" hash="2f854d58133eebad7f128a08d799f7ef"/></dir><dir name="Helper"><file name="Data.php" hash="ed47b3c61a5e701e1683a7717c6b8ef1"/><file name="Paymentfee.php" hash="6ae85c5606efc68ecd188c3513826f3a"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Languages.php" hash="fb24871559fa1ce2613438ad5613a196"/><file name="Modes.php" hash="678a822a7f0c0665fc696c44937825be"/><file name="Orderstatus.php" hash="610ca9cedb01e329d821f4e407e5bfc8"/><file name="Version.php" hash="818a7ae5f4126fbb0c8fc76376e03c65"/></dir></dir></dir></dir><file name="Base.php" hash="56f9937fb48514ac0c309790b640a597"/><dir name="Gateway"><file name="Abstract.php" hash="2044da519f4ef12fdb7c73d1d4b9d50a"/><file name="Afterpay.php" hash="054b525c972119fd330291776c2550ac"/><file name="Americanexpress.php" hash="705926d7a69fb889f54185743f4cac9f"/><file name="Banktransfer.php" hash="d4d5712ab327c418ee2d949e49faee01"/><file name="Bitcoin.php" hash="001420be0c8d665d905bcc79275e989e"/><file name="Cartebancaire.php" hash="451bff78fa26e4bae883d0c18ca1f844"/><file name="Cartebleue.php" hash="b7974f8f8e655daaf50a899d15cc15fd"/><file name="Default.php" hash="dd934ee60d32000773f26be805d46925"/><file name="Directdebit.php" hash="7890209183bab5f47edcca60a19cd007"/><file name="Giropay.php" hash="ea35629ddfd08cd341128af6d95c8911"/><file name="Ideal.php" hash="1b5b6318c3e544659f465fdbc463fa51"/><file name="Klarna.php" hash="901891d606ea469296e75251fc7abe14"/><file name="Klarnaaccount.php" hash="4d85440b0df2df05ec001c6a5d7416dd"/><file name="Maestro.php" hash="c29f0bd00282c992017a2487d12d8bda"/><file name="Mastercard.php" hash="3febe4f0ee3cc630cd959e8ce086d2ee"/><file name="Mistercash.php" hash="d618b6ab14ffa5d9810cf65232b6d2a3"/><file name="Paypal.php" hash="ad4600fdc877a84a6a4f8647ae2587df"/><file name="Przelewy24.php" hash="f49bfa8354fa2bce2add3221a04843cf"/><file name="Sofortbanking.php" hash="544531b74c8fd34e7ccd48a32210d81f"/><file name="Visa.php" hash="50cbf582c2b5192923d290fcbec35870"/><file name="Vpay.php" hash="acf7d286f343b4e663a55a8540bf45d2"/><file name="Webmoney.php" hash="72a36f0854db4c02e0477208b47faccf"/></dir><file name="Observer.php" hash="72363edbe183cfa833e276f0e3cda200"/><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="5191056c5dae3862c2a468acd3e5cbac"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="314df1d94874fcb856af2e0be4019782"/></dir><file name="Tax.php" hash="dc485fa37d31e13e20f578cb58075486"/><file name="Total.php" hash="f26e4dc51d0e510eb1c2c65750dec92b"/></dir><dir name="Quote"><file name="Quote.php" hash="d09d4d5c4b55770b0a50f80f0a5fa643"/><file name="TaxTotal.php" hash="a1f53b6ed1988364aa396b3bd7afa1e0"/><file name="Total.php" hash="95febaa23124a4732b0855b04318e245"/></dir></dir></dir><dir name="controllers"><file name="StandardController.php" hash="793d913a16fc5a6ad56f6c4f306af793"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f14dc99c26f44cc53b4a5974dd9cdd2d"/><file name="config.xml" hash="cb88f2a81f818eabd2e7d278b8edcdd7"/><file name="system.xml" hash="62a60d9877b6fdd4338a7a23c5016bab"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cardgate_Cgp</name>
4
+ <version>1.1.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Card Gate Payment Module</summary>
10
  <description>Card Gate is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
11
+ <notes>- Added payment-fee as percentage</notes>
12
  <authors><author><name>Cardgate BV</name><user>cardgateplus</user><email>support@cardgate.com</email></author></authors>
13
+ <date>2016-03-22</date>
14
+ <time>10:51:18</time>
15
+ <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="cardgate_cgp.css" hash="bebfc13fca1b36867c17864ae70fdabd"/><dir name="images"><dir name="cardgate"><file name="cardgate_cgp.png" hash="b97b15baba0b27042733c8ea4b4fb6bc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="nl_NL"><file name="Cardgate_Cgp.csv" hash="c3f92e7f8c8a62cbe26075ef113294d9"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzCardgate_Cgp.xml" hash="c7a72af045f4b737b50cc6c360d4300d"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="cardgate"><dir name="cgp"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir><dir name="form"><file name="banktransfer.phtml" hash="ff7a2a827a7b7a5ed9bcb5d484c30c68"/><file name="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="e2876171abf8e94d7b77a47ce9279561"/><file name="klarnaaccount.phtml" hash="419f88941703c8562369844bb6a1d692"/></dir><file name="redirect.phtml" hash="ecb2b0a854cd6358adeba535f8889046"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Cardgate"><dir name="Cgp"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Version.php" hash="73d6f00aa532e14d021c6a142ba549fd"/></dir></dir></dir></dir><dir name="Form"><file name="Banktransfer.php" hash="be49e1b58910ee33b329badaa9fc85ce"/><file name="Ideal.php" hash="868520be00ae55a3f4958a48f0d152cc"/><file name="Klarna.php" hash="c66cbcc135151dcc4337d22fc0552a46"/><file name="Klarnaaccount.php" hash="77e35328922bfb232f93896b77367c1e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="7f4fb8293923e064ecbd77451c52afd9"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="07e72679dc8ddd5f7e2db9e24bb76aa6"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="87021e3b682c1abf1ae95e173730023a"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="40c399761dccfd494d7cfb439447c5e3"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="0cde857c2b7f33cdb5927143a98f0958"/></dir></dir></dir><file name="Redirect.php" hash="2f854d58133eebad7f128a08d799f7ef"/></dir><dir name="Helper"><file name="Data.php" hash="ed47b3c61a5e701e1683a7717c6b8ef1"/><file name="Paymentfee.php" hash="46fe1c5454474be94ff7c1ebe8cefa17"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Languages.php" hash="fb24871559fa1ce2613438ad5613a196"/><file name="Modes.php" hash="678a822a7f0c0665fc696c44937825be"/><file name="Orderstatus.php" hash="610ca9cedb01e329d821f4e407e5bfc8"/><file name="Version.php" hash="818a7ae5f4126fbb0c8fc76376e03c65"/></dir></dir></dir></dir><file name="Base.php" hash="56f9937fb48514ac0c309790b640a597"/><dir name="Gateway"><file name="Abstract.php" hash="2044da519f4ef12fdb7c73d1d4b9d50a"/><file name="Afterpay.php" hash="054b525c972119fd330291776c2550ac"/><file name="Americanexpress.php" hash="705926d7a69fb889f54185743f4cac9f"/><file name="Banktransfer.php" hash="d4d5712ab327c418ee2d949e49faee01"/><file name="Bitcoin.php" hash="001420be0c8d665d905bcc79275e989e"/><file name="Cartebancaire.php" hash="451bff78fa26e4bae883d0c18ca1f844"/><file name="Cartebleue.php" hash="b7974f8f8e655daaf50a899d15cc15fd"/><file name="Default.php" hash="dd934ee60d32000773f26be805d46925"/><file name="Directdebit.php" hash="7890209183bab5f47edcca60a19cd007"/><file name="Giropay.php" hash="ea35629ddfd08cd341128af6d95c8911"/><file name="Ideal.php" hash="1b5b6318c3e544659f465fdbc463fa51"/><file name="Klarna.php" hash="901891d606ea469296e75251fc7abe14"/><file name="Klarnaaccount.php" hash="4d85440b0df2df05ec001c6a5d7416dd"/><file name="Maestro.php" hash="c29f0bd00282c992017a2487d12d8bda"/><file name="Mastercard.php" hash="3febe4f0ee3cc630cd959e8ce086d2ee"/><file name="Mistercash.php" hash="d618b6ab14ffa5d9810cf65232b6d2a3"/><file name="Paypal.php" hash="ad4600fdc877a84a6a4f8647ae2587df"/><file name="Przelewy24.php" hash="f49bfa8354fa2bce2add3221a04843cf"/><file name="Sofortbanking.php" hash="544531b74c8fd34e7ccd48a32210d81f"/><file name="Visa.php" hash="50cbf582c2b5192923d290fcbec35870"/><file name="Vpay.php" hash="acf7d286f343b4e663a55a8540bf45d2"/><file name="Webmoney.php" hash="72a36f0854db4c02e0477208b47faccf"/></dir><file name="Observer.php" hash="72363edbe183cfa833e276f0e3cda200"/><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="5191056c5dae3862c2a468acd3e5cbac"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="314df1d94874fcb856af2e0be4019782"/></dir><file name="Tax.php" hash="dc485fa37d31e13e20f578cb58075486"/><file name="Total.php" hash="f26e4dc51d0e510eb1c2c65750dec92b"/></dir><dir name="Quote"><file name="Quote.php" hash="d09d4d5c4b55770b0a50f80f0a5fa643"/><file name="TaxTotal.php" hash="a1f53b6ed1988364aa396b3bd7afa1e0"/><file name="Total.php" hash="a525e84dc0d62a4ca073a7ddb80f162b"/></dir></dir></dir><dir name="controllers"><file name="StandardController.php" hash="793d913a16fc5a6ad56f6c4f306af793"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f14dc99c26f44cc53b4a5974dd9cdd2d"/><file name="config.xml" hash="cb88f2a81f818eabd2e7d278b8edcdd7"/><file name="system.xml" hash="816dcbbc6a0b93dd6ec3a598831bbede"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>