Cardgate_Cgp - Version 1.0.30

Version Notes

- option to send Order e-mail only at payment completion.

Download this release

Release Info

Developer Magento Core Team
Extension Cardgate_Cgp
Version 1.0.30
Comparing to
See all releases


Code changes from version 1.0.29 to 1.0.30

Files changed (6) hide show
  1. app/code/local/Cardgate/Cgp/Model/Gateway/Abstract.php +6 -13
  2. app/code/local/Cardgate/Cgp/etc/config.xml +2 -1
  3. app/code/local/Cardgate/Cgp/etc/system.xml +10 -0
  4. app/design/frontend/base/default/template/cardgate/cgp/redirect.phtml +0 -12
  5. app/locale/nl_NL/Cardgate_Cgp.csv +3 -1
  6. package.xml +7 -8
app/code/local/Cardgate/Cgp/Model/Gateway/Abstract.php CHANGED
@@ -32,6 +32,7 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
32
  *
33
  * @var mixed
34
  */
 
35
  protected $_url = 'https://gateway.cardgateplus.com/';
36
  //protected $_url = 'http://gateway.cardgate.dev/';
37
  protected $_supportedCurrencies = array( 'EUR', 'USD', 'JPY', 'BGN', 'CZK',
@@ -205,6 +206,11 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
205
  $session = Mage::getSingleton( 'checkout/session' );
206
  $extra_data = $session->_additional_information;
207
  $order = $this->getOrder();
 
 
 
 
 
208
  $customer = $order->getBillingAddress();
209
 
210
  $s_arr = array();
@@ -353,19 +359,6 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
353
  $shipping['flags'] = $flags;
354
  $shipping['vat'] = $tax_rate;
355
 
356
- /*
357
- $baseShippingAmount = ( float ) $order->getBaseShippingAmount();
358
- $baseShippingDiscountAmount = ( float ) $order->getBaseShippingDiscountAmount();
359
-
360
- if ( $baseShippingDiscountAmount > 0 && $baseShippingAmount > 0 ) {
361
- $discountRate = ($baseShippingDiscountAmount / $baseShippingAmount) * 100;
362
- $shipping['discount'] = sprintf( '%01.2f', $discountRate );
363
- $shipping['flags'] += 16;
364
- } else {
365
- $shipping['discount'] = sprintf( '%01.2f', 0 );
366
- }
367
- */
368
-
369
  $cartitems[] = $shipping;
370
  }
371
 
32
  *
33
  * @var mixed
34
  */
35
+
36
  protected $_url = 'https://gateway.cardgateplus.com/';
37
  //protected $_url = 'http://gateway.cardgate.dev/';
38
  protected $_supportedCurrencies = array( 'EUR', 'USD', 'JPY', 'BGN', 'CZK',
206
  $session = Mage::getSingleton( 'checkout/session' );
207
  $extra_data = $session->_additional_information;
208
  $order = $this->getOrder();
209
+
210
+ if (!$this->getConfigData( 'orderemail_at_payment' )){
211
+ $order->sendNewOrderEmail();
212
+ $order->setEmailSent( true );
213
+ }
214
  $customer = $order->getBillingAddress();
215
 
216
  $s_arr = array();
359
  $shipping['flags'] = $flags;
360
  $shipping['vat'] = $tax_rate;
361
 
 
 
 
 
 
 
 
 
 
 
 
 
 
362
  $cartitems[] = $shipping;
363
  }
364
 
app/code/local/Cardgate/Cgp/etc/config.xml CHANGED
@@ -20,7 +20,7 @@
20
  <config>
21
  <modules>
22
  <Cardgate_Cgp>
23
- <version>1.0.29</version>
24
  </Cardgate_Cgp>
25
  </modules>
26
 
@@ -225,6 +225,7 @@
225
  <failed_status>canceled</failed_status>
226
  <fraud_status>canceled</fraud_status>
227
  <use_backoffice_urls>0</use_backoffice_urls>
 
228
  <autocreate_invoice>1</autocreate_invoice>
229
  <mail_invoice>1</mail_invoice>
230
  <notification_email>general</notification_email>
20
  <config>
21
  <modules>
22
  <Cardgate_Cgp>
23
+ <version>1.0.30</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>0</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
@@ -76,6 +76,16 @@
76
  <show_in_website>1</show_in_website>
77
  <show_in_store>1</show_in_store>
78
  </use_backoffice_urls>
 
 
 
 
 
 
 
 
 
 
79
  <autocreate_invoice translate="label comment">
80
  <label>Create invoice after payment</label>
81
  <frontend_type>select</frontend_type>
76
  <show_in_website>1</show_in_website>
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>
84
+ <sort_order>60</sort_order>
85
+ <show_in_default>1</show_in_default>
86
+ <show_in_website>1</show_in_website>
87
+ <show_in_store>1</show_in_store>
88
+ </orderemail_at_payment>
89
  <autocreate_invoice translate="label comment">
90
  <label>Create invoice after payment</label>
91
  <frontend_type>select</frontend_type>
app/design/frontend/base/default/template/cardgate/cgp/redirect.phtml CHANGED
@@ -1,15 +1,3 @@
1
- <?php
2
- /*
3
- $session = Mage::getSingleton('checkout/session');
4
- if ($session->getCgpOnestepCheckout() == true) {
5
- $url = Mage::getUrl('cgp/standard/cancel/', array('_secure' => true));
6
- header("Location: $url");
7
- exit();
8
- }
9
- $session->setCgpOnestepQuoteId($session->getCardgateQuoteId());
10
- $session->setCgpOnestepCheckout(true);
11
- */
12
- ?>
13
  <?php echo Mage::helper('cgp')->__('You will be redirected to finish your payment.'); ?>
14
  <?php echo $this->getForm(); ?>
15
  <script type="text/javascript">document.getElementById("cardgateplus_checkout").submit();</script>
 
 
 
 
 
 
 
 
 
 
 
 
1
  <?php echo Mage::helper('cgp')->__('You will be redirected to finish your payment.'); ?>
2
  <?php echo $this->getForm(); ?>
3
  <script type="text/javascript">document.getElementById("cardgateplus_checkout").submit();</script>
app/locale/nl_NL/Cardgate_Cgp.csv CHANGED
@@ -74,4 +74,6 @@
74
  "Invoice Fee (excl. VAT)","Factuurkosten (excl. BTW)"
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."
 
 
74
  "Invoice Fee (excl. VAT)","Factuurkosten (excl. BTW)"
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."
package.xml CHANGED
@@ -1,19 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cardgate_Cgp</name>
4
- <version>1.0.29</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>- Updated development redirect url.&#xD;
12
- </notes>
13
- <authors><author><name>Richard Schoots</name><user>cardgateplus</user><email>support@cardgate.com</email></author></authors>
14
- <date>2014-12-10</date>
15
- <time>12:33:51</time>
16
- <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="cardgate_cgp.css" hash="bebfc13fca1b36867c17864ae70fdabd"/><dir name="images"><dir name="cardgate"><file name="cardgate_cgp.png" hash="b97b15baba0b27042733c8ea4b4fb6bc"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="nl_NL"><file name="Cardgate_Cgp.csv" hash="26124aa7700a35aa27e3032f61e3aa85"/></dir></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="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="590c98ab018c474e8e4dc65e9199ba85"/><file name="klarnaaccount.phtml" hash="419f88941703c8562369844bb6a1d692"/></dir><file name="redirect.phtml" hash="0bbc40f290a5c0b8a634620adf6106f0"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Cardgate"><dir name="Cgp"><dir name="Block"><dir name="Form"><file name="Ideal.php" hash="286d495abf8a0876182b4a5012b5f567"/><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><file name="Base.php" hash="b8a2f888d0d8e86a639b8379720c9e7a"/><dir name="Gateway"><file name="Abstract.php" hash="d8b8f6e577c5f3d5c93cfb36ec060a2e"/><file name="Americanexpress.php" hash="63988a4b6ec2b92c41115bac80b489c0"/><file name="Banktransfer.php" hash="a5e4a42135b0e8da48941869bb0b1435"/><file name="Default.php" hash="956d1ff0c2cfe0698efc23277e602cec"/><file name="Directdebit.php" hash="6ecd143d3d0b91c818fd8a9bf3858d0f"/><file name="Giropay.php" hash="aff19feafd61a08e3e298a865d52c3d5"/><file name="Ideal.php" hash="8ba0ccae24cde16a65ec17b462a64b6d"/><file name="Klarna.php" hash="330efb073aba572606b1f25b597bb106"/><file name="Klarnaaccount.php" hash="2012566e77136f823e965c8811321ea3"/><file name="Maestro.php" hash="b2887cc1de0590ab78e4373324924486"/><file name="Mastercard.php" hash="f1bfabcc244175c3e691e1707a541415"/><file name="Mistercash.php" hash="cc750b3e2d0cab9e345e77124d652115"/><file name="Paypal.php" hash="5831bb3e2e3f6d3e9506e9c6bbcf76c9"/><file name="Przelewy24.php" hash="62dc63f9d029d3f1599ffa6f4ec91e27"/><file name="Sofortbanking.php" hash="c680c21fa1a8a6427519664e1b1c1a94"/><file name="Visa.php" hash="d977468b9dac7c70d637b6167918c569"/><file name="Vpay.php" hash="2eb70f7616beada4fe23f2554f575e2e"/><file name="Webmoney.php" hash="b0f44c9232cf456778123c05127d3f12"/></dir><file name="Observer.php" hash="81f7a3c5149f52dcb2d4c7434d250003"/></dir><dir name="controllers"><file name="StandardController.php" hash="2070748231cc42d40c67869c14c289d6"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1caa98cae31103bb77143f821f68f451"/><file name="config.xml" hash="fd10b8f22f25a8a37e5abbaf4648c262"/><file name="system.xml" hash="6c58bf6def08cec53f1bf5f1d0ca7983"/></dir></dir></dir></target></contents>
17
  <compatible/>
18
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Cardgate_Cgp</name>
4
+ <version>1.0.30</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>- option to send Order e-mail only at payment completion.</notes>
12
+ <authors><author><name>Richard Schoots</name><user>auto-converted</user><email>support@cardgate.com</email></author></authors>
13
+ <date>2014-12-11</date>
14
+ <time>15:34:25</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="65b0c7a55b855a75633f42494d0e30ca"/></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="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="Ideal.php" hash="286d495abf8a0876182b4a5012b5f567"/><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="ef5fc7a9e77162c8895803f6f3ab821b"/><file name="Americanexpress.php" hash="63988a4b6ec2b92c41115bac80b489c0"/><file name="Banktransfer.php" hash="a5e4a42135b0e8da48941869bb0b1435"/><file name="Default.php" hash="956d1ff0c2cfe0698efc23277e602cec"/><file name="Directdebit.php" hash="6ecd143d3d0b91c818fd8a9bf3858d0f"/><file name="Giropay.php" hash="aff19feafd61a08e3e298a865d52c3d5"/><file name="Ideal.php" hash="8ba0ccae24cde16a65ec17b462a64b6d"/><file name="Klarna.php" hash="330efb073aba572606b1f25b597bb106"/><file name="Klarnaaccount.php" hash="2012566e77136f823e965c8811321ea3"/><file name="Maestro.php" hash="b2887cc1de0590ab78e4373324924486"/><file name="Mastercard.php" hash="f1bfabcc244175c3e691e1707a541415"/><file name="Mistercash.php" hash="cc750b3e2d0cab9e345e77124d652115"/><file name="Paypal.php" hash="5831bb3e2e3f6d3e9506e9c6bbcf76c9"/><file name="Przelewy24.php" hash="62dc63f9d029d3f1599ffa6f4ec91e27"/><file name="Sofortbanking.php" hash="c680c21fa1a8a6427519664e1b1c1a94"/><file name="Visa.php" hash="d977468b9dac7c70d637b6167918c569"/><file name="Vpay.php" hash="2eb70f7616beada4fe23f2554f575e2e"/><file name="Webmoney.php" hash="b0f44c9232cf456778123c05127d3f12"/></dir><file name="Base.php" hash="b8a2f888d0d8e86a639b8379720c9e7a"/><file name="Observer.php" hash="81f7a3c5149f52dcb2d4c7434d250003"/></dir><dir name="controllers"><file name="StandardController.php" hash="2070748231cc42d40c67869c14c289d6"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1caa98cae31103bb77143f821f68f451"/><file name="config.xml" hash="0e4681b1a297670b50809484225cca30"/><file name="system.xml" hash="41f0cabf687c23355456729b91375009"/></dir></dir></dir></target></contents>
 
16
  <compatible/>
17
+ <dependencies/>
18
  </package>