sisowpayment - Version 4.3.3

Version Notes

Ebill fix

Release Info

Developer	Magento Core Team
Extension	sisowpayment
Version	4.3.3
Comparing to
See all releases

Code changes from version 4.3.2 to 4.3.3

Files changed (3) hide show

app/code/local/Sisow/Model/Observer/Sendebill.php +8 -4
app/code/local/Sisow/controllers/CheckoutController.php +2 -8
package.xml +8 -17

app/code/local/Sisow/Model/Observer/Sendebill.php CHANGED Viewed

	@@ -5,15 +5,16 @@ class Sisow_Model_Observer_Sendebill
5	{
6	$order = $observer->getEvent()->getOrder();
7
8	- if( $order->getPayment()->getMethodInstance()->getCode() == 'sisow_ebill')
9	{
10	$arg = array();
11	$base = Mage::getModel('sisow/base');
12
13	- $base->payment = 'ebill';
14
15	$arg['billing_firstname'] = $order->getBillingAddress()->getFirstname();
16	$arg['billing_lastname'] = $order->getBillingAddress()->getLastname();

17	$arg['testmode'] = (Mage::getStoreConfig('payment/sisow_ebill/testmode')) ? 'true' : 'false';
18	$arg['days'] = Mage::getStoreConfig('payment/sisow_ebill/days');
19
	@@ -23,11 +24,12 @@ class Sisow_Model_Observer_Sendebill
23
24	$base->amount = round($order->getGrandTotal(), 2);
25	$base->purchaseId = $order->getCustomerId() . $order->getRealOrderId();
26	- $base->entranceCode = $order->getRealOrderId();

27	$base->description = $order->getRealOrderId();
28
29	$base->notifyUrl = Mage::getUrl('sisow/checkout/notify', array('_secure' => true));
30	- $base->returnUrl = Mage::~~getUrl~~(~~'sisow/checkout/return', array('_secure' => true~~));
31
32	if( ($ex = $base->TransactionRequest($arg)) < 0)
33	{
	@@ -39,9 +41,11 @@ class Sisow_Model_Observer_Sendebill
39	$comm = 'Sisow Ebill created.<br />';
40	$comm .= 'Transaction ID: ' . $base->trxId . '<br/>';
41	$st = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;

42	$payment->setAdditionalInformation('trxId', $base->trxId)
43	->setAdditionalInformation('documentId', $base->documentId)
44	->setAdditionalInformation('linkPdf', $base->GetLink(''))

45	->save();
46	$order->setState($st, $st, $comm);
47	$order->save();


5	{
6	$order = $observer->getEvent()->getOrder();
7
8	+ if( $order->getPayment()->getMethodInstance()->getCode() == 'sisow_ebill' \|\| $order->getPayment()->getMethodInstance()->getCode() == 'sisow_overboeking')
9	{
10	$arg = array();
11	$base = Mage::getModel('sisow/base');
12
13	+ $base->payment = $order->getPayment()->getMethodInstance()->getCode() == 'sisow_ebill' ? 'ebill' : 'overboeking';
14
15	$arg['billing_firstname'] = $order->getBillingAddress()->getFirstname();
16	$arg['billing_lastname'] = $order->getBillingAddress()->getLastname();
17	+ $arg['billing_countrycode'] = $order->getBillingAddress()->getCountry();
18	$arg['testmode'] = (Mage::getStoreConfig('payment/sisow_ebill/testmode')) ? 'true' : 'false';
19	$arg['days'] = Mage::getStoreConfig('payment/sisow_ebill/days');
20

24
25	$base->amount = round($order->getGrandTotal(), 2);
26	$base->purchaseId = $order->getCustomerId() . $order->getRealOrderId();
27	+ $base->entranceCode = str_replace('-', '', $order->getRealOrderId());
28	+
29	$base->description = $order->getRealOrderId();
30
31	$base->notifyUrl = Mage::getUrl('sisow/checkout/notify', array('_secure' => true));
32	+ $base->returnUrl = Mage::getBaseUrl();
33
34	if( ($ex = $base->TransactionRequest($arg)) < 0)
35	{

41	$comm = 'Sisow Ebill created.<br />';
42	$comm .= 'Transaction ID: ' . $base->trxId . '<br/>';
43	$st = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
44	+ $invalidchar = strpos($order->getRealOrderId(), '-') !== FALSE ? 'true' : 'false';
45	$payment->setAdditionalInformation('trxId', $base->trxId)
46	->setAdditionalInformation('documentId', $base->documentId)
47	->setAdditionalInformation('linkPdf', $base->GetLink(''))
48	+ ->setAdditionalInformation('invalidchar', $invalidchar)
49	->save();
50	$order->setState($st, $st, $comm);
51	$order->save();

app/code/local/Sisow/controllers/CheckoutController.php CHANGED Viewed

	@@ -77,14 +77,8 @@ class Sisow_CheckoutController extends Mage_Core_Controller_Front_Action
77	exit;
78	}
79
80	- ~~$sha = sha1~~($~~trxid . $~~orderid . ~~$status . Mage::getStoreConfig('sisow_core/merchantid'~~) ~~. Mage::getStoreConfig('sisow_core/merchantkey'~~));
81	-
82	- if($sha != $_GET['sha1'])
83	- {
84	- echo 'Incorrect URL';
85	- Mage::log($orderid . ": NotifyUrl couldn't be authorised (request uri: ".$_SERVER['REQUEST_URI'].')', null, 'log_sisow.log');
86	- exit;
87	- }
88
89	/*
90	* Sisow


77	exit;
78	}
79
80	+ if(strlen($orderid > 9))
81	+ $orderid = substr($orderid, 0, 9) . "-" . substr($orderid, 9);






82
83	/*
84	* Sisow

package.xml CHANGED Viewed

@@ -1,27 +1,18 @@
             <?xml version="1.0"?>
             <package>
                 <name>sisowpayment</name>
-            -
                <version>4.3.2</version>
                 <stability>stable</stability>
                 <license/>
                 <channel>community</channel>
                 <extends/>
-            -
                <summary>This plug-in contains all the payment options from Sisow.</summary>
-            -
                <description>This plug-in contains the following payment methods:&#xD;
-            -
            Achteraf Betalen(Focum)&#xD;
-            -
            Bankwire&#xD;
-            -
            Creditcard (Maestro/MasterCard/Visa)&#xD;
-            -
            Ebill&#xD;
-            -
            iDEAL&#xD;
-            -
            Klarna Account&#xD;
-            -
            Klarna Invoice&#xD;
-            -
            MisterCash&#xD;
-            -
            Sofort</description>
-            -
                <notes>Fix: refund on manually generated invoice</notes>
-            -
                <authors><author><name>Sisow</name><user>auto-converted</user><email>support@sisow.nl</email></author></authors>
-            -
                <date>2015-06-29</date>
-            -
                <time>06:53:43</time>
-            -
                <contents><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="bd2ef07e171945a0784a8ee8b79362bb"/></dir></target><target name="mageetc"><dir name="modules"><file name="Sisow.xml" hash="7da3fbd82a48d5428b8c723bafbb946b"/></dir></target><target name="magelocal"><dir name="Sisow"><dir name="Block"><dir name="Adminhtml"><file name="Notice.php" hash="56154d92843b3c8a205837010405923e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="c086b64c05012dc579ee54fb6e50c5a3"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="c7b7b19d5f2d2c5fbd07f355f8f57f9e"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="ccfaa67f45416ab398ec55ea7356b537"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="a715f52568aa5f4a42a65437be3d0fb8"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="2158794a5836acedc765900403649b16"/></dir></dir></dir><dir name="Paymentmethod"><file name="Creditcard.php" hash="bddf58a2a12dae02e5061b04e68345da"/><file name="Default.php" hash="b1c2947be1e0e731a5aea8757f038018"/><file name="DefaultInfo.php" hash="12bc768b15a910295c911f4790ae936a"/><file name="Eps.php" hash="561dd123d17e0b8b44c8d365d0bc4e00"/><file name="Focum.php" hash="cc242ee202d45176ff1265ca445ec937"/><file name="Giropay.php" hash="712d77e79fcab547ca5544b7e6b2807f"/><file name="Ideal.php" hash="45d11ae70ca002c9c2f10431d65f388e"/><file name="IdealInfo.php" hash="f2be70b33ab781c89a25c4be6f738067"/><file name="Klarna.php" hash="8b529f2c376fd78888b91d8d73339118"/><file name="Klarnaacc.php" hash="2923d73bb1a9b8ad712d7671c6012e37"/><file name="Overboeking.php" hash="87050fba1fb782fce9e02e5c8095ef2e"/></dir><file name="Redirect.php" hash="b2e5c13b798b253c02e44d47857f65cc"/></dir><dir name="Helper"><file name="Data.php" hash="42c4a6fdcc9e0c827829f54144775fb6"/><file name="Paymentfee.php" hash="44f51f6166d85f0d6df2348c094ba0aa"/></dir><dir name="Model"><dir name="Config"><file name="Autoinvoice.php" hash="d4edbab951b4b16e8ccab660bbee8fda"/><file name="GeneralAutoinvoice.php" hash="603d830548bf012631fa0e0f00738802"/><file name="Newordermail.php" hash="b0225e1243442e4c1df1ea4eaab72c5c"/><file name="NewordermailMethod.php" hash="41813afa9531be21163c6a4c1550b759"/></dir><dir name="Methods"><file name="Abstract.php" hash="c9019e661566e87877031a14d2681cc4"/><file name="Ebill.php" hash="b4e00783ca4854a4a13e2f4ed78e0e77"/><file name="Eps.php" hash="2e167aa5f5de19e61372b82eefc43c40"/><file name="Focum.php" hash="8802d0c495c6188340391d0d6f5faa0c"/><file name="Giropay.php" hash="e9c83931c3d1491ff14d12288c4f6348"/><file name="Ideal.php" hash="26275c27874cd4e1eb32b7d59540c65e"/><file name="Klarna.php" hash="46a92a6a29e51e2e152389475e77d025"/><file name="Klarnaacc.php" hash="6905ba077eab559fe4d24a864e0ed416"/><file name="Maestro.php" hash="7372b9babeb8e60e6e7de39a6a249747"/><file name="Mastercard.php" hash="f09053c2dd9581aa094063254178207f"/><file name="Mistercash.php" hash="f56cfae23c74791432cef1e50733829c"/><file name="Overboeking.php" hash="028a8cb928c8fe1fd84645a5427ceae1"/><file name="Paypalec.php" hash="8f802ac3efc8709ab17e130671b1c8dd"/><file name="Sofort.php" hash="f9ebf43bda7ffd62582c869a5ba5014b"/><file name="Visa.php" hash="0214e927261846df04892bdf2c048792"/><file name="WebshopGiftcard.php" hash="3ea06c83b6c0d1f87f1d61dcbf3a55c7"/></dir><dir name="Observer"><file name="Order.php" hash="e5e0ce8e5a05c3c2f87d3893b9932be8"/><file name="Paymentfee.php" hash="78835217b2b6875e14da8b6630c21456"/><file name="Sendebill.php" hash="3042553c46184cea135d9e527055092c"/><file name="Submit.php" hash="47aa5da33f953cf9363f05578b2850fe"/></dir><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="2340fd22ec6597f5fad53d9faea2d9fe"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="cec95df39f550cd70e6eb63b16cfb627"/></dir><file name="Tax.php" hash="5fba21bc05a7ed55b3c57ccb4b2790b5"/><file name="Total.php" hash="b77c63f1173d2112056a782490968cf6"/></dir><dir name="Quote"><file name="Quote.php" hash="838ad691a2da75b942a8ef41c2815a9a"/><file name="TaxTotal.php" hash="bd7cd2a16dc3dbc8c7a3c82746a0f671"/><file name="Total.php" hash="d2c8afd1ec4c96b6215ae28766e18177"/></dir></dir><file name="Base.php" hash="3a0cb9d55f7faeb7d5feca0a109157b0"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="eb415c1b7ca547226c6c9721a01a0219"/><file name="NotifyController.php" hash="4793822e1b937191ace1f2925038082f"/></dir><dir name="etc"><file name="config.xml" hash="75bd39c2d21962d9f9a5744379c79a7d"/><file name="system.xml" hash="26b9ad4d30b9a172fbe2991dc1083d62"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sisow"><dir name="adminhtml"><file name="notice.phtml" hash="7fa2d76678ad34eae48516fd757c30df"/></dir><dir name="checkout"><file name="default_info.phtml" hash="558581601de86afce3bd62ea50de7a4e"/><file name="ideal_info.phtml" hash="864ee0e16191ef6dca5c18522172b51c"/></dir><file name="form.phtml" hash="0dc40ad38b62218d6f947674312b7a61"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="sisow"><dir name="checkout"><file name="default_form.phtml" hash="200cebfa46ff85c95fdc0cedda4441a4"/><file name="default_info.phtml" hash="94eeee994f2f21dc36489f6b7824e616"/><file name="eps_form.phtml" hash="a202c60fba2712e9f677fa0ba6034068"/><file name="focum_form.phtml" hash="e1076aadcee16249baaf0b5e4c079d1a"/><file name="giropay_form.phtml" hash="64100a34bd184137a52be2bf18f78478"/><file name="ideal_form.phtml" hash="37f399e0cd922e70586a3be6a00f76a3"/><file name="ideal_info.phtml" hash="88e15559e2f0cca9744b4dae1a81a1ea"/><file name="klarna_form.phtml" hash="8a232f3e8f6e3bcf453298a922dd26bf"/><file name="klarnaacc_form.phtml" hash="c2e32986bbd9a95bea23b1ff8d49ef0e"/><file name="overboeking_form.phtml" hash="164e244d6df230f20f460012fc72a7d8"/></dir><dir name="paymentfee"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir></dir><file name="form.phtml" hash="8874a0713c384d1346f6ae713f2cb9bd"/><file name="formecare.phtml" hash="0de41387de5f0c8d35066c0f30e113c2"/><file name="formovb.phtml" hash="20da22a0ef4384411bf971ff133a6a2c"/></dir></dir><dir name="layout"><file name="sisow.xml" hash="bc2d1b353ba1597e72e1087967cc5275"/></dir></dir></dir></dir></target></contents>
                 <compatible/>
                 <dependencies/>
             </package>


1	<?xml version="1.0"?>
2	<package>
3	<name>sisowpayment</name>
4	+ <version>4.3.3</version>
5	<stability>stable</stability>
6	<license/>
7	<channel>community</channel>
8	<extends/>
9	+ <summary>Update 4.3.3 for Sisow plug-in</summary>
10	+ <description>Fix: Ebill - sign</description>
11	+ <notes>Ebill fix</notes>
12	+ <authors><author><name>Sisow</name><user>auto-converted</user><email>info@sisow.nl</email></author></authors>
13	+ <date>2015-07-17</date>
14	+ <time>14:25:37</time>
15	+ <contents><target name="magelocal"><dir name="Sisow"><dir name="Block"><dir name="Adminhtml"><file name="Notice.php" hash="56154d92843b3c8a205837010405923e"/></dir><dir name="Paymentfee"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="Totals.php" hash="c086b64c05012dc579ee54fb6e50c5a3"/></dir></dir></dir><dir name="Checkout"><file name="Fee.php" hash="c7b7b19d5f2d2c5fbd07f355f8f57f9e"/></dir><dir name="Creditmemo"><file name="Totals.php" hash="ccfaa67f45416ab398ec55ea7356b537"/></dir><dir name="Invoice"><dir name="Totals"><file name="Fee.php" hash="a715f52568aa5f4a42a65437be3d0fb8"/></dir></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="2158794a5836acedc765900403649b16"/></dir></dir></dir><dir name="Paymentmethod"><file name="Creditcard.php" hash="bddf58a2a12dae02e5061b04e68345da"/><file name="Default.php" hash="b1c2947be1e0e731a5aea8757f038018"/><file name="DefaultInfo.php" hash="12bc768b15a910295c911f4790ae936a"/><file name="Eps.php" hash="561dd123d17e0b8b44c8d365d0bc4e00"/><file name="Focum.php" hash="cc242ee202d45176ff1265ca445ec937"/><file name="Giropay.php" hash="712d77e79fcab547ca5544b7e6b2807f"/><file name="Ideal.php" hash="45d11ae70ca002c9c2f10431d65f388e"/><file name="IdealInfo.php" hash="f2be70b33ab781c89a25c4be6f738067"/><file name="Klarna.php" hash="8b529f2c376fd78888b91d8d73339118"/><file name="Klarnaacc.php" hash="2923d73bb1a9b8ad712d7671c6012e37"/><file name="Overboeking.php" hash="87050fba1fb782fce9e02e5c8095ef2e"/></dir><file name="Redirect.php" hash="b2e5c13b798b253c02e44d47857f65cc"/></dir><dir name="Helper"><file name="Data.php" hash="42c4a6fdcc9e0c827829f54144775fb6"/><file name="Paymentfee.php" hash="44f51f6166d85f0d6df2348c094ba0aa"/></dir><dir name="Model"><dir name="Config"><file name="Autoinvoice.php" hash="d4edbab951b4b16e8ccab660bbee8fda"/><file name="GeneralAutoinvoice.php" hash="603d830548bf012631fa0e0f00738802"/><file name="Newordermail.php" hash="b0225e1243442e4c1df1ea4eaab72c5c"/><file name="NewordermailMethod.php" hash="41813afa9531be21163c6a4c1550b759"/></dir><dir name="Methods"><file name="Abstract.php" hash="c9019e661566e87877031a14d2681cc4"/><file name="Ebill.php" hash="b4e00783ca4854a4a13e2f4ed78e0e77"/><file name="Eps.php" hash="2e167aa5f5de19e61372b82eefc43c40"/><file name="Focum.php" hash="8802d0c495c6188340391d0d6f5faa0c"/><file name="Giropay.php" hash="e9c83931c3d1491ff14d12288c4f6348"/><file name="Ideal.php" hash="26275c27874cd4e1eb32b7d59540c65e"/><file name="Klarna.php" hash="46a92a6a29e51e2e152389475e77d025"/><file name="Klarnaacc.php" hash="6905ba077eab559fe4d24a864e0ed416"/><file name="Maestro.php" hash="7372b9babeb8e60e6e7de39a6a249747"/><file name="Mastercard.php" hash="f09053c2dd9581aa094063254178207f"/><file name="Mistercash.php" hash="f56cfae23c74791432cef1e50733829c"/><file name="Overboeking.php" hash="028a8cb928c8fe1fd84645a5427ceae1"/><file name="Paypalec.php" hash="8f802ac3efc8709ab17e130671b1c8dd"/><file name="Sofort.php" hash="f9ebf43bda7ffd62582c869a5ba5014b"/><file name="Visa.php" hash="0214e927261846df04892bdf2c048792"/><file name="WebshopGiftcard.php" hash="3ea06c83b6c0d1f87f1d61dcbf3a55c7"/></dir><dir name="Observer"><file name="Order.php" hash="e5e0ce8e5a05c3c2f87d3893b9932be8"/><file name="Paymentfee.php" hash="78835217b2b6875e14da8b6630c21456"/><file name="Sendebill.php" hash="aa38728aef65c0a887365f6af9b24fc3"/><file name="Submit.php" hash="47aa5da33f953cf9363f05578b2850fe"/></dir><dir name="Paymentfee"><dir name="Creditmemo"><file name="Total.php" hash="2340fd22ec6597f5fad53d9faea2d9fe"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="cec95df39f550cd70e6eb63b16cfb627"/></dir><file name="Tax.php" hash="5fba21bc05a7ed55b3c57ccb4b2790b5"/><file name="Total.php" hash="b77c63f1173d2112056a782490968cf6"/></dir><dir name="Quote"><file name="Quote.php" hash="838ad691a2da75b942a8ef41c2815a9a"/><file name="TaxTotal.php" hash="bd7cd2a16dc3dbc8c7a3c82746a0f671"/><file name="Total.php" hash="d2c8afd1ec4c96b6215ae28766e18177"/></dir></dir><file name="Base.php" hash="3a0cb9d55f7faeb7d5feca0a109157b0"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="46833ec9cdd686f1bab64c31fff5b62b"/><file name="NotifyController.php" hash="4793822e1b937191ace1f2925038082f"/></dir><dir name="etc"><file name="config.xml" hash="75bd39c2d21962d9f9a5744379c79a7d"/><file name="system.xml" hash="26b9ad4d30b9a172fbe2991dc1083d62"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sisow"><dir name="adminhtml"><file name="notice.phtml" hash="7fa2d76678ad34eae48516fd757c30df"/></dir><dir name="checkout"><file name="default_info.phtml" hash="558581601de86afce3bd62ea50de7a4e"/><file name="ideal_info.phtml" hash="864ee0e16191ef6dca5c18522172b51c"/></dir><file name="form.phtml" hash="0dc40ad38b62218d6f947674312b7a61"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="sisow.xml" hash="bc2d1b353ba1597e72e1087967cc5275"/></dir><dir name="template"><dir name="sisow"><dir name="checkout"><file name="default_form.phtml" hash="200cebfa46ff85c95fdc0cedda4441a4"/><file name="default_info.phtml" hash="94eeee994f2f21dc36489f6b7824e616"/><file name="eps_form.phtml" hash="a202c60fba2712e9f677fa0ba6034068"/><file name="focum_form.phtml" hash="e1076aadcee16249baaf0b5e4c079d1a"/><file name="giropay_form.phtml" hash="64100a34bd184137a52be2bf18f78478"/><file name="ideal_form.phtml" hash="37f399e0cd922e70586a3be6a00f76a3"/><file name="ideal_info.phtml" hash="88e15559e2f0cca9744b4dae1a81a1ea"/><file name="klarna_form.phtml" hash="8a232f3e8f6e3bcf453298a922dd26bf"/><file name="klarnaacc_form.phtml" hash="c2e32986bbd9a95bea23b1ff8d49ef0e"/><file name="overboeking_form.phtml" hash="164e244d6df230f20f460012fc72a7d8"/></dir><dir name="paymentfee"><dir name="checkout"><file name="fee.phtml" hash="79362bab3963195ad6727d077fe87b11"/></dir></dir><file name="form.phtml" hash="8874a0713c384d1346f6ae713f2cb9bd"/><file name="formecare.phtml" hash="0de41387de5f0c8d35066c0f30e113c2"/><file name="formovb.phtml" hash="20da22a0ef4384411bf971ff133a6a2c"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Sisow.xml" hash="7da3fbd82a48d5428b8c723bafbb946b"/></dir></target><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="bd2ef07e171945a0784a8ee8b79362bb"/></dir></target></contents>









16	<compatible/>
17	<dependencies/>
18	</package>