Version Notes
- Added shipping address when registering transaction
Download this release
Release Info
Developer | Cardgate BV |
Extension | Cardgate_Cgp |
Version | 1.2.0 |
Comparing to | |
See all releases |
Code changes from version 1.1.15 to 1.2.0
app/code/local/Cardgate/Cgp/Model/Base.php
CHANGED
@@ -335,7 +335,7 @@ class Cardgate_Cgp_Model_Base extends Varien_Object {
|
|
335 |
$complete = false;
|
336 |
$newState = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
|
337 |
$newStatus = $statusPending;
|
338 |
-
$statusMessage = Mage::helper( 'cgp' )->__( '
|
339 |
break;
|
340 |
case "100":
|
341 |
$complete = false;
|
335 |
$complete = false;
|
336 |
$newState = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
|
337 |
$newStatus = $statusPending;
|
338 |
+
$statusMessage = Mage::helper( 'cgp' )->__( 'Transaction in progress.' );
|
339 |
break;
|
340 |
case "100":
|
341 |
$complete = false;
|
app/code/local/Cardgate/Cgp/Model/Gateway/Abstract.php
CHANGED
@@ -313,6 +313,7 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
313 |
$order->setEmailSent( true );
|
314 |
}
|
315 |
$customer = $order->getBillingAddress();
|
|
|
316 |
|
317 |
$s_arr = array();
|
318 |
$s_arr['language'] = $this->getConfigData( 'lang' );
|
@@ -377,11 +378,11 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
377 |
);
|
378 |
}
|
379 |
|
|
|
|
|
380 |
// add shipping
|
381 |
if ( $order->getShippingAmount() > 0 ) {
|
382 |
|
383 |
-
$tax_info = $order->getFullTaxInfo();
|
384 |
-
|
385 |
$flags = 8;
|
386 |
if ( ! isset( $tax_info[0]['percent'] ) ) {
|
387 |
$tax_rate = 0;
|
@@ -452,16 +453,27 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
452 |
$cartpricetotal += ceil( ( $cartitem['price'] * $cartitem['quantity'] ) * 100 );
|
453 |
$cartvattotal += ceil( ( $cartitem['vat_amount'] * $cartitem['quantity'] ) * 100 );
|
454 |
}
|
455 |
-
if ( $cartpricetotal != ceil( $order->getGrandTotal() * 100 )
|
|
|
456 |
$cartitems[] = array(
|
457 |
'quantity' => '1',
|
458 |
'sku' => 'cg-correction',
|
459 |
'name' => 'Correction',
|
460 |
-
'price' => sprintf( '%01.2f',
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
461 |
'vat_amount' => sprintf( '%01.2f', ( ceil( $order->getTaxAmount() * 100 ) / 100 ) - ( $cartvattotal / 100 ) ),
|
462 |
-
// 'vat' => 0,
|
463 |
'vat_inc' => 1,
|
464 |
-
'type' =>
|
465 |
);
|
466 |
}
|
467 |
|
@@ -576,8 +588,10 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
576 |
|
577 |
$s_arr['siteid'] = $this->getConfigData( 'site_id' );
|
578 |
$s_arr['ref'] = $order->getIncrementId();
|
|
|
579 |
$s_arr['first_name'] = $customer->getFirstname();
|
580 |
$s_arr['last_name'] = $customer->getLastname();
|
|
|
581 |
$s_arr['email'] = $order->getCustomerEmail();
|
582 |
$s_arr['address'] = $customer->getStreet( 1 ) . ( $customer->getStreet( 2 ) ? ', ' . $customer->getStreet( 2 ) : '' );
|
583 |
$s_arr['city'] = $customer->getCity();
|
@@ -586,6 +600,18 @@ abstract class Cardgate_Cgp_Model_Gateway_Abstract extends Mage_Payment_Model_Me
|
|
586 |
$s_arr['phone_number'] = $customer->getTelephone();
|
587 |
$s_arr['state'] = $customer->getRegionCode();
|
588 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
589 |
if ( $this->getConfigData( 'use_backoffice_urls' ) == false ) {
|
590 |
$s_arr['return_url'] = Mage::getUrl( 'cgp/standard/success/', array(
|
591 |
'_secure' => true
|
313 |
$order->setEmailSent( true );
|
314 |
}
|
315 |
$customer = $order->getBillingAddress();
|
316 |
+
$ship_customer = $order->getShippingAddress();
|
317 |
|
318 |
$s_arr = array();
|
319 |
$s_arr['language'] = $this->getConfigData( 'lang' );
|
378 |
);
|
379 |
}
|
380 |
|
381 |
+
$tax_info = $order->getFullTaxInfo();
|
382 |
+
|
383 |
// add shipping
|
384 |
if ( $order->getShippingAmount() > 0 ) {
|
385 |
|
|
|
|
|
386 |
$flags = 8;
|
387 |
if ( ! isset( $tax_info[0]['percent'] ) ) {
|
388 |
$tax_rate = 0;
|
453 |
$cartpricetotal += ceil( ( $cartitem['price'] * $cartitem['quantity'] ) * 100 );
|
454 |
$cartvattotal += ceil( ( $cartitem['vat_amount'] * $cartitem['quantity'] ) * 100 );
|
455 |
}
|
456 |
+
if ( $cartpricetotal != ceil( $order->getGrandTotal() * 100 )) {
|
457 |
+
$iCorrectionAmount = ( ceil( $order->getGrandTotal() * 100 ) / 100 ) - ( $cartpricetotal / 100 );
|
458 |
$cartitems[] = array(
|
459 |
'quantity' => '1',
|
460 |
'sku' => 'cg-correction',
|
461 |
'name' => 'Correction',
|
462 |
+
'price' => sprintf( '%01.2f', $iCorrectionAmount ),
|
463 |
+
'vat_amount' => 0,
|
464 |
+
'vat' => 0,
|
465 |
+
'vat_inc' => 1,
|
466 |
+
'type' => ( $iCorrectionAmount > 0 ) ? 1 : 4
|
467 |
+
);
|
468 |
+
}
|
469 |
+
if ( $cartvattotal != ceil( $order->getTaxAmount() * 100 ) ) {
|
470 |
+
$cartitems[] = array(
|
471 |
+
'quantity' => '1',
|
472 |
+
'sku' => 'cg-vatcorrection',
|
473 |
+
'name' => 'VAT Correction',
|
474 |
'vat_amount' => sprintf( '%01.2f', ( ceil( $order->getTaxAmount() * 100 ) / 100 ) - ( $cartvattotal / 100 ) ),
|
|
|
475 |
'vat_inc' => 1,
|
476 |
+
'type' => 7
|
477 |
);
|
478 |
}
|
479 |
|
588 |
|
589 |
$s_arr['siteid'] = $this->getConfigData( 'site_id' );
|
590 |
$s_arr['ref'] = $order->getIncrementId();
|
591 |
+
|
592 |
$s_arr['first_name'] = $customer->getFirstname();
|
593 |
$s_arr['last_name'] = $customer->getLastname();
|
594 |
+
$s_arr['company_name'] = $customer->getCompany();
|
595 |
$s_arr['email'] = $order->getCustomerEmail();
|
596 |
$s_arr['address'] = $customer->getStreet( 1 ) . ( $customer->getStreet( 2 ) ? ', ' . $customer->getStreet( 2 ) : '' );
|
597 |
$s_arr['city'] = $customer->getCity();
|
600 |
$s_arr['phone_number'] = $customer->getTelephone();
|
601 |
$s_arr['state'] = $customer->getRegionCode();
|
602 |
|
603 |
+
// CURO protocol... because..
|
604 |
+
$s_arr['shipto_firstname'] = $ship_customer->getFirstname();
|
605 |
+
$s_arr['shipto_lastname'] = $ship_customer->getLastname();
|
606 |
+
$s_arr['shipto_company'] = $ship_customer->getCompany();
|
607 |
+
$s_arr['shipto_email'] = $ship_customer->getEmail();
|
608 |
+
$s_arr['shipto_address'] = $ship_customer->getStreet( 1 ) . ( $ship_customer->getStreet( 2 ) ? ', ' . $ship_customer->getStreet( 2 ) : '' );
|
609 |
+
$s_arr['shipto_city'] = $ship_customer->getCity();
|
610 |
+
$s_arr['shipto_country_id'] = $ship_customer->getCountry();
|
611 |
+
$s_arr['shipto_zipcode'] = $ship_customer->getPostcode();
|
612 |
+
$s_arr['shipto_phone'] = $ship_customer->getTelephone();
|
613 |
+
$s_arr['shipto_state'] = $ship_customer->getRegionCode();
|
614 |
+
|
615 |
if ( $this->getConfigData( 'use_backoffice_urls' ) == false ) {
|
616 |
$s_arr['return_url'] = Mage::getUrl( 'cgp/standard/success/', array(
|
617 |
'_secure' => true
|
app/code/local/Cardgate/Cgp/etc/adminhtml.xml
CHANGED
@@ -17,7 +17,7 @@
|
|
17 |
<config>
|
18 |
<children>
|
19 |
<cgp_options>
|
20 |
-
<title>CardGate
|
21 |
</cgp_options>
|
22 |
</children>
|
23 |
</config>
|
17 |
<config>
|
18 |
<children>
|
19 |
<cgp_options>
|
20 |
+
<title>CardGate Settings</title>
|
21 |
</cgp_options>
|
22 |
</children>
|
23 |
</config>
|
app/code/local/Cardgate/Cgp/etc/config.xml
CHANGED
@@ -10,7 +10,7 @@
|
|
10 |
<config>
|
11 |
<modules>
|
12 |
<Cardgate_Cgp>
|
13 |
-
<version>1.
|
14 |
</Cardgate_Cgp>
|
15 |
</modules>
|
16 |
|
10 |
<config>
|
11 |
<modules>
|
12 |
<Cardgate_Cgp>
|
13 |
+
<version>1.2.0</version>
|
14 |
</Cardgate_Cgp>
|
15 |
</modules>
|
16 |
|
package.xml
CHANGED
@@ -1,19 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Cardgate_Cgp</name>
|
4 |
-
<version>1.
|
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 Payment Module</summary>
|
10 |
<description>Card Gate is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
|
11 |
-
<notes>- Added
|
12 |
-
- Flagged PHP5.3 compatibility</notes>
|
13 |
<authors><author><name>Cardgate BV</name><user>cardgateplus</user><email>support@cardgate.com</email></author></authors>
|
14 |
-
<date>2016-
|
15 |
-
<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="76f3cf838d2f620fce0e515bab119705"/><file name="Cardgate_Cgp.csv.from_package" hash="c3f92e7f8c8a62cbe26075ef113294d9"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzCardgate_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="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir><dir name="form"><file name="banktransfer.phtml" hash="ff7a2a827a7b7a5ed9bcb5d484c30c68"/><file name="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="e2876171abf8e94d7b77a47ce9279561"/><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="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Version.php" hash="763fe8ee500ef1ed7db22c4f81e83b96"/></dir></dir></dir></dir><dir name="Form"><file name="Banktransfer.php" hash="be49e1b58910ee33b329badaa9fc85ce"/><file name="Ideal.php" hash="24a367e9b73955b3579438cb5eec213c"/><file name="Klarna.php" hash="c66cbcc135151dcc4337d22fc0552a46"/><file name="Klarnaaccount.php" hash="77e35328922bfb232f93896b77367c1e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="7b2d199e11a13936213e87a54bc09e5c"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="07e72679dc8ddd5f7e2db9e24bb76aa6"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="87021e3b682c1abf1ae95e173730023a"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="40c399761dccfd494d7cfb439447c5e3"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="0cde857c2b7f33cdb5927143a98f0958"/></dir></dir></dir><file name="Redirect.php" hash="2f854d58133eebad7f128a08d799f7ef"/></dir><dir name="Helper"><file name="Data.php" hash="ed47b3c61a5e701e1683a7717c6b8ef1"/><file name="Paymentfee.php" hash="23700e6d5f7f96f149214679fa6ed614"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Languages.php" hash="fb24871559fa1ce2613438ad5613a196"/><file name="Modes.php" hash="678a822a7f0c0665fc696c44937825be"/><file name="Orderstatus.php" hash="610ca9cedb01e329d821f4e407e5bfc8"/><file name="Version.php" hash="818a7ae5f4126fbb0c8fc76376e03c65"/></dir></dir></dir></dir><file name="Base.php" hash="
|
17 |
<compatible/>
|
18 |
<dependencies><required><php><min>5.3.0</min><max>7.1.0</max></php></required></dependencies>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Cardgate_Cgp</name>
|
4 |
+
<version>1.2.0</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 Payment Module</summary>
|
10 |
<description>Card Gate is a Payment Service Provider from the Netherlands. We offer various payment methods against competitive rates.</description>
|
11 |
+
<notes>- Added shipping address when registering transaction</notes>
|
|
|
12 |
<authors><author><name>Cardgate BV</name><user>cardgateplus</user><email>support@cardgate.com</email></author></authors>
|
13 |
+
<date>2016-10-12</date>
|
14 |
+
<time>09:01:47</time>
|
15 |
+
<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="76f3cf838d2f620fce0e515bab119705"/><file name="Cardgate_Cgp.csv.from_package" hash="c3f92e7f8c8a62cbe26075ef113294d9"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZzCardgate_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="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir><dir name="form"><file name="banktransfer.phtml" hash="ff7a2a827a7b7a5ed9bcb5d484c30c68"/><file name="ideal.phtml" hash="42fdfee86ba3a098f5f73e9240332581"/><file name="klarna.phtml" hash="e2876171abf8e94d7b77a47ce9279561"/><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="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Version.php" hash="763fe8ee500ef1ed7db22c4f81e83b96"/></dir></dir></dir></dir><dir name="Form"><file name="Banktransfer.php" hash="be49e1b58910ee33b329badaa9fc85ce"/><file name="Ideal.php" hash="24a367e9b73955b3579438cb5eec213c"/><file name="Klarna.php" hash="c66cbcc135151dcc4337d22fc0552a46"/><file name="Klarnaaccount.php" hash="77e35328922bfb232f93896b77367c1e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="7b2d199e11a13936213e87a54bc09e5c"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="07e72679dc8ddd5f7e2db9e24bb76aa6"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="87021e3b682c1abf1ae95e173730023a"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="40c399761dccfd494d7cfb439447c5e3"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="0cde857c2b7f33cdb5927143a98f0958"/></dir></dir></dir><file name="Redirect.php" hash="2f854d58133eebad7f128a08d799f7ef"/></dir><dir name="Helper"><file name="Data.php" hash="ed47b3c61a5e701e1683a7717c6b8ef1"/><file name="Paymentfee.php" hash="23700e6d5f7f96f149214679fa6ed614"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Source"><file name="Languages.php" hash="fb24871559fa1ce2613438ad5613a196"/><file name="Modes.php" hash="678a822a7f0c0665fc696c44937825be"/><file name="Orderstatus.php" hash="610ca9cedb01e329d821f4e407e5bfc8"/><file name="Version.php" hash="818a7ae5f4126fbb0c8fc76376e03c65"/></dir></dir></dir></dir><file name="Base.php" hash="148a6ac88e58c0d9f4c09b4f8d1515ad"/><dir name="Gateway"><file name="Abstract.php" hash="02ec5a271341d53e30d291214f681ba9"/><file name="Afterpay.php" hash="054b525c972119fd330291776c2550ac"/><file name="Americanexpress.php" hash="705926d7a69fb889f54185743f4cac9f"/><file name="Banktransfer.php" hash="d4d5712ab327c418ee2d949e49faee01"/><file name="Bitcoin.php" hash="001420be0c8d665d905bcc79275e989e"/><file name="Cartebancaire.php" hash="451bff78fa26e4bae883d0c18ca1f844"/><file name="Cartebleue.php" hash="b7974f8f8e655daaf50a899d15cc15fd"/><file name="Default.php" hash="dd934ee60d32000773f26be805d46925"/><file name="Directdebit.php" hash="7890209183bab5f47edcca60a19cd007"/><file name="Giropay.php" hash="ea35629ddfd08cd341128af6d95c8911"/><file name="Ideal.php" hash="1b5b6318c3e544659f465fdbc463fa51"/><file name="Klarna.php" hash="901891d606ea469296e75251fc7abe14"/><file name="Klarnaaccount.php" hash="4d85440b0df2df05ec001c6a5d7416dd"/><file name="Maestro.php" hash="c29f0bd00282c992017a2487d12d8bda"/><file name="Mastercard.php" hash="3febe4f0ee3cc630cd959e8ce086d2ee"/><file name="Mistercash.php" hash="d618b6ab14ffa5d9810cf65232b6d2a3"/><file name="Paypal.php" hash="ad4600fdc877a84a6a4f8647ae2587df"/><file name="Przelewy24.php" hash="f49bfa8354fa2bce2add3221a04843cf"/><file name="Sofortbanking.php" hash="544531b74c8fd34e7ccd48a32210d81f"/><file name="Visa.php" hash="50cbf582c2b5192923d290fcbec35870"/><file name="Vpay.php" hash="acf7d286f343b4e663a55a8540bf45d2"/><file name="Webmoney.php" hash="72a36f0854db4c02e0477208b47faccf"/></dir><file name="Observer.php" hash="72363edbe183cfa833e276f0e3cda200"/><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="5191056c5dae3862c2a468acd3e5cbac"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="314df1d94874fcb856af2e0be4019782"/></dir><file name="Tax.php" hash="dc485fa37d31e13e20f578cb58075486"/><file name="Total.php" hash="f26e4dc51d0e510eb1c2c65750dec92b"/></dir><dir name="Quote"><file name="Quote.php" hash="d09d4d5c4b55770b0a50f80f0a5fa643"/><file name="TaxTotal.php" hash="a1f53b6ed1988364aa396b3bd7afa1e0"/><file name="Total.php" hash="a525e84dc0d62a4ca073a7ddb80f162b"/></dir></dir></dir><dir name="controllers"><file name="StandardController.php" hash="3a613e0268c5d42d733fbb17df2ed171"/></dir><dir name="etc"><file name="adminhtml.xml" hash="4fbe66b7e79dde67d6ac3c764230b109"/><file name="config.xml" hash="fbeb05229592c9f462ccd1765c24086f"/><file name="system.xml" hash="06d8bfa170c034bfd40219beb6a71479"/></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>7.1.0</max></php></required></dependencies>
|
18 |
</package>
|