Version Notes
* Rewrote from scratch
* Updated Lib to latest version
* Redesigned credit card payment form
* Several minor bug fixes
* Fixed a bug causing the plugin to crash during invoice creation
* Payment Methods will now only be displayed if the Keys are set in the config.
* Fixed a bug causing warnings in the Magento Systemlog in multiple cases
Download this release
Release Info
| Developer | PayIntelligent |
| Extension | Paymill_Paymill |
| Version | 3.0.6 |
| Comparing to | |
| See all releases | |
Code changes from version 3.0.4 to 3.0.6
- app/code/community/Paymill/Paymill/Helper/Data.php +18 -0
- app/code/community/Paymill/Paymill/Model/Method/MethodModelAbstract.php +11 -0
- app/code/community/Paymill/Paymill/Model/Observer.php +2 -2
- app/code/community/Paymill/Paymill/etc/config.xml +1 -1
- app/code/community/Paymill/Paymill/etc/system.xml +3 -3
- lib/Services/Paymill/PaymentProcessor.php +1 -1
- package.xml +8 -5
app/code/community/Paymill/Paymill/Helper/Data.php
CHANGED
|
@@ -98,4 +98,22 @@ class Paymill_Paymill_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 98 |
return $this->getVersion() . "_Magento_" . Mage::getVersion();
|
| 99 |
}
|
| 100 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 101 |
}
|
| 98 |
return $this->getVersion() . "_Magento_" . Mage::getVersion();
|
| 99 |
}
|
| 100 |
|
| 101 |
+
/**
|
| 102 |
+
* Validates the private key value by comparing it to an empty string
|
| 103 |
+
* @return boolean
|
| 104 |
+
*/
|
| 105 |
+
public function isPrivateKeySet()
|
| 106 |
+
{
|
| 107 |
+
return Mage::helper('paymill/OptionHelper')->getPrivateKey() !== "";
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
+
/**
|
| 111 |
+
* Validates the public key value by comparing it to an empty string
|
| 112 |
+
* @return boolean
|
| 113 |
+
*/
|
| 114 |
+
public function isPublicKeySet()
|
| 115 |
+
{
|
| 116 |
+
return Mage::helper('paymill/OptionHelper')->getPublicKey() !== "";
|
| 117 |
+
}
|
| 118 |
+
|
| 119 |
}
|
app/code/community/Paymill/Paymill/Model/Method/MethodModelAbstract.php
CHANGED
|
@@ -109,6 +109,17 @@ abstract class Paymill_Paymill_Model_Method_MethodModelAbstract extends Mage_Pay
|
|
| 109 |
return true;
|
| 110 |
}
|
| 111 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 112 |
/**
|
| 113 |
* Return Quote or Order Object depending on the type of the payment info
|
| 114 |
*
|
| 109 |
return true;
|
| 110 |
}
|
| 111 |
|
| 112 |
+
/**
|
| 113 |
+
* Defines if the payment method is available for checkout
|
| 114 |
+
* @param Mage_Sales_Model_Quote $quote
|
| 115 |
+
* @return boolean
|
| 116 |
+
*/
|
| 117 |
+
public function isAvailable($quote = null)
|
| 118 |
+
{
|
| 119 |
+
$keysAreSet = Mage::helper("paymill")->isPublicKeySet() && Mage::helper("paymill")->isPrivateKeySet();
|
| 120 |
+
return parent::isAvailable($quote) && $keysAreSet;
|
| 121 |
+
}
|
| 122 |
+
|
| 123 |
/**
|
| 124 |
* Return Quote or Order Object depending on the type of the payment info
|
| 125 |
*
|
app/code/community/Paymill/Paymill/Model/Observer.php
CHANGED
|
@@ -37,8 +37,8 @@ class Paymill_Paymill_Model_Observer
|
|
| 37 |
}
|
| 38 |
}
|
| 39 |
$order = Mage::getModel('sales/order')->load($orderId);
|
| 40 |
-
|
| 41 |
-
if ($
|
| 42 |
|
| 43 |
if (Mage::helper('paymill/transactionHelper')->getPreAuthenticatedFlagState($order)) { // If the transaction is not flagged as a debit (not a preAuth) transaction
|
| 44 |
Mage::helper('paymill/loggingHelper')->log("Debug", "No Invoice generated, since the transaction is flagged as preauth");
|
| 37 |
}
|
| 38 |
}
|
| 39 |
$order = Mage::getModel('sales/order')->load($orderId);
|
| 40 |
+
$paymentCode = $order->getPayment()->getMethod();
|
| 41 |
+
if ($paymentCode === 'paymill_creditcard' || $paymentCode === 'paymill_directdebit') {
|
| 42 |
|
| 43 |
if (Mage::helper('paymill/transactionHelper')->getPreAuthenticatedFlagState($order)) { // If the transaction is not flagged as a debit (not a preAuth) transaction
|
| 44 |
Mage::helper('paymill/loggingHelper')->log("Debug", "No Invoice generated, since the transaction is flagged as preauth");
|
app/code/community/Paymill/Paymill/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
-
<version>3.0.
|
| 6 |
</Paymill_Paymill>
|
| 7 |
</modules>
|
| 8 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
+
<version>3.0.6</version>
|
| 6 |
</Paymill_Paymill>
|
| 7 |
</modules>
|
| 8 |
|
app/code/community/Paymill/Paymill/etc/system.xml
CHANGED
|
@@ -11,7 +11,7 @@
|
|
| 11 |
<sort_order>700</sort_order>
|
| 12 |
<fields>
|
| 13 |
<version>
|
| 14 |
-
<label>v3.0.
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
|
@@ -95,7 +95,7 @@
|
|
| 95 |
<sort_order>800</sort_order>
|
| 96 |
<fields>
|
| 97 |
<version>
|
| 98 |
-
<label>v3.0.
|
| 99 |
<sort_order>100</sort_order>
|
| 100 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 101 |
<frontend_type>label</frontend_type>
|
|
@@ -171,7 +171,7 @@
|
|
| 171 |
<sort_order>800</sort_order>
|
| 172 |
<fields>
|
| 173 |
<version>
|
| 174 |
-
<label>v3.0.
|
| 175 |
<sort_order>100</sort_order>
|
| 176 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 177 |
<frontend_type>label</frontend_type>
|
| 11 |
<sort_order>700</sort_order>
|
| 12 |
<fields>
|
| 13 |
<version>
|
| 14 |
+
<label>v3.0.5</label>
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
| 95 |
<sort_order>800</sort_order>
|
| 96 |
<fields>
|
| 97 |
<version>
|
| 98 |
+
<label>v3.0.5</label>
|
| 99 |
<sort_order>100</sort_order>
|
| 100 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 101 |
<frontend_type>label</frontend_type>
|
| 171 |
<sort_order>800</sort_order>
|
| 172 |
<fields>
|
| 173 |
<version>
|
| 174 |
+
<label>v3.0.5</label>
|
| 175 |
<sort_order>100</sort_order>
|
| 176 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 177 |
<frontend_type>label</frontend_type>
|
lib/Services/Paymill/PaymentProcessor.php
CHANGED
|
@@ -56,7 +56,7 @@ class Services_Paymill_PaymentProcessor
|
|
| 56 |
$this->setPrivateKey($privateKey);
|
| 57 |
$this->setApiUrl($apiUrl);
|
| 58 |
$this->setLibBase($libBase);
|
| 59 |
-
$this->_preAuthAmount = $params['preauthamount'];
|
| 60 |
$this->_token = $params['token'];
|
| 61 |
$this->_amount = $params['amount'];
|
| 62 |
$this->_currency = $params['currency'];
|
| 56 |
$this->setPrivateKey($privateKey);
|
| 57 |
$this->setApiUrl($apiUrl);
|
| 58 |
$this->setLibBase($libBase);
|
| 59 |
+
$this->_preAuthAmount = isset($params['preauthamount']) ? $params['preauthamount'] : 0;
|
| 60 |
$this->_token = $params['token'];
|
| 61 |
$this->_amount = $params['amount'];
|
| 62 |
$this->_currency = $params['currency'];
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Paymill_Paymill</name>
|
| 4 |
-
<version>3.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -16,11 +16,14 @@ IMPORTANT: Only use the latest version.
|
|
| 16 |
<notes>* Rewrote from scratch
|
| 17 |
* Updated Lib to latest version
|
| 18 |
* Redesigned credit card payment form
|
| 19 |
-
* Several minor bug fixes
|
|
|
|
|
|
|
|
|
|
| 20 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 21 |
-
<date>2013-
|
| 22 |
-
<time>
|
| 23 |
-
<contents><target name="magecommunity"><dir><dir name="Paymill"><dir name="Paymill"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="a072de29acb8c020366d94b127368fd2"/></dir><file name="Log.php" hash="1876dc72d3ea2af71cf11b78a1433090"/></dir><dir name="Payment"><dir name="Form"><file name="PaymentFormCreditcard.php" hash="47b33902693d6ad04099235507692d86"/><file name="PaymentFormDirectdebit.php" hash="1b15c365ac781a823977e4e78bdd1ad4"/></dir><dir name="Info"><file name="PaymentFormCreditcard.php" hash="ecd6af705b2f7fe793366231aa60109f"/><file name="PaymentFormDirectdebit.php" hash="24dbeb75e07650a952783c98fb54ffc7"/></dir></dir></dir><dir name="Helper"><file name="CustomerHelper.php" hash="baa44a3c09c3fe8000e0d3a854edcf3c"/><file name="Data.php" hash="
|
| 24 |
<compatible/>
|
| 25 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0.</max></php></required></dependencies>
|
| 26 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Paymill_Paymill</name>
|
| 4 |
+
<version>3.0.6</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License</license>
|
| 7 |
<channel>community</channel>
|
| 16 |
<notes>* Rewrote from scratch
|
| 17 |
* Updated Lib to latest version
|
| 18 |
* Redesigned credit card payment form
|
| 19 |
+
* Several minor bug fixes
|
| 20 |
+
* Fixed a bug causing the plugin to crash during invoice creation
|
| 21 |
+
* Payment Methods will now only be displayed if the Keys are set in the config.
|
| 22 |
+
* Fixed a bug causing warnings in the Magento Systemlog in multiple cases</notes>
|
| 23 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 24 |
+
<date>2013-08-12</date>
|
| 25 |
+
<time>08:38:15</time>
|
| 26 |
+
<contents><target name="magecommunity"><dir><dir name="Paymill"><dir name="Paymill"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="a072de29acb8c020366d94b127368fd2"/></dir><file name="Log.php" hash="1876dc72d3ea2af71cf11b78a1433090"/></dir><dir name="Payment"><dir name="Form"><file name="PaymentFormCreditcard.php" hash="47b33902693d6ad04099235507692d86"/><file name="PaymentFormDirectdebit.php" hash="1b15c365ac781a823977e4e78bdd1ad4"/></dir><dir name="Info"><file name="PaymentFormCreditcard.php" hash="ecd6af705b2f7fe793366231aa60109f"/><file name="PaymentFormDirectdebit.php" hash="24dbeb75e07650a952783c98fb54ffc7"/></dir></dir></dir><dir name="Helper"><file name="CustomerHelper.php" hash="baa44a3c09c3fe8000e0d3a854edcf3c"/><file name="Data.php" hash="244d329a530a90ad6183e0f2901442f6"/><file name="FastCheckoutHelper.php" hash="2a53baf4ae5fe79ba17e55ad0fd58197"/><file name="LoggingHelper.php" hash="69b6bbc137bdf4c00cd68dcbb6c1e745"/><file name="OptionHelper.php" hash="21d2931511b0eb6afe4f094785e6259a"/><file name="PaymentHelper.php" hash="641f1e0dfad92c3756d07673fc8ac9d2"/><file name="RefundHelper.php" hash="4ef32cb3359876ad0b0a1a3b5b90929e"/><file name="TransactionHelper.php" hash="03767c497742c07bea7c7474d71711d0"/></dir><dir name="Model"><file name="Fastcheckout.php" hash="73f98e9f714ca3852345d083fe61886b"/><file name="Log.php" hash="3fad24d6a59944e532d84b3da4e0deec"/><dir name="Method"><file name="MethodModelAbstract.php" hash="1b94d8a72891e09561161f092fdce4d4"/><file name="MethodModelCreditcard.php" hash="9d3a411d46dedd668262e839f5381bfa"/><file name="MethodModelDirectdebit.php" hash="b2b48a08b55e1b197f644be542f6e4dc"/></dir><dir name="Mysql4"><dir name="Fastcheckout"><file name="Collection.php" hash="12d097172603664ba709c172b58a93e7"/></dir><file name="Fastcheckout.php" hash="14c502c4d34233dc28608ade742ab714"/><dir name="Log"><file name="Collection.php" hash="c5b02070b09412822a839b3cbb0eba4e"/></dir><file name="Log.php" hash="aa7ffaa88fec8df550926e974c15baa0"/></dir><file name="Observer.php" hash="66fc31850592ec7cc01357721a7e0080"/><file name="TransactionData.php" hash="6ee635f10a61be28fd9e4a2fff84ff07"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="6c29c403416a13150e76e400a2437157"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="383052bdb4651dacf1373a27349259fd"/><file name="config.xml" hash="b3f3ee438eb62c6b3ae827254b21cf41"/><file name="system.xml" hash="23659381a9241d65ade793d79f735c7f"/></dir><dir name="sql"><dir name="paymill_setup"><file name="mysql4-install-3.0.0.php" hash="cb5c381203c39066849fa301e6dfc70f"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="layout"><file name="paymill.xml" hash="77d6d4e07a61ba76c8842249d267f62d"/></dir><dir name="template"><dir name="paymill"><dir name="payment"><dir name="info"><file name="creditcard.phtml" hash="6cd22661b0299e918c17a1f53ad7d6e3"/><file name="directdebit.phtml" hash="6cd22661b0299e918c17a1f53ad7d6e3"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="paymill.xml" hash="a93d3b26d40c793f10b51ba8f5bea27d"/></dir><dir name="template"><dir name="paymill"><dir name="payment"><dir name="form"><file name="creditcard.phtml" hash="a8e42f2b62e752d8ae3cf010228abe78"/><file name="directdebit.phtml" hash="2234a3ca4cbd76f6cff0396ddfae96f0"/></dir><dir name="info"><file name="creditcard.phtml" hash="f8172621f496767cba1aa5ee9a17f241"/><file name="directdebit.phtml" hash="f8172621f496767cba1aa5ee9a17f241"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Paymill_Paymill.xml" hash="87f99b47f25b708a6aa8f94507bc91db"/></dir></dir></target><target name="magelocale"><dir><dir name="de_DE"><file name="Paymill_Paymill.csv" hash="2bd3abdd228ca04bf94e25cd4644f6cc"/></dir><dir name="en_GB"><file name="Paymill_Paymill.csv" hash="56724674005626dbbc17f25917476f6f"/></dir><dir name="en_US"><file name="Paymill_Paymill.csv" hash="56724674005626dbbc17f25917476f6f"/></dir></dir></target><target name="mageweb"><dir><dir name="js"><dir name="paymill"><file name="paymentForm.js" hash="a893716ff9ef8d83f54e343fd896059b"/></dir></dir></dir></target><target name="magelib"><dir><dir name="Services"><dir name="Paymill"><dir name="Apiclient"><file name="Curl.php" hash="be417f59f4500ac3821459f1d4adb073"/><file name="Interface.php" hash="db5fb584ce410ff55b71419624f6d7db"/><file name="paymill.crt" hash="f85d1ff17b0079709f131f3ce3f288d2"/></dir><file name="Base.php" hash="371fbb92b604876ef9f4cdde503d8360"/><file name="Clients.php" hash="55eecee28daf6f00e803dfec1e31156c"/><file name="Exception.php" hash="21dc05247ea04d8ced72c2ee39a4d602"/><file name="LoggingInterface.php" hash="7f425749d7fab561c9826c3984fed9dc"/><file name="Offers.php" hash="07f219489dc347c432530cdc927d720a"/><file name="PaymentProcessor.php" hash="0bc9c5e444630188c4e5a6085feb9266"/><file name="Payments.php" hash="01d376af043989b363155d2dd94a808d"/><file name="Preauthorizations.php" hash="62dda9a5ee853e9c53d0c40fae7e95bd"/><file name="Refunds.php" hash="2b1599f36acb269fce94693b8ab172f8"/><file name="Subscriptions.php" hash="ddc58cc1e045a2ca7831f84886db4fbf"/><file name="Transactions.php" hash="f61bb42d8bf51b397574bb2c7d66e5e2"/><file name="Webhooks.php" hash="0d47a80f04565970179d5543685ca1aa"/></dir></dir></dir></target><target name="mageskin"><dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="paymill"><file name="logo.css" hash="9bd7e954725c6de30bbc2e9f99262c52"/></dir></dir><dir name="images"><dir name="paymill"><file name="icon_32x20_amex.png" hash="42c5fb43b4b603804b50da9761927d40"/><file name="icon_32x20_dinersclub.png" hash="0a7a8fc8f679ccf05d91298c9968629c"/><file name="icon_32x20_discover.png" hash="4fe8ef419087bed97cddbdeb251b847c"/><file name="icon_32x20_jcb.png" hash="774a040f938c5566fa3fddfa840d4743"/><file name="icon_32x20_maestro.png" hash="a6ffd22c9bbedb603449e2aa6136dbd1"/><file name="icon_32x20_mastercard.png" hash="09aef6dcbc50038605b7c0e5a38eb76e"/><file name="icon_32x20_visa.png" hash="e6d54e5c0120202eb5757bcfe499d73b"/><file name="icon_paymill.png" hash="303983a288b45cc7ddc5b88ad2eedd51"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 27 |
<compatible/>
|
| 28 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0.</max></php></required></dependencies>
|
| 29 |
</package>
|
