Version Notes
* better jQuery compatibility
* fix problems with the magento compiler
Download this release
Release Info
| Developer | PayIntelligent |
| Extension | Paymill_Paymill |
| Version | 3.4.1 |
| Comparing to | |
| See all releases | |
Code changes from version 3.4.0 to 3.4.1
- app/code/community/Paymill/Paymill/Block/Adminhtml/Log/View/Plane.php +64 -64
- app/code/community/Paymill/Paymill/Model/Observer.php +10 -9
- app/code/community/Paymill/Paymill/etc/config.xml +3 -3
- app/code/community/Paymill/Paymill/etc/system.xml +3 -3
- app/code/community/Paymill/Paymill/sql/paymill_setup/mysql4-install-3.0.0.php +0 -6
- app/design/frontend/base/default/layout/paymill.xml +28 -28
- app/design/frontend/base/default/template/paymill/payment/form/creditcard.phtml +4 -4
- app/design/frontend/base/default/template/paymill/payment/form/directdebit.phtml +3 -3
- app/locale/de_DE/Paymill_Paymill.csv +2 -2
- lib/Services/Paymill/Apiclient/Curl.php +5 -7
- lib/Services/Paymill/Apiclient/paymill.crt +25 -25
- lib/Services/Paymill/Base.php +0 -1
- lib/Services/Paymill/Clients.php +0 -2
- lib/Services/Paymill/Offers.php +0 -2
- lib/Services/Paymill/PaymentProcessor.php +2 -7
- lib/Services/Paymill/Payments.php +0 -2
- lib/Services/Paymill/Preauthorizations.php +24 -26
- lib/Services/Paymill/Refunds.php +0 -2
- lib/Services/Paymill/Subscriptions.php +0 -2
- lib/Services/Paymill/Transactions.php +0 -2
- lib/Services/Paymill/Webhooks.php +0 -2
- package.xml +6 -7
app/code/community/Paymill/Paymill/Block/Adminhtml/Log/View/Plane.php
CHANGED
|
@@ -1,65 +1,65 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
/**
|
| 4 |
-
* Magento
|
| 5 |
-
*
|
| 6 |
-
* NOTICE OF LICENSE
|
| 7 |
-
*
|
| 8 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
-
* It is also available through the world-wide-web at this URL:
|
| 11 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
-
* If you did not receive a copy of the license and are unable to
|
| 13 |
-
* obtain it through the world-wide-web, please send an email
|
| 14 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
-
*
|
| 16 |
-
* @category Paymill
|
| 17 |
-
* @package Paymill_Paymill
|
| 18 |
-
* @copyright Copyright (c) 2013 PAYMILL GmbH (https://paymill.com/en-gb/)
|
| 19 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 20 |
-
*/
|
| 21 |
-
class Paymill_Paymill_Block_Adminhtml_Log_View_Plane extends Mage_Adminhtml_Block_Widget_Form
|
| 22 |
-
{
|
| 23 |
-
|
| 24 |
-
/**
|
| 25 |
-
* Prepare form before rendering HTML
|
| 26 |
-
*
|
| 27 |
-
* @return Paymill_Paymill_Block_Adminhtml_Log_View_Plane
|
| 28 |
-
*/
|
| 29 |
-
protected function _prepareForm()
|
| 30 |
-
{
|
| 31 |
-
$this->setTemplate('paymill/log/view.phtml');
|
| 32 |
-
return parent::_prepareForm();
|
| 33 |
-
}
|
| 34 |
-
|
| 35 |
-
/**
|
| 36 |
-
* Returns Log Model
|
| 37 |
-
*
|
| 38 |
-
* @return Paymill_Paymill_Model_Log
|
| 39 |
-
*/
|
| 40 |
-
public function getEntry()
|
| 41 |
-
{
|
| 42 |
-
return Mage::registry('paymill_log_entry');
|
| 43 |
-
}
|
| 44 |
-
|
| 45 |
-
/**
|
| 46 |
-
* Gets the formatted Request Xml
|
| 47 |
-
*
|
| 48 |
-
* @return string
|
| 49 |
-
*/
|
| 50 |
-
public function getDevInfo()
|
| 51 |
-
{
|
| 52 |
-
return $this->getEntry()->getDevInfo();
|
| 53 |
-
}
|
| 54 |
-
|
| 55 |
-
/**
|
| 56 |
-
* Gets the formatted Response Xml
|
| 57 |
-
*
|
| 58 |
-
* @return string
|
| 59 |
-
*/
|
| 60 |
-
public function getDevInfoAdditional()
|
| 61 |
-
{
|
| 62 |
-
return $this->getEntry()->getDevInfoAdditional();
|
| 63 |
-
}
|
| 64 |
-
|
| 65 |
}
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* Magento
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* @category Paymill
|
| 17 |
+
* @package Paymill_Paymill
|
| 18 |
+
* @copyright Copyright (c) 2013 PAYMILL GmbH (https://paymill.com/en-gb/)
|
| 19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 20 |
+
*/
|
| 21 |
+
class Paymill_Paymill_Block_Adminhtml_Log_View_Plane extends Mage_Adminhtml_Block_Widget_Form
|
| 22 |
+
{
|
| 23 |
+
|
| 24 |
+
/**
|
| 25 |
+
* Prepare form before rendering HTML
|
| 26 |
+
*
|
| 27 |
+
* @return Paymill_Paymill_Block_Adminhtml_Log_View_Plane
|
| 28 |
+
*/
|
| 29 |
+
protected function _prepareForm()
|
| 30 |
+
{
|
| 31 |
+
$this->setTemplate('paymill/log/view.phtml');
|
| 32 |
+
return parent::_prepareForm();
|
| 33 |
+
}
|
| 34 |
+
|
| 35 |
+
/**
|
| 36 |
+
* Returns Log Model
|
| 37 |
+
*
|
| 38 |
+
* @return Paymill_Paymill_Model_Log
|
| 39 |
+
*/
|
| 40 |
+
public function getEntry()
|
| 41 |
+
{
|
| 42 |
+
return Mage::registry('paymill_log_entry');
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
/**
|
| 46 |
+
* Gets the formatted Request Xml
|
| 47 |
+
*
|
| 48 |
+
* @return string
|
| 49 |
+
*/
|
| 50 |
+
public function getDevInfo()
|
| 51 |
+
{
|
| 52 |
+
return $this->getEntry()->getDevInfo();
|
| 53 |
+
}
|
| 54 |
+
|
| 55 |
+
/**
|
| 56 |
+
* Gets the formatted Response Xml
|
| 57 |
+
*
|
| 58 |
+
* @return string
|
| 59 |
+
*/
|
| 60 |
+
public function getDevInfoAdditional()
|
| 61 |
+
{
|
| 62 |
+
return $this->getEntry()->getDevInfoAdditional();
|
| 63 |
+
}
|
| 64 |
+
|
| 65 |
}
|
app/code/community/Paymill/Paymill/Model/Observer.php
CHANGED
|
@@ -29,17 +29,15 @@ class Paymill_Paymill_Model_Observer
|
|
| 29 |
*/
|
| 30 |
public function generateInvoice(Varien_Event_Observer $observer)
|
| 31 |
{
|
| 32 |
-
$
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 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");
|
| 45 |
} else {
|
|
@@ -48,6 +46,7 @@ class Paymill_Paymill_Model_Observer
|
|
| 48 |
Mage::helper('paymill/loggingHelper')->log(Mage::helper('paymill')->__($paymentCode), Mage::helper('paymill')->__('paymill_checkout_generating_invoice'), "Order Id: " . $order->getIncrementId());
|
| 49 |
$invoiceId = Mage::getModel('sales/order_invoice_api')->create($order->getIncrementId(), array());
|
| 50 |
Mage::getModel('sales/order_invoice_api')->capture($invoiceId);
|
|
|
|
| 51 |
}
|
| 52 |
}
|
| 53 |
}
|
|
@@ -65,7 +64,9 @@ class Paymill_Paymill_Model_Observer
|
|
| 65 |
if ($order->getPayment()->getMethod() === 'paymill_creditcard' || $order->getPayment()->getMethod() === 'paymill_directdebit') {
|
| 66 |
$amount = (int) ((string) ($creditmemo->getGrandTotal() * 100));
|
| 67 |
Mage::helper('paymill/loggingHelper')->log("Trying to Refund.", var_export($order->getIncrementId(), true), $amount);
|
| 68 |
-
Mage::helper('paymill/refundHelper')->createRefund($order, $amount)
|
|
|
|
|
|
|
| 69 |
}
|
| 70 |
}
|
| 71 |
|
| 29 |
*/
|
| 30 |
public function generateInvoice(Varien_Event_Observer $observer)
|
| 31 |
{
|
| 32 |
+
$order = $observer->getEvent()->getOrder();
|
| 33 |
+
$orders = Mage::getModel('sales/order_invoice')->getCollection()
|
| 34 |
+
->addAttributeToFilter('order_id', array('eq'=>$order->getId()));
|
| 35 |
+
$orders->getSelect()->limit(1);
|
| 36 |
+
if ((int)$orders->count() !== 0) {
|
| 37 |
+
return $this;
|
| 38 |
}
|
|
|
|
| 39 |
$paymentCode = $order->getPayment()->getMethod();
|
| 40 |
if ($paymentCode === 'paymill_creditcard' || $paymentCode === 'paymill_directdebit') {
|
|
|
|
| 41 |
if (Mage::helper('paymill/transactionHelper')->getPreAuthenticatedFlagState($order)) { // If the transaction is not flagged as a debit (not a preAuth) transaction
|
| 42 |
Mage::helper('paymill/loggingHelper')->log("Debug", "No Invoice generated, since the transaction is flagged as preauth");
|
| 43 |
} else {
|
| 46 |
Mage::helper('paymill/loggingHelper')->log(Mage::helper('paymill')->__($paymentCode), Mage::helper('paymill')->__('paymill_checkout_generating_invoice'), "Order Id: " . $order->getIncrementId());
|
| 47 |
$invoiceId = Mage::getModel('sales/order_invoice_api')->create($order->getIncrementId(), array());
|
| 48 |
Mage::getModel('sales/order_invoice_api')->capture($invoiceId);
|
| 49 |
+
$order->setState(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT, true)->save();
|
| 50 |
}
|
| 51 |
}
|
| 52 |
}
|
| 64 |
if ($order->getPayment()->getMethod() === 'paymill_creditcard' || $order->getPayment()->getMethod() === 'paymill_directdebit') {
|
| 65 |
$amount = (int) ((string) ($creditmemo->getGrandTotal() * 100));
|
| 66 |
Mage::helper('paymill/loggingHelper')->log("Trying to Refund.", var_export($order->getIncrementId(), true), $amount);
|
| 67 |
+
if (!Mage::helper('paymill/refundHelper')->createRefund($order, $amount)) {
|
| 68 |
+
|
| 69 |
+
}
|
| 70 |
}
|
| 71 |
}
|
| 72 |
|
app/code/community/Paymill/Paymill/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
-
<version>3.4.
|
| 6 |
</Paymill_Paymill>
|
| 7 |
</modules>
|
| 8 |
|
|
@@ -105,7 +105,7 @@
|
|
| 105 |
</modules>
|
| 106 |
</translate>
|
| 107 |
<events>
|
| 108 |
-
<
|
| 109 |
<observers>
|
| 110 |
<paymill_paymill_model_observer>
|
| 111 |
<type>model</type>
|
|
@@ -113,7 +113,7 @@
|
|
| 113 |
<method>generateInvoice</method>
|
| 114 |
</paymill_paymill_model_observer>
|
| 115 |
</observers>
|
| 116 |
-
</
|
| 117 |
</events>
|
| 118 |
</frontend>
|
| 119 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Paymill_Paymill>
|
| 5 |
+
<version>3.4.1</version>
|
| 6 |
</Paymill_Paymill>
|
| 7 |
</modules>
|
| 8 |
|
| 105 |
</modules>
|
| 106 |
</translate>
|
| 107 |
<events>
|
| 108 |
+
<sales_order_save_after>
|
| 109 |
<observers>
|
| 110 |
<paymill_paymill_model_observer>
|
| 111 |
<type>model</type>
|
| 113 |
<method>generateInvoice</method>
|
| 114 |
</paymill_paymill_model_observer>
|
| 115 |
</observers>
|
| 116 |
+
</sales_order_save_after>
|
| 117 |
</events>
|
| 118 |
</frontend>
|
| 119 |
|
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.4.
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
|
@@ -86,7 +86,7 @@
|
|
| 86 |
<sort_order>800</sort_order>
|
| 87 |
<fields>
|
| 88 |
<version>
|
| 89 |
-
<label>v3.4.
|
| 90 |
<sort_order>100</sort_order>
|
| 91 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 92 |
<frontend_type>label</frontend_type>
|
|
@@ -159,7 +159,7 @@
|
|
| 159 |
<sort_order>800</sort_order>
|
| 160 |
<fields>
|
| 161 |
<version>
|
| 162 |
-
<label>v3.4.
|
| 163 |
<sort_order>100</sort_order>
|
| 164 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 165 |
<frontend_type>label</frontend_type>
|
| 11 |
<sort_order>700</sort_order>
|
| 12 |
<fields>
|
| 13 |
<version>
|
| 14 |
+
<label>v3.4.1</label>
|
| 15 |
<sort_order>1</sort_order>
|
| 16 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 17 |
<frontend_type>label</frontend_type>
|
| 86 |
<sort_order>800</sort_order>
|
| 87 |
<fields>
|
| 88 |
<version>
|
| 89 |
+
<label>v3.4.1</label>
|
| 90 |
<sort_order>100</sort_order>
|
| 91 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 92 |
<frontend_type>label</frontend_type>
|
| 159 |
<sort_order>800</sort_order>
|
| 160 |
<fields>
|
| 161 |
<version>
|
| 162 |
+
<label>v3.4.1</label>
|
| 163 |
<sort_order>100</sort_order>
|
| 164 |
<frontend_model>adminhtml/system_config_form_field_heading</frontend_model>
|
| 165 |
<frontend_type>label</frontend_type>
|
app/code/community/Paymill/Paymill/sql/paymill_setup/mysql4-install-3.0.0.php
CHANGED
|
@@ -41,12 +41,6 @@ $installer->run("
|
|
| 41 |
PRIMARY KEY (`id`),
|
| 42 |
UNIQUE KEY `userId` (`user_id`)
|
| 43 |
) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
|
| 44 |
-
|
| 45 |
-
UPDATE sales_flat_quote_payment SET method = 'paymill_creditcard' WHERE method = 'paymillcc';
|
| 46 |
-
UPDATE sales_flat_order_payment SET method = 'paymill_creditcard' WHERE method = 'paymillcc';
|
| 47 |
-
|
| 48 |
-
UPDATE sales_flat_quote_payment SET method = 'paymill_directdebit' WHERE method = 'paymillelv';
|
| 49 |
-
UPDATE sales_flat_order_payment SET method = 'paymill_directdebit' WHERE method = 'paymillelv';
|
| 50 |
");
|
| 51 |
|
| 52 |
|
| 41 |
PRIMARY KEY (`id`),
|
| 42 |
UNIQUE KEY `userId` (`user_id`)
|
| 43 |
) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 44 |
");
|
| 45 |
|
| 46 |
|
app/design/frontend/base/default/layout/paymill.xml
CHANGED
|
@@ -1,28 +1,28 @@
|
|
| 1 |
-
<?xml version="1.0" encoding="UTF-8"?>
|
| 2 |
-
<!--
|
| 3 |
-
To change this template, choose Tools | Templates
|
| 4 |
-
and open the template in the editor.
|
| 5 |
-
-->
|
| 6 |
-
<layout version="0.1.0">
|
| 7 |
-
<default>
|
| 8 |
-
<reference name="head">
|
| 9 |
-
<action method="addCss">
|
| 10 |
-
<stylesheet>css/paymill/logo.css</stylesheet>
|
| 11 |
-
</action>
|
| 12 |
-
<block type="core/text" name="google.cdn.jquery">
|
| 13 |
-
<action method="setText">
|
| 14 |
-
<text>
|
| 15 |
-
<![CDATA[
|
| 16 |
-
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
| 17 |
-
<script type="text/javascript" src="https://bridge.paymill.com/"></script></script>
|
| 18 |
-
<script type="text/javascript">pmQuery = jQuery.noConflict();</script>
|
| 19 |
-
]]>
|
| 20 |
-
</text>
|
| 21 |
-
</action>
|
| 22 |
-
</block>
|
| 23 |
-
<action method="addJs">
|
| 24 |
-
<script>paymill/paymentForm.js</script>
|
| 25 |
-
</action>
|
| 26 |
-
</reference>
|
| 27 |
-
</default>
|
| 28 |
-
</layout>
|
| 1 |
+
<?xml version="1.0" encoding="UTF-8"?>
|
| 2 |
+
<!--
|
| 3 |
+
To change this template, choose Tools | Templates
|
| 4 |
+
and open the template in the editor.
|
| 5 |
+
-->
|
| 6 |
+
<layout version="0.1.0">
|
| 7 |
+
<default>
|
| 8 |
+
<reference name="head">
|
| 9 |
+
<action method="addCss">
|
| 10 |
+
<stylesheet>css/paymill/logo.css</stylesheet>
|
| 11 |
+
</action>
|
| 12 |
+
<block type="core/text" name="google.cdn.jquery">
|
| 13 |
+
<action method="setText">
|
| 14 |
+
<text>
|
| 15 |
+
<![CDATA[
|
| 16 |
+
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
| 17 |
+
<script type="text/javascript" src="https://bridge.paymill.com/"></script></script>
|
| 18 |
+
<script type="text/javascript">pmQuery = jQuery.noConflict(true);</script>
|
| 19 |
+
]]>
|
| 20 |
+
</text>
|
| 21 |
+
</action>
|
| 22 |
+
</block>
|
| 23 |
+
<action method="addJs">
|
| 24 |
+
<script>paymill/paymentForm.js</script>
|
| 25 |
+
</action>
|
| 26 |
+
</reference>
|
| 27 |
+
</default>
|
| 28 |
+
</layout>
|
app/design/frontend/base/default/template/paymill/payment/form/creditcard.phtml
CHANGED
|
@@ -54,10 +54,10 @@
|
|
| 54 |
<input class="paymill-option-debug-cc" name="payment[paymill-option-debug]" id="payment[paymill-option-debug]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->isInDebugMode() ?>"/>
|
| 55 |
<input class="paymill-info-public_key-cc" name="payment[paymill-info-public_key-cc]" id="payment[paymill-info-public_key-cc]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->getPublicKey() ?>"/>
|
| 56 |
<input class="paymill-info-fastCheckout-cc" name="payment[paymill-info-fastCheckout-cc]" id="payment[paymill-info-fastCheckout-cc]" type="hidden" value="<?php echo $this->isNormalCheckout($_code) ?>"/>
|
| 57 |
-
<input class="paymill-payment-error-number" name="payment[paymill-payment-error-number]" id="payment[paymill-payment-error-number]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_number_cc")
|
| 58 |
-
<input class="paymill-payment-error-holder" name="payment[paymill-payment-error-holder]" id="payment[paymill-payment-error-holder]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_holder_cc")
|
| 59 |
-
<input class="paymill-payment-error-expdate" name="payment[paymill-payment-error-expdate]" id="payment[paymill-payment-error-expdate]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_expdate")
|
| 60 |
-
<input class="paymill-payment-error-cvc" name="payment[paymill-payment-error-cvc]" id="payment[paymill-payment-error--cvc]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_cvc")
|
| 61 |
</li>
|
| 62 |
</ul>
|
| 63 |
<script type="text/javascript">
|
| 54 |
<input class="paymill-option-debug-cc" name="payment[paymill-option-debug]" id="payment[paymill-option-debug]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->isInDebugMode() ?>"/>
|
| 55 |
<input class="paymill-info-public_key-cc" name="payment[paymill-info-public_key-cc]" id="payment[paymill-info-public_key-cc]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->getPublicKey() ?>"/>
|
| 56 |
<input class="paymill-info-fastCheckout-cc" name="payment[paymill-info-fastCheckout-cc]" id="payment[paymill-info-fastCheckout-cc]" type="hidden" value="<?php echo $this->isNormalCheckout($_code) ?>"/>
|
| 57 |
+
<input class="paymill-payment-error-number" name="payment[paymill-payment-error-number]" id="payment[paymill-payment-error-number]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_number_cc");?>"/>
|
| 58 |
+
<input class="paymill-payment-error-holder" name="payment[paymill-payment-error-holder]" id="payment[paymill-payment-error-holder]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_holder_cc"); ?>"/>
|
| 59 |
+
<input class="paymill-payment-error-expdate" name="payment[paymill-payment-error-expdate]" id="payment[paymill-payment-error-expdate]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_expdate"); ?>"/>
|
| 60 |
+
<input class="paymill-payment-error-cvc" name="payment[paymill-payment-error-cvc]" id="payment[paymill-payment-error--cvc]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_cvc"); ?>"/>
|
| 61 |
</li>
|
| 62 |
</ul>
|
| 63 |
<script type="text/javascript">
|
app/design/frontend/base/default/template/paymill/payment/form/directdebit.phtml
CHANGED
|
@@ -35,9 +35,9 @@
|
|
| 35 |
<input class="paymill-option-debug-elv" name="payment[paymill-option-debug-elv]" id="payment[paymill-option-debug-elv]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->isInDebugMode() ?>" />
|
| 36 |
<input class="paymill-info-public_key-elv" name="payment[paymill-info-public_key-elv]" id="payment[paymill-info-public_key-elv]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->getPublicKey() ?>" />
|
| 37 |
<input class="paymill-info-fastCheckout-elv" name="payment[paymill-info-fastCheckout-elv]" id="payment[paymill-info-fastCheckout-elv]" type="hidden" value="<?php echo $this->isNormalCheckout($_code) ?>" />
|
| 38 |
-
<input class="paymill-payment-error-number-elv" name="payment[paymill-payment-error-number-elv]" id="payment[paymill-payment-error-number-elv]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_number_elv")
|
| 39 |
-
<input class="paymill-payment-error-holder-elv" name="payment[paymill-payment-error-holder-elv]" id="payment[paymill-payment-error-holder-elv]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_holder_elv")
|
| 40 |
-
<input class="paymill-payment-error-bankcode" name="payment[paymill-payment-error-bankcode]" id="payment[paymill-payment-error-bankcode]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_bankcode")
|
| 41 |
</li>
|
| 42 |
</ul>
|
| 43 |
<script type="text/javascript">
|
| 35 |
<input class="paymill-option-debug-elv" name="payment[paymill-option-debug-elv]" id="payment[paymill-option-debug-elv]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->isInDebugMode() ?>" />
|
| 36 |
<input class="paymill-info-public_key-elv" name="payment[paymill-info-public_key-elv]" id="payment[paymill-info-public_key-elv]" type="hidden" value="<?php echo Mage::helper('paymill/optionHelper')->getPublicKey() ?>" />
|
| 37 |
<input class="paymill-info-fastCheckout-elv" name="payment[paymill-info-fastCheckout-elv]" id="payment[paymill-info-fastCheckout-elv]" type="hidden" value="<?php echo $this->isNormalCheckout($_code) ?>" />
|
| 38 |
+
<input class="paymill-payment-error-number-elv" name="payment[paymill-payment-error-number-elv]" id="payment[paymill-payment-error-number-elv]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_number_elv"); ?>" />
|
| 39 |
+
<input class="paymill-payment-error-holder-elv" name="payment[paymill-payment-error-holder-elv]" id="payment[paymill-payment-error-holder-elv]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_holder_elv"); ?>" />
|
| 40 |
+
<input class="paymill-payment-error-bankcode" name="payment[paymill-payment-error-bankcode]" id="payment[paymill-payment-error-bankcode]" type="hidden" value="<?php echo $this->__("paymill_error_text_invalid_bankcode"); ?>" />
|
| 41 |
</li>
|
| 42 |
</ul>
|
| 43 |
<script type="text/javascript">
|
app/locale/de_DE/Paymill_Paymill.csv
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
"paymill_credit_card","Kreditkarte"
|
| 2 |
"paymill_direct_debit","ELV"
|
| 3 |
"paymill_creditcard","Kreditkarte"
|
| 4 |
-
"paymill_directdebit","
|
| 5 |
"paymill_Basic_Setting","Paymill Grundeinstellungen"
|
| 6 |
"paymill_Public_Key","Public Key"
|
| 7 |
"paymill_Private_Key","Private Key"
|
|
@@ -51,7 +51,7 @@
|
|
| 51 |
"paymill_log_action_success", "Aktion erfolgreich"
|
| 52 |
"paymill_accepted_currency", "Akzeptierte Währungen"
|
| 53 |
"paymill_slogan","Sichere Kreditkartenzahlung powered by "
|
| 54 |
-
"paymill_slogan_elv","
|
| 55 |
"paymill_error_text_invalid_cvc", "Ungültige CVC"
|
| 56 |
"paymill_3ds_cancel", "Abbrechen"
|
| 57 |
"paymill_cvc_tooltip", "Hinter dem CVV-Code bzw. CVC verbirgt sich ein Sicherheitsmerkmal von Kreditkarten, üblicherweise handelt es sich dabei um eine drei- bis vierstelligen Nummer. Der CVV-Code befindet sich auf VISA-Kreditkarten. Der gleiche Code ist auch auf MasterCard-Kreditkarten zu finden, hier allerdings unter dem Namen CVC. Die Abkürzung CVC steht dabei für Card Validation Code. Bei VISA wird der Code als Card Verification Value-Code bezeichnet. Ähnlich wie bei Mastercard und VISA gibt es auch bei Diners Club, Discover und JCB eine dreistellige Nummer, die meist auf der Rückseite der Karte zu finden ist. Bei Maestro-Karten gibt es mit und ohne dreistelligen CVV. Wird eine Maestro-Karte ohne CVV verwendet kann einfach 000 eingetragen werden. American Express verwendet die CID (Card Identification Number). Dabei handelt es sich um eine vierstellige Nummer, die meist auf der Vorderseite der Karte, rechts oberhalb der Kartennummer zu finden ist."
|
| 1 |
"paymill_credit_card","Kreditkarte"
|
| 2 |
"paymill_direct_debit","ELV"
|
| 3 |
"paymill_creditcard","Kreditkarte"
|
| 4 |
+
"paymill_directdebit","ELV"
|
| 5 |
"paymill_Basic_Setting","Paymill Grundeinstellungen"
|
| 6 |
"paymill_Public_Key","Public Key"
|
| 7 |
"paymill_Private_Key","Private Key"
|
| 51 |
"paymill_log_action_success", "Aktion erfolgreich"
|
| 52 |
"paymill_accepted_currency", "Akzeptierte Währungen"
|
| 53 |
"paymill_slogan","Sichere Kreditkartenzahlung powered by "
|
| 54 |
+
"paymill_slogan_elv","ELV powered by "
|
| 55 |
"paymill_error_text_invalid_cvc", "Ungültige CVC"
|
| 56 |
"paymill_3ds_cancel", "Abbrechen"
|
| 57 |
"paymill_cvc_tooltip", "Hinter dem CVV-Code bzw. CVC verbirgt sich ein Sicherheitsmerkmal von Kreditkarten, üblicherweise handelt es sich dabei um eine drei- bis vierstelligen Nummer. Der CVV-Code befindet sich auf VISA-Kreditkarten. Der gleiche Code ist auch auf MasterCard-Kreditkarten zu finden, hier allerdings unter dem Namen CVC. Die Abkürzung CVC steht dabei für Card Validation Code. Bei VISA wird der Code als Card Verification Value-Code bezeichnet. Ähnlich wie bei Mastercard und VISA gibt es auch bei Diners Club, Discover und JCB eine dreistellige Nummer, die meist auf der Rückseite der Karte zu finden ist. Bei Maestro-Karten gibt es mit und ohne dreistelligen CVV. Wird eine Maestro-Karte ohne CVV verwendet kann einfach 000 eingetragen werden. American Express verwendet die CID (Card Identification Number). Dabei handelt es sich um eine vierstellige Nummer, die meist auf der Vorderseite der Karte, rechts oberhalb der Kartennummer zu finden ist."
|
lib/Services/Paymill/Apiclient/Curl.php
CHANGED
|
@@ -1,9 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once 'Interface.php';
|
| 4 |
-
|
| 5 |
-
require_once realpath(dirname(__FILE__)) . '/../Exception.php';
|
| 6 |
-
|
| 7 |
if (!function_exists('json_decode')) {
|
| 8 |
throw new Exception("Please install the PHP JSON extension");
|
| 9 |
}
|
|
@@ -81,11 +77,13 @@ class Services_Paymill_Apiclient_Curl implements Services_Paymill_Apiclient_Inte
|
|
| 81 |
$responseCode = $this->_responseArray['body']['data']['response_code'];
|
| 82 |
}
|
| 83 |
|
| 84 |
-
return array(
|
|
|
|
| 85 |
"error" => $errorMessage,
|
| 86 |
"response_code" => $responseCode,
|
| 87 |
"http_status_code" => $httpStatusCode
|
| 88 |
-
|
|
|
|
| 89 |
}
|
| 90 |
|
| 91 |
return $this->_responseArray['body'];
|
|
@@ -110,7 +108,7 @@ class Services_Paymill_Apiclient_Curl implements Services_Paymill_Apiclient_Inte
|
|
| 110 |
CURLOPT_CUSTOMREQUEST => $method,
|
| 111 |
CURLOPT_USERAGENT => self::USER_AGENT,
|
| 112 |
CURLOPT_SSL_VERIFYPEER => true,
|
| 113 |
-
CURLOPT_CAINFO =>
|
| 114 |
);
|
| 115 |
|
| 116 |
if (Services_Paymill_Apiclient_Interface::HTTP_GET === $method) {
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 3 |
if (!function_exists('json_decode')) {
|
| 4 |
throw new Exception("Please install the PHP JSON extension");
|
| 5 |
}
|
| 77 |
$responseCode = $this->_responseArray['body']['data']['response_code'];
|
| 78 |
}
|
| 79 |
|
| 80 |
+
return array(
|
| 81 |
+
"data" => array(
|
| 82 |
"error" => $errorMessage,
|
| 83 |
"response_code" => $responseCode,
|
| 84 |
"http_status_code" => $httpStatusCode
|
| 85 |
+
)
|
| 86 |
+
);
|
| 87 |
}
|
| 88 |
|
| 89 |
return $this->_responseArray['body'];
|
| 108 |
CURLOPT_CUSTOMREQUEST => $method,
|
| 109 |
CURLOPT_USERAGENT => self::USER_AGENT,
|
| 110 |
CURLOPT_SSL_VERIFYPEER => true,
|
| 111 |
+
CURLOPT_CAINFO => Mage::getBaseDir() . '/lib/Services/Paymill/Apiclient/paymill.crt',
|
| 112 |
);
|
| 113 |
|
| 114 |
if (Services_Paymill_Apiclient_Interface::HTTP_GET === $method) {
|
lib/Services/Paymill/Apiclient/paymill.crt
CHANGED
|
@@ -1,25 +1,25 @@
|
|
| 1 |
-
-----BEGIN CERTIFICATE-----
|
| 2 |
-
MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
|
| 3 |
-
MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
|
| 4 |
-
IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
|
| 5 |
-
MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
|
| 6 |
-
FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
|
| 7 |
-
bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
|
| 8 |
-
dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
|
| 9 |
-
H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
|
| 10 |
-
uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
|
| 11 |
-
mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
|
| 12 |
-
a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
|
| 13 |
-
E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
|
| 14 |
-
WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
|
| 15 |
-
VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
|
| 16 |
-
Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
|
| 17 |
-
cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
|
| 18 |
-
IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
|
| 19 |
-
AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
|
| 20 |
-
YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
|
| 21 |
-
6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
|
| 22 |
-
Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
|
| 23 |
-
c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
|
| 24 |
-
mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
|
| 25 |
-
-----END CERTIFICATE-----
|
| 1 |
+
-----BEGIN CERTIFICATE-----
|
| 2 |
+
MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
|
| 3 |
+
MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
|
| 4 |
+
IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
|
| 5 |
+
MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
|
| 6 |
+
FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
|
| 7 |
+
bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
|
| 8 |
+
dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
|
| 9 |
+
H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
|
| 10 |
+
uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
|
| 11 |
+
mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
|
| 12 |
+
a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
|
| 13 |
+
E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
|
| 14 |
+
WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
|
| 15 |
+
VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
|
| 16 |
+
Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
|
| 17 |
+
cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
|
| 18 |
+
IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
|
| 19 |
+
AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
|
| 20 |
+
YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
|
| 21 |
+
6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
|
| 22 |
+
Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
|
| 23 |
+
c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
|
| 24 |
+
mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
|
| 25 |
+
-----END CERTIFICATE-----
|
lib/Services/Paymill/Base.php
CHANGED
|
@@ -1,6 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once 'Apiclient/Curl.php';
|
| 4 |
/**
|
| 5 |
* Paymill API wrapper super class
|
| 6 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper super class
|
| 5 |
*/
|
lib/Services/Paymill/Clients.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for clients resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for clients resource
|
| 5 |
*/
|
lib/Services/Paymill/Offers.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for offers resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for offers resource
|
| 5 |
*/
|
lib/Services/Paymill/PaymentProcessor.php
CHANGED
|
@@ -166,11 +166,6 @@ class Services_Paymill_PaymentProcessor
|
|
| 166 |
*/
|
| 167 |
private function _initiatePhpWrapperClasses()
|
| 168 |
{
|
| 169 |
-
require_once $this->_libBase . 'Transactions.php';
|
| 170 |
-
require_once $this->_libBase . 'Preauthorizations.php';
|
| 171 |
-
require_once $this->_libBase . 'Clients.php';
|
| 172 |
-
require_once $this->_libBase . 'Payments.php';
|
| 173 |
-
|
| 174 |
$this->_transactionsObject = new Services_Paymill_Transactions($this->_privateKey, $this->_apiUrl);
|
| 175 |
$this->_preauthObject = new Services_Paymill_Preauthorizations($this->_privateKey, $this->_apiUrl);
|
| 176 |
$this->_clientsObject = new Services_Paymill_Clients($this->_privateKey, $this->_apiUrl);
|
|
@@ -258,12 +253,12 @@ class Services_Paymill_PaymentProcessor
|
|
| 258 |
$this->_lastResponse = $transaction;
|
| 259 |
if (isset($transaction['data']['response_code']) && $transaction['data']['response_code'] !== 20000) {
|
| 260 |
$this->_log("An Error occured: " . $transaction['data']['response_code'], var_export($transaction, true));
|
| 261 |
-
throw new Exception("Invalid Result Exception: Invalid ResponseCode", $transaction['data']['response_code']);
|
| 262 |
}
|
| 263 |
|
| 264 |
if (isset($transaction['response_code']) && $transaction['response_code'] !== 20000) {
|
| 265 |
$this->_log("An Error occured: " . $transaction['response_code'], var_export($transaction, true));
|
| 266 |
-
throw new Exception("Invalid Result Exception: Invalid ResponseCode", $transaction['response_code']);
|
| 267 |
}
|
| 268 |
|
| 269 |
if (!isset($transaction['id']) && !isset($transaction['data']['id'])) {
|
| 166 |
*/
|
| 167 |
private function _initiatePhpWrapperClasses()
|
| 168 |
{
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 169 |
$this->_transactionsObject = new Services_Paymill_Transactions($this->_privateKey, $this->_apiUrl);
|
| 170 |
$this->_preauthObject = new Services_Paymill_Preauthorizations($this->_privateKey, $this->_apiUrl);
|
| 171 |
$this->_clientsObject = new Services_Paymill_Clients($this->_privateKey, $this->_apiUrl);
|
| 253 |
$this->_lastResponse = $transaction;
|
| 254 |
if (isset($transaction['data']['response_code']) && $transaction['data']['response_code'] !== 20000) {
|
| 255 |
$this->_log("An Error occured: " . $transaction['data']['response_code'], var_export($transaction, true));
|
| 256 |
+
throw new Exception("Invalid Result Exception: Invalid ResponseCode", (int) $transaction['data']['response_code']);
|
| 257 |
}
|
| 258 |
|
| 259 |
if (isset($transaction['response_code']) && $transaction['response_code'] !== 20000) {
|
| 260 |
$this->_log("An Error occured: " . $transaction['response_code'], var_export($transaction, true));
|
| 261 |
+
throw new Exception("Invalid Result Exception: Invalid ResponseCode", (int) $transaction['response_code']);
|
| 262 |
}
|
| 263 |
|
| 264 |
if (!isset($transaction['id']) && !isset($transaction['data']['id'])) {
|
lib/Services/Paymill/Payments.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for payments resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for payments resource
|
| 5 |
*/
|
lib/Services/Paymill/Preauthorizations.php
CHANGED
|
@@ -1,27 +1,25 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
{
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
*
|
| 17 |
-
*
|
| 18 |
-
*
|
| 19 |
-
* @
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
throw new Services_Paymill_Exception( __CLASS__ . " does not support " . __METHOD__, "404");
|
| 26 |
-
}
|
| 27 |
}
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
/**
|
| 4 |
+
* Paymill API wrapper for transactions resource
|
| 5 |
+
*/
|
| 6 |
+
class Services_Paymill_Preauthorizations extends Services_Paymill_Base
|
| 7 |
+
{
|
| 8 |
+
/**
|
| 9 |
+
* {@inheritDoc}
|
| 10 |
+
*/
|
| 11 |
+
protected $_serviceResource = 'preauthorizations/';
|
| 12 |
+
|
| 13 |
+
/**
|
| 14 |
+
* General REST PUT verb
|
| 15 |
+
* Update resource item
|
| 16 |
+
*
|
| 17 |
+
* @param array $itemData
|
| 18 |
+
*
|
| 19 |
+
* @return array item updated or null
|
| 20 |
+
*/
|
| 21 |
+
public function update(array $itemData = array())
|
| 22 |
+
{
|
| 23 |
+
throw new Services_Paymill_Exception( __CLASS__ . " does not support " . __METHOD__, "404");
|
| 24 |
+
}
|
|
|
|
|
|
|
| 25 |
}
|
lib/Services/Paymill/Refunds.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for refunds resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for refunds resource
|
| 5 |
*/
|
lib/Services/Paymill/Subscriptions.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for subscriptions resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for subscriptions resource
|
| 5 |
*/
|
lib/Services/Paymill/Transactions.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for transactions resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for transactions resource
|
| 5 |
*/
|
lib/Services/Paymill/Webhooks.php
CHANGED
|
@@ -1,7 +1,5 @@
|
|
| 1 |
<?php
|
| 2 |
|
| 3 |
-
require_once ('Base.php');
|
| 4 |
-
|
| 5 |
/**
|
| 6 |
* Paymill API wrapper for webhooks resource
|
| 7 |
*/
|
| 1 |
<?php
|
| 2 |
|
|
|
|
|
|
|
| 3 |
/**
|
| 4 |
* Paymill API wrapper for webhooks resource
|
| 5 |
*/
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Paymill_Paymill</name>
|
| 4 |
-
<version>3.4.
|
| 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 |
-
* Global css and js loading</notes>
|
| 19 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 20 |
-
<date>2013-
|
| 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="
|
| 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.4.1</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> * better jQuery compatibility
|
| 17 |
+
* fix problems with the magento compiler</notes>
|
|
|
|
| 18 |
<authors><author><name>PayIntelligent</name><user>Paymill</user><email>community@paymill.de</email></author></authors>
|
| 19 |
+
<date>2013-11-04</date>
|
| 20 |
+
<time>10:54:29</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="3b7c3c02a50d24def79485a7d2d47dd5"/><file name="PaymentFormCreditcard.php" hash="5351fa41246fb107bd3e62fdd274f715"/><file name="PaymentFormDirectdebit.php" hash="526991e3ed3c25b6c242fdd21e7aba25"/></dir><dir name="Info"><file name="PaymentFormCreditcard.php" hash="3e7a3d2b84878bc22f6ac9e2a0ac5c76"/><file name="PaymentFormDirectdebit.php" hash="bbc8f0cae5dff57df9ec1975650fe5e0"/></dir></dir></dir><dir name="Helper"><file name="CustomerHelper.php" hash="f077f41331778bd63518644b0ca3fec3"/><file name="Data.php" hash="65371da937bd0aa1ba57aa4b9d27d989"/><file name="FastCheckoutHelper.php" hash="48058398d9af8d92f69e0a0566b0b040"/><file name="LoggingHelper.php" hash="53ea7f4d5c3af8de149a06dbe37ac061"/><file name="OptionHelper.php" hash="cbf3daa334bce07b7eb62a5a43dd18dc"/><file name="PaymentHelper.php" hash="1753eb12f7c7c0d30dbe181bb87655b0"/><file name="RefundHelper.php" hash="b936d48e6f9022acb0370ec755cf5850"/><file name="TransactionHelper.php" hash="7cce355230eee2f1c617df1bd18f8752"/></dir><dir name="Model"><file name="Fastcheckout.php" hash="94565a600a12f880edeabc941bd35ded"/><dir name="Log"><file name="Search.php" hash="4338b3876e745405bfcc5a32cfe42527"/></dir><file name="Log.php" hash="476c497495b92c3cf49e0c7b470854d4"/><dir name="Method"><file name="MethodModelAbstract.php" hash="7b7ebba9af21bc887e53e6b53685800f"/><file name="MethodModelCreditcard.php" hash="beba2b1d5de002322c16f5e772c5fe99"/><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="56b09daa390ba1f4f5116f1d701833e4"/><dir name="Log"><file name="Collection.php" hash="cf4d8fec68a4cc44b2e47bf69e014cf3"/></dir><file name="Log.php" hash="9bd80dc9300cc189b6b3ebd921b4e3e6"/></dir><file name="Observer.php" hash="7a50e0ae93ca57a4cc34079366d231aa"/><file name="TransactionData.php" hash="6f2bfd7a7ecde8dc4f21e03d33fdd7e4"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="fe634fc07d161f160ae060600561a0b1"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="402c36431d690ffa9b7eae074cadfb4e"/><file name="config.xml" hash="f2df171d57dcf0ede51854372a174c83"/><file name="system.xml" hash="07af8100ff47e64ca49b58b237cf7867"/></dir><dir name="sql"><dir name="paymill_setup"><file name="mysql4-install-3.0.0.php" hash="542728b094a88aa479de6d49017953ba"/></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="directdebit.phtml" hash="1c604ec666d9a3028a04c0d9a4257e4a"/></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="9f21301c2ef209073b42cbc6561e20b8"/><file name="directdebit.phtml" hash="f658d4fee38d90dd1840c9bf59ef1126"/></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="da4ed04467f50a8a5bbe5766834b765e"/></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="4380f0645f188df42968947f93ef98cd"/></dir><dir name="en_GB"><file name="Paymill_Paymill.csv" hash="8d17d41a96420fad84ca277cc1e08169"/></dir></target><target name="magelocal"><dir name="en_US"><file name="Paymill_Paymill.csv" hash=""/></dir><dir name="es_ES"><file name="Paymill_Paymill.csv" hash=""/></dir></target><target name="mage"><dir name="js"><dir name="paymill"><file name="paymentForm.js" hash="e29b3dd732c0e02d4ae41789e12929c7"/></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="6c09811ecd11d36b9e41b4a616481769"/></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></target></contents>
|
| 22 |
<compatible/>
|
| 23 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 24 |
</package>
|
