mPAY24 - Version 1.4.8

Version Notes

Upgrades and fixes:

1.Klarna bugfix (tax percentage problem)

2. Backend settings for proxy authentification and perr verification added

3. Payment charges on PDF Invoices

4. Payment charges bug - fixed

Download this release

Release Info

Developer Filipp Akinfiev
Extension mPAY24
Version 1.4.8
Comparing to
See all releases


Code changes from version 1.4.7 to 1.4.8

Files changed (34) hide show
  1. app/code/community/Mpay24/Mpay24/Block/Adminhtml/Sales/Totals.php +3 -3
  2. app/code/community/Mpay24/Mpay24/Block/Form/Selectpayment.php +10 -5
  3. app/code/community/Mpay24/Mpay24/Block/Sales/Order/Totals.php +3 -3
  4. app/code/community/Mpay24/Mpay24/Model/Api/MDXI.xsd +1 -1
  5. app/code/community/Mpay24/Mpay24/Model/Api/MPay24Api.php +56 -12
  6. app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php +51 -27
  7. app/code/community/Mpay24/Mpay24/Model/Api/MPay24Shop.php +24 -7
  8. app/code/community/Mpay24/Mpay24/Model/Api/curllog.log +0 -99
  9. app/code/community/Mpay24/Mpay24/Model/Method/Selectpayment.php +5 -5
  10. app/code/community/Mpay24/Mpay24/Model/Sales/Order/Creditmemo/Total/Paymentcharge.php +8 -5
  11. app/code/community/Mpay24/Mpay24/Model/Sales/Order/Invoice/Total/Paymentcharge.php +8 -5
  12. app/code/community/Mpay24/Mpay24/controllers/PaymentController.php +10 -10
  13. app/code/community/Mpay24/Mpay24/etc/config.xml +12 -6
  14. app/code/community/Mpay24/Mpay24/etc/system.xml +41 -2
  15. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-install-1.4.7.php +0 -48
  16. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-install-1.4.8.php +53 -0
  17. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.5.php +24 -19
  18. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.6.php +24 -19
  19. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.7.php +24 -19
  20. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.8.php +53 -0
  21. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.6.php +24 -19
  22. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.7.php +24 -19
  23. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.8.php +53 -0
  24. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.6-1.4.7.php +24 -19
  25. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.6-1.4.8.php +53 -0
  26. app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.7-1.4.8.php +53 -0
  27. app/design/frontend/default/default/template/mpay24/form/area.phtml +55 -56
  28. app/design/frontend/default/default/template/mpay24/form/dropDown.phtml +35 -34
  29. app/etc/modules/Mpay24_Mpay24.xml +2 -2
  30. app/locale/de_AT/Mpay24_Mpay24.csv +5 -1
  31. app/locale/de_CH/Mpay24_Mpay24.csv +5 -1
  32. app/locale/de_DE/Mpay24_Mpay24.csv +5 -1
  33. app/locale/en_US/Mpay24_Mpay24.csv +5 -1
  34. package.xml +9 -7
app/code/community/Mpay24/Mpay24/Block/Adminhtml/Sales/Totals.php CHANGED
@@ -16,7 +16,7 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Totals.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Adminhtml_Sales_Totals extends Mage_Adminhtml_Block_Sales_Totals {
@@ -41,8 +41,8 @@ class Mpay24_Mpay24_Block_Adminhtml_Sales_Totals extends Mage_Adminhtml_Block_Sa
41
  if ($index == "grand_total")
42
  if (((float)$source->getPaymentCharge()) != 0) {
43
  if($source->getPaymentChargeType() == "percent") {
44
- $label = Mage::helper('mpay24')->__("Payment charge") . "(" . number_format($source->getPaymentCharge(),2,'.','') . "%)";
45
- $amount = $source->getSubtotal()*$source->getPaymentCharge()/100;
46
  } else {
47
  $label = Mage::helper('mpay24')->__("Payment charge") . "(" . Mage::helper('mpay24')->__("Absolute value") . ")";
48
  $amount = $source->getPaymentCharge();
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Totals.php 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Adminhtml_Sales_Totals extends Mage_Adminhtml_Block_Sales_Totals {
41
  if ($index == "grand_total")
42
  if (((float)$source->getPaymentCharge()) != 0) {
43
  if($source->getPaymentChargeType() == "percent") {
44
+ $label = Mage::helper('mpay24')->__("Payment charge") . "(" . number_format($source->getBasePaymentCharge(),2,'.','') . "%)";
45
+ $amount = $source->getSubtotal()*$source->getBasePaymentCharge()/100;
46
  } else {
47
  $label = Mage::helper('mpay24')->__("Payment charge") . "(" . Mage::helper('mpay24')->__("Absolute value") . ")";
48
  $amount = $source->getPaymentCharge();
app/code/community/Mpay24/Mpay24/Block/Form/Selectpayment.php CHANGED
@@ -16,13 +16,14 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Selectpayment.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Form_Selectpayment extends Mage_Payment_Block_Form {
23
  protected function _construct() {
24
  parent::_construct();
25
- $this->setTemplate('mpay24/form/'.Mage::getStoreConfig('mpay24/mpay24/form_template'));
 
26
  }
27
 
28
  /**
@@ -60,14 +61,18 @@ class Mpay24_Mpay24_Block_Form_Selectpayment extends Mage_Payment_Block_Form {
60
  Mage::app()->reinitStores();
61
  }
62
 
 
 
 
 
 
63
  return $paymentsArray;
64
  } else {
65
  $i=1;
66
  $payments = array();
67
  foreach($paymentsArray as $id => $payment) {
68
- if(Mage::getStoreConfig('mpay24/mpay24/ps_'.$i) == 1) {
69
- $payments[$id] = $payment;
70
- }
71
 
72
  $i++;
73
  }
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Selectpayment.php 13 2013-10-31 14:44:29Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Form_Selectpayment extends Mage_Payment_Block_Form {
23
  protected function _construct() {
24
  parent::_construct();
25
+ if(Mage::getStoreConfig('mpay24/mpay24/form_template'))
26
+ $this->setTemplate('mpay24/form/'.Mage::getStoreConfig('mpay24/mpay24/form_template'));
27
  }
28
 
29
  /**
61
  Mage::app()->reinitStores();
62
  }
63
 
64
+ foreach($paymentsArray as $key => $value) {
65
+ $value['ACTIVE'] = 1;
66
+ $paymentsArray[$key] = $value;
67
+ }
68
+
69
  return $paymentsArray;
70
  } else {
71
  $i=1;
72
  $payments = array();
73
  foreach($paymentsArray as $id => $payment) {
74
+ $payment['ACTIVE'] = Mage::getStoreConfig('mpay24/mpay24/ps_'.$i);
75
+ $payments[$id] = $payment;
 
76
 
77
  $i++;
78
  }
app/code/community/Mpay24/Mpay24/Block/Sales/Order/Totals.php CHANGED
@@ -16,7 +16,7 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Totals.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Totals {
@@ -41,8 +41,8 @@ class Mpay24_Mpay24_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Tota
41
  if ($index == "grand_total")
42
  if (((float)$source->getPaymentCharge()) != 0) {
43
  if($source->getPaymentChargeType() == "percent") {
44
- $label = Mage::helper('mpay24')->__("Payment charge") . "(" . number_format($source->getPaymentCharge(),2,'.','') . "%)";
45
- $amount = $source->getSubtotal()*$source->getPaymentCharge()/100;
46
  } else {
47
  $label = Mage::helper('mpay24')->__("Payment charge") . "(" . Mage::helper('mpay24')->__("Absolute value") . ")";
48
  $amount = $source->getPaymentCharge();
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Totals.php 14 2013-10-31 15:13:46Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Totals {
41
  if ($index == "grand_total")
42
  if (((float)$source->getPaymentCharge()) != 0) {
43
  if($source->getPaymentChargeType() == "percent") {
44
+ $label = Mage::helper('mpay24')->__("Payment charge") . "(" . number_format($source->getBasePaymentCharge(),2,'.','') . "%)";
45
+ $amount = $source->getSubtotal()*$source->getBasePaymentCharge()/100;
46
  } else {
47
  $label = Mage::helper('mpay24')->__("Payment charge") . "(" . Mage::helper('mpay24')->__("Absolute value") . ")";
48
  $amount = $source->getPaymentCharge();
app/code/community/Mpay24/Mpay24/Model/Api/MDXI.xsd CHANGED
@@ -446,4 +446,4 @@
446
  <xs:attribute name="FooterStyle" type="xs:string"/>
447
  </xs:complexType>
448
  </xs:element>
449
- </xs:schema>
446
  <xs:attribute name="FooterStyle" type="xs:string"/>
447
  </xs:complexType>
448
  </xs:element>
449
+ </xs:schema>
app/code/community/Mpay24/Mpay24/Model/Api/MPay24Api.php CHANGED
@@ -4,7 +4,7 @@
4
  * build the SOAP request, sent to mPAY24
5
  *
6
  * @author mPAY24 GmbH <support@mpay24.com>
7
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
8
  * @filesource MPay24Api.php
9
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
10
  */
@@ -62,6 +62,16 @@ class MPay24Api {
62
  * @var int
63
  */
64
  private $proxy_port = "";
 
 
 
 
 
 
 
 
 
 
65
  /**
66
  * The whole soap-xml (envelope and body), which is to be sent to mPAY24 as request
67
  * @var string
@@ -72,6 +82,11 @@ class MPay24Api {
72
  * @var string
73
  */
74
  private $response = "";
 
 
 
 
 
75
  /**
76
  * TRUE if log files are to be written, by default - FALSE
77
  * @var bool
@@ -106,8 +121,11 @@ class MPay24Api {
106
  * FALSE - when you want to use the LIVE system
107
  * @param string $proxyHost The host name in case you are behind a proxy server ("" when not)
108
  * @param int $proxyPort 4-digit port number in case you are behind a proxy server ("" when not)
 
 
 
109
  */
110
- public function configure($merchantID, $soapPassword, $test, $proxyHost, $proxyPort) {
111
  /**
112
  * An error message, that will be displayed to the user in case you are using the LIVE system
113
  * @const LIVE_ERROR_MSG
@@ -124,8 +142,14 @@ class MPay24Api {
124
  $this->setSoapPassword($soapPassword);
125
  $this->setSystem($test);
126
 
127
- if($proxyHost != "" && $proxyPort != "")
128
- $this->setProxySettings($proxyHost, $proxyPort);
 
 
 
 
 
 
129
  }
130
 
131
  /**
@@ -645,11 +669,24 @@ class MPay24Api {
645
  * @param string $proxy_host Proxy host
646
  * @param string $proxy_port Proxy port
647
  */
648
- private function setProxySettings($proxy_host="", $proxy_port="") {
649
  if($proxy_host != "" && $proxy_port != "") {
650
  $this->proxy_host = $proxy_host;
651
  $this->proxy_port = $proxy_port;
652
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
653
  }
654
 
655
  /**
@@ -677,7 +714,7 @@ class MPay24Api {
677
  * Create a curl request and send the cretaed SOAP XML
678
  */
679
  private function send() {
680
- $userAgent = 'mPAY24 PHP API $Rev: 5 $ ($Date:: 2013-10-10 #$)';
681
 
682
  if($this->shop != '') {
683
  $userAgent = $this->shop;
@@ -706,8 +743,15 @@ class MPay24Api {
706
  try {
707
  curl_setopt($ch, CURLOPT_CAINFO, __DIR__.'/cacert.pem');
708
 
709
- if($this->proxy_host !== '' && $this->proxy_port !== '')
710
  curl_setopt($ch, CURLOPT_PROXY, $this->proxy_host.':'.$this->proxy_port);
 
 
 
 
 
 
 
711
 
712
  $this->response = curl_exec($ch);
713
  curl_close($ch);
@@ -775,7 +819,7 @@ class MPay24Api {
775
  * The GeneralResponse class contains the status of a response and return code, which was delivered by mPAY24 as an answer of your request
776
  *
777
  * @author mPAY24 GmbH <support@mpay24.com>
778
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
779
  * @filesource MPay24Api.php
780
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
781
  */
@@ -851,7 +895,7 @@ class GeneralResponse {
851
  * The PaymentResponse class contains a generalResponse object and the location(URL), which will be used for the payment session
852
  *
853
  * @author mPAY24 GmbH <support@mpay24.com>
854
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
855
  * @filesource MPay24Api.php
856
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
857
  */
@@ -907,7 +951,7 @@ class PaymentResponse extends GeneralResponse {
907
  * The ManagePaymentResponse class contains a generalResponse object and the mPAYTID and/or tid of the transaction which was managed
908
  *
909
  * @author mPAY24 GmbH <support@mpay24.com>
910
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
911
  * @filesource MPay24Api.php
912
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
913
  */
@@ -978,7 +1022,7 @@ class ManagePaymentResponse extends GeneralResponse {
978
  * The ListPaymentMethodsResponse class contains a generalResponse object and all the needed informarion for the active payment mothods (payment methods count, payment types, brands and descriptions)
979
  *
980
  * @author mPAY24 GmbH <support@mpay24.com>
981
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
982
  * @filesource MPay24Api.php
983
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
984
  */
@@ -1131,7 +1175,7 @@ class ListPaymentMethodsResponse extends GeneralResponse {
1131
  * The TransactionStatusResponse class contains a generalResponse object and all the parameters, returned with the confirmation from mPAY24
1132
  *
1133
  * @author mPAY24 GmbH <support@mpay24.com>
1134
- * @version $Id: MPay24Api.php 5 2013-10-10 13:08:44Z sapolhei $
1135
  * @filesource MPay24Api.php
1136
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
1137
  */
4
  * build the SOAP request, sent to mPAY24
5
  *
6
  * @author mPAY24 GmbH <support@mpay24.com>
7
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
8
  * @filesource MPay24Api.php
9
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
10
  */
62
  * @var int
63
  */
64
  private $proxy_port = "";
65
+ /**
66
+ * The user name, in case you are using proxy
67
+ * @var string
68
+ */
69
+ private $proxy_user = "";
70
+ /**
71
+ * The password, in case you are using proxy
72
+ * @var string
73
+ */
74
+ private $proxy_pass = "";
75
  /**
76
  * The whole soap-xml (envelope and body), which is to be sent to mPAY24 as request
77
  * @var string
82
  * @var string
83
  */
84
  private $response = "";
85
+ /**
86
+ * FALSE to stop cURL from verifying the peer's certificate, default - TRUE
87
+ * @var bool
88
+ */
89
+ private $verify_peer = true;
90
  /**
91
  * TRUE if log files are to be written, by default - FALSE
92
  * @var bool
121
  * FALSE - when you want to use the LIVE system
122
  * @param string $proxyHost The host name in case you are behind a proxy server ("" when not)
123
  * @param int $proxyPort 4-digit port number in case you are behind a proxy server ("" when not)
124
+ * @param string $proxyUser The proxy user in case you are behind a proxy server ("" when not)
125
+ * @param string $proxyPass The proxy password in case you are behind a proxy server ("" when not)
126
+ * @param bool $verifyPeer Set as FALSE to stop cURL from verifying the peer's certificate
127
  */
128
+ public function configure($merchantID, $soapPassword, $test, $proxyHost, $proxyPort, $proxyUser, $proxyPass, $verifyPeer) {
129
  /**
130
  * An error message, that will be displayed to the user in case you are using the LIVE system
131
  * @const LIVE_ERROR_MSG
142
  $this->setSoapPassword($soapPassword);
143
  $this->setSystem($test);
144
 
145
+ if($proxyHost != "" && $proxyPort != "") {
146
+ if($proxyUser != "" && $proxyPass != "")
147
+ $this->setProxySettings($proxyHost, $proxyPort, $proxyUser, $proxyPass);
148
+ else
149
+ $this->setProxySettings($proxyHost, $proxyPort);
150
+ }
151
+
152
+ $this->setVerifyPeer($verifyPeer);
153
  }
154
 
155
  /**
669
  * @param string $proxy_host Proxy host
670
  * @param string $proxy_port Proxy port
671
  */
672
+ private function setProxySettings($proxy_host="", $proxy_port="",$proxy_user="",$proxy_pass="") {
673
  if($proxy_host != "" && $proxy_port != "") {
674
  $this->proxy_host = $proxy_host;
675
  $this->proxy_port = $proxy_port;
676
  }
677
+
678
+ if($proxy_user != "" && $proxy_pass != "") {
679
+ $this->proxy_user = $proxy_user;
680
+ $this->proxy_pass = $proxy_pass;
681
+ }
682
+ }
683
+
684
+ /**
685
+ * Set whether to stop cURL from verifying the peer's certificate
686
+ * @param bool $verify_peer Set as FALSE to stop cURL from verifying the peer's certificate
687
+ */
688
+ private function setVerifyPeer($verify_peer) {
689
+ $this->verify_peer = $verify_peer;
690
  }
691
 
692
  /**
714
  * Create a curl request and send the cretaed SOAP XML
715
  */
716
  private function send() {
717
+ $userAgent = 'mPAY24 PHP API $Rev: 9 $ ($Date:: 2013-10-29 #$)';
718
 
719
  if($this->shop != '') {
720
  $userAgent = $this->shop;
743
  try {
744
  curl_setopt($ch, CURLOPT_CAINFO, __DIR__.'/cacert.pem');
745
 
746
+ if($this->proxy_host !== '' && $this->proxy_port !== '') {
747
  curl_setopt($ch, CURLOPT_PROXY, $this->proxy_host.':'.$this->proxy_port);
748
+
749
+ if($this->proxy_user !== '' && $this->proxy_pass !== '')
750
+ curl_setopt($ch, CURLOPT_PROXYUSERPWD, $this->proxy_user.':'.$this->proxy_pass);
751
+
752
+ if($this->verify_peer !== true)
753
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
754
+ }
755
 
756
  $this->response = curl_exec($ch);
757
  curl_close($ch);
819
  * The GeneralResponse class contains the status of a response and return code, which was delivered by mPAY24 as an answer of your request
820
  *
821
  * @author mPAY24 GmbH <support@mpay24.com>
822
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
823
  * @filesource MPay24Api.php
824
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
825
  */
895
  * The PaymentResponse class contains a generalResponse object and the location(URL), which will be used for the payment session
896
  *
897
  * @author mPAY24 GmbH <support@mpay24.com>
898
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
899
  * @filesource MPay24Api.php
900
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
901
  */
951
  * The ManagePaymentResponse class contains a generalResponse object and the mPAYTID and/or tid of the transaction which was managed
952
  *
953
  * @author mPAY24 GmbH <support@mpay24.com>
954
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
955
  * @filesource MPay24Api.php
956
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
957
  */
1022
  * The ListPaymentMethodsResponse class contains a generalResponse object and all the needed informarion for the active payment mothods (payment methods count, payment types, brands and descriptions)
1023
  *
1024
  * @author mPAY24 GmbH <support@mpay24.com>
1025
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
1026
  * @filesource MPay24Api.php
1027
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
1028
  */
1175
  * The TransactionStatusResponse class contains a generalResponse object and all the parameters, returned with the confirmation from mPAY24
1176
  *
1177
  * @author mPAY24 GmbH <support@mpay24.com>
1178
+ * @version $Id: MPay24Api.php 9 2013-10-29 15:36:26Z sapolhei $
1179
  * @filesource MPay24Api.php
1180
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
1181
  */
app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /**
3
  * @author support@mpay24.com
4
- * @version $Id: MPay24MagentoShop.php 5 2013-10-10 13:08:44Z sapolhei $
5
  * @filesource test.php
6
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
7
  */
@@ -20,7 +20,7 @@ class MPay24MagentoShop extends MPay24Shop {
20
 
21
  const CANCEL_URL = 'mpay24/payment/cancel';
22
 
23
- const MAGENTO_VERSION = "Magento 1.4.7 ";
24
 
25
  var $tid;
26
  var $price;
@@ -395,7 +395,7 @@ class MPay24MagentoShop extends MPay24Shop {
395
  if(in_array('ItemPrice',$conf)) {
396
  $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice = number_format($_item->getPriceInclTax()*1,2,'.','');
397
  $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice->setStyle($style);
398
- $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice->setTax(number_format($_item->getTaxAmount(),2,'.',''));
399
  }
400
  } else {
401
  if(in_array('ItemPrice',$conf)) {
@@ -404,9 +404,16 @@ class MPay24MagentoShop extends MPay24Shop {
404
  }
405
  }
406
 
407
- if(in_array('Price',$conf)) {
408
- $mdxi->Order->ShoppingCart->Item($linecount)->Price = number_format(($_item->getData('price')*1),2,'.','') * (int)$_item->getQtyOrdered();
409
- $mdxi->Order->ShoppingCart->Item($linecount)->Price->setStyle($style);
 
 
 
 
 
 
 
410
  }
411
  }
412
  }
@@ -427,15 +434,31 @@ class MPay24MagentoShop extends MPay24Shop {
427
  $mdxi->Order->ShoppingCart->Discount = number_format($this->order->getData('discount_amount'), 2, '.', '');
428
  }
429
 
 
430
  if(number_format($this->order->getData('shipping_amount'),2,'.','') !== '0.00') {
431
- $mdxi->Order->ShoppingCart->ShippingCosts->setHeader($this->order->getData('shipping_description'));
432
- $mdxi->Order->ShoppingCart->ShippingCosts->setHeaderStyle(Mage::getStoreConfig('mpay24/mpay24spsc/shipping_costs_headerstyle'));
433
- $mdxi->Order->ShoppingCart->ShippingCosts->setStyle(Mage::getStoreConfig('mpay24/mpay24spsc/shipping_costs_style'));
434
-
435
  if(Mage::getStoreConfig('tax/cart_display/shipping') == 2 || Mage::getStoreConfig('tax/cart_display/shipping') == 3)
436
- $mdxi->Order->ShoppingCart->ShippingCosts = number_format($this->order->getShippingInclTax(), 2, '.', '');
437
  else
438
- $mdxi->Order->ShoppingCart->ShippingCosts = number_format($this->order->getData('shipping_amount'), 2, '.', '');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
439
  }
440
 
441
  $t=1;
@@ -449,7 +472,7 @@ class MPay24MagentoShop extends MPay24Shop {
449
  foreach(array_keys($taxArray) as $taxKey)
450
  $taxInfo[$taxKey] = $taxArray[$taxKey];
451
 
452
- if(Mage::getStoreConfig('tax/cart_display/shipping') == 2 || Mage::getStoreConfig('tax/cart_display/shipping') == 3) {
453
  if(substr(Mage::getStoreConfig('general/locale/code'), 0, 2) == 'de')
454
  $inklText = "inkl. ";
455
  else
@@ -467,19 +490,6 @@ class MPay24MagentoShop extends MPay24Shop {
467
  $t++;
468
  }
469
  }
470
-
471
- if($this->order->getPaymentCharge() > 0) {
472
- if($this->order->getPaymentChargeType() == "percent") {
473
- $mdxi->Order->ShoppingCart->Tax($t, number_format($this->order->getData('subtotal')*$this->order->getPaymentCharge()/100,2,'.',''));
474
- $mdxi->Order->ShoppingCart->Tax($t)->setHeader(Mage::helper('mpay24')->__("Payment charge") . " (" . $this->order->getPaymentCharge() . "%)");
475
- } else {
476
- $mdxi->Order->ShoppingCart->Tax($t, number_format($this->order->getPaymentCharge(),2,'.',''));
477
- $mdxi->Order->ShoppingCart->Tax($t)->setHeader(Mage::helper('mpay24')->__("Payment charge") . " (" . Mage::helper('mpay24')->__("Absolute value") . ")");
478
- }
479
-
480
- $mdxi->Order->ShoppingCart->Tax($t)->setHeaderStyle(Mage::getStoreConfig('mpay24/mpay24spsc/tax_headerstyle'));
481
- $mdxi->Order->ShoppingCart->Tax($t)->setStyle(Mage::getStoreConfig('mpay24/mpay24spsc/tax_style'));
482
- }
483
 
484
  $billingCountry = "";
485
  $billingCountryCode = "";
@@ -677,16 +687,30 @@ class MPay24MagentoShop extends MPay24Shop {
677
  $debug = TRUE;
678
  else
679
  $debug = FALSE;
 
 
 
 
 
680
 
681
  if(Mage::getStoreConfig('mpay24/mpay24as/use_proxy') == 1) {
682
  $proxy_host = Mage::getStoreConfig('mpay24/mpay24as/proxy_host');
683
  $proxy_port = Mage::getStoreConfig('mpay24/mpay24as/proxy_port');
 
 
 
 
 
 
 
684
  } else {
685
  $proxy_host = null;
686
  $proxy_port = null;
 
 
687
  }
688
 
689
- $mPay24MagentoShop = new MPay24MagentoShop(Mage::getStoreConfig('mpay24/mpay24as/merchantid'), Mage::getStoreConfig('mpay24/mpay24as/soap_pass'), $test, $proxy_host, $proxy_port, $debug);
690
  return $mPay24MagentoShop;
691
  }
692
  }
1
  <?php
2
  /**
3
  * @author support@mpay24.com
4
+ * @version $Id: MPay24MagentoShop.php 16 2013-11-12 15:30:44Z sapolhei $
5
  * @filesource test.php
6
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
7
  */
20
 
21
  const CANCEL_URL = 'mpay24/payment/cancel';
22
 
23
+ const MAGENTO_VERSION = "Magento 1.4.8 ";
24
 
25
  var $tid;
26
  var $price;
395
  if(in_array('ItemPrice',$conf)) {
396
  $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice = number_format($_item->getPriceInclTax()*1,2,'.','');
397
  $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice->setStyle($style);
398
+ $mdxi->Order->ShoppingCart->Item($linecount)->ItemPrice->setTax(number_format(number_format(($_item->getData('price')*1),2,'.','') * number_format($_item->getTaxPercent(),2,'.','')/100,2,'.',''));
399
  }
400
  } else {
401
  if(in_array('ItemPrice',$conf)) {
404
  }
405
  }
406
 
407
+ if(Mage::getStoreConfig('tax/cart_display/price') == 2 || Mage::getStoreConfig('tax/cart_display/price') == 3) {
408
+ if(in_array('Price',$conf)) {
409
+ $mdxi->Order->ShoppingCart->Item($linecount)->Price = number_format(($_item->getPriceInclTax()*1),2,'.','') * (int)$_item->getQtyOrdered();
410
+ $mdxi->Order->ShoppingCart->Item($linecount)->Price->setStyle($style);
411
+ }
412
+ } else {
413
+ if(in_array('Price',$conf)) {
414
+ $mdxi->Order->ShoppingCart->Item($linecount)->Price = number_format(($_item->getData('price')*1),2,'.','') * (int)$_item->getQtyOrdered();
415
+ $mdxi->Order->ShoppingCart->Item($linecount)->Price->setStyle($style);
416
+ }
417
  }
418
  }
419
  }
434
  $mdxi->Order->ShoppingCart->Discount = number_format($this->order->getData('discount_amount'), 2, '.', '');
435
  }
436
 
437
+ $s=1;
438
  if(number_format($this->order->getData('shipping_amount'),2,'.','') !== '0.00') {
 
 
 
 
439
  if(Mage::getStoreConfig('tax/cart_display/shipping') == 2 || Mage::getStoreConfig('tax/cart_display/shipping') == 3)
440
+ $mdxi->Order->ShoppingCart->ShippingCosts($s, number_format($this->order->getShippingInclTax(), 2, '.', ''));
441
  else
442
+ $mdxi->Order->ShoppingCart->ShippingCosts($s, number_format($this->order->getData('shipping_amount'), 2, '.', ''));
443
+
444
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setHeader($this->order->getData('shipping_description'));
445
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setHeaderStyle(Mage::getStoreConfig('mpay24/mpay24spsc/shipping_costs_headerstyle'));
446
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setStyle(Mage::getStoreConfig('mpay24/mpay24spsc/shipping_costs_style'));
447
+
448
+ $s++;
449
+ }
450
+
451
+ if($this->order->getPaymentCharge() > 0) {
452
+ if($this->order->getPaymentChargeType() == "percent") {
453
+ $mdxi->Order->ShoppingCart->ShippingCosts($s, number_format($this->order->getData('subtotal')*$this->order->getBasePaymentCharge()/100,2,'.',''));
454
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setHeader(Mage::helper('mpay24')->__("Payment charge") . " (" . $this->order->getBasePaymentCharge() . "%)");
455
+ } else {
456
+ $mdxi->Order->ShoppingCart->ShippingCosts($s, number_format($this->order->getPaymentCharge(),2,'.',''));
457
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setHeader(Mage::helper('mpay24')->__("Payment charge") . " (" . Mage::helper('mpay24')->__("Absolute value") . ")");
458
+ }
459
+
460
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setHeaderStyle(Mage::getStoreConfig('mpay24/mpay24spsc/tax_headerstyle'));
461
+ $mdxi->Order->ShoppingCart->ShippingCosts($s)->setStyle(Mage::getStoreConfig('mpay24/mpay24spsc/tax_style'));
462
  }
463
 
464
  $t=1;
472
  foreach(array_keys($taxArray) as $taxKey)
473
  $taxInfo[$taxKey] = $taxArray[$taxKey];
474
 
475
+ if(Mage::getStoreConfig('tax/cart_display/price') == 2 || Mage::getStoreConfig('tax/cart_display/price') == 3) {
476
  if(substr(Mage::getStoreConfig('general/locale/code'), 0, 2) == 'de')
477
  $inklText = "inkl. ";
478
  else
490
  $t++;
491
  }
492
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
493
 
494
  $billingCountry = "";
495
  $billingCountryCode = "";
687
  $debug = TRUE;
688
  else
689
  $debug = FALSE;
690
+
691
+ if(Mage::getStoreConfig('mpay24/mpay24as/verify_peer') == 1)
692
+ $verify_peer = TRUE;
693
+ else
694
+ $verify_peer = FALSE;
695
 
696
  if(Mage::getStoreConfig('mpay24/mpay24as/use_proxy') == 1) {
697
  $proxy_host = Mage::getStoreConfig('mpay24/mpay24as/proxy_host');
698
  $proxy_port = Mage::getStoreConfig('mpay24/mpay24as/proxy_port');
699
+ if(Mage::getStoreConfig('mpay24/mpay24as/use_proxy_auth') == 1) {
700
+ $proxy_user = Mage::getStoreConfig('mpay24/mpay24as/proxy_user');
701
+ $proxy_pass = Mage::getStoreConfig('mpay24/mpay24as/proxy_pass');
702
+ } else {
703
+ $proxy_user = null;
704
+ $proxy_pass = null;
705
+ }
706
  } else {
707
  $proxy_host = null;
708
  $proxy_port = null;
709
+ $proxy_user = null;
710
+ $proxy_pass = null;
711
  }
712
 
713
+ $mPay24MagentoShop = new MPay24MagentoShop(Mage::getStoreConfig('mpay24/mpay24as/merchantid'), Mage::getStoreConfig('mpay24/mpay24as/soap_pass'), $test, $debug, $verify_peer, $proxy_host, $proxy_port, $proxy_user, $proxy_pass);
714
  return $mPay24MagentoShop;
715
  }
716
  }
app/code/community/Mpay24/Mpay24/Model/Api/MPay24Shop.php CHANGED
@@ -6,7 +6,7 @@ include_once("orderXML.php");
6
  * The abstract MPay24Shop class provides abstract functions, which are used from the other functions in order to make a payment or a request to mPAY24
7
  *
8
  * @author mPAY24 GmbH <support@mpay24.com>
9
- * @version $Id: MPay24Shop.php 5 2013-10-10 13:08:44Z sapolhei $
10
  * @filesource MPay24Shop.php
11
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
12
  */
@@ -25,29 +25,46 @@ abstract class MPay24Shop extends Transaction {
25
  * @param string $soapPassword The webservice's password, supported by mPAY24
26
  * @param bool $test TRUE - when you want to use the TEST system,
27
  * FALSE - when you want to use the LIVE system
28
- * @param string $proxyHost The host name in case you are behind a proxy server ("" when not)
29
- * @param int $proxyPort 4-digit port number in case you are behind a proxy server ("" when not)
30
  * @param bool $debug TRUE - when you want to write log files,
31
  * FALSE - when you don't want write log files
 
 
 
 
 
 
32
  */
33
- function MPay24Shop($merchantID, $soapPassword, $test, $proxyHost=null, $proxyPort=null, $debug=false) {
34
  if(!is_bool($test))
35
  die("The test parameter '$test' you have given is wrong, it must be boolean value 'true' or 'false'!");
36
 
37
  if(!is_bool($debug))
38
  die("The debug parameter '$debug' you have given is wrong, it must be boolean value 'true' or 'false'!");
 
 
 
39
 
40
  $this->mPay24Api = new MPay24Api();
41
 
42
  if($proxyHost == null) {
43
  $pHost = "";
44
  $pPort = "";
 
 
45
  } else {
46
  $pHost = $proxyHost;
47
  $pPort = $proxyPort;
 
 
 
 
 
 
 
 
48
  }
49
 
50
- $this->mPay24Api->configure($merchantID, $soapPassword, $test, $pHost, $pPort);
51
  $this->mPay24Api->setDebug($debug);
52
 
53
  if (version_compare(phpversion(), '5.0.0', '<')===true || !in_array('curl', get_loaded_extensions()) || !in_array('dom', get_loaded_extensions())) {
@@ -634,7 +651,7 @@ define("TRANSACTION_PROPERTIES", "SECRET,TID,STATUS,MPAYTID,APPR_CODE,P_TYPE,
634
  * * STRING: FILTER_STATUS
635
  * * STRING: APPR_CODE
636
  * @author mPAY24 GmbH <support@mpay24.com>
637
- * @version $Id: MPay24Shop.php 5 2013-10-10 13:08:44Z sapolhei $
638
  * @filesource MPay24Shop.php
639
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
640
  */
@@ -706,7 +723,7 @@ class Transaction {
706
  * The abstract MPay24flexLINK class provides abstract functions, which are used from the other functions in order to create a flexLINK
707
  *
708
  * @author mPAY24 GmbH <support@mpay24.com>
709
- * @version $Id: MPay24Shop.php 5 2013-10-10 13:08:44Z sapolhei $
710
  * @filesource MPay24Shop.php
711
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
712
  */
6
  * The abstract MPay24Shop class provides abstract functions, which are used from the other functions in order to make a payment or a request to mPAY24
7
  *
8
  * @author mPAY24 GmbH <support@mpay24.com>
9
+ * @version $Id: MPay24Shop.php 9 2013-10-29 15:36:26Z sapolhei $
10
  * @filesource MPay24Shop.php
11
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
12
  */
25
  * @param string $soapPassword The webservice's password, supported by mPAY24
26
  * @param bool $test TRUE - when you want to use the TEST system,
27
  * FALSE - when you want to use the LIVE system
 
 
28
  * @param bool $debug TRUE - when you want to write log files,
29
  * FALSE - when you don't want write log files
30
+ * @param bool $verfiyPeer Set as FALSE to stop cURL from verifying the peer's certificate
31
+ * @param string $proxyHost The host name in case you are behind a proxy server ("" when not)
32
+ * @param int $proxyPort 4-digit port number in case you are behind a proxy server ("" when not)
33
+
34
+ * @param string $proxyUser The proxy user in case you are behind a proxy server ("" when not)
35
+ * @param string $proxyPass The proxy password in case you are behind a proxy server ("" when not)
36
  */
37
+ function MPay24Shop($merchantID, $soapPassword, $test, $debug=false, $verfiyPeer=true, $proxyHost=null, $proxyPort=null, $proxyUser=null, $proxyPass=null) {
38
  if(!is_bool($test))
39
  die("The test parameter '$test' you have given is wrong, it must be boolean value 'true' or 'false'!");
40
 
41
  if(!is_bool($debug))
42
  die("The debug parameter '$debug' you have given is wrong, it must be boolean value 'true' or 'false'!");
43
+
44
+ if(!is_bool($verfiyPeer))
45
+ die("The verifyPeer parameter '$verfiyPeer' you have given is wrong, it must be boolean value 'true' or 'false'!");
46
 
47
  $this->mPay24Api = new MPay24Api();
48
 
49
  if($proxyHost == null) {
50
  $pHost = "";
51
  $pPort = "";
52
+ $pUser = "";
53
+ $pPass = "";
54
  } else {
55
  $pHost = $proxyHost;
56
  $pPort = $proxyPort;
57
+
58
+ if($proxyUser == null) {
59
+ $pUser = "";
60
+ $pPass = "";
61
+ } else {
62
+ $pUser = $proxyUser;
63
+ $pPass = $proxyPass;
64
+ }
65
  }
66
 
67
+ $this->mPay24Api->configure($merchantID, $soapPassword, $test, $pHost, $pPort, $pUser, $pPass, $verfiyPeer);
68
  $this->mPay24Api->setDebug($debug);
69
 
70
  if (version_compare(phpversion(), '5.0.0', '<')===true || !in_array('curl', get_loaded_extensions()) || !in_array('dom', get_loaded_extensions())) {
651
  * * STRING: FILTER_STATUS
652
  * * STRING: APPR_CODE
653
  * @author mPAY24 GmbH <support@mpay24.com>
654
+ * @version $Id: MPay24Shop.php 9 2013-10-29 15:36:26Z sapolhei $
655
  * @filesource MPay24Shop.php
656
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
657
  */
723
  * The abstract MPay24flexLINK class provides abstract functions, which are used from the other functions in order to create a flexLINK
724
  *
725
  * @author mPAY24 GmbH <support@mpay24.com>
726
+ * @version $Id: MPay24Shop.php 9 2013-10-29 15:36:26Z sapolhei $
727
  * @filesource MPay24Shop.php
728
  * @license http://ec.europa.eu/idabc/eupl.html EUPL, Version 1.1
729
  */
app/code/community/Mpay24/Mpay24/Model/Api/curllog.log CHANGED
@@ -1,99 +0,0 @@
1
- * About to connect() to www.mpay24.com port 443 (#0)
2
- * Trying 213.164.25.234...
3
- * connected
4
- * Connected to www.mpay24.com (213.164.25.234) port 443 (#0)
5
- * successfully set certificate verify locations:
6
- * CAfile: C:\Users\anna\workspace\anna-2\magento_module\app\code\community\Mpay24\Mpay24\Model\Api/cacert.pem
7
- CApath: none
8
- * SSL connection using RC4-SHA
9
- * Server certificate:
10
- * subject: 1.3.6.1.4.1.311.60.2.1.3=AT; businessCategory=Private Organization; serialNumber=199939d; C=AT; ST=Wien; L=Wien; O=mPAY24 GmbH; OU=Terms of use at www.verisign.com/rpa (c)05; CN=www.mpay24.com
11
- * start date: 2011-10-18 00:00:00 GMT
12
- * expire date: 2013-12-02 23:59:59 GMT
13
- * common name: www.mpay24.com (matched)
14
- * issuer: C=US; O=VeriSign, Inc.; OU=VeriSign Trust Network; OU=Terms of use at https://www.verisign.com/rpa (c)06; CN=VeriSign Class 3 Extended Validation SSL SGC CA
15
- * SSL certificate verify ok.
16
- * Server auth using Basic with user 'u72169'
17
- > POST /app/bin/etpproxy_v15 HTTP/1.1
18
- Authorization: Basic dTcyMTY5OkJydXNldmE4Ng==
19
- User-Agent: mPAY24 PHP API $Rev: 7 $ ($Date:: 2013-10-10 #$)
20
- Host: www.mpay24.com
21
- Accept: */*
22
- Content-Length: 423
23
- Content-Type: application/x-www-form-urlencoded
24
-
25
- * upload completely sent off: 423 out of 423 bytes
26
- < HTTP/1.1 200 OK
27
- < Date: Thu, 10 Oct 2013 13:35:08 GMT
28
- < Server:
29
- < Content-Length: 1311
30
- < Content-Type: text/xml; charset=utf-8
31
- <
32
- * Connection #0 to host www.mpay24.com left intact
33
- * Closing connection #0
34
- * About to connect() to www.mpay24.com port 443 (#0)
35
- * Trying 213.164.25.234...
36
- * connected
37
- * Connected to www.mpay24.com (213.164.25.234) port 443 (#0)
38
- * successfully set certificate verify locations:
39
- * CAfile: C:\Users\anna\workspace\anna-2\magento_module\app\code\community\Mpay24\Mpay24\Model\Api/cacert.pem
40
- CApath: none
41
- * SSL connection using RC4-SHA
42
- * Server certificate:
43
- * subject: 1.3.6.1.4.1.311.60.2.1.3=AT; businessCategory=Private Organization; serialNumber=199939d; C=AT; ST=Wien; L=Wien; O=mPAY24 GmbH; OU=Terms of use at www.verisign.com/rpa (c)05; CN=www.mpay24.com
44
- * start date: 2011-10-18 00:00:00 GMT
45
- * expire date: 2013-12-02 23:59:59 GMT
46
- * common name: www.mpay24.com (matched)
47
- * issuer: C=US; O=VeriSign, Inc.; OU=VeriSign Trust Network; OU=Terms of use at https://www.verisign.com/rpa (c)06; CN=VeriSign Class 3 Extended Validation SSL SGC CA
48
- * SSL certificate verify ok.
49
- * Server auth using Basic with user 'u72169'
50
- > POST /app/bin/etpproxy_v15 HTTP/1.1
51
- Authorization: Basic dTcyMTY5OkJydXNldmE4Ng==
52
- User-Agent: mPAY24 PHP API $Rev: 7 $ ($Date:: 2013-10-10 #$)
53
- Host: www.mpay24.com
54
- Accept: */*
55
- Content-Length: 423
56
- Content-Type: application/x-www-form-urlencoded
57
-
58
- * upload completely sent off: 423 out of 423 bytes
59
- < HTTP/1.1 200 OK
60
- < Date: Thu, 10 Oct 2013 13:38:00 GMT
61
- < Server:
62
- < Content-Length: 1311
63
- < Content-Type: text/xml; charset=utf-8
64
- <
65
- * Connection #0 to host www.mpay24.com left intact
66
- * Closing connection #0
67
- * About to connect() to www.mpay24.com port 443 (#0)
68
- * Trying 213.164.25.234...
69
- * connected
70
- * Connected to www.mpay24.com (213.164.25.234) port 443 (#0)
71
- * successfully set certificate verify locations:
72
- * CAfile: C:\Users\anna\workspace\anna-2\magento_module\app\code\community\Mpay24\Mpay24\Model\Api/cacert.pem
73
- CApath: none
74
- * SSL connection using RC4-SHA
75
- * Server certificate:
76
- * subject: 1.3.6.1.4.1.311.60.2.1.3=AT; businessCategory=Private Organization; serialNumber=199939d; C=AT; ST=Wien; L=Wien; O=mPAY24 GmbH; OU=Terms of use at www.verisign.com/rpa (c)05; CN=www.mpay24.com
77
- * start date: 2011-10-18 00:00:00 GMT
78
- * expire date: 2013-12-02 23:59:59 GMT
79
- * common name: www.mpay24.com (matched)
80
- * issuer: C=US; O=VeriSign, Inc.; OU=VeriSign Trust Network; OU=Terms of use at https://www.verisign.com/rpa (c)06; CN=VeriSign Class 3 Extended Validation SSL SGC CA
81
- * SSL certificate verify ok.
82
- * Server auth using Basic with user 'u72169'
83
- > POST /app/bin/etpproxy_v15 HTTP/1.1
84
- Authorization: Basic dTcyMTY5OkJydXNldmE4Ng==
85
- User-Agent: mPAY24 PHP API $Rev: 7 $ ($Date:: 2013-10-10 #$)
86
- Host: www.mpay24.com
87
- Accept: */*
88
- Content-Length: 423
89
- Content-Type: application/x-www-form-urlencoded
90
-
91
- * upload completely sent off: 423 out of 423 bytes
92
- < HTTP/1.1 200 OK
93
- < Date: Thu, 10 Oct 2013 13:38:54 GMT
94
- < Server:
95
- < Content-Length: 1311
96
- < Content-Type: text/xml; charset=utf-8
97
- <
98
- * Connection #0 to host www.mpay24.com left intact
99
- * Closing connection #0
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Mpay24/Mpay24/Model/Method/Selectpayment.php CHANGED
@@ -12,11 +12,11 @@
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
- * @category Mpay24
16
- * @package Mpay24_Mpay24
17
- * @author Firedrago Magento
18
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Selectpayment.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
12
  * obtain it through the world-wide-web, please send an email
13
  * to license@magentocommerce.com so we can send you a copy immediately.
14
  *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Selectpayment.php 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
 
22
  include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
app/code/community/Mpay24/Mpay24/Model/Sales/Order/Creditmemo/Total/Paymentcharge.php CHANGED
@@ -16,16 +16,13 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Paymentcharge.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Model_Sales_Order_Creditmemo_Total_Paymentcharge extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract {
23
  public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) {
24
  $creditmemo->setPaymentCharge(0);
25
  $creditmemo->setBasePaymentCharge(0);
26
-
27
- $amount = $creditmemo->getOrder()->getPaymentCharge();
28
- $creditmemo->setPaymentCharge($amount);
29
 
30
  $amount = $creditmemo->getOrder()->getBasePaymentCharge();
31
  $creditmemo->setBasePaymentCharge($amount);
@@ -33,8 +30,14 @@ class Mpay24_Mpay24_Model_Sales_Order_Creditmemo_Total_Paymentcharge extends Mag
33
  $type = $creditmemo->getOrder()->getPaymentChargeType();
34
  $creditmemo->setPaymentChargeType($type);
35
 
 
 
 
 
 
 
36
  if($type == 'percent') {
37
- $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $creditmemo->getSubtotal()*$creditmemo->getPaymentCharge()/100);
38
  $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $creditmemo->getSubtotal()*$creditmemo->getBasePaymentCharge()/100);
39
  } else {
40
  $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $creditmemo->getPaymentCharge());
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Paymentcharge.php 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Model_Sales_Order_Creditmemo_Total_Paymentcharge extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract {
23
  public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo) {
24
  $creditmemo->setPaymentCharge(0);
25
  $creditmemo->setBasePaymentCharge(0);
 
 
 
26
 
27
  $amount = $creditmemo->getOrder()->getBasePaymentCharge();
28
  $creditmemo->setBasePaymentCharge($amount);
30
  $type = $creditmemo->getOrder()->getPaymentChargeType();
31
  $creditmemo->setPaymentChargeType($type);
32
 
33
+ $amount = $creditmemo->getOrder()->getPaymentCharge();
34
+ if($type == 'percent')
35
+ $creditmemo->setPaymentCharge($creditmemo->getSubtotal()*$creditmemo->getBasePaymentCharge()/100);
36
+ else
37
+ $creditmemo->setPaymentCharge($amount);
38
+
39
  if($type == 'percent') {
40
+ $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $creditmemo->getPaymentCharge());
41
  $creditmemo->setBaseGrandTotal($creditmemo->getBaseGrandTotal() + $creditmemo->getSubtotal()*$creditmemo->getBasePaymentCharge()/100);
42
  } else {
43
  $creditmemo->setGrandTotal($creditmemo->getGrandTotal() + $creditmemo->getPaymentCharge());
app/code/community/Mpay24/Mpay24/Model/Sales/Order/Invoice/Total/Paymentcharge.php CHANGED
@@ -16,16 +16,13 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: Paymentcharge.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Model_Sales_Order_Invoice_Total_Paymentcharge extends Mage_Sales_Model_Order_Invoice_Total_Abstract {
23
  public function collect(Mage_Sales_Model_Order_Invoice $invoice) {
24
  $invoice->setPaymentCharge(0);
25
  $invoice->setBasePaymentCharge(0);
26
-
27
- $amount = $invoice->getOrder()->getPaymentCharge();
28
- $invoice->setPaymentCharge($amount);
29
 
30
  $amount = $invoice->getOrder()->getBasePaymentCharge();
31
  $invoice->setBasePaymentCharge($amount);
@@ -33,8 +30,14 @@ class Mpay24_Mpay24_Model_Sales_Order_Invoice_Total_Paymentcharge extends Mage_S
33
  $type = $invoice->getOrder()->getPaymentChargeType();
34
  $invoice->setPaymentChargeType($type);
35
 
 
 
 
 
 
 
36
  if($type == 'percent') {
37
- $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getSubtotal()*$invoice->getPaymentCharge()/100);
38
  $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $invoice->getSubtotal()*$invoice->getBasePaymentCharge()/100);
39
  } else {
40
  $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getPaymentCharge());
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: Paymentcharge.php 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
 
22
  class Mpay24_Mpay24_Model_Sales_Order_Invoice_Total_Paymentcharge extends Mage_Sales_Model_Order_Invoice_Total_Abstract {
23
  public function collect(Mage_Sales_Model_Order_Invoice $invoice) {
24
  $invoice->setPaymentCharge(0);
25
  $invoice->setBasePaymentCharge(0);
 
 
 
26
 
27
  $amount = $invoice->getOrder()->getBasePaymentCharge();
28
  $invoice->setBasePaymentCharge($amount);
30
  $type = $invoice->getOrder()->getPaymentChargeType();
31
  $invoice->setPaymentChargeType($type);
32
 
33
+ $amount = $invoice->getOrder()->getPaymentCharge();
34
+ if($type == 'percent')
35
+ $invoice->setPaymentCharge($invoice->getSubtotal()*$invoice->getBasePaymentCharge()/100);
36
+ else
37
+ $invoice->setPaymentCharge($amount);
38
+
39
  if($type == 'percent') {
40
+ $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getPaymentCharge());
41
  $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $invoice->getSubtotal()*$invoice->getBasePaymentCharge()/100);
42
  } else {
43
  $invoice->setGrandTotal($invoice->getGrandTotal() + $invoice->getPaymentCharge());
app/code/community/Mpay24/Mpay24/controllers/PaymentController.php CHANGED
@@ -16,7 +16,7 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: PaymentController.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
  include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
22
 
@@ -201,9 +201,9 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
201
  if($order->getPayment()) {
202
  if(!$confirmation || !in_array($this->getRequest()->getClientIp(), explode(',', Mage::getStoreConfig('mpay24/mpay24as/allowed_ips')))) {
203
  $mPay24MagentoShop = MPay24MagentoShop::getMPay24Api();
204
- $mPAY24Result = $mPay24MagentoShop->updateTransactionStatus($incrementId);
205
- $res = $mPAY24Result->getGeneralResponse()->getStatus();
206
- $status = $mPAY24Result->getParam('TSTATUS');
207
 
208
  if($mPAY24Result->getGeneralResponse()->getStatus() != 'OK' || $mPAY24Result->getParam('APPR_CODE') == '')
209
  $apprCode = 'N/A';
@@ -245,7 +245,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
245
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
246
  $order->getPayment()->setAmountAuthorized($mPAY24Result->getParam('PRICE')/100)->save();
247
  $order->getPayment()->setAdditionalInformation('error', false)->save();
248
- $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PROCESSING, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("RESERVED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]');
249
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING)->save();
250
  $order->sendNewOrderEmail();
251
 
@@ -287,7 +287,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
287
  }
288
  }
289
 
290
- $order->addStatusToHistory($s, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]', true)->save();
291
 
292
  $order->save();
293
  break;
@@ -312,7 +312,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
312
  $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
313
  Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
314
 
315
- $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_COMPLETE, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("CREDITED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]')->save();
316
  $order->save();
317
 
318
  break;
@@ -321,7 +321,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
321
  $order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
322
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
323
  $order->getPayment()->setAdditionalInformation('error', false)->save();
324
- $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("SUSPENDED") . ' [ '.$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]');
325
  }
326
  $order->save();
327
  break;
@@ -335,7 +335,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
335
  $order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
336
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
337
  $order->sendOrderUpdateEmail();
338
- $order->addStatusToHistory($order->getState(), Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("REVERSED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]', true)->save();
339
  $order->save();
340
  break;
341
  case 'ERROR':
@@ -343,7 +343,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
343
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
344
  $order->getPayment()->setAdditionalInformation('error', true)->save();
345
 
346
- $order->addStatusToHistory($order->getStatus(), Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("ERROR") . " " . $order->getPayment()->getAdditionalInformation('error_text'));
347
  $order->save();
348
 
349
  break;
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: PaymentController.php 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
  include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
22
 
201
  if($order->getPayment()) {
202
  if(!$confirmation || !in_array($this->getRequest()->getClientIp(), explode(',', Mage::getStoreConfig('mpay24/mpay24as/allowed_ips')))) {
203
  $mPay24MagentoShop = MPay24MagentoShop::getMPay24Api();
204
+ $mPAY24Result = $mPay24MagentoShop->updateTransactionStatus($incrementId);
205
+ $res = $mPAY24Result->getGeneralResponse()->getStatus();
206
+ $status = $mPAY24Result->getParam('TSTATUS');
207
 
208
  if($mPAY24Result->getGeneralResponse()->getStatus() != 'OK' || $mPAY24Result->getParam('APPR_CODE') == '')
209
  $apprCode = 'N/A';
245
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
246
  $order->getPayment()->setAmountAuthorized($mPAY24Result->getParam('PRICE')/100)->save();
247
  $order->getPayment()->setAdditionalInformation('error', false)->save();
248
+ $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PROCESSING, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("RESERVED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
249
  $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING)->save();
250
  $order->sendNewOrderEmail();
251
 
287
  }
288
  }
289
 
290
+ $order->addStatusToHistory($s, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
291
 
292
  $order->save();
293
  break;
312
  $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
313
  Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
314
 
315
+ $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_COMPLETE, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("CREDITED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
316
  $order->save();
317
 
318
  break;
321
  $order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
322
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
323
  $order->getPayment()->setAdditionalInformation('error', false)->save();
324
+ $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("SUSPENDED") . ' [ '.$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
325
  }
326
  $order->save();
327
  break;
335
  $order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
336
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
337
  $order->sendOrderUpdateEmail();
338
+ $order->addStatusToHistory($order->getState(), Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("REVERSED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
339
  $order->save();
340
  break;
341
  case 'ERROR':
343
  $order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
344
  $order->getPayment()->setAdditionalInformation('error', true)->save();
345
 
346
+ $order->addStatusToHistory($order->getStatus(), Mage::helper('mpay24')->__("$confirmationCalled") . Mage::helper('mpay24')->__("ERROR") . " " . $order->getPayment()->getAdditionalInformation('error_text') . " (" . $this->getRequest()->getClientIp() . ")");
347
  $order->save();
348
 
349
  break;
app/code/community/Mpay24/Mpay24/etc/config.xml CHANGED
@@ -1,11 +1,11 @@
1
  <?xml version="1.0"?>
2
  <!--
3
- @version $Id: config.xml 5 2013-10-10 13:08:44Z sapolhei $
4
  -->
5
  <config>
6
  <modules>
7
  <Mpay24_Mpay24>
8
- <version>1.4.7</version>
9
  </Mpay24_Mpay24>
10
  </modules>
11
 
@@ -110,6 +110,8 @@
110
  <totals>
111
  <payment_charge>
112
  <class>mpay24/sales_order_invoice_total_paymentcharge</class>
 
 
113
  </payment_charge>
114
  </totals>
115
  </order_invoice>
@@ -118,6 +120,8 @@
118
  <totals>
119
  <payment_charge>
120
  <class>mpay24/sales_order_creditmemo_total_paymentcharge</class>
 
 
121
  </payment_charge>
122
  </totals>
123
  </order_creditmemo>
@@ -131,7 +135,7 @@
131
  <amount_prefix></amount_prefix>
132
  <font_size>7</font_size>
133
  <display_zero>0</display_zero>
134
- <sort_order>200</sort_order>
135
  </payment_charge>
136
  </totals>
137
  </pdf>
@@ -236,6 +240,8 @@
236
  <soap_pass backend_model="adminhtml/system_config_backend_encrypted"/>
237
  <debug>1</debug>
238
  <use_proxy>0</use_proxy>
 
 
239
  <allowed_ips>213.164.23.169,213.164.25.245,127.0.0.1</allowed_ips>
240
  </mpay24as>
241
  <mpay24sporder>
@@ -289,9 +295,9 @@
289
  <subtotal_style></subtotal_style>
290
  </mpay24spsc>
291
  <mpay24>
292
- <payments_active>false</payments_active>
293
- <billingAddressMode>ReadOnly</billingAddressMode>
294
- <show_free_products>0</show_free_products>
295
  </mpay24>
296
  </mpay24>
297
  <payment>
1
  <?xml version="1.0"?>
2
  <!--
3
+ @version $Id: config.xml 10 2013-10-31 14:23:20Z sapolhei $
4
  -->
5
  <config>
6
  <modules>
7
  <Mpay24_Mpay24>
8
+ <version>1.4.8</version>
9
  </Mpay24_Mpay24>
10
  </modules>
11
 
110
  <totals>
111
  <payment_charge>
112
  <class>mpay24/sales_order_invoice_total_paymentcharge</class>
113
+ <after>subtotal,discount,shipping,tax</after>
114
+ <before>grand_total</before>
115
  </payment_charge>
116
  </totals>
117
  </order_invoice>
120
  <totals>
121
  <payment_charge>
122
  <class>mpay24/sales_order_creditmemo_total_paymentcharge</class>
123
+ <after>subtotal,discount,shipping,tax</after>
124
+ <before>grand_total</before>
125
  </payment_charge>
126
  </totals>
127
  </order_creditmemo>
135
  <amount_prefix></amount_prefix>
136
  <font_size>7</font_size>
137
  <display_zero>0</display_zero>
138
+ <sort_order>500</sort_order>
139
  </payment_charge>
140
  </totals>
141
  </pdf>
240
  <soap_pass backend_model="adminhtml/system_config_backend_encrypted"/>
241
  <debug>1</debug>
242
  <use_proxy>0</use_proxy>
243
+ <use_proxy_auth>0</use_proxy_auth>
244
+ <verify_peer>1</verify_peer>
245
  <allowed_ips>213.164.23.169,213.164.25.245,127.0.0.1</allowed_ips>
246
  </mpay24as>
247
  <mpay24sporder>
295
  <subtotal_style></subtotal_style>
296
  </mpay24spsc>
297
  <mpay24>
298
+ <payments_active>false</payments_active>
299
+ <billingAddressMode>ReadOnly</billingAddressMode>
300
+ <show_free_products>0</show_free_products>
301
  </mpay24>
302
  </mpay24>
303
  <payment>
app/code/community/Mpay24/Mpay24/etc/system.xml CHANGED
@@ -1,6 +1,6 @@
1
  <?xml version="1.0"?>
2
  <!--
3
- @version $Id: system.xml 5 2013-10-10 13:08:44Z sapolhei $
4
  -->
5
  <config>
6
  <sections>
@@ -135,10 +135,49 @@
135
  <show_in_store>1</show_in_store>
136
  <depends><use_proxy>1</use_proxy></depends>
137
  </proxy_port>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
138
  <allowed_ips translate="label">
139
  <label>Allowed IPs for the Confirmation</label>
140
  <frontend_type>multiselect</frontend_type>
141
- <sort_order>10</sort_order>
142
  <source_model>mpay24/source_allowedIPs</source_model>
143
  <show_in_default>1</show_in_default>
144
  <show_in_website>1</show_in_website>
1
  <?xml version="1.0"?>
2
  <!--
3
+ @version $Id: system.xml 9 2013-10-29 15:36:26Z sapolhei $
4
  -->
5
  <config>
6
  <sections>
135
  <show_in_store>1</show_in_store>
136
  <depends><use_proxy>1</use_proxy></depends>
137
  </proxy_port>
138
+ <use_proxy_auth translate="label">
139
+ <label>Use proxy authentification</label>
140
+ <frontend_type>select</frontend_type>
141
+ <source_model>adminhtml/system_config_source_yesno</source_model>
142
+ <sort_order>10</sort_order>
143
+ <show_in_default>1</show_in_default>
144
+ <show_in_website>1</show_in_website>
145
+ <show_in_store>1</show_in_store>
146
+ <depends><use_proxy>1</use_proxy></depends>
147
+ </use_proxy_auth>
148
+ <proxy_user translate="label">
149
+ <label>Proxy User</label>
150
+ <frontend_type>text</frontend_type>
151
+ <sort_order>11</sort_order>
152
+ <show_in_default>1</show_in_default>
153
+ <show_in_website>1</show_in_website>
154
+ <show_in_store>1</show_in_store>
155
+ <depends><use_proxy_auth>1</use_proxy_auth></depends>
156
+ </proxy_user>
157
+ <proxy_pass translate="label">
158
+ <label>Proxy Password</label>
159
+ <frontend_type>password</frontend_type>
160
+ <backend_model>mpay24/system_config_backend_encrypted</backend_model>
161
+ <sort_order>12</sort_order>
162
+ <show_in_default>1</show_in_default>
163
+ <show_in_website>1</show_in_website>
164
+ <show_in_store>1</show_in_store>
165
+ <depends><use_proxy_auth>1</use_proxy_auth></depends>
166
+ </proxy_pass>
167
+ <verify_peer translate="label">
168
+ <label>cURL: Verify the peer's certificate</label>
169
+ <frontend_type>select</frontend_type>
170
+ <source_model>adminhtml/system_config_source_yesno</source_model>
171
+ <sort_order>13</sort_order>
172
+ <show_in_default>1</show_in_default>
173
+ <show_in_website>1</show_in_website>
174
+ <show_in_store>1</show_in_store>
175
+ <depends><active>1</active></depends>
176
+ </verify_peer>
177
  <allowed_ips translate="label">
178
  <label>Allowed IPs for the Confirmation</label>
179
  <frontend_type>multiselect</frontend_type>
180
+ <sort_order>14</sort_order>
181
  <source_model>mpay24/source_allowedIPs</source_model>
182
  <show_in_default>1</show_in_default>
183
  <show_in_website>1</show_in_website>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-install-1.4.7.php DELETED
@@ -1,48 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Open Software License (OSL 3.0)
8
- * that is bundled with this package in the file LICENSE.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/osl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * @category Mpay24
16
- * @package Mpay24_Mpay24
17
- * @author Firedrago Magento
18
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-install-1.4.7.php 5 2013-10-10 13:08:44Z sapolhei $
20
- */
21
- $this->startSetup();
22
-
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
-
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
-
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
-
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
-
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
-
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
-
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
-
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
-
47
- $this->endSetup();
48
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-install-1.4.8.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-install-1.4.8.php 16 2013-11-12 15:30:44Z sapolhei $
20
+ */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
+
26
+ $install->startSetup();
27
+
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
+
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
+
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
+
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
35
+
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
+
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
+
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
+
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
+ ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.5.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.4-1.4.5.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.4-1.4.5.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.6.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.4-1.4.6.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.4-1.4.6.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.7.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.4-1.4.7.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.4-1.4.7.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.8.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.4-1.4.8.php 16 2013-11-12 15:30:44Z sapolhei $
20
+ */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
+
26
+ $install->startSetup();
27
+
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
+
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
+
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
+
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
35
+
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
+
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
+
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
+
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
+ ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.6.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.5-1.4.6.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.5-1.4.6.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.7.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.5-1.4.7.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.5-1.4.7.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.8.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.5-1.4.8.php 16 2013-11-12 15:30:44Z sapolhei $
20
+ */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
+
26
+ $install->startSetup();
27
+
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
+
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
+
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
+
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
35
+
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
+
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
+
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
+
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
+ ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.6-1.4.7.php CHANGED
@@ -16,33 +16,38 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: mysql4-upgrade-1.4.6-1.4.7.php 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
- $this->startSetup();
 
 
 
22
 
23
- $this->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
24
 
25
- $this->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
26
 
27
- $this->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
28
 
29
- $this->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
30
 
31
- $this->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
32
- $this->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
33
- $this->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
34
 
35
- $this->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
36
- $this->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
37
- $this->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
38
 
39
- $this->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
40
- $this->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
41
- $this->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
42
 
43
- $this->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
44
- $this->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
45
- $this->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
46
 
47
- $this->endSetup();
 
 
 
 
48
  ?>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.6-1.4.7.php 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
 
26
+ $install->startSetup();
27
 
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
 
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
 
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
 
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
 
 
35
 
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
 
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
 
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
 
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
  ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.6-1.4.8.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.6-1.4.8.php 16 2013-11-12 15:30:44Z sapolhei $
20
+ */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
+
26
+ $install->startSetup();
27
+
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
+
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
+
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
+
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
35
+
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
+
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
+
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
+
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
+ ?>
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.7-1.4.8.php ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Open Software License (OSL 3.0)
8
+ * that is bundled with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/osl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magentocommerce.com so we can send you a copy immediately.
14
+ *
15
+ * @category Mpay24
16
+ * @package Mpay24_Mpay24
17
+ * @author Firedrago Magento
18
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: mysql4-upgrade-1.4.7-1.4.8.php 16 2013-11-12 15:30:44Z sapolhei $
20
+ */
21
+ if(class_exists('Mage_Sales_Model_Resource_Setup'))
22
+ $install = new Mage_Sales_Model_Resource_Setup('sales_setup');
23
+ else
24
+ $install = $this;
25
+
26
+ $install->startSetup();
27
+
28
+ $install->run("DELETE FROM {$this->getTable('core_config_data')} WHERE `path` LIKE '%mpay%'");
29
+
30
+ $install->run("DROP TABLE if exists {$this->getTable('mpay24_debug')};");
31
+
32
+ $install->run("UPDATE {$this->getTable('sales_flat_quote_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
33
+
34
+ $install->run("UPDATE {$this->getTable('sales_flat_order_payment')} SET `method` = 'mpay24' WHERE `method` LIKE 'mpay24_%';");
35
+
36
+ $install->addAttribute('quote_address', 'payment_charge_type', array('type' => 'varchar'));
37
+ $install->addAttribute('quote_address', 'payment_charge', array('type' => 'decimal'));
38
+ $install->addAttribute('quote_address', 'base_payment_charge', array('type' => 'decimal'));
39
+
40
+ $install->addAttribute('order', 'payment_charge_type', array('type' => 'varchar'));
41
+ $install->addAttribute('order', 'payment_charge', array('type' => 'decimal'));
42
+ $install->addAttribute('order', 'base_payment_charge', array('type' => 'decimal'));
43
+
44
+ $install->addAttribute('invoice', 'payment_charge_type', array('type' => 'varchar'));
45
+ $install->addAttribute('invoice', 'payment_charge', array('type' => 'decimal'));
46
+ $install->addAttribute('invoice', 'base_payment_charge', array('type' => 'decimal'));
47
+
48
+ $install->addAttribute('creditmemo', 'payment_charge_type', array('type' => 'varchar'));
49
+ $install->addAttribute('creditmemo', 'payment_charge', array('type' => 'decimal'));
50
+ $install->addAttribute('creditmemo', 'base_payment_charge', array('type' => 'decimal'));
51
+
52
+ $install->endSetup();
53
+ ?>
app/design/frontend/default/default/template/mpay24/form/area.phtml CHANGED
@@ -16,7 +16,7 @@
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: area.phtml 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
  ?>
22
  <?php
@@ -32,30 +32,6 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
32
  <script type="text/javascript">
33
  var selectedPayment = "../../../web/img/logos/payment-mpay24";
34
  var brand = "";
35
-
36
- function activate(input, id, description) {
37
- brand = description;
38
- if(input.parentNode.getAttribute('style') == "border: 1px inset transparent;") {
39
- var inputs = document.getElementById('mpay24_table').getElementsByTagName('input');
40
-
41
- for(var i=0; i<inputs.length; i++) {
42
- inputs[i].parentNode.setAttribute('style', "border: 1px inset transparent;");
43
- inputs[i].disabled = true;
44
- }
45
-
46
- document.getElementById('mpay24_table').disabled = true;
47
-
48
- input.parentNode.setAttribute('style', "border: 1px inset blue;");
49
- document.getElementById(id).disabled = false;
50
-
51
- selectedPayment = id;
52
- payment.save();
53
- } else {
54
- input.parentNode.setAttribute('style', "border: 1px inset transparent;");
55
- document.getElementById(id).disabled = true;
56
- document.getElementById('mpay24_table').disabled = false;
57
- }
58
- }
59
  </script>
60
 
61
  <?php if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1): ?>
@@ -116,42 +92,65 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
116
  </colgroup>
117
  <tr>
118
  <td colspan="2">
119
- <div style="width: 500px;"><!-- 248 -->
120
  <?php
121
  $j = 1;
122
  foreach ($this->getActiveMethods() as $id => $payment):
123
- if(strlen($id) == 1)
124
- $id = "00$id";
125
- elseif(strlen($id) == 2)
126
- $id = "0$id";
127
-
128
- $addInfo = "";
129
-
130
- if(Mage::getStoreConfig("mpay24/mpay24/forced_preselection") == 1) {
131
- $addInfo .= " - ";
132
-
133
- if(Mage::getStoreConfig("mpay24/mpay24/tax_$j") > 0) {
134
- if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'absolute')
135
- $addInfo .= Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())->getSymbol();
136
- $addInfo .= " " . Mage::getStoreConfig("mpay24/mpay24/tax_$j");
137
-
138
- if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'percent')
139
- $addInfo .= "%";
140
-
141
- $addInfo .= " " . Mage::helper('mpay24')->__("Payment charge");
142
- } else
143
- $addInfo .= Mage::helper('mpay24')->__("For free");
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
144
  }
145
-
146
- ?>
147
- <div style="border:5px solid transparent; float:left;">
148
- <div style="border: 1px inset transparent;">
149
- <a href="#" onclick="activate(this, '<?php echo $id;?>', '<?php echo $payment['DESCR']?>');"><img src='https://www.mpay24.com/merchadm/img/ptypes/<?php echo $id?>.png' alt='<?php echo $payment['DESCR'] . $addInfo?>' title='<?php echo $payment['DESCR'] . $addInfo?>' ></a>
150
- <input type="hidden" id='<?php echo $id;?>' name='mpay24_ps' value='<?php echo $id . "_" . $j;?>' disabled />
151
  </div>
152
- </div>
153
- <?php
154
- $j++;
155
  endforeach; ?>
156
  <input type="hidden" id='mpay24_all' name='mpay24_ps' value='false' />
157
  </div>
16
  * @package Mpay24_Mpay24
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: area.phtml 16 2013-11-12 15:30:44Z sapolhei $
20
  */
21
  ?>
22
  <?php
32
  <script type="text/javascript">
33
  var selectedPayment = "../../../web/img/logos/payment-mpay24";
34
  var brand = "";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
35
  </script>
36
 
37
  <?php if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1): ?>
92
  </colgroup>
93
  <tr>
94
  <td colspan="2">
95
+ <div>
96
  <?php
97
  $j = 1;
98
  foreach ($this->getActiveMethods() as $id => $payment):
99
+ if($payment['ACTIVE'] == 1) {
100
+ if(strlen($id) == 1)
101
+ $id = "00$id";
102
+ elseif(strlen($id) == 2)
103
+ $id = "0$id";
104
+
105
+ $addInfo = "";
106
+
107
+ if(Mage::getStoreConfig("mpay24/mpay24/forced_preselection") == 1) {
108
+ $addInfo .= " - ";
109
+
110
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_$j") > 0) {
111
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'absolute')
112
+ $addInfo .= Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())->getSymbol();
113
+ $addInfo .= " " . Mage::getStoreConfig("mpay24/mpay24/tax_$j");
114
+
115
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'percent')
116
+ $addInfo .= "%";
117
+
118
+ $addInfo .= " " . Mage::helper('mpay24')->__("Payment charge");
119
+ } else
120
+ $addInfo .= Mage::helper('mpay24')->__("For free");
121
+ }
122
+
123
+ ?>
124
+ <div style="border:5px solid transparent; float:left;">
125
+ <div style="border: 1px inset transparent;">
126
+ <a href="#" onclick="
127
+ brand = '<?php echo $payment['DESCR']?>';
128
+ if(this.parentNode.getAttribute('style') == 'border: 1px inset transparent;') {
129
+ var inputs = document.getElementById('mpay24_table').getElementsByTagName('input');
130
+
131
+ for(var i=0; i<inputs.length; i++) {
132
+ inputs[i].parentNode.setAttribute('style', 'border: 1px inset transparent;');
133
+ inputs[i].disabled = true;
134
+ }
135
+
136
+ document.getElementById('mpay24_table').disabled = true;
137
+
138
+ this.parentNode.setAttribute('style', 'border: 1px inset blue;');
139
+ document.getElementById('<?php echo $id;?>').disabled = false;
140
+
141
+ selectedPayment = '<?php echo $id;?>';
142
+ payment.save();
143
+ } else {
144
+ this.parentNode.setAttribute('style', 'border: 1px inset transparent;');
145
+ document.getElementById('<?php echo $id;?>').disabled = true;
146
+ document.getElementById('mpay24_table').disabled = false;
147
  }
148
+ "><img src='https://www.mpay24.com/merchadm/img/ptypes/<?php echo $id?>.png' alt='<?php echo $payment['DESCR'] . $addInfo?>' title='<?php echo $payment['DESCR'] . $addInfo?>' ></a>
149
+ <input type="hidden" id='<?php echo $id;?>' name='mpay24_ps' value='<?php echo $id . "_" . $j;?>' disabled />
150
+ </div>
 
 
 
151
  </div>
152
+ <?php
153
+ } $j++;
 
154
  endforeach; ?>
155
  <input type="hidden" id='mpay24_all' name='mpay24_ps' value='false' />
156
  </div>
app/design/frontend/default/default/template/mpay24/form/dropDown.phtml CHANGED
@@ -16,7 +16,7 @@
16
  * @package default_defaut
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
- * @version $Id: dropDown.phtml 5 2013-10-10 13:08:44Z sapolhei $
20
  */
21
  ?>
22
  <?php
@@ -114,40 +114,41 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
114
  $firstID = "";
115
  $j = 1;
116
  foreach ($this->getActiveMethods() as $id => $payment):
117
- $changed = false;
118
- if($temp_brand == "" || $temp_brand != $payment['P_TYPE']) {
119
- if($temp_brand == "")
120
- echo "</optgroup>";
121
- $temp_brand = $payment['P_TYPE'];
122
- echo "<optgroup label='$temp_brand'>";
123
- }
124
-
125
- if(strlen($id) == 1)
126
- $id = "00$id";
127
- elseif(strlen($id) == 2)
128
- $id = "0$id";
129
-
130
- if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1 && $firstID == "")
131
- $firstID = $id;
132
- ?>
133
-
134
- <option value="<?php echo $id . "_" . $j ?>"><?php echo $payment['DESCR'];
135
- if(Mage::getStoreConfig("mpay24/mpay24/forced_preselection") == 1) {
136
- echo " - ";
137
-
138
- if(Mage::getStoreConfig("mpay24/mpay24/tax_$j") > 0) {
139
- if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'absolute')
140
- echo Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())->getSymbol();
141
- echo " " . Mage::getStoreConfig("mpay24/mpay24/tax_$j");
142
-
143
- if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'percent')
144
- echo "%";
145
 
146
- echo " " . Mage::helper('mpay24')->__("Payment charge");
147
- } else
148
- echo Mage::helper('mpay24')->__("For free");
149
- } ?></option>
150
- <?php $j++; endforeach; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
151
  </select>
152
  </td>
153
  <td>
16
  * @package default_defaut
17
  * @author Firedrago Magento
18
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
+ * @version $Id: dropDown.phtml 10 2013-10-31 14:23:20Z sapolhei $
20
  */
21
  ?>
22
  <?php
114
  $firstID = "";
115
  $j = 1;
116
  foreach ($this->getActiveMethods() as $id => $payment):
117
+ if($payment['ACTIVE'] == 1) {
118
+ $changed = false;
119
+ if($temp_brand == "" || $temp_brand != $payment['P_TYPE']) {
120
+ if($temp_brand == "")
121
+ echo "</optgroup>";
122
+ $temp_brand = $payment['P_TYPE'];
123
+ echo "<optgroup label='$temp_brand'>";
124
+ }
125
+
126
+ if(strlen($id) == 1)
127
+ $id = "00$id";
128
+ elseif(strlen($id) == 2)
129
+ $id = "0$id";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
130
 
131
+ if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1 && $firstID == "")
132
+ $firstID = $id;
133
+ ?>
134
+
135
+ <option value="<?php echo $id . "_" . $j ?>"><?php echo $payment['DESCR'];
136
+ if(Mage::getStoreConfig("mpay24/mpay24/forced_preselection") == 1) {
137
+ echo " - ";
138
+
139
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_$j") > 0) {
140
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'absolute')
141
+ echo Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())->getSymbol();
142
+ echo " " . Mage::getStoreConfig("mpay24/mpay24/tax_$j");
143
+
144
+ if(Mage::getStoreConfig("mpay24/mpay24/tax_type_$j") == 'percent')
145
+ echo "%";
146
+
147
+ echo " " . Mage::helper('mpay24')->__("Payment charge");
148
+ } else
149
+ echo Mage::helper('mpay24')->__("For free");
150
+ } ?></option>
151
+ <?php } $j++; endforeach; ?>
152
  </select>
153
  </td>
154
  <td>
app/etc/modules/Mpay24_Mpay24.xml CHANGED
@@ -1,6 +1,6 @@
1
  <?xml version="1.0"?>
2
  <!--
3
- * @version $Id: Mpay24_Mpay24.xml 7 2013-10-10 14:19:46Z sapolhei $
4
  -->
5
  <config>
6
  <modules>
@@ -10,7 +10,7 @@
10
  <depends>
11
  <Mage_Payment />
12
  </depends>
13
- <version>1.4.7</version>
14
  </Mpay24_Mpay24>
15
  </modules>
16
  </config>
1
  <?xml version="1.0"?>
2
  <!--
3
+ * @version $Id: Mpay24_Mpay24.xml 9 2013-10-29 15:36:26Z sapolhei $
4
  -->
5
  <config>
6
  <modules>
10
  <depends>
11
  <Mage_Payment />
12
  </depends>
13
+ <version>1.4.8</version>
14
  </Mpay24_Mpay24>
15
  </modules>
16
  </config>
app/locale/de_AT/Mpay24_Mpay24.csv CHANGED
@@ -67,4 +67,8 @@
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
- "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
 
 
 
 
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
+ "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
71
+ "Use proxy authentification","Proxy-Authenitifizierung verwenden"
72
+ "Proxy User","Proxy-Benutzer"
73
+ "Proxy Password","Proxy-Passwort"
74
+ "cURL: Verify the peer's certificate","cURL: Peers Zertifikate verfizieren"
app/locale/de_CH/Mpay24_Mpay24.csv CHANGED
@@ -67,4 +67,8 @@
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
- "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
 
 
 
 
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
+ "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
71
+ "Use proxy authentification","Proxy-Authenitifizierung verwenden"
72
+ "Proxy User","Proxy-Benutzer"
73
+ "Proxy Password","Proxy-Passwort"
74
+ "cURL: Verify the peer's certificate","cURL: Peers Zertifikate verfizieren"
app/locale/de_DE/Mpay24_Mpay24.csv CHANGED
@@ -67,4 +67,8 @@
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
- "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
 
 
 
 
67
  "Please choose a payment system from the drop down menu...", "Bitte wählen Sie ein Zahlungssystem von dem Drop-Down-Menü..."
68
  "Please choose a payment system from the icon area...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area..."
69
  "For free", "Kostenlos"
70
+ "Please choose a payment system from the icon area, by clicking on the icons...", "Bitte wählen Sie ein Zahlungssystem von dem Icon-Area indem Sie auf dem Icon klicken..."
71
+ "Use proxy authentification","Proxy-Authenitifizierung verwenden"
72
+ "Proxy User","Proxy-Benutzer"
73
+ "Proxy Password","Proxy-Passwort"
74
+ "cURL: Verify the peer's certificate","cURL: Peers Zertifikate verfizieren"
app/locale/en_US/Mpay24_Mpay24.csv CHANGED
@@ -67,4 +67,8 @@
67
  "Please choose a payment system from the drop down menu...", "Please choose a payment system from the drop down menu..."
68
  "Please choose a payment system from the icon area...", "Please choose a payment system from the icon area..."
69
  "For free", "For free"
70
- "Please choose a payment system from the icon area, by clicking on the icons...", "Please choose a payment system from the icon area, by clicking on the icons..."
 
 
 
 
67
  "Please choose a payment system from the drop down menu...", "Please choose a payment system from the drop down menu..."
68
  "Please choose a payment system from the icon area...", "Please choose a payment system from the icon area..."
69
  "For free", "For free"
70
+ "Please choose a payment system from the icon area, by clicking on the icons...", "Please choose a payment system from the icon area, by clicking on the icons..."
71
+ "Use proxy authentification","Use proxy authentification"
72
+ "Proxy User","Proxy User"
73
+ "Proxy Password","Proxy Password"
74
+ "cURL: Verify the peer's certificate","cURL: Verify the peer's certificate"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>mPAY24</name>
4
- <version>1.4.7</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
@@ -28,15 +28,17 @@ Die Payment L&#xF6;sung der mPAY24 GmbH unterst&#xFC;tzt folgende Bezahlarten un
28
  Weitere Informationen unter www.mPAY24.com</description>
29
  <notes>Upgrades and fixes:&#xD;
30
  &#xD;
31
- 1.Payment charges (percent or absoulte value) could be defined for each payment system&#xD;
32
  &#xD;
33
- 2. SQL installation scripts fixed&#xD;
34
  &#xD;
35
- 3. In case of an error or cancelation of the payment, the shopping cart will be not deleted and the customer will be redirected to the checkout process</notes>
 
 
36
  <authors><author><name>Firedrago Magento</name><user>firedrago</user><email>firedrago.magento@gmail.com</email></author></authors>
37
- <date>2013-10-10</date>
38
- <time>14:24:23</time>
39
- <contents><target name="magelocale"><dir name="de_AT"><file name="Mpay24_Mpay24.csv" hash="c5816e3e5782e8416de5ae37eef9d98a"/></dir><dir name="de_DE"><file name="Mpay24_Mpay24.csv" hash="c5816e3e5782e8416de5ae37eef9d98a"/></dir><dir name="de_CH"><file name="Mpay24_Mpay24.csv" hash="c5816e3e5782e8416de5ae37eef9d98a"/></dir><dir name="en_US"><file name="Mpay24_Mpay24.csv" hash="d13be529cacddd66710936f964f0de04"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mpay24_Mpay24.xml" hash="ed1f445fe640ee60960da2d010d6accd"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="form"><file name="area.phtml" hash="020ad63812b57af8749e1e638dca3d25"/><file name="dropDown.phtml" hash="03266e55cce821c1cc8ed110e7fea7ec"/></dir><dir name="info"><file name="selectpayment.phtml" hash="d9ca6b83f45b70074ffdfc3066029d7d"/></dir></dir></dir><dir name="layout"><file name="mpay24.xml" hash="f61a3b1f24cf322c25d0cbfc23f473d6"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="info"><dir name="pdf"><file name="selectpayment.phtml" hash="fbdb9f2a8059cef41294ad0ebb66f6ed"/></dir><file name="selectpayment.phtml" hash="8ba60bd26e7dc29b76a14dd9b98cc501"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mpay24"><dir name="Mpay24"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="3370e076767f51aaf3a5e35564b64d7b"/></dir><dir name="Invoice"><file name="Totals.php" hash="45beeec6902eddd0a68d5d196c9c8993"/></dir><file name="Totals.php" hash="a9ea28f1c34c458ef346484a07a25ce4"/></dir><file name="Totals.php" hash="0ea703ba0a3ff253616a71c01c6f9152"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Fieldset.php" hash="370665a4e4f25cc5eeaa8a8979cc13ba"/></dir></dir></dir></dir><dir name="Form"><file name="Selectpayment.php" hash="eb60bb70ba4c24a7cb56f5e025b2ca70"/></dir><file name="Form.php" hash="72f46c1cddecdb39cac90558ae3f8f34"/><dir name="Info"><file name="Selectpayment.php" hash="8617c9b39fff14c9da36134823713b8d"/></dir><file name="Mpay24.php" hash="7cd507fba0979dc4f3eb937e37bc52ff"/><file name="ParentRedirect.php" hash="f99827ac084d828afdeeea9014933c57"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="1d10e5e7f3022b8b4e12ffaf9fa0b42d"/></dir><dir name="Invoice"><file name="Totals.php" hash="b531a8c77d11c6af8ff13807062c3a36"/></dir><file name="Totals.php" hash="d90ee95adc75fd0a813311cbfd29dfbc"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="d02323e509bf1e693641a007e881d84a"/></dir><dir name="Model"><dir name="Api"><file name="MDXI.xsd" hash="ed7c1c7faba5c7e5921d1e6a4c68f2a2"/><file name="MPay24Api.php" hash="037092e458e7ec94c737c878b3eff246"/><file name="MPay24MagentoShop.php" hash="befaa6db6f5d7e2f61de75503d4b0e15"/><file name="MPay24Shop.php" hash="cf688d9d7f66a45aef16b9db0f44f975"/><file name="cacert.pem" hash="b4bc508481b6291f414f4e6fd7e5d0a5"/><file name="curllog.log" hash="31789307a7940a14944f5677c3d5c414"/><file name="orderXML.php" hash="704a162695cd9f540ca3123d0e7c6f12"/><dir name="xmls"><file name="Example_MDXI.xml" hash="660e8669bc96a337f3df4eafdc14d10f"/></dir></dir><file name="Config.php" hash="3f24700f4a88009c8b288f0b28cdecc8"/><dir name="Entity"><file name="Setup.php" hash="b430870f5b30400666d49e872fcb1829"/></dir><dir name="Method"><file name="Abstract.php" hash="fc8ae6c60da3f92ad5a8f94e5f6685b3"/><file name="Selectpayment.php" hash="aad96a4fa61721833f005949e87d7c8f"/></dir><dir name="Mpay24"><file name="Debug.php" hash="0292a590e18f447302a567e4805cc395"/></dir><dir name="Mysql4"><dir name="Mpay24"><dir name="Debug"><file name="Collection.php" hash="8ad74bfe0138d89799966b0a5098b973"/></dir><file name="Debug.php" hash="92e0274bbf10e95551ee1b2ce32fe77f"/></dir><file name="Setup.php" hash="cfde4d0356acd80dfc7ab96eb6fbc435"/></dir><file name="Observer.php" hash="3849b061a5b07f2e132f77744214decb"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Paymentcharge.php" hash="943ae96e845c0c336169356024d76d7d"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="Paymentcharge.php" hash="aeef4b2983461b46ca6b3f741ac95038"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Paymentcharge.php" hash="03cef9af1493b3a96fda734f8126c8cf"/></dir></dir></dir></dir><file name="Selectpayment.php" hash="6ff7750c42535e2921b17a7fab397f2a"/><file name="Session.php" hash="4b5004e1e1bb6eb411ff3462f0b01112"/><dir name="Source"><file name="AllowedIPs.php" hash="18da40de21159be4ac8be98909c5e284"/><file name="BillAddr.php" hash="80f771c682b65ed5f33eadfca86d6b58"/><file name="ClearingAction.php" hash="bafcc60b16e0345e0a12a49e7fb2ddc3"/><file name="FormTemplate.php" hash="d8d72b857ef3898a5b40601442408448"/><file name="PaidOrder.php" hash="ea962026625292782fd3830667419490"/><file name="PaymentCharge.php" hash="8f3f8b1548699bca5c63942e4c8916bb"/><file name="PaymentsActive.php" hash="408c0c11925732e2d6433d867d221d63"/><file name="Request.php" hash="89a5f1bc2c4984aaa2fdbe0e3e5e2b19"/><file name="Result.php" hash="85bafadd31d2f9da948721a8831f3d9e"/><file name="ShoppingCartRowsAction.php" hash="bc66fc6256b192d6b113537a73211cf3"/><file name="System.php" hash="f6142277dfbdab3e0e71fb9814c24652"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Encrypted.php" hash="66086ea048550c72962e7690b9a1c768"/></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="8ede56cc97e53af699648fa65566a7c5"/><file name="PaymentController.php" hash="9e657069203da6018f66c3e49af9e059"/></dir><dir name="etc"><file name="config.xml" hash="9e9c1589c7d972c120c38f389e0b5351"/><file name="system.xml" hash="088518f626848948ad06d10afd730201"/></dir><dir name="sql"><dir name="mpay24_setup"><file name="mysql4-install-1.4.7.php" hash="06802436c12ccc8f1a38a37ded30b0b5"/><file name="mysql4-upgrade-1.4.4-1.4.5.php" hash="c42283c8fceb2676d87b92afbffdaf69"/><file name="mysql4-upgrade-1.4.4-1.4.6.php" hash="c9a001f80d75f9ee3fbea4154569e282"/><file name="mysql4-upgrade-1.4.4-1.4.7.php" hash="4576b522f982c0f083fda5b6aae3a950"/><file name="mysql4-upgrade-1.4.5-1.4.6.php" hash="7508a117daf83092b24a7815bd46e457"/><file name="mysql4-upgrade-1.4.5-1.4.7.php" hash="1bfe7a93eeec4eb44b2340dc9f359205"/><file name="mysql4-upgrade-1.4.6-1.4.7.php" hash="1f344fe48cf3ae71608790e0802dcbbd"/></dir></dir></dir></dir></target></contents>
40
  <compatible/>
41
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
42
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>mPAY24</name>
4
+ <version>1.4.8</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL 3.0)</license>
7
  <channel>community</channel>
28
  Weitere Informationen unter www.mPAY24.com</description>
29
  <notes>Upgrades and fixes:&#xD;
30
  &#xD;
31
+ 1.Klarna bugfix (tax percentage problem)&#xD;
32
  &#xD;
33
+ 2. Backend settings for proxy authentification and perr verification added&#xD;
34
  &#xD;
35
+ 3. Payment charges on PDF Invoices&#xD;
36
+ &#xD;
37
+ 4. Payment charges bug - fixed</notes>
38
  <authors><author><name>Firedrago Magento</name><user>firedrago</user><email>firedrago.magento@gmail.com</email></author></authors>
39
+ <date>2013-11-12</date>
40
+ <time>15:32:02</time>
41
+ <contents><target name="magelocale"><dir name="de_AT"><file name="Mpay24_Mpay24.csv" hash="a7e72d1087393f94d86861ed0e883e85"/></dir><dir name="de_DE"><file name="Mpay24_Mpay24.csv" hash="a7e72d1087393f94d86861ed0e883e85"/></dir><dir name="de_CH"><file name="Mpay24_Mpay24.csv" hash="a7e72d1087393f94d86861ed0e883e85"/></dir><dir name="en_US"><file name="Mpay24_Mpay24.csv" hash="11370cb31ba912887f880b921964e21f"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mpay24_Mpay24.xml" hash="2ac1eb7a517eaafd1cf4e73216a94c04"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="form"><file name="area.phtml" hash="74d9310632fc66dc9ea30074de9feb8c"/><file name="dropDown.phtml" hash="8f645c37d4185459928507546d3f95d3"/></dir><dir name="info"><file name="selectpayment.phtml" hash="d9ca6b83f45b70074ffdfc3066029d7d"/></dir></dir></dir><dir name="layout"><file name="mpay24.xml" hash="f61a3b1f24cf322c25d0cbfc23f473d6"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="info"><dir name="pdf"><file name="selectpayment.phtml" hash="fbdb9f2a8059cef41294ad0ebb66f6ed"/></dir><file name="selectpayment.phtml" hash="8ba60bd26e7dc29b76a14dd9b98cc501"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mpay24"><dir name="Mpay24"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="3370e076767f51aaf3a5e35564b64d7b"/></dir><dir name="Invoice"><file name="Totals.php" hash="45beeec6902eddd0a68d5d196c9c8993"/></dir><file name="Totals.php" hash="a9ea28f1c34c458ef346484a07a25ce4"/></dir><file name="Totals.php" hash="3e7a1e3c5e7beecf656708fb6ef451ba"/></dir><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="Fieldset.php" hash="370665a4e4f25cc5eeaa8a8979cc13ba"/></dir></dir></dir></dir><dir name="Form"><file name="Selectpayment.php" hash="9ec3a4bd0d85368b1d1d8dd48a8b562c"/></dir><file name="Form.php" hash="72f46c1cddecdb39cac90558ae3f8f34"/><dir name="Info"><file name="Selectpayment.php" hash="8617c9b39fff14c9da36134823713b8d"/></dir><file name="Mpay24.php" hash="7cd507fba0979dc4f3eb937e37bc52ff"/><file name="ParentRedirect.php" hash="f99827ac084d828afdeeea9014933c57"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="1d10e5e7f3022b8b4e12ffaf9fa0b42d"/></dir><dir name="Invoice"><file name="Totals.php" hash="b531a8c77d11c6af8ff13807062c3a36"/></dir><file name="Totals.php" hash="6012cce58a706e6762c5624e52a6191b"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="d02323e509bf1e693641a007e881d84a"/></dir><dir name="Model"><dir name="Api"><file name="MDXI.xsd" hash="4caed9393190d1dacea5efc43f5b16ad"/><file name="MPay24Api.php" hash="6f96a97da40b296db3aabdd6447985a5"/><file name="MPay24MagentoShop.php" hash="34c671f44a9b21ac19467d4d714656ca"/><file name="MPay24Shop.php" hash="ffad7b21f937968ee0bc92347aea217a"/><file name="cacert.pem" hash="b4bc508481b6291f414f4e6fd7e5d0a5"/><file name="curllog.log" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="orderXML.php" hash="704a162695cd9f540ca3123d0e7c6f12"/><dir name="xmls"><file name="Example_MDXI.xml" hash="660e8669bc96a337f3df4eafdc14d10f"/></dir></dir><file name="Config.php" hash="3f24700f4a88009c8b288f0b28cdecc8"/><dir name="Entity"><file name="Setup.php" hash="b430870f5b30400666d49e872fcb1829"/></dir><dir name="Method"><file name="Abstract.php" hash="fc8ae6c60da3f92ad5a8f94e5f6685b3"/><file name="Selectpayment.php" hash="f0854bae6bdaa01e1e16b2804da6b9fd"/></dir><dir name="Mpay24"><file name="Debug.php" hash="0292a590e18f447302a567e4805cc395"/></dir><dir name="Mysql4"><dir name="Mpay24"><dir name="Debug"><file name="Collection.php" hash="8ad74bfe0138d89799966b0a5098b973"/></dir><file name="Debug.php" hash="92e0274bbf10e95551ee1b2ce32fe77f"/></dir><file name="Setup.php" hash="cfde4d0356acd80dfc7ab96eb6fbc435"/></dir><file name="Observer.php" hash="3849b061a5b07f2e132f77744214decb"/><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Paymentcharge.php" hash="2a18a3056a29073476c71167b0123b65"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="Paymentcharge.php" hash="0ac2ca2a09948eab7b5c29d3b167ed90"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Paymentcharge.php" hash="03cef9af1493b3a96fda734f8126c8cf"/></dir></dir></dir></dir><file name="Selectpayment.php" hash="6ff7750c42535e2921b17a7fab397f2a"/><file name="Session.php" hash="4b5004e1e1bb6eb411ff3462f0b01112"/><dir name="Source"><file name="AllowedIPs.php" hash="18da40de21159be4ac8be98909c5e284"/><file name="BillAddr.php" hash="80f771c682b65ed5f33eadfca86d6b58"/><file name="ClearingAction.php" hash="bafcc60b16e0345e0a12a49e7fb2ddc3"/><file name="FormTemplate.php" hash="d8d72b857ef3898a5b40601442408448"/><file name="PaidOrder.php" hash="ea962026625292782fd3830667419490"/><file name="PaymentCharge.php" hash="8f3f8b1548699bca5c63942e4c8916bb"/><file name="PaymentsActive.php" hash="408c0c11925732e2d6433d867d221d63"/><file name="Request.php" hash="89a5f1bc2c4984aaa2fdbe0e3e5e2b19"/><file name="Result.php" hash="85bafadd31d2f9da948721a8831f3d9e"/><file name="ShoppingCartRowsAction.php" hash="bc66fc6256b192d6b113537a73211cf3"/><file name="System.php" hash="f6142277dfbdab3e0e71fb9814c24652"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Encrypted.php" hash="66086ea048550c72962e7690b9a1c768"/></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="8ede56cc97e53af699648fa65566a7c5"/><file name="PaymentController.php" hash="76dbc4537c25161956c79379f5911d8d"/></dir><dir name="etc"><file name="config.xml" hash="227b18ca4b290f490f44e92e2a4a87fc"/><file name="system.xml" hash="f1c9ede9364cf9b1d6734f86d5190a90"/></dir><dir name="sql"><dir name="mpay24_setup"><file name="mysql4-install-1.4.8.php" hash="40f75d2db5a793cddb4cac3f155bf3c3"/><file name="mysql4-upgrade-1.4.4-1.4.5.php" hash="05a7d1f81102a1f05ef2c4b8cf33aa85"/><file name="mysql4-upgrade-1.4.4-1.4.6.php" hash="5bf86d6498af63fb0afe3953c14d4e7e"/><file name="mysql4-upgrade-1.4.4-1.4.7.php" hash="08e2aa39f98e5c0cdb52cdb0823a015b"/><file name="mysql4-upgrade-1.4.4-1.4.8.php" hash="ae6956df0cf6530463d98b2f0b814e32"/><file name="mysql4-upgrade-1.4.5-1.4.6.php" hash="d87de8d8c3037199051d8e579a4ac3f9"/><file name="mysql4-upgrade-1.4.5-1.4.7.php" hash="86eb6d0edef7c76f4d709a1dd2187191"/><file name="mysql4-upgrade-1.4.5-1.4.8.php" hash="f3157f8e0ef74958e357ba5dcccc3fed"/><file name="mysql4-upgrade-1.4.6-1.4.7.php" hash="e041611350cc319072fd0cba3824ed96"/><file name="mysql4-upgrade-1.4.6-1.4.8.php" hash="e1c0aed8b5cc3c144ba50f9526e4e9db"/><file name="mysql4-upgrade-1.4.7-1.4.8.php" hash="71cd3d81e624084012b41031083ced69"/></dir></dir></dir></dir></target></contents>
42
  <compatible/>
43
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
44
  </package>