Version Notes
Fix: pending klarna
Download this release
Release Info
Developer | Magento Core Team |
Extension | sisowpayment |
Version | 4.2.4 |
Comparing to | |
See all releases |
Code changes from version 4.2.3 to 4.2.4
- app/code/local/Sisow/Block/Redirect.php +2 -2
- app/code/local/Sisow/Model/Base.php +1 -0
- app/code/local/Sisow/Model/Observer/Sendebill.php +4 -1
- app/design/frontend/base/default/template/sisow/checkout/eps_form.phtml +9 -2
- app/design/frontend/base/default/template/sisow/checkout/focum_form.phtml +6 -5
- app/design/frontend/base/default/template/sisow/checkout/giropay_form.phtml +7 -2
- package.xml +5 -5
app/code/local/Sisow/Block/Redirect.php
CHANGED
@@ -312,7 +312,7 @@ class Sisow_Block_Redirect extends Mage_Core_Block_Abstract
|
|
312 |
}
|
313 |
$state = Mage_Sales_Model_Order::STATE_PROCESSING;
|
314 |
$payment = $order->getPayment();
|
315 |
-
|
316 |
if ($base->pendingKlarna)
|
317 |
{
|
318 |
$state = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
|
@@ -398,7 +398,7 @@ class Sisow_Block_Redirect extends Mage_Core_Block_Abstract
|
|
398 |
$transaction->addTransaction($transaction_type);
|
399 |
}
|
400 |
|
401 |
-
if($method == 'klarna' || $method == 'klarnaacc')
|
402 |
{
|
403 |
$mail = (Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') > 0) ? Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') : Mage::getStoreConfig('sisow_core/autoinvoice');
|
404 |
if($mail > 1)
|
312 |
}
|
313 |
$state = Mage_Sales_Model_Order::STATE_PROCESSING;
|
314 |
$payment = $order->getPayment();
|
315 |
+
|
316 |
if ($base->pendingKlarna)
|
317 |
{
|
318 |
$state = Mage_Sales_Model_Order::STATE_PENDING_PAYMENT;
|
398 |
$transaction->addTransaction($transaction_type);
|
399 |
}
|
400 |
|
401 |
+
if(($method == 'klarna' || $method == 'klarnaacc') && !$base->pendingKlarna)
|
402 |
{
|
403 |
$mail = (Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') > 0) ? Mage::getStoreConfig('payment/'.$payment->getMethod().'/autoinvoice') : Mage::getStoreConfig('sisow_core/autoinvoice');
|
404 |
if($mail > 1)
|
app/code/local/Sisow/Model/Base.php
CHANGED
@@ -238,6 +238,7 @@ class Sisow_Model_Base extends Mage_Core_Model_Abstract
|
|
238 |
$pars[$k] = $v;
|
239 |
}
|
240 |
}
|
|
|
241 |
if (!$this->send("TransactionRequest", $pars))
|
242 |
return -8;
|
243 |
$this->trxId = $this->parse("trxid");
|
238 |
$pars[$k] = $v;
|
239 |
}
|
240 |
}
|
241 |
+
|
242 |
if (!$this->send("TransactionRequest", $pars))
|
243 |
return -8;
|
244 |
$this->trxId = $this->parse("trxid");
|
app/code/local/Sisow/Model/Observer/Sendebill.php
CHANGED
@@ -14,10 +14,13 @@ class Sisow_Model_Observer_Sendebill
|
|
14 |
|
15 |
$arg['billing_firstname'] = $order->getBillingAddress()->getFirstname();
|
16 |
$arg['billing_lastname'] = $order->getBillingAddress()->getLastname();
|
17 |
-
$arg['billing_mail'] = $order->getBillingAddress()->getEmail();
|
18 |
$arg['testmode'] = (Mage::getStoreConfig('payment/sisow_ebill/testmode')) ? 'true' : 'false';
|
19 |
$arg['days'] = Mage::getStoreConfig('payment/sisow_ebill/days');
|
20 |
|
|
|
|
|
|
|
|
|
21 |
$base->amount = round($order->getGrandTotal(), 2);
|
22 |
$base->purchaseId = $order->getCustomerId() . $order->getRealOrderId();
|
23 |
$base->entranceCode = $order->getRealOrderId();
|
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 |
|
20 |
+
$arg['billing_mail'] = $order->getBillingAddress()->getEmail();
|
21 |
+
if(empty($arg['billing_mail']))
|
22 |
+
$arg['billing_mail'] = $order->getCustomerEmail();
|
23 |
+
|
24 |
$base->amount = round($order->getGrandTotal(), 2);
|
25 |
$base->purchaseId = $order->getCustomerId() . $order->getRealOrderId();
|
26 |
$base->entranceCode = $order->getRealOrderId();
|
app/design/frontend/base/default/template/sisow/checkout/eps_form.phtml
CHANGED
@@ -9,13 +9,20 @@ j(document).ready(function() {
|
|
9 |
});
|
10 |
</script>
|
11 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
12 |
-
<li>
|
13 |
<?php
|
14 |
if($_paymentfee['incl'] > 0)
|
15 |
{
|
16 |
echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
|
17 |
}
|
18 |
?>
|
19 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
20 |
</li>
|
21 |
</ul>
|
9 |
});
|
10 |
</script>
|
11 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
12 |
+
<li class="form-alt">
|
13 |
<?php
|
14 |
if($_paymentfee['incl'] > 0)
|
15 |
{
|
16 |
echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
|
17 |
}
|
18 |
?>
|
19 |
+
|
20 |
+
|
21 |
+
<img src="https://www.girosolution.de/fileadmin/Downloads/Logos/eps_logo.png" width="60px">
|
22 |
+
|
23 |
+
<label for="eps_widget">Bankleitzahl <span class="required"></span></label>
|
24 |
+
<div class="input-box">
|
25 |
+
<input id="eps_widget" autocomplete="off" name="payment[sisow_eps_bic]" class="input-text required-entry"/>
|
26 |
+
</div>
|
27 |
</li>
|
28 |
</ul>
|
app/design/frontend/base/default/template/sisow/checkout/focum_form.phtml
CHANGED
@@ -1,7 +1,5 @@
|
|
1 |
<?php
|
2 |
$paymentfee = $this->getFee();
|
3 |
-
|
4 |
-
$fee = $paymentfee['incl'];
|
5 |
$phone = $this->getPhone();
|
6 |
$_code = $this->getMethodCode();
|
7 |
|
@@ -10,9 +8,12 @@ $_code = $this->getMethodCode();
|
|
10 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
11 |
<li class="form-alt">
|
12 |
<a href="https://www.achterafbetalen.nl/" target="_blank"><img src="https://www.achterafbetalen.nl/files/logo.png" alt="AchterafBetalen" width="100px"/></a>
|
13 |
-
<?php
|
14 |
-
|
15 |
-
|
|
|
|
|
|
|
16 |
|
17 |
<br/>
|
18 |
<label for="sisow_gender"><?php echo $this->__('Salutation'); ?> <span class="required"></span></label>
|
1 |
<?php
|
2 |
$paymentfee = $this->getFee();
|
|
|
|
|
3 |
$phone = $this->getPhone();
|
4 |
$_code = $this->getMethodCode();
|
5 |
|
8 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
9 |
<li class="form-alt">
|
10 |
<a href="https://www.achterafbetalen.nl/" target="_blank"><img src="https://www.achterafbetalen.nl/files/logo.png" alt="AchterafBetalen" width="100px"/></a>
|
11 |
+
<?php
|
12 |
+
if($_paymentfee['incl'] > 0)
|
13 |
+
{
|
14 |
+
echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
|
15 |
+
}
|
16 |
+
?>
|
17 |
|
18 |
<br/>
|
19 |
<label for="sisow_gender"><?php echo $this->__('Salutation'); ?> <span class="required"></span></label>
|
app/design/frontend/base/default/template/sisow/checkout/giropay_form.phtml
CHANGED
@@ -12,13 +12,18 @@ $_paymentfee = $this->getFee();
|
|
12 |
|
13 |
</script>
|
14 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
15 |
-
<li>
|
16 |
<?php
|
17 |
if($_paymentfee['incl'] > 0)
|
18 |
{
|
19 |
echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
|
20 |
}
|
21 |
?>
|
22 |
-
<
|
|
|
|
|
|
|
|
|
|
|
23 |
</li>
|
24 |
</ul>
|
12 |
|
13 |
</script>
|
14 |
<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
|
15 |
+
<li class="form-alt">
|
16 |
<?php
|
17 |
if($_paymentfee['incl'] > 0)
|
18 |
{
|
19 |
echo '<b>'. $this->__(Mage::getStoreConfig('payment/'.$_code.'/payment_fee_label')) .' ' . Mage::app()->getStore()->convertPrice($_paymentfee['incl'], true, true).'</b>';
|
20 |
}
|
21 |
?>
|
22 |
+
<img src="https://www.girosolution.de/fileadmin/Downloads/Logos/giropay_200px_color_rgb.png" width="60px">
|
23 |
+
|
24 |
+
<label for="giropay_widget">Bankleitzahl <span class="required"></span></label>
|
25 |
+
<div class="input-box">
|
26 |
+
<input id="giropay_widget" autocomplete="off" name="payment[sisow_giropay_bic]" class="input-text required-entry" />
|
27 |
+
</div>
|
28 |
</li>
|
29 |
</ul>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>sisowpayment</name>
|
4 |
-
<version>4.2.
|
5 |
<stability>stable</stability>
|
6 |
<license/>
|
7 |
<channel>community</channel>
|
@@ -17,11 +17,11 @@ Klarna Account
|
|
17 |
Klarna Invoice
|
18 |
MisterCash
|
19 |
Sofort</description>
|
20 |
-
<notes>Fix:
|
21 |
<authors><author><name>Sisow</name><user>auto-converted</user><email>support@sisow.nl</email></author></authors>
|
22 |
-
<date>2015-
|
23 |
-
<time>
|
24 |
-
<contents><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="3c34bbc6892ce908fe3880bf52866b46"/></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="
|
25 |
<compatible/>
|
26 |
<dependencies/>
|
27 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>sisowpayment</name>
|
4 |
+
<version>4.2.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license/>
|
7 |
<channel>community</channel>
|
17 |
Klarna Invoice
|
18 |
MisterCash
|
19 |
Sofort</description>
|
20 |
+
<notes>Fix: pending klarna</notes>
|
21 |
<authors><author><name>Sisow</name><user>auto-converted</user><email>support@sisow.nl</email></author></authors>
|
22 |
+
<date>2015-04-01</date>
|
23 |
+
<time>13:06:28</time>
|
24 |
+
<contents><target name="magelocale"><dir name="nl_NL"><file name="Sisow.csv" hash="3c34bbc6892ce908fe3880bf52866b46"/></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="107b2f81b466f1b9d4e22642acbbc00e"/></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="414b9f57a3e10811d4ba7eb3ca5ad227"/><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="16fcca65584580b116b0ea9a75524ce3"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="f9a7575bdd75cad75286f3901f54d0b4"/><file name="NotifyController.php" hash="4793822e1b937191ace1f2925038082f"/></dir><dir name="etc"><file name="config.xml" hash="e931b6fc3bbfe92460a48803ff7ab638"/><file name="system.xml" hash="eb7e6cb9d8d49644033a2301b71d88bd"/></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></dir></dir></target></contents>
|
25 |
<compatible/>
|
26 |
<dependencies/>
|
27 |
</package>
|