Version Notes
1.Status bug fixing: initialize method used instead of authorize.
2.Template improvement: Frontend base package used instead of default.
3.IE 11 frontend template support added.
4.Payment Method discount bug fixed.
5.Default Styling added.
Download this release
Release Info
| Developer | Filipp Akinfiev |
| Extension | mPAY24 |
| Version | 1.5.7 |
| Comparing to | |
| See all releases | |
Code changes from version 1.5.6 to 1.5.7
- app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php +6 -6
- app/code/community/Mpay24/Mpay24/Model/Api/curllog.log +65 -0
- app/code/community/Mpay24/Mpay24/Model/Api/orderXML.php +6 -6
- app/code/community/Mpay24/Mpay24/Model/Selectpayment.php +2 -2
- app/code/community/Mpay24/Mpay24/controllers/PaymentController.php +51 -44
- app/code/community/Mpay24/Mpay24/etc/config.xml +2 -2
- app/code/community/Mpay24/Mpay24/etc/system.xml +5 -4
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/{mysql4-install-1.5.6.php → mysql4-install-1.5.7.php} +0 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.0-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.1-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.2-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.3-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.4-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.5-1.5.7.php +53 -0
- app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.6-1.5.7.php +53 -0
- app/design/frontend/base/default/template/mpay24/form/area.phtml +1 -1
- package.xml +4 -4
app/code/community/Mpay24/Mpay24/Model/Api/MPay24MagentoShop.php
CHANGED
|
@@ -20,7 +20,7 @@ class MPay24MagentoShop extends MPay24Shop {
|
|
| 20 |
|
| 21 |
const CANCEL_URL = 'mpay24/payment/cancel';
|
| 22 |
|
| 23 |
-
const MAGENTO_VERSION = "Magento 1.5.
|
| 24 |
|
| 25 |
var $tid;
|
| 26 |
var $price;
|
|
@@ -89,10 +89,10 @@ class MPay24MagentoShop extends MPay24Shop {
|
|
| 89 |
$order->sendNewOrderEmail();
|
| 90 |
|
| 91 |
if($order->getInvoiceCollection()->count() == 0)
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
| 96 |
$this->_createInvoice($order);
|
| 97 |
}
|
| 98 |
|
|
@@ -590,7 +590,7 @@ class MPay24MagentoShop extends MPay24Shop {
|
|
| 590 |
$mdxi->Order->ShippingAddr->Email = substr($this->xmlentities($this->order->getShippingAddress()->getEmail()),0,50);
|
| 591 |
$mdxi->Order->ShippingAddr->Phone = substr($this->xmlentities($this->order->getShippingAddress()->getTelephone()),0,20);
|
| 592 |
}
|
| 593 |
-
|
| 594 |
if(Mage::helper('customer')->isLoggedIn())
|
| 595 |
$mdxi->Order->URL->Success = Mage::getUrl(MPay24MagentoShop::SUCCESS_URL,array('_secure' => true, '_query' => "TID=" . substr($this->order->getIncrementId(),0,32) ));
|
| 596 |
else
|
| 20 |
|
| 21 |
const CANCEL_URL = 'mpay24/payment/cancel';
|
| 22 |
|
| 23 |
+
const MAGENTO_VERSION = "Magento 1.5.7 ";
|
| 24 |
|
| 25 |
var $tid;
|
| 26 |
var $price;
|
| 89 |
$order->sendNewOrderEmail();
|
| 90 |
|
| 91 |
if($order->getInvoiceCollection()->count() == 0)
|
| 92 |
+
// if(Mage::getStoreConfig('payment/mpay24/paid_payment_action') == MPay24MagentoShop::PAYMENT_TYPE_SALE) {
|
| 93 |
+
// $order->getPayment()->setAdditionalInformation('mpay24AutoClearing', true)->save();
|
| 94 |
+
// $this->_createInvoice($order, true);
|
| 95 |
+
// } else
|
| 96 |
$this->_createInvoice($order);
|
| 97 |
}
|
| 98 |
|
| 590 |
$mdxi->Order->ShippingAddr->Email = substr($this->xmlentities($this->order->getShippingAddress()->getEmail()),0,50);
|
| 591 |
$mdxi->Order->ShippingAddr->Phone = substr($this->xmlentities($this->order->getShippingAddress()->getTelephone()),0,20);
|
| 592 |
}
|
| 593 |
+
|
| 594 |
if(Mage::helper('customer')->isLoggedIn())
|
| 595 |
$mdxi->Order->URL->Success = Mage::getUrl(MPay24MagentoShop::SUCCESS_URL,array('_secure' => true, '_query' => "TID=" . substr($this->order->getIncrementId(),0,32) ));
|
| 596 |
else
|
app/code/community/Mpay24/Mpay24/Model/Api/curllog.log
CHANGED
|
@@ -0,0 +1,65 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
* Hostname was NOT found in DNS cache
|
| 2 |
+
* Trying 192.168.10.14...
|
| 3 |
+
* Connected to test.mpay24.com (192.168.10.14) port 443 (#2)
|
| 4 |
+
* successfully set certificate verify locations:
|
| 5 |
+
* CAfile: E:\Users\sadrian\workspace\anna-2\magento_module\app\code\community\Mpay24\Mpay24\Model\Api/cacert.pem
|
| 6 |
+
CApath: none
|
| 7 |
+
* SSL connection using TLSv1.2 / ECDHE-RSA-AES256-GCM-SHA384
|
| 8 |
+
* Server certificate:
|
| 9 |
+
* subject: OU=Domain Control Validated; OU=Provided by EUNETIC GmbH; OU=EuropeanSSL Single; CN=test.mpay24.com
|
| 10 |
+
* start date: 2013-05-13 00:00:00 GMT
|
| 11 |
+
* expire date: 2015-05-13 23:59:59 GMT
|
| 12 |
+
* subjectAltName: test.mpay24.com matched
|
| 13 |
+
* issuer: C=DE; O=EUNETIC GmbH; CN=EuropeanSSL Server CA
|
| 14 |
+
* SSL certificate verify ok.
|
| 15 |
+
* Server auth using Basic with user 'u99999'
|
| 16 |
+
> POST /app/bin/etpproxy_v15 HTTP/1.1
|
| 17 |
+
Authorization: Basic dTk5OTk5OlZhcm5hLjMwMTIyMDEx
|
| 18 |
+
User-Agent: mPAY24 PHP API $Rev: 9 $ ($Date:: 2013-10-29 #$)
|
| 19 |
+
Host: test.mpay24.com
|
| 20 |
+
Accept: */*
|
| 21 |
+
Content-Length: 423
|
| 22 |
+
Content-Type: application/x-www-form-urlencoded
|
| 23 |
+
|
| 24 |
+
* upload completely sent off: 423 out of 423 bytes
|
| 25 |
+
< HTTP/1.1 200 OK
|
| 26 |
+
< Date: Fri, 13 Feb 2015 15:10:59 GMT
|
| 27 |
+
* Server Apache is not blacklisted
|
| 28 |
+
< Server: Apache
|
| 29 |
+
< Content-Length: 2367
|
| 30 |
+
< Content-Type: text/xml; charset=utf-8
|
| 31 |
+
<
|
| 32 |
+
* Connection #2 to host test.mpay24.com left intact
|
| 33 |
+
* Hostname was found in DNS cache
|
| 34 |
+
* Hostname in DNS cache was stale, zapped
|
| 35 |
+
* Trying 192.168.10.14...
|
| 36 |
+
* Connected to test.mpay24.com (192.168.10.14) port 443 (#3)
|
| 37 |
+
* successfully set certificate verify locations:
|
| 38 |
+
* CAfile: E:\Users\sadrian\workspace\anna-2\magento_module\app\code\community\Mpay24\Mpay24\Model\Api/cacert.pem
|
| 39 |
+
CApath: none
|
| 40 |
+
* SSL connection using TLSv1.2 / ECDHE-RSA-AES256-GCM-SHA384
|
| 41 |
+
* Server certificate:
|
| 42 |
+
* subject: OU=Domain Control Validated; OU=Provided by EUNETIC GmbH; OU=EuropeanSSL Single; CN=test.mpay24.com
|
| 43 |
+
* start date: 2013-05-13 00:00:00 GMT
|
| 44 |
+
* expire date: 2015-05-13 23:59:59 GMT
|
| 45 |
+
* subjectAltName: test.mpay24.com matched
|
| 46 |
+
* issuer: C=DE; O=EUNETIC GmbH; CN=EuropeanSSL Server CA
|
| 47 |
+
* SSL certificate verify ok.
|
| 48 |
+
* Server auth using Basic with user 'u99999'
|
| 49 |
+
> POST /app/bin/etpproxy_v15 HTTP/1.1
|
| 50 |
+
Authorization: Basic dTk5OTk5OlZhcm5hLjMwMTIyMDEx
|
| 51 |
+
User-Agent: mPAY24 PHP API $Rev: 9 $ ($Date:: 2013-10-29 #$)
|
| 52 |
+
Host: test.mpay24.com
|
| 53 |
+
Accept: */*
|
| 54 |
+
Content-Length: 423
|
| 55 |
+
Content-Type: application/x-www-form-urlencoded
|
| 56 |
+
|
| 57 |
+
* upload completely sent off: 423 out of 423 bytes
|
| 58 |
+
< HTTP/1.1 200 OK
|
| 59 |
+
< Date: Fri, 13 Feb 2015 15:13:14 GMT
|
| 60 |
+
* Server Apache is not blacklisted
|
| 61 |
+
< Server: Apache
|
| 62 |
+
< Content-Length: 2367
|
| 63 |
+
< Content-Type: text/xml; charset=utf-8
|
| 64 |
+
<
|
| 65 |
+
* Connection #3 to host test.mpay24.com left intact
|
app/code/community/Mpay24/Mpay24/Model/Api/orderXML.php
CHANGED
|
@@ -57,10 +57,10 @@ class ORDER {
|
|
| 57 |
|
| 58 |
$value = $args[0];
|
| 59 |
|
| 60 |
-
if(preg_match('
|
| 61 |
$value = str_replace(',', '.', $match[0]);
|
| 62 |
|
| 63 |
-
if(preg_match('
|
| 64 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 65 |
|
| 66 |
$this->node->setAttribute($attributeName, $value);
|
|
@@ -81,10 +81,10 @@ class ORDER {
|
|
| 81 |
if(array_key_exists(1, $args)) {
|
| 82 |
$value = $args[1];
|
| 83 |
|
| 84 |
-
if(preg_match('
|
| 85 |
$value = str_replace(',', '.', $match[0]);
|
| 86 |
|
| 87 |
-
if(preg_match('
|
| 88 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 89 |
|
| 90 |
$node = $this->doc->createElement($method, $value);
|
|
@@ -127,10 +127,10 @@ class ORDER {
|
|
| 127 |
|
| 128 |
$value = str_replace('&', '&', $value);
|
| 129 |
|
| 130 |
-
if(preg_match('
|
| 131 |
$value = str_replace(',', '.', $match[0]);
|
| 132 |
|
| 133 |
-
if(preg_match('
|
| 134 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 135 |
|
| 136 |
if(strpos($value, "<") || strpos($value, ">"))
|
| 57 |
|
| 58 |
$value = $args[0];
|
| 59 |
|
| 60 |
+
if(preg_match('/\b[0-9]+,[0-9]+\b/', $value, $match))
|
| 61 |
$value = str_replace(',', '.', $match[0]);
|
| 62 |
|
| 63 |
+
if(preg_match('/\b[0-9]+.[0-9]+\b/', $value, $match) && $value == $match[0] && $attributeName != 'shippingCosts' && (is_int(strpos($attributeName, 'price')) || is_int(strpos($attributeName, 'Price')) || is_int(strpos($attributeName, 'Tax')) || is_int(strpos($attributeName, 'cost')) || is_int(strpos($attributeName, 'Cost'))))
|
| 64 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 65 |
|
| 66 |
$this->node->setAttribute($attributeName, $value);
|
| 81 |
if(array_key_exists(1, $args)) {
|
| 82 |
$value = $args[1];
|
| 83 |
|
| 84 |
+
if(preg_match('/\b[0-9]+,[0-9]+\b/', $value, $match))
|
| 85 |
$value = str_replace(',', '.', $match[0]);
|
| 86 |
|
| 87 |
+
if(preg_match('/\b[0-9]+.[0-9]+\b/', $value, $match) && $value == $match[0] && $name != 'shippingCosts' && (is_int(strpos($name, 'price')) || is_int(strpos($name, 'Price')) || is_int(strpos($name, 'Tax')) || is_int(strpos($name, 'cost')) || is_int(strpos($name, 'Cost'))))
|
| 88 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 89 |
|
| 90 |
$node = $this->doc->createElement($method, $value);
|
| 127 |
|
| 128 |
$value = str_replace('&', '&', $value);
|
| 129 |
|
| 130 |
+
if(preg_match('/\b[0-9]+,[0-9]+\b/', $value, $match))
|
| 131 |
$value = str_replace(',', '.', $match[0]);
|
| 132 |
|
| 133 |
+
if(preg_match('/\b[0-9]+.[0-9]+\b/', $value, $match) && $value == $match[0] && $name != 'shippingCosts' && (is_int(strpos($name, 'price')) || is_int(strpos($name, 'Price')) || is_int(strpos($name, 'Tax')) || is_int(strpos($name, 'cost')) || is_int(strpos($name, 'Cost'))))
|
| 134 |
$value = number_format(floatval($match[0]), 2, '.', '');
|
| 135 |
|
| 136 |
if(strpos($value, "<") || strpos($value, ">"))
|
app/code/community/Mpay24/Mpay24/Model/Selectpayment.php
CHANGED
|
@@ -87,7 +87,7 @@ class Mpay24_Mpay24_Model_Selectpayment extends Mpay24_Mpay24_Model_Method_Selec
|
|
| 87 |
* @return bool|Mpay24_Mpay24_Model_PaymentMethod
|
| 88 |
*/
|
| 89 |
public function capture(Varien_Object $payment, $amount) {
|
| 90 |
-
|
| 91 |
$this->clearSession();
|
| 92 |
$mPay24MagentoShop = MPay24MagentoShop::getMPay24Api();
|
| 93 |
$mPAY24Result = $mPay24MagentoShop->clearAmount($payment->getOrder()->getIncrementId(),$amount*100);
|
|
@@ -97,7 +97,7 @@ class Mpay24_Mpay24_Model_Selectpayment extends Mpay24_Mpay24_Model_Method_Selec
|
|
| 97 |
Mage::throwException(Mage::helper('mpay24')->__("The order could not be captured! For mor information see the log files!"));
|
| 98 |
return false;
|
| 99 |
}
|
| 100 |
-
|
| 101 |
|
| 102 |
parent::capture($payment, $amount);
|
| 103 |
|
| 87 |
* @return bool|Mpay24_Mpay24_Model_PaymentMethod
|
| 88 |
*/
|
| 89 |
public function capture(Varien_Object $payment, $amount) {
|
| 90 |
+
// if(!$payment->getAdditionalInformation('MIFClear') && Mage::getStoreConfig('payment/mpay24/paid_payment_action') != MPay24MagentoShop::PAYMENT_TYPE_SALE && !$payment->getAdditionalInformation('error')) {
|
| 91 |
$this->clearSession();
|
| 92 |
$mPay24MagentoShop = MPay24MagentoShop::getMPay24Api();
|
| 93 |
$mPAY24Result = $mPay24MagentoShop->clearAmount($payment->getOrder()->getIncrementId(),$amount*100);
|
| 97 |
Mage::throwException(Mage::helper('mpay24')->__("The order could not be captured! For mor information see the log files!"));
|
| 98 |
return false;
|
| 99 |
}
|
| 100 |
+
// }
|
| 101 |
|
| 102 |
parent::capture($payment, $amount);
|
| 103 |
|
app/code/community/Mpay24/Mpay24/controllers/PaymentController.php
CHANGED
|
@@ -277,10 +277,10 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 277 |
$order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
|
| 278 |
$order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
|
| 279 |
|
| 280 |
-
|
| 281 |
-
|
| 282 |
-
|
| 283 |
-
|
| 284 |
$status = $mPAY24Result->getParam('TSTATUS');
|
| 285 |
|
| 286 |
$order->getPayment()->setAdditionalInformation('confirmed', $status)->save();
|
|
@@ -302,14 +302,18 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 302 |
// $s = Mage::getStoreConfig('payment/mpay24/paid_order_status');
|
| 303 |
// else
|
| 304 |
// $s = Mage_Sales_Model_Order::STATE_COMPLETE;
|
| 305 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 306 |
switch($status) {
|
| 307 |
case 'RESERVED':
|
| 308 |
$this->setBillpayData($order, $mPAY24Result);
|
| 309 |
// $order->getPayment()->setAmountAuthorized($mPAY24Result->getParam('PRICE')/100)->save();
|
| 310 |
// $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PROCESSING, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("RESERVED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
|
| 311 |
// $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING)->save();
|
| 312 |
-
// $order->sendNewOrderEmail();
|
| 313 |
|
| 314 |
// if($order->getInvoiceCollection()->count() == 0)
|
| 315 |
// if(Mage::getStoreConfig('payment/mpay24/paid_payment_action') == MPay24MagentoShop::PAYMENT_TYPE_SALE)
|
|
@@ -318,6 +322,7 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 318 |
// $this->_createInvoice($order);
|
| 319 |
|
| 320 |
$order->getPayment()->authorize(false, $mPAY24Result->getParam('PRICE')/100)->save();
|
|
|
|
| 321 |
break;
|
| 322 |
case 'BILLED':
|
| 323 |
$this->setBillpayData($order, $mPAY24Result);
|
|
@@ -348,14 +353,18 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 348 |
// }
|
| 349 |
// }
|
| 350 |
if($order->getInvoiceCollection()->count() == 0)
|
| 351 |
-
$
|
| 352 |
|
| 353 |
$order->addStatusHistoryComment(Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
| 354 |
// $order->addStatusToHistory($s, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
|
| 355 |
|
|
|
|
|
|
|
| 356 |
$order->save();
|
| 357 |
break;
|
| 358 |
case 'CREDITED':
|
|
|
|
|
|
|
| 359 |
if ($order->getTotalOnlineRefunded() == 0.00) {
|
| 360 |
$creditmemo = Mage::getModel('sales/service_order', $order)
|
| 361 |
->prepareCreditmemo()
|
|
@@ -367,18 +376,16 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 367 |
$creditmemo->save();
|
| 368 |
|
| 369 |
$order->getPayment()->refund($creditmemo)->save();
|
| 370 |
-
$order->sendOrderUpdateEmail();
|
| 371 |
}
|
| 372 |
|
| 373 |
-
$this->setBillpayData($order, $mPAY24Result);
|
| 374 |
|
| 375 |
// $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
|
| 376 |
// Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
|
| 377 |
|
| 378 |
// $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_COMPLETE, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("CREDITED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
| 379 |
$order->addStatusHistoryComment(Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("CREDITED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
|
|
|
| 380 |
$order->save();
|
| 381 |
-
|
| 382 |
break;
|
| 383 |
case 'SUSPENDED':
|
| 384 |
$order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("SUSPENDED") . ' [ '.$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
|
|
@@ -391,8 +398,8 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 391 |
$order->getPayment()->void($orderInvoice)->save();
|
| 392 |
}
|
| 393 |
|
| 394 |
-
$order->sendOrderUpdateEmail();
|
| 395 |
$order->addStatusToHistory($order->getState(), Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("REVERSED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
|
|
|
|
| 396 |
$order->save();
|
| 397 |
break;
|
| 398 |
case 'ERROR':
|
|
@@ -401,8 +408,8 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 401 |
$order->getPayment()->setAdditionalInformation('error', true)->save();
|
| 402 |
|
| 403 |
$order->addStatusToHistory($order->getStatus(), Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("ERROR") . " " . $order->getPayment()->getAdditionalInformation('error_text') . " (" . $this->getRequest()->getClientIp() . ")");
|
|
|
|
| 404 |
$order->save();
|
| 405 |
-
|
| 406 |
break;
|
| 407 |
default:
|
| 408 |
break;
|
|
@@ -615,49 +622,49 @@ class Mpay24_Mpay24_PaymentController extends Mage_Core_Controller_Front_Action
|
|
| 615 |
return $model;
|
| 616 |
}
|
| 617 |
|
| 618 |
-
|
| 619 |
// Mage::log('mPAY24 Extension ('.debug_backtrace()[2]['function'].'): create invoice called');
|
| 620 |
-
|
| 621 |
-
|
| 622 |
-
|
| 623 |
-
|
| 624 |
|
| 625 |
-
|
| 626 |
-
|
| 627 |
|
| 628 |
// if($capture && $onlineCapture)
|
| 629 |
-
|
| 630 |
|
| 631 |
-
|
| 632 |
|
| 633 |
// Mage::log("mPAY24 Extension (".debug_backtrace()[2]['function']."): Invoice registered!");
|
| 634 |
-
|
| 635 |
-
|
| 636 |
|
| 637 |
-
|
| 638 |
-
|
| 639 |
-
|
| 640 |
-
|
| 641 |
|
| 642 |
-
|
| 643 |
|
| 644 |
// if($capture)
|
| 645 |
-
|
| 646 |
-
|
| 647 |
-
|
| 648 |
-
|
| 649 |
-
|
| 650 |
-
//
|
| 651 |
-
//
|
| 652 |
-
|
| 653 |
-
|
| 654 |
-
|
| 655 |
-
|
| 656 |
-
|
| 657 |
-
|
| 658 |
-
|
| 659 |
-
|
| 660 |
-
|
| 661 |
|
| 662 |
/**
|
| 663 |
* Add transaction to payment with defined type
|
| 277 |
$order->getPayment()->setAdditionalInformation('mpay_tid', $mPAY24Result->getParam('MPAYTID'))->save();
|
| 278 |
$order->getPayment()->setAdditionalInformation('appr_code', $apprCode)->save();
|
| 279 |
|
| 280 |
+
// //SOFORT Ueberweisung status check
|
| 281 |
+
// if($mPAY24Result->getParam('P_TYPE') == 'SOFORT' && ($mPAY24Result->getParam('TSTATUS') == 'BILLED' || $mPAY24Result->getParam('TSTATUS') == 'RESERVED' || $mPAY24Result->getParam('TSTATUS') == 'SUSPENDED'))
|
| 282 |
+
// $status = Mage::getStoreConfig('mpay24/mpay24as/sofort_state');
|
| 283 |
+
// else
|
| 284 |
$status = $mPAY24Result->getParam('TSTATUS');
|
| 285 |
|
| 286 |
$order->getPayment()->setAdditionalInformation('confirmed', $status)->save();
|
| 302 |
// $s = Mage::getStoreConfig('payment/mpay24/paid_order_status');
|
| 303 |
// else
|
| 304 |
// $s = Mage_Sales_Model_Order::STATE_COMPLETE;
|
| 305 |
+
|
| 306 |
+
if($order->getState() == Mage_Sales_Model_Order::STATE_PENDING_PAYMENT) {
|
| 307 |
+
$order->sendNewOrderEmail()->save();
|
| 308 |
+
Mage::log("new order mail sent!!!");
|
| 309 |
+
}
|
| 310 |
+
|
| 311 |
switch($status) {
|
| 312 |
case 'RESERVED':
|
| 313 |
$this->setBillpayData($order, $mPAY24Result);
|
| 314 |
// $order->getPayment()->setAmountAuthorized($mPAY24Result->getParam('PRICE')/100)->save();
|
| 315 |
// $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PROCESSING, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("RESERVED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
|
| 316 |
// $order->setState(Mage_Sales_Model_Order::STATE_PROCESSING)->save();
|
|
|
|
| 317 |
|
| 318 |
// if($order->getInvoiceCollection()->count() == 0)
|
| 319 |
// if(Mage::getStoreConfig('payment/mpay24/paid_payment_action') == MPay24MagentoShop::PAYMENT_TYPE_SALE)
|
| 322 |
// $this->_createInvoice($order);
|
| 323 |
|
| 324 |
$order->getPayment()->authorize(false, $mPAY24Result->getParam('PRICE')/100)->save();
|
| 325 |
+
$order->sendOrderUpdateEmail(true, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("RESERVED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]')->save();
|
| 326 |
break;
|
| 327 |
case 'BILLED':
|
| 328 |
$this->setBillpayData($order, $mPAY24Result);
|
| 353 |
// }
|
| 354 |
// }
|
| 355 |
if($order->getInvoiceCollection()->count() == 0)
|
| 356 |
+
$invoice = $this->_createInvoice($order);
|
| 357 |
|
| 358 |
$order->addStatusHistoryComment(Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
| 359 |
// $order->addStatusToHistory($s, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
|
| 360 |
|
| 361 |
+
$order->sendOrderUpdateEmail(true, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("BILLED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]')->save();
|
| 362 |
+
|
| 363 |
$order->save();
|
| 364 |
break;
|
| 365 |
case 'CREDITED':
|
| 366 |
+
$this->setBillpayData($order, $mPAY24Result);
|
| 367 |
+
|
| 368 |
if ($order->getTotalOnlineRefunded() == 0.00) {
|
| 369 |
$creditmemo = Mage::getModel('sales/service_order', $order)
|
| 370 |
->prepareCreditmemo()
|
| 376 |
$creditmemo->save();
|
| 377 |
|
| 378 |
$order->getPayment()->refund($creditmemo)->save();
|
|
|
|
| 379 |
}
|
| 380 |
|
|
|
|
| 381 |
|
| 382 |
// $this->_addChildTransaction(Mage_Sales_Model_Order_Payment_Transaction::TYPE_REFUND,
|
| 383 |
// Mage_Sales_Model_Order_Payment_Transaction::TYPE_CAPTURE);
|
| 384 |
|
| 385 |
// $order->addStatusToHistory(Mage_Sales_Model_Order::STATE_COMPLETE, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("CREDITED") . ' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
| 386 |
$order->addStatusHistoryComment(Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("CREDITED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")")->save();
|
| 387 |
+
$order->sendOrderUpdateEmail(true, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("CREDITED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]')->save();
|
| 388 |
$order->save();
|
|
|
|
| 389 |
break;
|
| 390 |
case 'SUSPENDED':
|
| 391 |
$order->addStatusToHistory(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("SUSPENDED") . ' [ '.$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")");
|
| 398 |
$order->getPayment()->void($orderInvoice)->save();
|
| 399 |
}
|
| 400 |
|
|
|
|
| 401 |
$order->addStatusToHistory($order->getState(), Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("REVERSED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]' . " (" . $this->getRequest()->getClientIp() . ")", true)->save();
|
| 402 |
+
$order->sendOrderUpdateEmail(true, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("REVERSED") .' [ ' . $mPAY24Result->getParam('CURRENCY') . " " .$order->formatPriceTxt($mPAY24Result->getParam('PRICE')/100).' ]')->save();
|
| 403 |
$order->save();
|
| 404 |
break;
|
| 405 |
case 'ERROR':
|
| 408 |
$order->getPayment()->setAdditionalInformation('error', true)->save();
|
| 409 |
|
| 410 |
$order->addStatusToHistory($order->getStatus(), Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("ERROR") . " " . $order->getPayment()->getAdditionalInformation('error_text') . " (" . $this->getRequest()->getClientIp() . ")");
|
| 411 |
+
$order->sendOrderUpdateEmail(true, Mage::helper('mpay24')->__("$paymentHistoryText") . Mage::helper('mpay24')->__("ERROR") . " " . $order->getPayment()->getAdditionalInformation('error_text'))->save();
|
| 412 |
$order->save();
|
|
|
|
| 413 |
break;
|
| 414 |
default:
|
| 415 |
break;
|
| 622 |
return $model;
|
| 623 |
}
|
| 624 |
|
| 625 |
+
public function _createInvoice($order, $capture=false, $mif=false, $onlineCapture=true) {
|
| 626 |
// Mage::log('mPAY24 Extension ('.debug_backtrace()[2]['function'].'): create invoice called');
|
| 627 |
+
$arrBacktrace = debug_backtrace();
|
| 628 |
+
Mage::log('mPAY24 Extension ('.$arrBacktrace[2]['function'].'): create invoice called');
|
| 629 |
+
if ($order->canInvoice()) {
|
| 630 |
+
$invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
|
| 631 |
|
| 632 |
+
if (!$invoice->getTotalQty())
|
| 633 |
+
Mage::throwException(Mage::helper('core')->__('Cannot create an invoice without products.'));
|
| 634 |
|
| 635 |
// if($capture && $onlineCapture)
|
| 636 |
+
$invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE);
|
| 637 |
|
| 638 |
+
$invoice->register();
|
| 639 |
|
| 640 |
// Mage::log("mPAY24 Extension (".debug_backtrace()[2]['function']."): Invoice registered!");
|
| 641 |
+
$arrBacktrace = debug_backtrace();
|
| 642 |
+
Mage::log("mPAY24 Extension (".$arrBacktrace[2]['function']."): Invoice registered!");
|
| 643 |
|
| 644 |
+
Mage::getModel('core/resource_transaction')
|
| 645 |
+
->addObject($invoice)
|
| 646 |
+
->addObject($invoice->getOrder())
|
| 647 |
+
->save();
|
| 648 |
|
| 649 |
+
$order->save();
|
| 650 |
|
| 651 |
// if($capture)
|
| 652 |
+
foreach ($order->getInvoiceCollection() as $orderInvoice)
|
| 653 |
+
if ($order->getTotalPaid() == 0.00) {
|
| 654 |
+
$orderInvoice->pay();
|
| 655 |
+
$orderInvoice->save();
|
| 656 |
+
|
| 657 |
+
// if($mif)
|
| 658 |
+
// $order->getPayment()->setAdditionalInformation('MIFClear', true)->save();
|
| 659 |
+
|
| 660 |
+
$order->getPayment()->capture($orderInvoice)->save();
|
| 661 |
+
}
|
| 662 |
+
|
| 663 |
+
$invoice->sendEmail(true, '');
|
| 664 |
+
return $invoice;
|
| 665 |
+
} else
|
| 666 |
+
Mage::throwException(Mage::helper('core')->__('Cannot create an invoice.'));
|
| 667 |
+
}
|
| 668 |
|
| 669 |
/**
|
| 670 |
* Add transaction to payment with defined type
|
app/code/community/Mpay24/Mpay24/etc/config.xml
CHANGED
|
@@ -5,7 +5,7 @@
|
|
| 5 |
<config>
|
| 6 |
<modules>
|
| 7 |
<Mpay24_Mpay24>
|
| 8 |
-
<version>1.5.
|
| 9 |
</Mpay24_Mpay24>
|
| 10 |
</modules>
|
| 11 |
|
|
@@ -239,7 +239,7 @@
|
|
| 239 |
<old_merchantid />
|
| 240 |
<soap_pass backend_model="adminhtml/system_config_backend_encrypted"/>
|
| 241 |
<debug>0</debug>
|
| 242 |
-
<sofort_state>SUSPENDED</sofort_state>
|
| 243 |
<use_proxy>0</use_proxy>
|
| 244 |
<use_proxy_auth>0</use_proxy_auth>
|
| 245 |
<verify_peer>1</verify_peer>
|
| 5 |
<config>
|
| 6 |
<modules>
|
| 7 |
<Mpay24_Mpay24>
|
| 8 |
+
<version>1.5.7</version>
|
| 9 |
</Mpay24_Mpay24>
|
| 10 |
</modules>
|
| 11 |
|
| 239 |
<old_merchantid />
|
| 240 |
<soap_pass backend_model="adminhtml/system_config_backend_encrypted"/>
|
| 241 |
<debug>0</debug>
|
| 242 |
+
<!-- <sofort_state>SUSPENDED</sofort_state> -->
|
| 243 |
<use_proxy>0</use_proxy>
|
| 244 |
<use_proxy_auth>0</use_proxy_auth>
|
| 245 |
<verify_peer>1</verify_peer>
|
app/code/community/Mpay24/Mpay24/etc/system.xml
CHANGED
|
@@ -107,7 +107,7 @@
|
|
| 107 |
<show_in_store>1</show_in_store>
|
| 108 |
<depends><active>1</active></depends>
|
| 109 |
</debug>
|
| 110 |
-
<sofort_state translate="label comment">
|
| 111 |
<label>SOFORT Banking end-state</label>
|
| 112 |
<frontend_type>select</frontend_type>
|
| 113 |
<source_model>mpay24/source_sOFORTState</source_model>
|
|
@@ -117,7 +117,7 @@
|
|
| 117 |
<show_in_store>1</show_in_store>
|
| 118 |
<depends><active>1</active></depends>
|
| 119 |
<comment>ONLY FOR 'SOFORT Überweisung' merchants: Please contact support@mpay24.com for more information!</comment>
|
| 120 |
-
</sofort_state>
|
| 121 |
<use_proxy translate="label">
|
| 122 |
<label>API uses proxy</label>
|
| 123 |
<frontend_type>select</frontend_type>
|
|
@@ -193,6 +193,7 @@
|
|
| 193 |
<show_in_default>1</show_in_default>
|
| 194 |
<show_in_website>1</show_in_website>
|
| 195 |
<show_in_store>1</show_in_store>
|
|
|
|
| 196 |
</allowed_ips>
|
| 197 |
</fields>
|
| 198 |
</mpay24as>
|
|
@@ -2139,7 +2140,7 @@
|
|
| 2139 |
<show_in_store>1</show_in_store>
|
| 2140 |
<depends><payments_active>true</payments_active></depends>
|
| 2141 |
</ps_50>
|
| 2142 |
-
<payment_action translate="label">
|
| 2143 |
<label>Automatic clearing for credit card payments</label>
|
| 2144 |
<frontend_type>select</frontend_type>
|
| 2145 |
<source_model>mpay24/source_clearingAction</source_model>
|
|
@@ -2148,7 +2149,7 @@
|
|
| 2148 |
<show_in_default>1</show_in_default>
|
| 2149 |
<show_in_website>1</show_in_website>
|
| 2150 |
<show_in_store>1</show_in_store>
|
| 2151 |
-
</payment_action>
|
| 2152 |
<paid_order_status translate="label">
|
| 2153 |
<label>Status of paid orders</label>
|
| 2154 |
<frontend_type>select</frontend_type>
|
| 107 |
<show_in_store>1</show_in_store>
|
| 108 |
<depends><active>1</active></depends>
|
| 109 |
</debug>
|
| 110 |
+
<!-- <sofort_state translate="label comment">
|
| 111 |
<label>SOFORT Banking end-state</label>
|
| 112 |
<frontend_type>select</frontend_type>
|
| 113 |
<source_model>mpay24/source_sOFORTState</source_model>
|
| 117 |
<show_in_store>1</show_in_store>
|
| 118 |
<depends><active>1</active></depends>
|
| 119 |
<comment>ONLY FOR 'SOFORT Überweisung' merchants: Please contact support@mpay24.com for more information!</comment>
|
| 120 |
+
</sofort_state> -->
|
| 121 |
<use_proxy translate="label">
|
| 122 |
<label>API uses proxy</label>
|
| 123 |
<frontend_type>select</frontend_type>
|
| 193 |
<show_in_default>1</show_in_default>
|
| 194 |
<show_in_website>1</show_in_website>
|
| 195 |
<show_in_store>1</show_in_store>
|
| 196 |
+
<depends><active>1</active></depends>
|
| 197 |
</allowed_ips>
|
| 198 |
</fields>
|
| 199 |
</mpay24as>
|
| 2140 |
<show_in_store>1</show_in_store>
|
| 2141 |
<depends><payments_active>true</payments_active></depends>
|
| 2142 |
</ps_50>
|
| 2143 |
+
<!-- <payment_action translate="label">
|
| 2144 |
<label>Automatic clearing for credit card payments</label>
|
| 2145 |
<frontend_type>select</frontend_type>
|
| 2146 |
<source_model>mpay24/source_clearingAction</source_model>
|
| 2149 |
<show_in_default>1</show_in_default>
|
| 2150 |
<show_in_website>1</show_in_website>
|
| 2151 |
<show_in_store>1</show_in_store>
|
| 2152 |
+
</payment_action> -->
|
| 2153 |
<paid_order_status translate="label">
|
| 2154 |
<label>Status of paid orders</label>
|
| 2155 |
<frontend_type>select</frontend_type>
|
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/{mysql4-install-1.5.6.php → mysql4-install-1.5.7.php}
RENAMED
|
File without changes
|
app/code/community/Mpay24/Mpay24/sql/mpay24_setup/mysql4-upgrade-1.5.0-1.5.7.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.5.0-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.1-1.5.7.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.5.1-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.2-1.5.7.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.5.2-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.3-1.5.7.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.5.3-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.4-1.5.7.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.5.4-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.5-1.5.7.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.5.5-1.5.6.php 33 2015-01-15 16:29:36Z 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.5.6-1.5.7.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.5.6.php 31 2015-01-15 16:26:31Z 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/base/default/template/mpay24/form/area.phtml
CHANGED
|
@@ -30,7 +30,7 @@ if(Mage::getStoreConfig('mpay24/mpay24/payments_active') == 'true') {
|
|
| 30 |
}
|
| 31 |
?>
|
| 32 |
<script type="text/javascript">
|
| 33 |
-
var selectedPayment = "../../../img/logos/payment-mpay24.
|
| 34 |
var brand = "";
|
| 35 |
</script>
|
| 36 |
|
| 30 |
}
|
| 31 |
?>
|
| 32 |
<script type="text/javascript">
|
| 33 |
+
var selectedPayment = "../../../img/logos/payment-mpay24.svg";
|
| 34 |
var brand = "";
|
| 35 |
</script>
|
| 36 |
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>mPAY24</name>
|
| 4 |
-
<version>1.5.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -37,9 +37,9 @@ Weitere Informationen unter www.mPAY24.com</description>
|
|
| 37 |
5.Default Styling added.
|
| 38 |
</notes>
|
| 39 |
<authors><author><name>Filipp Akinfiev</name><user>firedrago</user><email>firedrago.magento@gmail.com</email></author></authors>
|
| 40 |
-
<date>2015-02-
|
| 41 |
-
<time>
|
| 42 |
-
<contents><target name="magelocale"><dir name="de_AT"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="de_DE"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="de_CH"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="en_US"><file name="Mpay24_Mpay24.csv" hash="dd7dc27a5f34809094689e0c7cfbf511"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mpay24_Mpay24.xml" hash="c4240c748dddde41f3b843eea1307477"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="form"><file name="area.phtml" hash="
|
| 43 |
<compatible/>
|
| 44 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 45 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>mPAY24</name>
|
| 4 |
+
<version>1.5.7</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
| 37 |
5.Default Styling added.
|
| 38 |
</notes>
|
| 39 |
<authors><author><name>Filipp Akinfiev</name><user>firedrago</user><email>firedrago.magento@gmail.com</email></author></authors>
|
| 40 |
+
<date>2015-02-13</date>
|
| 41 |
+
<time>15:21:12</time>
|
| 42 |
+
<contents><target name="magelocale"><dir name="de_AT"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="de_DE"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="de_CH"><file name="Mpay24_Mpay24.csv" hash="be5ba8435255f2b125788f1e513225fe"/></dir><dir name="en_US"><file name="Mpay24_Mpay24.csv" hash="dd7dc27a5f34809094689e0c7cfbf511"/></dir></target><target name="mageetc"><dir name="modules"><file name="Mpay24_Mpay24.xml" hash="c4240c748dddde41f3b843eea1307477"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="mpay24"><dir name="form"><file name="area.phtml" hash="f0f0b9d1d3d22455f074d71838f0120f"/><file name="dropDown.phtml" hash="0e1d4e2b3c014e0037a8428be5df99c5"/><file name="radio.phtml" hash="40675c11f9114261f8590e9f5faa7c00"/></dir><dir name="info"><file name="selectpayment.phtml" hash="9f3f3adbbdc18aba8710c6bdee2176a9"/></dir></dir></dir><dir name="layout"><file name="mpay24.xml" hash="92ba7cb97b6ce38c68dab60320dec9eb"/></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="72560f7d19995e6ad68ee6ed9ecb538a"/></dir><file name="selectpayment.phtml" hash="930025a984717c6be1a18d54d06ad9e1"/></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="6a32d04093ed17bd205049fc2c08a149"/></dir></dir></dir></dir><dir name="Form"><file name="Selectpayment.php" hash="d7c2782f8d5307a3fca856b44ced5af4"/></dir><file name="Form.php" hash="72f46c1cddecdb39cac90558ae3f8f34"/><dir name="Info"><file name="Selectpayment.php" hash="39c93c8c340083d48acec81987b7be29"/></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="632a64d7b4c62518dcbb451ed514edb9"/><file name="MPay24Api.php" hash="6f96a97da40b296db3aabdd6447985a5"/><file name="MPay24MagentoShop.php" hash="5e719f52e62b46794c04e7e021fc70f1"/><file name="MPay24Shop.php" hash="e42d98233a8e32905f349fc7a006ef17"/><file name="cacert.pem" hash="b4bc508481b6291f414f4e6fd7e5d0a5"/><file name="curllog.log" hash="81316a190c4d6e2ac32098eb9294eac8"/><file name="orderXML.php" hash="385c9dde9c20f1cf9a74356e14429e85"/><dir name="xmls"><file name="Example_MDXI.xml" hash="dddd02e4cdc0905792c1a2a9f3681bfd"/></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="0adcb299abd53d7c683b8f5ebef37aae"/></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="fee0d97f00f19ec06dc77ae0528fd152"/><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="1a86b6bd8d2e1ef83f2f740fb6fa99d6"/></dir></dir></dir></dir><file name="Selectpayment.php" hash="59021fb8027213e1c576c895b82c1ec7"/><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="49c51df9cb1b1d444ac03437fc9d0a4d"/><file name="FormTemplate.php" hash="1231ad5dd8970b965ad39d82246b30a2"/><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="SOFORTState.php" hash="a16d4556b94f6a61312fc340af81a132"/><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="12d1dcfc0dd146da05a6c44c12ece18c"/></dir><dir name="etc"><file name="config.xml" hash="0be0f4f88c804a4f69b51d12095b8ac5"/><file name="system.xml" hash="a9121575bade57507e8a605d10814362"/></dir><dir name="sql"><dir name="mpay24_setup"><file name="mysql4-install-1.5.7.php" hash="8d9fd18c79349bddc659fad52f8268a0"/><file name="mysql4-upgrade-1.5.0-1.5.1.php" hash="b13cab4e8f540eafaed6d1b67c2d36fd"/><file name="mysql4-upgrade-1.5.0-1.5.2.php" hash="58de6132c6c20229c218f7dd6b63c517"/><file name="mysql4-upgrade-1.5.0-1.5.3.php" hash="7c279082cc7abb0059fd17efcb95743b"/><file name="mysql4-upgrade-1.5.0-1.5.4.php" hash="6ed1b0675d49e3c91b38c6480da16b74"/><file name="mysql4-upgrade-1.5.0-1.5.5.php" hash="08e713f5dfe1052a80074379c2e825b4"/><file name="mysql4-upgrade-1.5.0-1.5.6.php" hash="d23a8de77b456dd9947d33ff340e73ef"/><file name="mysql4-upgrade-1.5.0-1.5.7.php" hash="d23a8de77b456dd9947d33ff340e73ef"/><file name="mysql4-upgrade-1.5.1-1.5.2.php" hash="ec30ce829fe0b8890a7ba5cfe4ad44f5"/><file name="mysql4-upgrade-1.5.1-1.5.3.php" hash="b9e80f15e9b6d348ca543ba1efac9b1e"/><file name="mysql4-upgrade-1.5.1-1.5.4.php" hash="98e09e4a3415c01a6a6ba2c95d4ab7e8"/><file name="mysql4-upgrade-1.5.1-1.5.5.php" hash="83f421852862b528296efcfb69478286"/><file name="mysql4-upgrade-1.5.1-1.5.6.php" hash="8f1676e7dc9745294055561da67777fd"/><file name="mysql4-upgrade-1.5.1-1.5.7.php" hash="8f1676e7dc9745294055561da67777fd"/><file name="mysql4-upgrade-1.5.2-1.5.3.php" hash="f0b50443003dd3d86adae3fe1d0df6a3"/><file name="mysql4-upgrade-1.5.2-1.5.4.php" hash="d4eedacc2a9762fe281859b9d7299a97"/><file name="mysql4-upgrade-1.5.2-1.5.5.php" hash="d38edd4e064bb4d22b2156a6313accf0"/><file name="mysql4-upgrade-1.5.2-1.5.6.php" hash="62cd8ede70f69fca8c967535eaafb522"/><file name="mysql4-upgrade-1.5.2-1.5.7.php" hash="62cd8ede70f69fca8c967535eaafb522"/><file name="mysql4-upgrade-1.5.3-1.5.4.php" hash="d12b6833f9855d4f9a57be0a233c4ba5"/><file name="mysql4-upgrade-1.5.3-1.5.5.php" hash="ed28b0437bdd6bb51397a092089a05a2"/><file name="mysql4-upgrade-1.5.3-1.5.6.php" hash="e97395aaa2b4ca62e805f9f7babc2c93"/><file name="mysql4-upgrade-1.5.3-1.5.7.php" hash="e97395aaa2b4ca62e805f9f7babc2c93"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="1c4f542ef99a0483ed65aa6b2b5c698a"/><file name="mysql4-upgrade-1.5.4-1.5.6.php" hash="b2318c532a0f245161cce4b24ab9c7ce"/><file name="mysql4-upgrade-1.5.4-1.5.7.php" hash="b2318c532a0f245161cce4b24ab9c7ce"/><file name="mysql4-upgrade-1.5.5-1.5.6.php" hash="046f95cfef93bc42f9b7ae5252643a9c"/><file name="mysql4-upgrade-1.5.5-1.5.7.php" hash="046f95cfef93bc42f9b7ae5252643a9c"/><file name="mysql4-upgrade-1.5.6-1.5.7.php" hash="8d9fd18c79349bddc659fad52f8268a0"/></dir></dir></dir></dir></target></contents>
|
| 43 |
<compatible/>
|
| 44 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 45 |
</package>
|
