Version Notes
* remove prefilled stars from the payment form
* avoid double token creation
Download this release
Release Info
| Developer | PayIntelligent |
| Extension | Paymill_Paymill |
| Version | 3.6.4 |
| Comparing to | |
| See all releases | |
Code changes from version 3.6.3 to 3.6.4
app/code/community/Paymill/Paymill/Block/Payment/Form/PaymentFormCreditcard.php
CHANGED
|
@@ -61,7 +61,7 @@ class Paymill_Paymill_Block_Payment_Form_PaymentFormCreditcard extends Paymill_P
|
|
| 61 |
$payment = parent::getPaymentData($code);
|
| 62 |
|
| 63 |
$data = array();
|
| 64 |
-
if (!
|
| 65 |
$data['cc_number'] = '************' . $payment['last4'];
|
| 66 |
$data['expire_year'] = $payment['expire_year'];
|
| 67 |
$data['expire_month'] = $payment['expire_month'];
|
| 61 |
$payment = parent::getPaymentData($code);
|
| 62 |
|
| 63 |
$data = array();
|
| 64 |
+
if (!empty($payment)) {
|
| 65 |
$data['cc_number'] = '************' . $payment['last4'];
|
| 66 |
$data['expire_year'] = $payment['expire_year'];
|
| 67 |
$data['expire_month'] = $payment['expire_month'];
|
app/code/community/Paymill/Paymill/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
-
<version>3.6.
|
| 6 |
</Paymill_Paymill>
|
| 7 |
</modules>
|
| 8 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
+
<version>3.6.4</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.6.
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
|
@@ -77,7 +77,7 @@
|
|
| 77 |
<sort_order>800</sort_order>
|
| 78 |
<fields>
|
| 79 |
<version>
|
| 80 |
-
<label>v3.6.
|
| 81 |
<sort_order>100</sort_order>
|
| 82 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 83 |
<frontend_type>label</frontend_type>
|
|
@@ -179,7 +179,7 @@
|
|
| 179 |
<sort_order>800</sort_order>
|
| 180 |
<fields>
|
| 181 |
<version>
|
| 182 |
-
<label>v3.6.
|
| 183 |
<sort_order>100</sort_order>
|
| 184 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 185 |
<frontend_type>label</frontend_type>
|
| 11 |
<sort_order>700</sort_order>
|
| 12 |
<fields>
|
| 13 |
<version>
|
| 14 |
+
<label>v3.6.4</label>
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
| 77 |
<sort_order>800</sort_order>
|
| 78 |
<fields>
|
| 79 |
<version>
|
| 80 |
+
<label>v3.6.4</label>
|
| 81 |
<sort_order>100</sort_order>
|
| 82 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 83 |
<frontend_type>label</frontend_type>
|
| 179 |
<sort_order>800</sort_order>
|
| 180 |
<fields>
|
| 181 |
<version>
|
| 182 |
+
<label>v3.6.4</label>
|
| 183 |
<sort_order>100</sort_order>
|
| 184 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 185 |
<frontend_type>label</frontend_type>
|
js/paymill/paymentForm.js
CHANGED
|
@@ -135,6 +135,11 @@ Paymill.prototype.paymillSubmitForm = function()
|
|
| 135 |
{
|
| 136 |
PAYMILL_PUBLIC_KEY = pmQuery('.paymill-info-public_key-' + this.getPaymillCode()).val();
|
| 137 |
this.paymillSelectedPaymentName = pmQuery("input[name='payment[method]']:checked").val();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 138 |
switch (this.paymillSelectedPaymentName) {
|
| 139 |
case this.paymillCc:
|
| 140 |
paymill.config('3ds_cancel_label', pmQuery('.paymill_3ds_cancel').val());
|
|
@@ -154,6 +159,7 @@ Paymill.prototype.paymillSubmitForm = function()
|
|
| 154 |
cvc = pmQuery('#' + this.paymillSelectedPaymentName + '_cvc').val();
|
| 155 |
}
|
| 156 |
|
|
|
|
| 157 |
this.debug("Generating Token");
|
| 158 |
paymill.createToken({
|
| 159 |
amount_int: parseInt(this.getTokenAmount()),
|
|
@@ -177,6 +183,7 @@ Paymill.prototype.paymillSubmitForm = function()
|
|
| 177 |
return false;
|
| 178 |
}
|
| 179 |
|
|
|
|
| 180 |
this.debug("Generating Token");
|
| 181 |
paymill.createToken({
|
| 182 |
number: pmQuery('#' + this.paymillSelectedPaymentName + '_account').val(),
|
|
@@ -192,6 +199,7 @@ Paymill.prototype.paymillSubmitForm = function()
|
|
| 192 |
return false;
|
| 193 |
}
|
| 194 |
|
|
|
|
| 195 |
this.debug("Generating Token");
|
| 196 |
paymill.createToken({
|
| 197 |
iban: pmQuery('#' + this.paymillSelectedPaymentName + '_iban').val(),
|
|
@@ -586,11 +594,13 @@ Paymill.prototype.addPaymillEvents = function()
|
|
| 586 |
*/
|
| 587 |
paymillResponseHandler = function(error, result)
|
| 588 |
{
|
|
|
|
|
|
|
| 589 |
var nv = {};
|
| 590 |
paymillObj = new Paymill();
|
| 591 |
paymillObj.setCodes();
|
| 592 |
if (error) {
|
| 593 |
-
|
| 594 |
var message = 'unknown_error';
|
| 595 |
var key = error.apierror;
|
| 596 |
if(paymillObj.getValueIfExist('.PAYMILL_' + key + '-' + paymillObj.getPaymillCode()) !== ''){
|
| 135 |
{
|
| 136 |
PAYMILL_PUBLIC_KEY = pmQuery('.paymill-info-public_key-' + this.getPaymillCode()).val();
|
| 137 |
this.paymillSelectedPaymentName = pmQuery("input[name='payment[method]']:checked").val();
|
| 138 |
+
|
| 139 |
+
if (!window.PAYMILL_LOADING !== "undefined" && window.PAYMILL_LOADING) {
|
| 140 |
+
return false;
|
| 141 |
+
}
|
| 142 |
+
|
| 143 |
switch (this.paymillSelectedPaymentName) {
|
| 144 |
case this.paymillCc:
|
| 145 |
paymill.config('3ds_cancel_label', pmQuery('.paymill_3ds_cancel').val());
|
| 159 |
cvc = pmQuery('#' + this.paymillSelectedPaymentName + '_cvc').val();
|
| 160 |
}
|
| 161 |
|
| 162 |
+
window.PAYMILL_LOADING = true;
|
| 163 |
this.debug("Generating Token");
|
| 164 |
paymill.createToken({
|
| 165 |
amount_int: parseInt(this.getTokenAmount()),
|
| 183 |
return false;
|
| 184 |
}
|
| 185 |
|
| 186 |
+
window.PAYMILL_LOADING = true;
|
| 187 |
this.debug("Generating Token");
|
| 188 |
paymill.createToken({
|
| 189 |
number: pmQuery('#' + this.paymillSelectedPaymentName + '_account').val(),
|
| 199 |
return false;
|
| 200 |
}
|
| 201 |
|
| 202 |
+
window.PAYMILL_LOADING = true;
|
| 203 |
this.debug("Generating Token");
|
| 204 |
paymill.createToken({
|
| 205 |
iban: pmQuery('#' + this.paymillSelectedPaymentName + '_iban').val(),
|
| 594 |
*/
|
| 595 |
paymillResponseHandler = function(error, result)
|
| 596 |
{
|
| 597 |
+
window.PAYMILL_LOADING = false;
|
| 598 |
+
|
| 599 |
var nv = {};
|
| 600 |
paymillObj = new Paymill();
|
| 601 |
paymillObj.setCodes();
|
| 602 |
if (error) {
|
| 603 |
+
pmQuery('#paymill_creditcard_cvc').val('');
|
| 604 |
var message = 'unknown_error';
|
| 605 |
var key = error.apierror;
|
| 606 |
if(paymillObj.getValueIfExist('.PAYMILL_' + key + '-' + paymillObj.getPaymillCode()) !== ''){
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Paymill_Paymill</name>
|
| 4 |
-
<version>3.6.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -13,13 +13,12 @@ The Paymill Magento extension provides a credit card form and a direct debit for
|
|
| 13 |
<br /><br />
|
| 14 |
IMPORTANT: Only use the latest version.
|
| 15 |
</description>
|
| 16 |
-
<notes> *
|
| 17 |
-
*
|
| 18 |
-
* online offline refund compatibility added</notes>
|
| 19 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 20 |
-
<date>2014-
|
| 21 |
-
<time>
|
| 22 |
-
<contents><target name="magecommunity"><dir name="Paymill"><dir><dir name="Paymill"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="7d74f94403297eeb551272ad5c94513f"/><dir name="View"><file name="Plane.php" hash="179e10aea0213d2caed595ae9111b993"/><file name="Tabs.php" hash="d16d9748921a34067242eaf92d6f299e"/></dir><file name="View.php" hash="af850dd16c3e7505a69a6cb3ca3fbc27"/></dir><file name="Log.php" hash="02930fb46a2a4569176ceb29c45037e8"/></dir><dir name="Payment"><dir name="Form"><file name="PaymentFormAbstract.php" hash="b42edc338110bd2f81fcf85169d3d82c"/><file name="PaymentFormCreditcard.php" hash="
|
| 23 |
<compatible/>
|
| 24 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 25 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Paymill_Paymill</name>
|
| 4 |
+
<version>3.6.4</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License</license>
|
| 7 |
<channel>community</channel>
|
| 13 |
<br /><br />
|
| 14 |
IMPORTANT: Only use the latest version.
|
| 15 |
</description>
|
| 16 |
+
<notes> * remove prefilled stars from the payment form
|
| 17 |
+
* avoid double token creation</notes>
|
|
|
|
| 18 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 19 |
+
<date>2014-02-05</date>
|
| 20 |
+
<time>10:37:12</time>
|
| 21 |
+
<contents><target name="magecommunity"><dir name="Paymill"><dir><dir name="Paymill"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="Grid.php" hash="7d74f94403297eeb551272ad5c94513f"/><dir name="View"><file name="Plane.php" hash="179e10aea0213d2caed595ae9111b993"/><file name="Tabs.php" hash="d16d9748921a34067242eaf92d6f299e"/></dir><file name="View.php" hash="af850dd16c3e7505a69a6cb3ca3fbc27"/></dir><file name="Log.php" hash="02930fb46a2a4569176ceb29c45037e8"/></dir><dir name="Payment"><dir name="Form"><file name="PaymentFormAbstract.php" hash="b42edc338110bd2f81fcf85169d3d82c"/><file name="PaymentFormCreditcard.php" hash="85d6e40be73890112802483df85b52aa"/><file name="PaymentFormDirectdebit.php" hash="8498937e6ead26ce37b34d16005a917f"/></dir><dir name="Info"><file name="PaymentFormCreditcard.php" hash="9d11216e743fa204bea678276f5a16b3"/><file name="PaymentFormDirectdebit.php" hash="2143f473d531511aa2f6ae1051b0e7f9"/></dir></dir></dir><dir name="Helper"><file name="CustomerHelper.php" hash="6c3229dc3943ce4506ed23c0f246df24"/><file name="Data.php" hash="8e55041f6bb52f1e142b86dfa486b85e"/><file name="FastCheckoutHelper.php" hash="2f1556faba2752afa0172463d9c799a7"/><file name="LoggingHelper.php" hash="53ea7f4d5c3af8de149a06dbe37ac061"/><file name="OptionHelper.php" hash="cbf3daa334bce07b7eb62a5a43dd18dc"/><file name="PaymentHelper.php" hash="1a90794eeb572a02c55ee0d596445ace"/><file name="RefundHelper.php" hash="b936d48e6f9022acb0370ec755cf5850"/><file name="TransactionHelper.php" hash="efdb288bcc7cd9c8f7a26513ba769c72"/></dir><dir name="Model"><file name="Fastcheckout.php" hash="e3b585d2f3265300f08fa44a4e9ccd7b"/><dir name="Log"><file name="Search.php" hash="4338b3876e745405bfcc5a32cfe42527"/></dir><file name="Log.php" hash="0662d814e53bd2eeb6f5c906c16ad971"/><dir name="Method"><file name="MethodModelAbstract.php" hash="31d17aa7e9a3985bbda12a03e2c6660b"/><file name="MethodModelCreditcard.php" hash="b9732130e949f346cf3a4e63614f812e"/><file name="MethodModelDirectdebit.php" hash="bc7bc9b40760ca488e48a257dccc768d"/></dir><dir name="Mysql4"><dir name="Fastcheckout"><file name="Collection.php" hash="14d4aa413ec952fd2452f08ab2a208f6"/></dir><file name="Fastcheckout.php" hash="9b19c307417862938442ddd6789f2b43"/><dir name="Log"><file name="Collection.php" hash="cf4d8fec68a4cc44b2e47bf69e014cf3"/></dir><file name="Log.php" hash="bdf0bf498c1214955e20e72185e5320f"/></dir><file name="Observer.php" hash="2c28ba431d7292e542e803bdc473803b"/><file name="TransactionData.php" hash="4b2c8b136a04333ed3d03a54ddf5d20b"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="fe634fc07d161f160ae060600561a0b1"/></dir><file name="TokenController.php" hash="8b606f0728fd556a6180ebeb042dbf13"/></dir><dir name="etc"><file name="adminhtml.xml" hash="402c36431d690ffa9b7eae074cadfb4e"/><file name="config.xml" hash="5485e0c2db15a68aa98253b8be71018a"/><file name="system.xml" hash="813fcdc246b0d79efa8e55de5b562c1e"/></dir><dir name="sql"><dir name="paymill_setup"><file name="mysql4-install-3.0.0.php" hash="37e5e1850e143315779e30bd1b45f277"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="template"><dir name="paymill"><dir><dir name="log"><file name="view.phtml" hash="2d4df28de6e1cb4701963db3d0c0545c"/></dir><dir name="payment"><dir name="info"><file name="creditcard.phtml" hash="1c604ec666d9a3028a04c0d9a4257e4a"/><file name="creditcard_pdf.phtml" hash="68febe619bb9918b785dcbb0593c4ebe"/><file name="directdebit.phtml" hash="1c604ec666d9a3028a04c0d9a4257e4a"/><file name="directdebit_pdf.phtml" hash="5a2e5c36d4f4702e5f9be4b5affe3421"/></dir></dir></dir></dir></dir><dir name="layout"><file name="paymill.xml" hash="fcc95f6e7c375fee779178a0f9f1a1d8"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="paymill"><dir><dir name="payment"><dir name="form"><file name="creditcard.phtml" hash="a001eed05872558c878c2ef9dff50285"/><file name="directdebit.phtml" hash="108212daf86dd078cf770106c575eb63"/></dir><dir name="info"><file name="creditcard.phtml" hash="42f875eb1b6e3e6151ddf152ef0bf13a"/><file name="directdebit.phtml" hash="42f875eb1b6e3e6151ddf152ef0bf13a"/></dir></dir></dir></dir></dir><dir name="layout"><file name="paymill.xml" hash="f0f6e4a11f165da63c2a45c4033c6f3a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Paymill_Paymill.xml" hash="d36d3af5f5752dcf87517272ddb9af53"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="Paymill_Paymill.csv" hash="feca7ce45756f25b1d1022d37cf9f730"/></dir><dir name="en_GB"><file name="Paymill_Paymill.csv" hash="275eac7cbdff80f0975281c8be7607f0"/></dir><dir name="en_US"><file name="Paymill_Paymill.csv" hash="9894b443e469b1d0af4f58c4e723b4f0"/></dir><dir name="es_ES"><file name="Paymill_Paymill.csv" hash="6dd76017112dc190ebee3beac2f2b8f0"/></dir></target><target name="mage"><dir name="js"><dir name="paymill"><file name="paymentForm.js" hash="352634ae093cc76fbc3d9a51f5a5b5d6"/></dir></dir></target><target name="magelib"><dir name="Services"><dir><dir name="Paymill"><dir name="Apiclient"><file name="Curl.php" hash="b1e7fb6eacb5a5cb41dc91247774db45"/><file name="Interface.php" hash="349309458455e550c562fb17cf23f4a6"/><file name="paymill.crt" hash="51e14b4c734e450402ea2cf73f2aee0f"/></dir><file name="Base.php" hash="141fa330c6894ff15faf413be19bf209"/><file name="Clients.php" hash="c8eb5fe8780f2da7b5eb173a5be43c7f"/><file name="Exception.php" hash="9beffb75d92c0de3c1c7ea5b33930fff"/><file name="LoggingInterface.php" hash="46ebeede1da14b761c54a18aff6c3b79"/><file name="Offers.php" hash="e2dcf9c9a54d9aba16e1caf02b438098"/><file name="PaymentProcessor.php" hash="5532a7043b185cd64ced0167c42ea763"/><file name="Payments.php" hash="d2a6d0679701d100c9e876f88215455c"/><file name="Preauthorizations.php" hash="597f7228584f32ee42d8916ae098b454"/><file name="Refunds.php" hash="e909af53108426a9e178417db850675f"/><file name="Subscriptions.php" hash="b72a31c4041029e08df1d7e85aa7391b"/><file name="Transactions.php" hash="a4c9d4d2243af38f2109e89ee4943888"/><file name="Webhooks.php" hash="5fd2e6baf7bb0dc3ad8edb1eab41fb91"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="paymill"><file name="logo.css" hash="936683ad4bc4587be00c9e5f54cc37c3"/></dir></dir><dir name="images"><dir name="paymill"><file name="ajax-loader.gif" hash="07c56b266e277696ee3d9e3ffd627450"/><file name="icon_32x20_amex.png" hash="42c5fb43b4b603804b50da9761927d40"/><file name="icon_32x20_carta-si.png" hash="236ea747b59067b1d25cdc317e52aae5"/><file name="icon_32x20_carte-bleue.png" hash="187f19af694d83bd745c278845c3b3cd"/><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_unionpay.png" hash="6c9d16d6c65c0da5ff11e8ae13b01d15"/><file name="icon_32x20_visa.png" hash="e6d54e5c0120202eb5757bcfe499d73b"/><file name="icon_paymill.png" hash="303983a288b45cc7ddc5b88ad2eedd51"/></dir></dir></dir></dir></dir></target></contents>
|
| 22 |
<compatible/>
|
| 23 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 24 |
</package>
|
