Version Notes
- Payment methods can now be used for admin orders.
Download this release
Release Info
Developer | Magento Core Team |
Extension | Cardgate_Cgp |
Version | 1.0.34 |
Comparing to | |
See all releases |
Code changes from version 1.0.33 to 1.0.34
- app/code/local/Cardgate/Cgp/Model/Gateway/Abstract.php +5 -2
- app/code/local/Cardgate/Cgp/Model/Gateway/Americanexpress.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Banktransfer.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Directdebit.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Giropay.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Ideal.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Maestro.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Mastercard.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Mistercash.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Paypal.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Przelewy24.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Sofortbanking.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Visa.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Vpay.php +1 -0
- app/code/local/Cardgate/Cgp/Model/Gateway/Webmoney.php +1 -0
- app/code/local/Cardgate/Cgp/etc/config.xml +2 -2
- app/code/local/Cardgate/Cgp/etc/system.xml +1 -1
- app/locale/nl_NL/Cardgate_Cgp.csv +1 -1
- package.xml +5 -5
app/code/local/Cardgate/Cgp/Model/Gateway/Abstract.php
CHANGED
@@ -179,6 +179,9 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
179 |
$base = Mage::getSingleton( 'cgp/base' );
|
180 |
|
181 |
$currency_code = $this->getQuote()->getBaseCurrencyCode();
|
|
|
|
|
|
|
182 |
if ( !in_array( $currency_code, $this->_supportedCurrencies ) ) {
|
183 |
$base->log( 'Unacceptable currency code (' . $currency_code . ').' );
|
184 |
Mage::throwException(
|
@@ -215,7 +218,7 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
215 |
|
216 |
$base = Mage::getSingleton( 'cgp/base' );
|
217 |
$extra_data = $_SESSION['cgp_formdata']['payment']['cgp'];
|
218 |
-
|
219 |
$order = $this->getOrder();
|
220 |
|
221 |
if ( !$this->getConfigData( 'orderemail_at_payment' ) ) {
|
@@ -546,7 +549,7 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
546 |
$s_arr['amount'] .
|
547 |
$s_arr['ref'] .
|
548 |
$this->getConfigData( 'hash_key' ) );
|
549 |
-
|
550 |
// Logging
|
551 |
$base->log( 'Initiating a new transaction' );
|
552 |
$base->log( 'Sending customer to Card Gate Plus with values:' );
|
179 |
$base = Mage::getSingleton( 'cgp/base' );
|
180 |
|
181 |
$currency_code = $this->getQuote()->getBaseCurrencyCode();
|
182 |
+
if ( empty( $currency_code ) ) {
|
183 |
+
$currency_code = Mage::app()->getStore()->getCurrentCurrencyCode();
|
184 |
+
}
|
185 |
if ( !in_array( $currency_code, $this->_supportedCurrencies ) ) {
|
186 |
$base->log( 'Unacceptable currency code (' . $currency_code . ').' );
|
187 |
Mage::throwException(
|
218 |
|
219 |
$base = Mage::getSingleton( 'cgp/base' );
|
220 |
$extra_data = $_SESSION['cgp_formdata']['payment']['cgp'];
|
221 |
+
|
222 |
$order = $this->getOrder();
|
223 |
|
224 |
if ( !$this->getConfigData( 'orderemail_at_payment' ) ) {
|
549 |
$s_arr['amount'] .
|
550 |
$s_arr['ref'] .
|
551 |
$this->getConfigData( 'hash_key' ) );
|
552 |
+
|
553 |
// Logging
|
554 |
$base->log( 'Initiating a new transaction' );
|
555 |
$base->log( 'Sending customer to Card Gate Plus with values:' );
|
app/code/local/Cardgate/Cgp/Model/Gateway/Americanexpress.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Americanexpress extends Cardgate_Cgp_Model_Gate
|
|
20 |
{
|
21 |
protected $_code = 'cgp_americanexpress';
|
22 |
protected $_model = 'americanexpress';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_americanexpress';
|
22 |
protected $_model = 'americanexpress';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Banktransfer.php
CHANGED
@@ -20,5 +20,6 @@ class Cardgate_Cgp_Model_Gateway_Banktransfer extends Cardgate_Cgp_Model_Gateway
|
|
20 |
{
|
21 |
protected $_code = 'cgp_banktransfer';
|
22 |
protected $_model = 'banktransfer';
|
|
|
23 |
protected $_formBlockType = 'cgp/form_banktransfer';
|
24 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_banktransfer';
|
22 |
protected $_model = 'banktransfer';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
protected $_formBlockType = 'cgp/form_banktransfer';
|
25 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Directdebit.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Directdebit extends Cardgate_Cgp_Model_Gateway_
|
|
20 |
{
|
21 |
protected $_code = 'cgp_directdebit';
|
22 |
protected $_model = 'directdebit';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_directdebit';
|
22 |
protected $_model = 'directdebit';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Giropay.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Giropay extends Cardgate_Cgp_Model_Gateway_Abst
|
|
20 |
{
|
21 |
protected $_code = 'cgp_giropay';
|
22 |
protected $_model = 'giropay';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_giropay';
|
22 |
protected $_model = 'giropay';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Ideal.php
CHANGED
@@ -20,5 +20,6 @@ class Cardgate_Cgp_Model_Gateway_Ideal extends Cardgate_Cgp_Model_Gateway_Abstra
|
|
20 |
{
|
21 |
protected $_code = 'cgp_ideal';
|
22 |
protected $_model = 'ideal';
|
|
|
23 |
protected $_formBlockType = 'cgp/form_ideal';
|
24 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_ideal';
|
22 |
protected $_model = 'ideal';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
protected $_formBlockType = 'cgp/form_ideal';
|
25 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Maestro.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Maestro extends Cardgate_Cgp_Model_Gateway_Abst
|
|
20 |
{
|
21 |
protected $_code = 'cgp_maestro';
|
22 |
protected $_model = 'maestro';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_maestro';
|
22 |
protected $_model = 'maestro';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Mastercard.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Mastercard extends Cardgate_Cgp_Model_Gateway_A
|
|
20 |
{
|
21 |
protected $_code = 'cgp_mastercard';
|
22 |
protected $_model = 'mastercard';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_mastercard';
|
22 |
protected $_model = 'mastercard';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Mistercash.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Mistercash extends Cardgate_Cgp_Model_Gateway_A
|
|
20 |
{
|
21 |
protected $_code = 'cgp_mistercash';
|
22 |
protected $_model = 'mistercash';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_mistercash';
|
22 |
protected $_model = 'mistercash';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Paypal.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Paypal extends Cardgate_Cgp_Model_Gateway_Abstr
|
|
20 |
{
|
21 |
protected $_code = 'cgp_paypal';
|
22 |
protected $_model = 'paypal';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_paypal';
|
22 |
protected $_model = 'paypal';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Przelewy24.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Przelewy24 extends Cardgate_Cgp_Model_Gateway_A
|
|
20 |
{
|
21 |
protected $_code = 'cgp_przelewy24';
|
22 |
protected $_model = 'przelewy24';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_przelewy24';
|
22 |
protected $_model = 'przelewy24';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Sofortbanking.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Sofortbanking extends Cardgate_Cgp_Model_Gatewa
|
|
20 |
{
|
21 |
protected $_code = 'cgp_sofortbanking';
|
22 |
protected $_model = 'sofortbanking';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_sofortbanking';
|
22 |
protected $_model = 'sofortbanking';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Visa.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Visa extends Cardgate_Cgp_Model_Gateway_Abstrac
|
|
20 |
{
|
21 |
protected $_code = 'cgp_visa';
|
22 |
protected $_model = 'visa';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_visa';
|
22 |
protected $_model = 'visa';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Vpay.php
CHANGED
@@ -20,4 +20,5 @@ class Cardgate_Cgp_Model_Gateway_Vpay extends Cardgate_Cgp_Model_Gateway_Abstrac
|
|
20 |
{
|
21 |
protected $_code = 'cgp_vpay';
|
22 |
protected $_model = 'vpay';
|
|
|
23 |
}
|
20 |
{
|
21 |
protected $_code = 'cgp_vpay';
|
22 |
protected $_model = 'vpay';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
app/code/local/Cardgate/Cgp/Model/Gateway/Webmoney.php
CHANGED
@@ -20,5 +20,6 @@ class Cardgate_Cgp_Model_Gateway_Webmoney extends Cardgate_Cgp_Model_Gateway_Abs
|
|
20 |
{
|
21 |
protected $_code = 'cgp_webmoney';
|
22 |
protected $_model = 'webmoney';
|
|
|
23 |
}
|
24 |
|
20 |
{
|
21 |
protected $_code = 'cgp_webmoney';
|
22 |
protected $_model = 'webmoney';
|
23 |
+
protected $_canUseInternal = true;
|
24 |
}
|
25 |
|
app/code/local/Cardgate/Cgp/etc/config.xml
CHANGED
@@ -20,7 +20,7 @@
|
|
20 |
<config>
|
21 |
<modules>
|
22 |
<Cardgate_Cgp>
|
23 |
-
<version>1.0.
|
24 |
</Cardgate_Cgp>
|
25 |
</modules>
|
26 |
|
@@ -225,7 +225,7 @@
|
|
225 |
<failed_status>canceled</failed_status>
|
226 |
<fraud_status>canceled</fraud_status>
|
227 |
<use_backoffice_urls>0</use_backoffice_urls>
|
228 |
-
<orderemail_at_payment>
|
229 |
<autocreate_invoice>1</autocreate_invoice>
|
230 |
<mail_invoice>1</mail_invoice>
|
231 |
<notification_email>general</notification_email>
|
20 |
<config>
|
21 |
<modules>
|
22 |
<Cardgate_Cgp>
|
23 |
+
<version>1.0.34</version>
|
24 |
</Cardgate_Cgp>
|
25 |
</modules>
|
26 |
|
225 |
<failed_status>canceled</failed_status>
|
226 |
<fraud_status>canceled</fraud_status>
|
227 |
<use_backoffice_urls>0</use_backoffice_urls>
|
228 |
+
<orderemail_at_payment>1</orderemail_at_payment>
|
229 |
<autocreate_invoice>1</autocreate_invoice>
|
230 |
<mail_invoice>1</mail_invoice>
|
231 |
<notification_email>general</notification_email>
|
app/code/local/Cardgate/Cgp/etc/system.xml
CHANGED
@@ -77,7 +77,7 @@
|
|
77 |
<show_in_store>1</show_in_store>
|
78 |
</use_backoffice_urls>
|
79 |
<orderemail_at_payment translate="label comment">
|
80 |
-
<label>Send Order Email at payment</label>
|
81 |
<frontend_type>select</frontend_type>
|
82 |
<comment>Send Order Email only after payment completion.</comment>
|
83 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
77 |
<show_in_store>1</show_in_store>
|
78 |
</use_backoffice_urls>
|
79 |
<orderemail_at_payment translate="label comment">
|
80 |
+
<label>Send Order Email only at payment</label>
|
81 |
<frontend_type>select</frontend_type>
|
82 |
<comment>Send Order Email only after payment completion.</comment>
|
83 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
app/locale/nl_NL/Cardgate_Cgp.csv
CHANGED
@@ -75,6 +75,6 @@
|
|
75 |
"Invoice Fee (incl. VAT)","Factuurkosten (incl. BTW)"
|
76 |
"Invoice fee tax class","Factuurkosten BTW class"
|
77 |
"The tax class to use to calculate the invoice fee tax","De BTW class die gebruikt wordt voor het berekenen van de factuurkosten BTW."
|
78 |
-
"Send Order Email at payment","Verstuur bestelling Email bij betaling"
|
79 |
"Send Order Email only after payment completion.","Verstuur de bestelling Email pas als de betaling afgerond is."
|
80 |
"Instructions","Instructies"
|
75 |
"Invoice Fee (incl. VAT)","Factuurkosten (incl. BTW)"
|
76 |
"Invoice fee tax class","Factuurkosten BTW class"
|
77 |
"The tax class to use to calculate the invoice fee tax","De BTW class die gebruikt wordt voor het berekenen van de factuurkosten BTW."
|
78 |
+
"Send Order Email only at payment","Verstuur bestelling Email pas bij betaling"
|
79 |
"Send Order Email only after payment completion.","Verstuur de bestelling Email pas als de betaling afgerond is."
|
80 |
"Instructions","Instructies"
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Cardgate_Cgp</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Card Gate Plus Payment Module</summary>
|
10 |
<description>Card Gate Plus is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
|
11 |
-
<notes>-
|
12 |
<authors><author><name>Richard Schoots</name><user>auto-converted</user><email>support@cardgate.com</email></author></authors>
|
13 |
-
<date>2015-
|
14 |
-
<time>
|
15 |
-
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="cardgate"><file name="cardgate_cgp.png" hash="b97b15baba0b27042733c8ea4b4fb6bc"/></dir></dir><file name="cardgate_cgp.css" hash="bebfc13fca1b36867c17864ae70fdabd"/></dir></dir></dir></target><target name="magelocale"><dir name="nl_NL"><file name="Cardgate_Cgp.csv" hash="
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Cardgate_Cgp</name>
|
4 |
+
<version>1.0.34</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Card Gate Plus Payment Module</summary>
|
10 |
<description>Card Gate Plus is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
|
11 |
+
<notes>- Payment methods can now be used for admin orders.</notes>
|
12 |
<authors><author><name>Richard Schoots</name><user>auto-converted</user><email>support@cardgate.com</email></author></authors>
|
13 |
+
<date>2015-06-19</date>
|
14 |
+
<time>13:39:50</time>
|
15 |
+
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="cardgate"><file name="cardgate_cgp.png" hash="b97b15baba0b27042733c8ea4b4fb6bc"/></dir></dir><file name="cardgate_cgp.css" hash="bebfc13fca1b36867c17864ae70fdabd"/></dir></dir></dir></target><target name="magelocale"><dir name="nl_NL"><file name="Cardgate_Cgp.csv" hash="2a367336716ba34a4bd9c5c59a47c09e"/></dir></target><target name="mageetc"><dir name="modules"><file name="Cardgate_Cgp.xml" hash="c7a72af045f4b737b50cc6c360d4300d"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="cardgate"><dir name="cgp"><dir name="form"><file name="banktransfer.phtml" hash="ff7a2a827a7b7a5ed9bcb5d484c30c68"/><file name="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="590c98ab018c474e8e4dc65e9199ba85"/><file name="klarnaaccount.phtml" hash="419f88941703c8562369844bb6a1d692"/></dir><file name="redirect.phtml" hash="ecb2b0a854cd6358adeba535f8889046"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Cardgate"><dir name="Cgp"><dir name="Block"><dir name="Form"><file name="Banktransfer.php" hash="cbd094ef3552618c9657f411082beb1e"/><file name="Ideal.php" hash="c0e11d3161bd93ca869a31d9b54e1b4b"/><file name="Klarna.php" hash="9bdbe1886bcdb283b86b6d208c3aa712"/><file name="Klarnaaccount.php" hash="0b4b84d9c472e815a30d5977ac53c932"/></dir><file name="Redirect.php" hash="668b52ec0c5fba7f42223d4e40a99987"/></dir><dir name="Helper"><file name="Data.php" hash="c94c725de2e14dc8019323c1ecf08962"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Languages.php" hash="4fe09e45e3d9f3866d4b7c8437832972"/><file name="Modes.php" hash="888158f9118ba5087357d5c1ad8514d4"/></dir></dir></dir></dir><dir name="Gateway"><file name="Abstract.php" hash="566134b83e6d2a01eba0c17f8a49e2dc"/><file name="Americanexpress.php" hash="e92216206b3b623aab4bd7b6e19741db"/><file name="Banktransfer.php" hash="babaf0ea30aad8aa9540c0879a9e67ca"/><file name="Default.php" hash="956d1ff0c2cfe0698efc23277e602cec"/><file name="Directdebit.php" hash="aab6b38b231d5add0e3b0fdcb3d73e3c"/><file name="Giropay.php" hash="e4c2497eaf88ddda0ba5d745945ea3bd"/><file name="Ideal.php" hash="430de461f07352905984bfa15adf9eec"/><file name="Klarna.php" hash="330efb073aba572606b1f25b597bb106"/><file name="Klarnaaccount.php" hash="2012566e77136f823e965c8811321ea3"/><file name="Maestro.php" hash="5675bd4e11b38499b209d91ca5367a07"/><file name="Mastercard.php" hash="11a3aca8cc5f3e04e08244e600c67e3d"/><file name="Mistercash.php" hash="ca9bfde52ea045fe73c6287bbb12837c"/><file name="Paypal.php" hash="cc679581956c2ae857404bc84e798fcc"/><file name="Przelewy24.php" hash="577fa43cee76b9546fc8c500a73e341a"/><file name="Sofortbanking.php" hash="7e3a03aec546156f4a3d47cb6232be2f"/><file name="Visa.php" hash="610a7893d1c03515dc1046b789005817"/><file name="Vpay.php" hash="aaf3f019a7a21c5b91a64bf95da81ed8"/><file name="Webmoney.php" hash="fb504c06b78108ac50bf3933fd44ab0e"/></dir><file name="Base.php" hash="b8a2f888d0d8e86a639b8379720c9e7a"/><file name="Observer.php" hash="81f7a3c5149f52dcb2d4c7434d250003"/></dir><dir name="controllers"><file name="StandardController.php" hash="1524983a5b9d05ef2d7e7d92c25ff409"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1caa98cae31103bb77143f821f68f451"/><file name="config.xml" hash="8ad0d1c7e5474bbe242285f54ed0240a"/><file name="system.xml" hash="b8b03f17d8a10036c3d2c062875065cd"/></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|