Version Notes
- Moved validation messages from session to quote to prevent issues with secure cookies
Download this release
Release Info
Developer | Avenla Oy |
Extension | Avenla_KlarnaCheckout |
Version | 1.1.6 |
Comparing to | |
See all releases |
Code changes from version 1.1.5 to 1.1.6
- app/code/community/Avenla/KlarnaCheckout/Model/Validator.php +15 -3
- app/code/community/Avenla/KlarnaCheckout/controllers/KCOController.php +11 -11
- app/code/community/Avenla/KlarnaCheckout/etc/config.xml +1 -1
- app/design/frontend/base/default/template/KCO/KCO.phtml +5 -1
- lib/KlarnaCheckout/Checkout/UserAgent.php +1 -1
- package.xml +5 -6
- skin/frontend/base/default/KCO/kco.css +1 -0
app/code/community/Avenla/KlarnaCheckout/Model/Validator.php
CHANGED
@@ -52,7 +52,7 @@ class Avenla_KlarnaCheckout_Model_Validator extends Mage_Core_Model_Abstract
|
|
52 |
{
|
53 |
if(!isset($ko->shipping_address->phone) || !isset($ko->billing_address->phone)){
|
54 |
$msg = Mage::helper('klarnaCheckout')->__('Please fill in your phone number.');
|
55 |
-
|
56 |
return false;
|
57 |
}
|
58 |
|
@@ -63,17 +63,29 @@ class Avenla_KlarnaCheckout_Model_Validator extends Mage_Core_Model_Abstract
|
|
63 |
|
64 |
if (!$quote->isVirtual() && (!$method || !$rate)){
|
65 |
$msg = Mage::helper('sales')->__('Please specify a shipping method.');
|
66 |
-
|
67 |
return false;
|
68 |
}
|
69 |
|
70 |
if($quote->getShippingAddress()->getPostcode() != $ko->shipping_address->postal_code){
|
71 |
$msg = Mage::helper('klarnaCheckout')->__('Please use the same post code for your quote and Klarna.');
|
72 |
-
|
73 |
return false;
|
74 |
}
|
75 |
}
|
76 |
|
77 |
return true;
|
78 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
79 |
}
|
52 |
{
|
53 |
if(!isset($ko->shipping_address->phone) || !isset($ko->billing_address->phone)){
|
54 |
$msg = Mage::helper('klarnaCheckout')->__('Please fill in your phone number.');
|
55 |
+
$this->setErrorMessage($quote, $msg);
|
56 |
return false;
|
57 |
}
|
58 |
|
63 |
|
64 |
if (!$quote->isVirtual() && (!$method || !$rate)){
|
65 |
$msg = Mage::helper('sales')->__('Please specify a shipping method.');
|
66 |
+
$this->setErrorMessage($quote, $msg);
|
67 |
return false;
|
68 |
}
|
69 |
|
70 |
if($quote->getShippingAddress()->getPostcode() != $ko->shipping_address->postal_code){
|
71 |
$msg = Mage::helper('klarnaCheckout')->__('Please use the same post code for your quote and Klarna.');
|
72 |
+
$this->setErrorMessage($quote, $msg);
|
73 |
return false;
|
74 |
}
|
75 |
}
|
76 |
|
77 |
return true;
|
78 |
}
|
79 |
+
|
80 |
+
/**
|
81 |
+
* Set error message to quote payment data
|
82 |
+
*
|
83 |
+
* @param Mage_Sales_Model_Quote
|
84 |
+
* @param string
|
85 |
+
*/
|
86 |
+
private function setErrorMessage($quote, $message)
|
87 |
+
{
|
88 |
+
$quote->getPayment()->setAdditionalInformation("kco_validation_message", $message);
|
89 |
+
$quote->getPayment()->save();
|
90 |
+
}
|
91 |
}
|
app/code/community/Avenla/KlarnaCheckout/controllers/KCOController.php
CHANGED
@@ -35,6 +35,9 @@ class Avenla_KlarnaCheckout_KCOController extends Mage_Core_Controller_Front_Act
|
|
35 |
|
36 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
37 |
$kco = Mage::getModel('klarnaCheckout/KCO');
|
|
|
|
|
|
|
38 |
|
39 |
if (!$quote->validateMinimumAmount()){
|
40 |
$minimumAmount = Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())
|
@@ -81,6 +84,10 @@ class Avenla_KlarnaCheckout_KCOController extends Mage_Core_Controller_Front_Act
|
|
81 |
if ($quote->getShippingAddress()->getShippingMethod() == null)
|
82 |
$result['msg'] = $this->__("Please select shipping method to use Klarna Checkout");
|
83 |
}
|
|
|
|
|
|
|
|
|
84 |
$result['klarnaframe'] = $ko['gui']['snippet'];
|
85 |
}
|
86 |
}
|
@@ -128,21 +135,14 @@ class Avenla_KlarnaCheckout_KCOController extends Mage_Core_Controller_Front_Act
|
|
128 |
public function validationAction()
|
129 |
{
|
130 |
$validator = Mage::getModel('klarnaCheckout/validator');
|
131 |
-
|
132 |
$ko = $validator->parseValidationPost();
|
133 |
$quote = Mage::getModel("sales/quote")->load($ko->merchant_reference->orderid1);
|
134 |
|
135 |
-
if(
|
136 |
-
|
137 |
-
|
138 |
-
|
139 |
-
Mage::getSingleton('core/session')->setSessionId($_GET['sid']);
|
140 |
-
header("HTTP/1.0 303 See Other");
|
141 |
-
Mage::app()->getFrontController()->getResponse()->setRedirect(
|
142 |
-
Mage::helper('checkout/url')->getCartUrl()
|
143 |
-
)->sendResponse();
|
144 |
}
|
145 |
-
exit();
|
146 |
}
|
147 |
|
148 |
/**
|
35 |
|
36 |
$quote = Mage::getSingleton('checkout/session')->getQuote();
|
37 |
$kco = Mage::getModel('klarnaCheckout/KCO');
|
38 |
+
|
39 |
+
$validationMessage = $quote->getPayment()->getAdditionalInformation("kco_validation_message");
|
40 |
+
$quote->getPayment()->setAdditionalInformation("kco_validation_message", null);
|
41 |
|
42 |
if (!$quote->validateMinimumAmount()){
|
43 |
$minimumAmount = Mage::app()->getLocale()->currency(Mage::app()->getStore()->getCurrentCurrencyCode())
|
84 |
if ($quote->getShippingAddress()->getShippingMethod() == null)
|
85 |
$result['msg'] = $this->__("Please select shipping method to use Klarna Checkout");
|
86 |
}
|
87 |
+
|
88 |
+
if($validationMessage)
|
89 |
+
$result['validationMsg'] = $validationMessage;
|
90 |
+
|
91 |
$result['klarnaframe'] = $ko['gui']['snippet'];
|
92 |
}
|
93 |
}
|
135 |
public function validationAction()
|
136 |
{
|
137 |
$validator = Mage::getModel('klarnaCheckout/validator');
|
|
|
138 |
$ko = $validator->parseValidationPost();
|
139 |
$quote = Mage::getModel("sales/quote")->load($ko->merchant_reference->orderid1);
|
140 |
|
141 |
+
if(!$validator->validateQuote($quote, $ko)){
|
142 |
+
$this->getResponse()
|
143 |
+
->setHttpResponseCode(303)
|
144 |
+
->setHeader('Location', Mage::getUrl('checkout/cart'));
|
|
|
|
|
|
|
|
|
|
|
145 |
}
|
|
|
146 |
}
|
147 |
|
148 |
/**
|
app/code/community/Avenla/KlarnaCheckout/etc/config.xml
CHANGED
@@ -23,7 +23,7 @@
|
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Avenla_KlarnaCheckout>
|
26 |
-
<version>1.1.
|
27 |
</Avenla_KlarnaCheckout>
|
28 |
</modules>
|
29 |
<global>
|
23 |
<config>
|
24 |
<modules>
|
25 |
<Avenla_KlarnaCheckout>
|
26 |
+
<version>1.1.6</version>
|
27 |
</Avenla_KlarnaCheckout>
|
28 |
</modules>
|
29 |
<global>
|
app/design/frontend/base/default/template/KCO/KCO.phtml
CHANGED
@@ -60,11 +60,15 @@
|
|
60 |
else{
|
61 |
$('klarnaMsg').update('').hide();
|
62 |
$('klarnaOverlay').hide();
|
|
|
|
|
|
|
|
|
63 |
}
|
64 |
|
65 |
if(response.klarnaframe){
|
66 |
$('klarnaFrame').update(response.klarnaframe);
|
67 |
-
waitForKlarna();
|
68 |
}
|
69 |
}
|
70 |
});
|
60 |
else{
|
61 |
$('klarnaMsg').update('').hide();
|
62 |
$('klarnaOverlay').hide();
|
63 |
+
|
64 |
+
if(response.validationMsg){
|
65 |
+
$('klarnaMsg').update('<h2 class="kco-validation-message">'+ response.validationMsg +'</h2>').show();
|
66 |
+
}
|
67 |
}
|
68 |
|
69 |
if(response.klarnaframe){
|
70 |
$('klarnaFrame').update(response.klarnaframe);
|
71 |
+
//waitForKlarna();
|
72 |
}
|
73 |
}
|
74 |
});
|
lib/KlarnaCheckout/Checkout/UserAgent.php
CHANGED
@@ -66,7 +66,7 @@ class Klarna_Checkout_UserAgent
|
|
66 |
),
|
67 |
'Module' => array(
|
68 |
'name' => 'KlarnaCheckout.MagentoModule',
|
69 |
-
'version' => '1.1.
|
70 |
)
|
71 |
);
|
72 |
}
|
66 |
),
|
67 |
'Module' => array(
|
68 |
'name' => 'KlarnaCheckout.MagentoModule',
|
69 |
+
'version' => '1.1.6'
|
70 |
)
|
71 |
);
|
72 |
}
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Avenla_KlarnaCheckout</name>
|
4 |
-
<version>1.1.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://productdownloads.avenla.com/magento-modules/klarna-checkout/">Custom license by Avenla Oy</license>
|
7 |
<channel>community</channel>
|
@@ -11,12 +11,11 @@
|
|
11 |

|
12 |
For questions and support - klarna-support@avenla.com
|
13 |
</description>
|
14 |
-
<notes>-
|
15 |
-
- Fixed reservation cancellation when partially invoiced order is canceled</notes>
|
16 |
<authors><author><name>Avenla Oy</name><user>Avenla</user><email>info@avenla.fi</email></author></authors>
|
17 |
-
<date>2015-06-
|
18 |
-
<time>
|
19 |
-
<contents><target name="magecommunity"><dir name="Avenla"><dir name="KlarnaCheckout"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Field"><file name="Pclass.php" hash="85f4411a44787934e4a4c0a7873cc7a2"/></dir><dir name="Fieldset"><file name="Info.php" hash="5ad648a3c67970d45f18b40df0a42df7"/></dir></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="Price.php" hash="15be72dbe2723bb2d72c6977abd4d8a7"/></dir></dir><dir name="KCO"><file name="Confirmation.php" hash="57515baadc5229ac55654913b88e6d28"/><file name="Info.php" hash="2af961abb2eb0609b84f8da5281332ad"/><file name="Newsletter.php" hash="8d02745a2c814101ae61b2bf00e8901e"/></dir><file name="KCO.php" hash="1abf22f4408a872572c1f8babed730d6"/><dir name="Widgets"><file name="Logo.php" hash="cddd29b3e350d1639db3808a83ad80e8"/><file name="Methods.php" hash="05cf4a02e055559dc591124bfd95d836"/></dir></dir><dir name="Helper"><file name="Api.php" hash="40f14b72afdcf758b97b564ebe27d0c6"/><file name="Data.php" hash="0f7f08e3ce78bd529ff666ecf57f9dea"/></dir><dir name="Model"><file name="Api.php" hash="4b8df889010e056b373700015f774b26"/><file name="Config.php" hash="582de5bd8c3c21f344634197f0f3866e"/><file name="KCO.php" hash="f342cec50252eafdc55b730174e72fb7"/><file name="Newsletter.php" hash="902340e5e0641b7b374036c71eb6c7e5"/><file name="Observer.php" hash="18c25fb69adc89ba018a3f1ceccdaf2f"/><file name="Order.php" hash="28bd04f709d0f2b6f24045470900cd52"/><dir name="Source"><file name="AnalyticsType.php" hash="ad52d555ff3cd3cd18e760b2d7ac242a"/><file name="Countries.php" hash="8b10dc9e7f8e3a09122d60501621c777"/><file name="Kcolayout.php" hash="9ece6e53ebb4e39e3c1d4d534d71cb27"/><file name="Orderlocale.php" hash="b34cf50525696d07e932d5024acc5f99"/><file name="Pplayout.php" hash="455484dbea2ff0770aa17e42851b81a6"/><file name="Ppwidget.php" hash="4e1de2ee86a2f5bf5100e211bc01b8f2"/><file name="Servermode.php" hash="df4420b3831b1a1e1ec04daa53711a4d"/><file name="Shippingmethods.php" hash="fecb931e29be4ae008c678cc1d760a02"/><file name="Taxclass.php" hash="c770ce5721c820c27895580e4d2de4b1"/></dir><file name="Validator.php" hash="cb8148baee0988c4a59eb6d9c5b1989d"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="KCOController.php" hash="f7c15ba5e99541a2e5d9693ad6325c7b"/></dir><file name="CartController.php" hash="891403418045004e6c047c0173dc7c6a"/><file name="KCOController.php" hash="37236dc0da3e3e67df45f97e43f702d6"/></dir><dir name="etc"><file name="config.xml" hash="57e6fee03a23605533be5a67b8a62ef6"/><file name="system.xml" hash="58be525b560516ddf049e48d157aee78"/><file name="widget.xml" hash="3dbffcaef836b334f5e7c1c675738275"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="KCO"><file name="info.phtml" hash="92048d26b2b4f751e4c83ddddab89448"/><dir name="system"><dir name="config"><dir name="field"><file name="pclass.phtml" hash="8566542d14d0dce48dc6aabaf5181007"/></dir><dir name="fieldset"><file name="info.phtml" hash="a7b2c13acb0f852c358a9852f51fdae6"/></dir></dir></dir></dir></dir><dir name="layout"><file name="KCO.xml" hash="4a9068eefb3de4a964cdf1e462832ebe"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="KCO"><file name="KCO.phtml" hash="c71d63a2599d086c0937cbd23426d20b"/><dir name="cart"><file name="crosssell.phtml" hash="e7f78cb99e14ab680b794524b8666812"/><file name="giftmessage.phtml" hash="4cb99583d6ce811a3a576a6e20ff0f99"/><dir name="item"><file name="default.phtml" hash="9190b3fad2f2ed57ea2ffbed2e1faa02"/></dir><file name="shipping.phtml" hash="b940c98adec4e3fd455ffc04094a1a4f"/></dir><file name="cart.phtml" hash="4d0d54548f1a20ed359f8e517767d233"/><file name="cart_twocolumns.phtml" hash="6e296c790b5c3a96cdb313ee4829b977"/><dir name="catalog"><dir name="product"><file name="price.phtml" hash="8f32fd038bed9521f6f576d736408ca9"/></dir></dir><file name="info.phtml" hash="a87d8ee70c92a10445fa864a63d042ba"/><file name="link.phtml" hash="d2c3dac8b2cde4b52854019e990b3b11"/><file name="newsletter.phtml" hash="87c3730ed525d3810a5df0a9180bf993"/><dir name="onepage"><file name="link.phtml" hash="a05ab2ebf5f0ed225c2f3967e2bceced"/></dir><dir name="widget"><file name="methods.phtml" hash="7415fafbd8f2acf134c4ac81c30f4bd4"/></dir></dir></dir><dir name="layout"><file name="KCO.xml" hash="519b9bd7c8018423aeb003a04897191f"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Klarna"><file name="Country.php" hash="40360c3964fc6193e7fb922845eb419b"/><file name="Currency.php" hash="a709407428d86521cc0775cbeb281523"/><file name="Encoding.php" hash="f8f8e744303ff7ce7f4b226331e7bdcf"/><file name="Exceptions.php" hash="933b2811e910da817743766cdde8ffeb"/><file name="Flags.php" hash="b407a1373adf5f172bef3e3d01e81cdb"/><file name="Klarna.php" hash="c92501977a6fc642715045a49e29b50a"/><file name="Language.php" hash="8e40aed0dece8f0a3fbe07e37451af16"/><dir name="checkout"><file name="checkouthtml.intf.php" hash="81e0740254585f2af67895df28093d35"/><file name="threatmetrix.class.php" hash="6ce1bfded90b6b3bb329176ff4c7acac"/></dir><dir name="examples"><file name="activate.php" hash="85a84a8eaeec830949551dfd98fe0236"/><file name="activateInvoice.php" hash="cfac2ed57d0c79679fb35ca723eaffab"/><file name="activatePart.php" hash="b46475c2d9f5b326ff2cd65586a1de6e"/><file name="activateReservation.php" hash="bd9b0e5717eaa32ebf6b5d31ad66e5d4"/><file name="addTransaction.php" hash="6426b7965de733bb17ddc7f74ee3949f"/><file name="calc_monthly_cost.php" hash="30e78c4d40db82643396f9289749a898"/><file name="cancelReservation.php" hash="ae8d00e19c671f6cfe8454a5bb590ab1"/><file name="changeReservation.php" hash="43d9486d29326a8c33a4fda466612149"/><file name="checkOrderStatus.php" hash="bef76f120b3e486790d78b50f4101701"/><file name="creditInvoice.php" hash="8edca171c9f7be2a3c15b23ff166048e"/><file name="creditPart.php" hash="5497b9307da7cccadbf4a6c0dc943876"/><file name="deleteInvoice.php" hash="6d2a6e53c64e7a1aacb79c775a46da5b"/><file name="emailInvoice.php" hash="764fbd5fab4f52dacd767a3f7ac17234"/><file name="fetchPClasses.php" hash="aac08dc4d9cfece6ac9e9a9c4e7b20cc"/><file name="getAddresses.php" hash="ebd79224ea702c92e99a407a53d42da0"/><file name="getPClasses.php" hash="8e444c98a7c63b82512af1f4ce35ac65"/><file name="invoiceAddress.php" hash="97475403b1db4264c0add60930380434"/><file name="invoiceAmount.php" hash="2f5dc326549b179cf99c27518b715e88"/><file name="invoicePartAmount.php" hash="87bf68e855bfdd4f6ba3547091104c97"/><file name="reserveAmount.php" hash="1a97ef5c39f5a2c6d97660504cbbfa10"/><file name="reserveOCR.php" hash="9349b5ea9807060cba4b5f3fcd14369f"/><file name="returnAmount.php" hash="02caca4d76b6d055d504023c770961a4"/><file name="sendInvoice.php" hash="9139eef562746840d09f9d9d5a465c21"/><file name="splitReservation.php" hash="0e09421de645d97c3b74485d51edacfd"/><file name="update.php" hash="3e3561165f4c6727731afe451b0f87d6"/><file name="updateChargeAmount.php" hash="34de26a7f6a089bdb18f67eae1f903c7"/><file name="updateGoodsQty.php" hash="e4f9ee36f56b47924ba35cda500cf13e"/><file name="updateOrderNo.php" hash="cdd594a386072f7bffbf05d2ecdcb9b7"/></dir><file name="klarnaaddr.php" hash="b090d4b0a819fdb7cc58815a8643de18"/><file name="klarnacalc.php" hash="3ab728bf3889240b881f282122fd25fd"/><file name="klarnaconfig.php" hash="a3a4011dccda60fcf3567f56254699ff"/><file name="klarnapclass.php" hash="26a8fd1df0806788f6719cb894787f76"/><dir name="pclasses"><file name="jsonstorage.class.php" hash="e59e526d9dcc17d1ca92ded188750672"/><file name="mysqlstorage.class.php" hash="896a5cd4edf461ef517e0bb2e328707b"/><file name="sqlstorage.class.php" hash="bb7ba4359e7e69424c9f0ecdafc0c9ae"/><file name="storage.intf.php" hash="26db57484b6db3d717c0150ffaa87b19"/><file name="xmlstorage.class.php" hash="4f13939bf8d73f2724f858dd17f219de"/></dir><dir name="transport"><dir name="xmlrpc-3.0.0.beta"><dir name="lib"><file name="xmlrpc.inc" hash="5a74ea2a831648febc9b2c8f809b252c"/><file name="xmlrpc_wrappers.inc" hash="5aa00141ead09fc5498d9a3c9fcab888"/><file name="xmlrpcs.inc" hash="158b97bda79333e9b40793d876b6e98f"/></dir></dir></dir></dir><dir name="KlarnaCheckout"><dir name="Checkout"><file name="BasicConnector.php" hash="e15b4e83aa79afa7c98dbbfb865d7a7a"/><file name="ConnectionErrorException.php" hash="e07a9ccb71869c98036b085b146171fa"/><file name="Connector.php" hash="5378924b60a858f14a41882a8c90c6bc"/><file name="ConnectorException.php" hash="b4304fc99da372305dc4ad40e849a4a9"/><file name="ConnectorInterface.php" hash="f7e0c91db42f54cc4a9858cc1ef47e1a"/><file name="Digest.php" hash="28bde4dc8443bbcc5ad7d04ea9d9c5eb"/><file name="Exception.php" hash="43b4516fe4fe5aa98e1f9b382f504ab7"/><dir name="HTTP"><file name="CURLFactory.php" hash="7fa2aecea60eaf467b1965d2335935d9"/><file name="CURLHandle.php" hash="0b7d459eec95a0f17f420d0493e828bc"/><file name="CURLHandleInterface.php" hash="ddcf0889e242f1f15e6df047386e8403"/><file name="CURLHeaders.php" hash="0807a7b2e579490e08576b4d30f1d1d8"/><file name="CURLTransport.php" hash="a50ed245e0246b6ecc27042bd457bb86"/><file name="Request.php" hash="d7718e7e503a8b4c355aff2b31d0c174"/><file name="Response.php" hash="6be76eb703d424b77e9ea1b37f4825f2"/><file name="Transport.php" hash="c8dd8f3560c310dc78b84bfa057419b5"/><file name="TransportInterface.php" hash="8395efa365907d216633370d79d5380b"/></dir><file name="Order.php" hash="29309d953e7b3b3ae411a6ee913410d9"/><file name="ResourceInterface.php" hash="93a56d28ccf5a29010fb33f15d53ae32"/><file name="UserAgent.php" hash="5a8f6a191192b12087189414abf29790"/></dir><file name="Checkout.php" hash="e28fbfb7516e27bb792d7b3fba8c8853"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="KCO"><file name="dropdown.png" hash="a408e177ff3130bdb4bb491935700df4"/><file name="kco.css" hash="293485490a353852b62c2ede827da28b"/><file name="klarna_simplifying.png" hash="280abffdadbbd0d372a8505c4c83a9e8"/><file name="loader.gif" hash="5e51d58f5d9bd09ab814d9ca9347d3b9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Avenla_KlarnaCheckout.xml" hash="22b47fd5cc2c12370457a51ffff752d6"/></dir></target><target name="magelocale"><dir name="fi_FI"><file name="Avenla_KlarnaCheckout.csv" hash="686c17ac49097e2db47ac73303e63237"/></dir></target></contents>
|
20 |
<compatible/>
|
21 |
<dependencies><required><php><min>5.2.16</min><max>6.0.0</max></php></required></dependencies>
|
22 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Avenla_KlarnaCheckout</name>
|
4 |
+
<version>1.1.6</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://productdownloads.avenla.com/magento-modules/klarna-checkout/">Custom license by Avenla Oy</license>
|
7 |
<channel>community</channel>
|
11 |

|
12 |
For questions and support - klarna-support@avenla.com
|
13 |
</description>
|
14 |
+
<notes>- Moved validation messages from session to quote to prevent issues with secure cookies</notes>
|
|
|
15 |
<authors><author><name>Avenla Oy</name><user>Avenla</user><email>info@avenla.fi</email></author></authors>
|
16 |
+
<date>2015-06-22</date>
|
17 |
+
<time>06:48:23</time>
|
18 |
+
<contents><target name="magecommunity"><dir name="Avenla"><dir name="KlarnaCheckout"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Field"><file name="Pclass.php" hash="85f4411a44787934e4a4c0a7873cc7a2"/></dir><dir name="Fieldset"><file name="Info.php" hash="5ad648a3c67970d45f18b40df0a42df7"/></dir></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="Price.php" hash="15be72dbe2723bb2d72c6977abd4d8a7"/></dir></dir><dir name="KCO"><file name="Confirmation.php" hash="57515baadc5229ac55654913b88e6d28"/><file name="Info.php" hash="2af961abb2eb0609b84f8da5281332ad"/><file name="Newsletter.php" hash="8d02745a2c814101ae61b2bf00e8901e"/></dir><file name="KCO.php" hash="1abf22f4408a872572c1f8babed730d6"/><dir name="Widgets"><file name="Logo.php" hash="cddd29b3e350d1639db3808a83ad80e8"/><file name="Methods.php" hash="05cf4a02e055559dc591124bfd95d836"/></dir></dir><dir name="Helper"><file name="Api.php" hash="40f14b72afdcf758b97b564ebe27d0c6"/><file name="Data.php" hash="0f7f08e3ce78bd529ff666ecf57f9dea"/></dir><dir name="Model"><file name="Api.php" hash="4b8df889010e056b373700015f774b26"/><file name="Config.php" hash="582de5bd8c3c21f344634197f0f3866e"/><file name="KCO.php" hash="f342cec50252eafdc55b730174e72fb7"/><file name="Newsletter.php" hash="902340e5e0641b7b374036c71eb6c7e5"/><file name="Observer.php" hash="18c25fb69adc89ba018a3f1ceccdaf2f"/><file name="Order.php" hash="28bd04f709d0f2b6f24045470900cd52"/><dir name="Source"><file name="AnalyticsType.php" hash="ad52d555ff3cd3cd18e760b2d7ac242a"/><file name="Countries.php" hash="8b10dc9e7f8e3a09122d60501621c777"/><file name="Kcolayout.php" hash="9ece6e53ebb4e39e3c1d4d534d71cb27"/><file name="Orderlocale.php" hash="b34cf50525696d07e932d5024acc5f99"/><file name="Pplayout.php" hash="455484dbea2ff0770aa17e42851b81a6"/><file name="Ppwidget.php" hash="4e1de2ee86a2f5bf5100e211bc01b8f2"/><file name="Servermode.php" hash="df4420b3831b1a1e1ec04daa53711a4d"/><file name="Shippingmethods.php" hash="fecb931e29be4ae008c678cc1d760a02"/><file name="Taxclass.php" hash="c770ce5721c820c27895580e4d2de4b1"/></dir><file name="Validator.php" hash="3962b04b46cea94f1ab10087221b9f28"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="KCOController.php" hash="f7c15ba5e99541a2e5d9693ad6325c7b"/></dir><file name="CartController.php" hash="891403418045004e6c047c0173dc7c6a"/><file name="KCOController.php" hash="a2583f4e864ede823f9c3c55c7c9c4cb"/></dir><dir name="etc"><file name="config.xml" hash="06df81610739036d0f365587440d5910"/><file name="system.xml" hash="58be525b560516ddf049e48d157aee78"/><file name="widget.xml" hash="3dbffcaef836b334f5e7c1c675738275"/></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="KCO"><file name="info.phtml" hash="92048d26b2b4f751e4c83ddddab89448"/><dir name="system"><dir name="config"><dir name="field"><file name="pclass.phtml" hash="8566542d14d0dce48dc6aabaf5181007"/></dir><dir name="fieldset"><file name="info.phtml" hash="a7b2c13acb0f852c358a9852f51fdae6"/></dir></dir></dir></dir></dir><dir name="layout"><file name="KCO.xml" hash="4a9068eefb3de4a964cdf1e462832ebe"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="KCO"><file name="KCO.phtml" hash="985bd2eb4a74405ddd7096507a1b1226"/><dir name="cart"><file name="crosssell.phtml" hash="e7f78cb99e14ab680b794524b8666812"/><file name="giftmessage.phtml" hash="4cb99583d6ce811a3a576a6e20ff0f99"/><dir name="item"><file name="default.phtml" hash="9190b3fad2f2ed57ea2ffbed2e1faa02"/></dir><file name="shipping.phtml" hash="b940c98adec4e3fd455ffc04094a1a4f"/></dir><file name="cart.phtml" hash="4d0d54548f1a20ed359f8e517767d233"/><file name="cart_twocolumns.phtml" hash="6e296c790b5c3a96cdb313ee4829b977"/><dir name="catalog"><dir name="product"><file name="price.phtml" hash="8f32fd038bed9521f6f576d736408ca9"/></dir></dir><file name="info.phtml" hash="a87d8ee70c92a10445fa864a63d042ba"/><file name="link.phtml" hash="d2c3dac8b2cde4b52854019e990b3b11"/><file name="newsletter.phtml" hash="87c3730ed525d3810a5df0a9180bf993"/><dir name="onepage"><file name="link.phtml" hash="a05ab2ebf5f0ed225c2f3967e2bceced"/></dir><dir name="widget"><file name="methods.phtml" hash="7415fafbd8f2acf134c4ac81c30f4bd4"/></dir></dir></dir><dir name="layout"><file name="KCO.xml" hash="519b9bd7c8018423aeb003a04897191f"/></dir></dir></dir></dir></target><target name="magelib"><dir name="Klarna"><file name="Country.php" hash="40360c3964fc6193e7fb922845eb419b"/><file name="Currency.php" hash="a709407428d86521cc0775cbeb281523"/><file name="Encoding.php" hash="f8f8e744303ff7ce7f4b226331e7bdcf"/><file name="Exceptions.php" hash="933b2811e910da817743766cdde8ffeb"/><file name="Flags.php" hash="b407a1373adf5f172bef3e3d01e81cdb"/><file name="Klarna.php" hash="c92501977a6fc642715045a49e29b50a"/><file name="Language.php" hash="8e40aed0dece8f0a3fbe07e37451af16"/><dir name="checkout"><file name="checkouthtml.intf.php" hash="81e0740254585f2af67895df28093d35"/><file name="threatmetrix.class.php" hash="6ce1bfded90b6b3bb329176ff4c7acac"/></dir><dir name="examples"><file name="activate.php" hash="85a84a8eaeec830949551dfd98fe0236"/><file name="activateInvoice.php" hash="cfac2ed57d0c79679fb35ca723eaffab"/><file name="activatePart.php" hash="b46475c2d9f5b326ff2cd65586a1de6e"/><file name="activateReservation.php" hash="bd9b0e5717eaa32ebf6b5d31ad66e5d4"/><file name="addTransaction.php" hash="6426b7965de733bb17ddc7f74ee3949f"/><file name="calc_monthly_cost.php" hash="30e78c4d40db82643396f9289749a898"/><file name="cancelReservation.php" hash="ae8d00e19c671f6cfe8454a5bb590ab1"/><file name="changeReservation.php" hash="43d9486d29326a8c33a4fda466612149"/><file name="checkOrderStatus.php" hash="bef76f120b3e486790d78b50f4101701"/><file name="creditInvoice.php" hash="8edca171c9f7be2a3c15b23ff166048e"/><file name="creditPart.php" hash="5497b9307da7cccadbf4a6c0dc943876"/><file name="deleteInvoice.php" hash="6d2a6e53c64e7a1aacb79c775a46da5b"/><file name="emailInvoice.php" hash="764fbd5fab4f52dacd767a3f7ac17234"/><file name="fetchPClasses.php" hash="aac08dc4d9cfece6ac9e9a9c4e7b20cc"/><file name="getAddresses.php" hash="ebd79224ea702c92e99a407a53d42da0"/><file name="getPClasses.php" hash="8e444c98a7c63b82512af1f4ce35ac65"/><file name="invoiceAddress.php" hash="97475403b1db4264c0add60930380434"/><file name="invoiceAmount.php" hash="2f5dc326549b179cf99c27518b715e88"/><file name="invoicePartAmount.php" hash="87bf68e855bfdd4f6ba3547091104c97"/><file name="reserveAmount.php" hash="1a97ef5c39f5a2c6d97660504cbbfa10"/><file name="reserveOCR.php" hash="9349b5ea9807060cba4b5f3fcd14369f"/><file name="returnAmount.php" hash="02caca4d76b6d055d504023c770961a4"/><file name="sendInvoice.php" hash="9139eef562746840d09f9d9d5a465c21"/><file name="splitReservation.php" hash="0e09421de645d97c3b74485d51edacfd"/><file name="update.php" hash="3e3561165f4c6727731afe451b0f87d6"/><file name="updateChargeAmount.php" hash="34de26a7f6a089bdb18f67eae1f903c7"/><file name="updateGoodsQty.php" hash="e4f9ee36f56b47924ba35cda500cf13e"/><file name="updateOrderNo.php" hash="cdd594a386072f7bffbf05d2ecdcb9b7"/></dir><file name="klarnaaddr.php" hash="b090d4b0a819fdb7cc58815a8643de18"/><file name="klarnacalc.php" hash="3ab728bf3889240b881f282122fd25fd"/><file name="klarnaconfig.php" hash="a3a4011dccda60fcf3567f56254699ff"/><file name="klarnapclass.php" hash="26a8fd1df0806788f6719cb894787f76"/><dir name="pclasses"><file name="jsonstorage.class.php" hash="e59e526d9dcc17d1ca92ded188750672"/><file name="mysqlstorage.class.php" hash="896a5cd4edf461ef517e0bb2e328707b"/><file name="sqlstorage.class.php" hash="bb7ba4359e7e69424c9f0ecdafc0c9ae"/><file name="storage.intf.php" hash="26db57484b6db3d717c0150ffaa87b19"/><file name="xmlstorage.class.php" hash="4f13939bf8d73f2724f858dd17f219de"/></dir><dir name="transport"><dir name="xmlrpc-3.0.0.beta"><dir name="lib"><file name="xmlrpc.inc" hash="5a74ea2a831648febc9b2c8f809b252c"/><file name="xmlrpc_wrappers.inc" hash="5aa00141ead09fc5498d9a3c9fcab888"/><file name="xmlrpcs.inc" hash="158b97bda79333e9b40793d876b6e98f"/></dir></dir></dir></dir><dir name="KlarnaCheckout"><dir name="Checkout"><file name="BasicConnector.php" hash="e15b4e83aa79afa7c98dbbfb865d7a7a"/><file name="ConnectionErrorException.php" hash="e07a9ccb71869c98036b085b146171fa"/><file name="Connector.php" hash="5378924b60a858f14a41882a8c90c6bc"/><file name="ConnectorException.php" hash="b4304fc99da372305dc4ad40e849a4a9"/><file name="ConnectorInterface.php" hash="f7e0c91db42f54cc4a9858cc1ef47e1a"/><file name="Digest.php" hash="28bde4dc8443bbcc5ad7d04ea9d9c5eb"/><file name="Exception.php" hash="43b4516fe4fe5aa98e1f9b382f504ab7"/><dir name="HTTP"><file name="CURLFactory.php" hash="7fa2aecea60eaf467b1965d2335935d9"/><file name="CURLHandle.php" hash="0b7d459eec95a0f17f420d0493e828bc"/><file name="CURLHandleInterface.php" hash="ddcf0889e242f1f15e6df047386e8403"/><file name="CURLHeaders.php" hash="0807a7b2e579490e08576b4d30f1d1d8"/><file name="CURLTransport.php" hash="a50ed245e0246b6ecc27042bd457bb86"/><file name="Request.php" hash="d7718e7e503a8b4c355aff2b31d0c174"/><file name="Response.php" hash="6be76eb703d424b77e9ea1b37f4825f2"/><file name="Transport.php" hash="c8dd8f3560c310dc78b84bfa057419b5"/><file name="TransportInterface.php" hash="8395efa365907d216633370d79d5380b"/></dir><file name="Order.php" hash="29309d953e7b3b3ae411a6ee913410d9"/><file name="ResourceInterface.php" hash="93a56d28ccf5a29010fb33f15d53ae32"/><file name="UserAgent.php" hash="830219073ecfc6579100c50da68774bd"/></dir><file name="Checkout.php" hash="e28fbfb7516e27bb792d7b3fba8c8853"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="KCO"><file name="dropdown.png" hash="a408e177ff3130bdb4bb491935700df4"/><file name="kco.css" hash="f7c155ff93c69f298210d6db230909ed"/><file name="klarna_simplifying.png" hash="280abffdadbbd0d372a8505c4c83a9e8"/><file name="loader.gif" hash="5e51d58f5d9bd09ab814d9ca9347d3b9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Avenla_KlarnaCheckout.xml" hash="22b47fd5cc2c12370457a51ffff752d6"/></dir></target><target name="magelocale"><dir name="fi_FI"><file name="Avenla_KlarnaCheckout.csv" hash="686c17ac49097e2db47ac73303e63237"/></dir></target></contents>
|
19 |
<compatible/>
|
20 |
<dependencies><required><php><min>5.2.16</min><max>6.0.0</max></php></required></dependencies>
|
21 |
</package>
|
skin/frontend/base/default/KCO/kco.css
CHANGED
@@ -1,6 +1,7 @@
|
|
1 |
#klarnaWrapper {position: relative;}
|
2 |
#klarnaOverlay{background-color:#FFF;position:absolute;height:100%;width:100%;opacity:0.5;}
|
3 |
#klarnaMsg h2{color:#1e7ec8;font-weight:bold;margin:0px;}
|
|
|
4 |
#kcoNewsLetterForm {display:block;margin: 10px 0px;}
|
5 |
.klarnaLink{margin-bottom:10px;}
|
6 |
.klarnaLink img{margin:0 auto;}
|
1 |
#klarnaWrapper {position: relative;}
|
2 |
#klarnaOverlay{background-color:#FFF;position:absolute;height:100%;width:100%;opacity:0.5;}
|
3 |
#klarnaMsg h2{color:#1e7ec8;font-weight:bold;margin:0px;}
|
4 |
+
#klarnaMsg h2.kco-validation-message{color:#fd7070;}
|
5 |
#kcoNewsLetterForm {display:block;margin: 10px 0px;}
|
6 |
.klarnaLink{margin-bottom:10px;}
|
7 |
.klarnaLink img{margin:0 auto;}
|