Version Notes
A problem with the payment systems logos was solved.
Download this release
Release Info
Developer | Filipp Akinfiev |
Extension | mPAY24 |
Version | 1.4.9 |
Comparing to | |
See all releases |
Code changes from version 1.4.8 to 1.4.9
- app/code/community/Mpay24/Mpay24/Block/Adminhtml/System/Config/Fieldset/Fieldset.php +2 -2
- app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php +2 -2
- app/code/community/Mpay24/Mpay24/Model/Observer.php +4 -1
- app/code/community/Mpay24/Mpay24/etc/config.xml +2 -2
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/{mysql4-install-1.4.8.php → mysql4-install-1.4.9.php} +1 -1
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.9.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.5-1.4.9.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.6-1.4.9.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.7-1.4.9.php +53 -0
- app/design/adminhtml/default/default/template/mpay24/info/selectpayment.phtml +2 -2
- app/design/frontend/default/default/template/mpay24/form/area.phtml +2 -2
- app/design/frontend/default/default/template/mpay24/form/dropDown.phtml +2 -2
- app/design/frontend/default/default/template/mpay24/info/selectpayment.phtml +2 -2
- app/etc/modules/Mpay24_Mpay24.xml +1 -1
- package.xml +5 -13
app/code/community/Mpay24/Mpay24/Block/Adminhtml/System/Config/Fieldset/Fieldset.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: Fieldset.php
|
20 |
*/
|
21 |
|
22 |
include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
|
@@ -53,7 +53,7 @@ class Mpay24_Mpay24_Block_Adminhtml_System_Config_Fieldset_Fieldset
|
|
53 |
elseif(strlen($first_paymentID) == 2)
|
54 |
$first_paymentID = "0$first_paymentID";
|
55 |
|
56 |
-
$field->setLabel("<img src='https://www.mpay24.com/
|
57 |
$html.= $field->toHtml();
|
58 |
} elseif(substr($field->getHtmlId(), 0, 17) != 'mpay24_mpay24_ps_' && strpos($field->getHtmlId(), 'mpay24_mpay24_tax_') === false )
|
59 |
$html.= $field->toHtml();
|
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: Fieldset.php 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
|
22 |
include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
|
53 |
elseif(strlen($first_paymentID) == 2)
|
54 |
$first_paymentID = "0$first_paymentID";
|
55 |
|
56 |
+
$field->setLabel("<img src='https://www.mpay24.com/web/img/logos/ptypes/$first_paymentID.png' alt='" . $payment['BRAND'] . ":" . $payment['DESCR'] . "' title='" . $payment['P_TYPE'] . ":" . $payment['DESCR'] . "'>");
|
57 |
$html.= $field->toHtml();
|
58 |
} elseif(substr($field->getHtmlId(), 0, 17) != 'mpay24_mpay24_ps_' && strpos($field->getHtmlId(), 'mpay24_mpay24_tax_') === false )
|
59 |
$html.= $field->toHtml();
|
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 |
* @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.
|
24 |
|
25 |
var $tid;
|
26 |
var $price;
|
1 |
<?php
|
2 |
/**
|
3 |
* @author support@mpay24.com
|
4 |
+
* @version $Id: MPay24MagentoShop.php 17 2013-12-10 07:18:39Z 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.9 ";
|
24 |
|
25 |
var $tid;
|
26 |
var $price;
|
app/code/community/Mpay24/Mpay24/Model/Observer.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: Observer.php
|
20 |
*/
|
21 |
include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
|
22 |
|
@@ -26,6 +26,9 @@ class Mpay24_Mpay24_Model_Observer extends Mage_Core_Model_Config_Data {
|
|
26 |
* Retrieve active system payments
|
27 |
*/
|
28 |
public function afterSave() {
|
|
|
|
|
|
|
29 |
Mage::getConfig()->saveConfig("mpay24/mpay24/payments_count", 0);
|
30 |
Mage::getConfig()->saveConfig("mpay24/mpay24/payments_error", "");
|
31 |
Mage::getConfig()->saveConfig("mpay24/mpay24/active_payments", "");
|
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: Observer.php 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
include_once "app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php";
|
22 |
|
26 |
* Retrieve active system payments
|
27 |
*/
|
28 |
public function afterSave() {
|
29 |
+
if(!Mage::getStoreConfig('payment/mpay24/active'))
|
30 |
+
return false;
|
31 |
+
|
32 |
Mage::getConfig()->saveConfig("mpay24/mpay24/payments_count", 0);
|
33 |
Mage::getConfig()->saveConfig("mpay24/mpay24/payments_error", "");
|
34 |
Mage::getConfig()->saveConfig("mpay24/mpay24/active_payments", "");
|
app/code/community/Mpay24/Mpay24/etc/config.xml
CHANGED
@@ -1,11 +1,11 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
-
@version $Id: config.xml
|
4 |
-->
|
5 |
<config>
|
6 |
<modules>
|
7 |
<Mpay24_Mpay24>
|
8 |
-
<version>1.4.
|
9 |
</Mpay24_Mpay24>
|
10 |
</modules>
|
11 |
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
+
@version $Id: config.xml 17 2013-12-10 07:18:39Z sapolhei $
|
4 |
-->
|
5 |
<config>
|
6 |
<modules>
|
7 |
<Mpay24_Mpay24>
|
8 |
+
<version>1.4.9</version>
|
9 |
</Mpay24_Mpay24>
|
10 |
</modules>
|
11 |
|
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/{mysql4-install-1.4.8.php → mysql4-install-1.4.9.php}
RENAMED
@@ -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: mysql4-install-1.4.
|
20 |
*/
|
21 |
if(class_exists('Mage_Sales_Model_Resource_Setup'))
|
22 |
$install = new Mage_Sales_Model_Resource_Setup('sales_setup');
|
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.9.php 18 2013-12-10 07:19:33Z sapolhei $
|
20 |
*/
|
21 |
if(class_exists('Mage_Sales_Model_Resource_Setup'))
|
22 |
$install = new Mage_Sales_Model_Resource_Setup('sales_setup');
|
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.4.4-1.4.9.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.9.php 18 2013-12-10 07:19:33Z 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.9.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.9.php 18 2013-12-10 07:19:33Z 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.9.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.9.php 18 2013-12-10 07:19:33Z 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.9.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.9.php 18 2013-12-10 07:19:33Z 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/adminhtml/default/default/template/mpay24/info/selectpayment.phtml
CHANGED
@@ -16,11 +16,11 @@
|
|
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: selectpayment.phtml
|
20 |
*/
|
21 |
?>
|
22 |
<p><b>
|
23 |
-
<?php echo "<label for='brand'>".Mage::helper('mpay24')->__("Payment method")."</label><span name='brand' style='float: right; margin-right: 400px;'><img onerror='if(typeof selectedPayment === \"undefined\") selectedPayment=\"../../../web/img/logos/payment-mpay24\"; this.src=\"https://www.mpay24.com/
|
24 |
<br/>
|
25 |
<?php if($this->getMethod()->getData('info_instance')->getOrder() !== null): ?>
|
26 |
<b><?php echo "<label for='mpaytid'>MPAYTID</label><span name='mpaytid' style='float: right; margin-right: 400px;'>".$this->htmlEscape($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('mpay_tid'))."</span>"; ?></b>
|
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: selectpayment.phtml 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
?>
|
22 |
<p><b>
|
23 |
+
<?php echo "<label for='brand'>".Mage::helper('mpay24')->__("Payment method")."</label><span name='brand' style='float: right; margin-right: 400px;'><img onerror='if(typeof selectedPayment === \"undefined\") selectedPayment=\"../../../web/img/logos/payment-mpay24\"; this.src=\"https://www.mpay24.com/web/img/logos/ptypes/\" + selectedPayment + \".png\";this.title=brand;this.alt=brand;' style='max-width: 40%;padding-top: 5px;' src='https://www.mpay24.com/web/img/logos/ptypes/".$this->getPMethId().".png' alt='".$this->getPType()."-".$this->getBrand()."' title='".$this->getPType()."-".$this->getBrand()."'>".' ('.Mage::getStoreConfig('payment/mpay24/title').')'."</span>"; ?></b><br/>
|
24 |
<br/>
|
25 |
<?php if($this->getMethod()->getData('info_instance')->getOrder() !== null): ?>
|
26 |
<b><?php echo "<label for='mpaytid'>MPAYTID</label><span name='mpaytid' style='float: right; margin-right: 400px;'>".$this->htmlEscape($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('mpay_tid'))."</span>"; ?></b>
|
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
|
20 |
*/
|
21 |
?>
|
22 |
<?php
|
@@ -145,7 +145,7 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
|
|
145 |
document.getElementById('<?php echo $id;?>').disabled = true;
|
146 |
document.getElementById('mpay24_table').disabled = false;
|
147 |
}
|
148 |
-
"><img src='https://www.mpay24.com/
|
149 |
<input type="hidden" id='<?php echo $id;?>' name='mpay24_ps' value='<?php echo $id . "_" . $j;?>' disabled />
|
150 |
</div>
|
151 |
</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 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
?>
|
22 |
<?php
|
145 |
document.getElementById('<?php echo $id;?>').disabled = true;
|
146 |
document.getElementById('mpay24_table').disabled = false;
|
147 |
}
|
148 |
+
"><img src='https://www.mpay24.com/web/img/logos/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>
|
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
|
20 |
*/
|
21 |
?>
|
22 |
<?php
|
@@ -153,7 +153,7 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
|
|
153 |
</td>
|
154 |
<td>
|
155 |
<?php if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1):?>
|
156 |
-
<img id="mpay24_img" src='https://www.mpay24.com/
|
157 |
<?php else:?>
|
158 |
<img id="mpay24_img" src='' style="display: none; margin-top: 19px; margin-bottom: 19px;">
|
159 |
<?php endif;?>
|
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 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
?>
|
22 |
<?php
|
153 |
</td>
|
154 |
<td>
|
155 |
<?php if(Mage::getStoreConfig('mpay24/mpay24/forced_preselection') == 1):?>
|
156 |
+
<img id="mpay24_img" src='https://www.mpay24.com/web/img/logos/ptypes/<?php echo $firstID?>.png' style="margin-top: 19px; margin-bottom: 19px;">
|
157 |
<?php else:?>
|
158 |
<img id="mpay24_img" src='' style="display: none; margin-top: 19px; margin-bottom: 19px;">
|
159 |
<?php endif;?>
|
app/design/frontend/default/default/template/mpay24/info/selectpayment.phtml
CHANGED
@@ -16,12 +16,12 @@
|
|
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: selectpayment.phtml
|
20 |
*/
|
21 |
?>
|
22 |
<p><b>
|
23 |
<?php
|
24 |
-
echo "<img onerror='if(typeof selectedPayment === \"undefined\") selectedPayment=\"../../../web/img/logos/payment-mpay24\"; this.src=\"https://www.mpay24.com/
|
25 |
|
26 |
<?php if($this->getMethod()->getData('info_instance')->getOrder() !== null): ?>
|
27 |
<?php echo Mage::helper('mpay24')->__("Approval code") . ": " . $this->htmlEscape($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('appr_code')) ?><br/>
|
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: selectpayment.phtml 17 2013-12-10 07:18:39Z sapolhei $
|
20 |
*/
|
21 |
?>
|
22 |
<p><b>
|
23 |
<?php
|
24 |
+
echo "<img onerror='if(typeof selectedPayment === \"undefined\") selectedPayment=\"../../../web/img/logos/payment-mpay24\"; this.src=\"https://www.mpay24.com/web/img/logos/ptypes/\" + selectedPayment + \".png\";this.title=brand;this.alt=brand;' style='max-width: 40%;padding-top: 5px;' src='https://www.mpay24.com/web/img/logos/ptypes/".$this->getPMethId().".png' alt='".$this->getPType()."-".$this->getBrand()."' title='".$this->getPType()."-".$this->getBrand()."'>".' ('.Mage::getStoreConfig('payment/mpay24/title').')' ?></b><br/>
|
25 |
|
26 |
<?php if($this->getMethod()->getData('info_instance')->getOrder() !== null): ?>
|
27 |
<?php echo Mage::helper('mpay24')->__("Approval code") . ": " . $this->htmlEscape($this->getInfo()->getOrder()->getPayment()->getAdditionalInformation('appr_code')) ?><br/>
|
app/etc/modules/Mpay24_Mpay24.xml
CHANGED
@@ -10,7 +10,7 @@
|
|
10 |
<depends>
|
11 |
<Mage_Payment />
|
12 |
</depends>
|
13 |
-
<version>1.4.
|
14 |
</Mpay24_Mpay24>
|
15 |
</modules>
|
16 |
</config>
|
10 |
<depends>
|
11 |
<Mage_Payment />
|
12 |
</depends>
|
13 |
+
<version>1.4.9</version>
|
14 |
</Mpay24_Mpay24>
|
15 |
</modules>
|
16 |
</config>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>mPAY24</name>
|
4 |
-
<version>1.4.
|
5 |
<stability>stable</stability>
|
6 |
<license>Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
@@ -26,19 +26,11 @@ Die Payment Lösung der mPAY24 GmbH unterstützt folgende Bezahlarten un
|
|
26 |

|
27 |

|
28 |
Weitere Informationen unter www.mPAY24.com</description>
|
29 |
-
<notes>
|
30 |
-

|
31 |
-
1.Klarna bugfix (tax percentage problem)
|
32 |
-

|
33 |
-
2. Backend settings for proxy authentification and perr verification added
|
34 |
-

|
35 |
-
3. Payment charges on PDF Invoices
|
36 |
-

|
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-
|
40 |
-
<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="
|
42 |
<compatible/>
|
43 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
44 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>mPAY24</name>
|
4 |
+
<version>1.4.9</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
26 |

|
27 |

|
28 |
Weitere Informationen unter www.mPAY24.com</description>
|
29 |
+
<notes>A problem with the payment systems logos was solved.</notes>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
30 |
<authors><author><name>Firedrago Magento</name><user>firedrago</user><email>firedrago.magento@gmail.com</email></author></authors>
|
31 |
+
<date>2013-12-10</date>
|
32 |
+
<time>07:20:31</time>
|
33 |
+
<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="82ae0bc8ee6737b8b7cc84b74d73008a"/></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="33a6fe44eedb4968c14e61b2b450537c"/><file name="dropDown.phtml" hash="b3f565e5db15ad3a841e3236d1b47246"/></dir><dir name="info"><file name="selectpayment.phtml" hash="1b0e830f18735a017ce5329a5acbb0e0"/></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="d351fa712378cff006fe8af9a942fc4b"/></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="31b844c88656b15886884edceff8e2bf"/></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="4779293b74b48dff14db85327a814135"/><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="57fea1fb914ff658d569ed89d13fd26a"/><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="15de01401898d6ce91343dbbe229c00d"/><file name="system.xml" hash="f1c9ede9364cf9b1d6734f86d5190a90"/></dir><dir name="sql"><dir name="mpay24_setup"><file name="mysql4-install-1.4.9.php" hash="42b963337c5fc68c8e15a0a3ff0b09fc"/><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.4-1.4.9.php" hash="26f251d1939ee4d9a156499c61bbd7f3"/><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.5-1.4.9.php" hash="0f01b950b01f4ac0f9c78a200fd8f013"/><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.6-1.4.9.php" hash="ce762f7b367d3863a388316faac149f9"/><file name="mysql4-upgrade-1.4.7-1.4.8.php" hash="71cd3d81e624084012b41031083ced69"/><file name="mysql4-upgrade-1.4.7-1.4.9.php" hash="f527ac405e1d125f5b563f21cc353d7b"/></dir></dir></dir></dir></target></contents>
|
34 |
<compatible/>
|
35 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
36 |
</package>
|