klarnapayments - Version 5.1.5

Version Notes

This version is not compatible with any Klarna module version of 4.x or earlier.

Download this release

Release Info

Developer Klarna
Extension klarnapayments
Version 5.1.5
Comparing to
See all releases


Code changes from version 5.1.0 to 5.1.5

app/code/community/Vaimo/Klarna/Block/Catalog/Product/Pricewidget.php CHANGED
@@ -60,16 +60,23 @@ class Vaimo_Klarna_Block_Catalog_Product_Pricewidget extends Mage_Core_Block_Tem
60
  $klarnaWidget = Mage::getModel('klarna/klarna_widget');
61
  $klarnaWidget->setQuote($this->getQuote(), Vaimo_Klarna_Helper_Data::KLARNA_METHOD_ACCOUNT);
62
  $klarnaSetup = $klarnaWidget->getKlarnaSetup();
63
- if($klarnaSetup->getCountryCode() != 'NL' && $klarnaSetup->getCountryCode() != 'AT') {
64
- return $klarnaSetup;
65
- } else {
66
- return NULL;
67
  }
 
68
  }
69
 
70
  public function getKlarnaInvoiceFeeInfo()
71
  {
72
- return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote());
73
  }
74
-
 
 
 
 
 
 
75
  }
60
  $klarnaWidget = Mage::getModel('klarna/klarna_widget');
61
  $klarnaWidget->setQuote($this->getQuote(), Vaimo_Klarna_Helper_Data::KLARNA_METHOD_ACCOUNT);
62
  $klarnaSetup = $klarnaWidget->getKlarnaSetup();
63
+ if ($klarnaSetup) {
64
+ if($klarnaSetup->getCountryCode() != 'NL' && $klarnaSetup->getCountryCode() != 'AT') {
65
+ return $klarnaSetup;
66
+ }
67
  }
68
+ return NULL;
69
  }
70
 
71
  public function getKlarnaInvoiceFeeInfo()
72
  {
73
+ return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote(), false);
74
  }
75
+
76
+ public function getProductPriceInclVat()
77
+ {
78
+ // @TODO This only returns Incl TAX if settings are set to Display prices including TAX... Needs to be Incl VAT, always
79
+ return Mage::helper('tax')->getPrice($this->getProduct(), $this->getProduct()->getFinalPrice(), true);
80
+ }
81
+
82
  }
app/code/community/Vaimo/Klarna/Block/Checkout/Top.php CHANGED
@@ -34,7 +34,7 @@ class Vaimo_Klarna_Block_Checkout_Top extends Mage_Checkout_Block_Cart_Abstract
34
 
35
  public function getKlarnaInvoiceFeeInfo()
36
  {
37
- return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote());
38
  }
39
 
40
  }
34
 
35
  public function getKlarnaInvoiceFeeInfo()
36
  {
37
+ return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote(), false);
38
  }
39
 
40
  }
app/code/community/Vaimo/Klarna/Block/Form/Abstract.php CHANGED
@@ -322,7 +322,7 @@ class Vaimo_Klarna_Block_Form_Abstract extends Mage_Payment_Block_Form
322
 
323
  public function getKlarnaInvoiceFeeInfo()
324
  {
325
- return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote());
326
  }
327
 
328
  public function getTermsUrlLink()
@@ -342,6 +342,7 @@ class Vaimo_Klarna_Block_Form_Abstract extends Mage_Payment_Block_Form
342
  */
343
  public function getMethodLabelAfterHtml()
344
  {
 
345
  $method = $this->getMethod()->getCode();
346
  $klarnaForm = Mage::getModel('klarna/klarna_form');
347
  $klarnaForm->setQuote($this->getQuote(), $method);
322
 
323
  public function getKlarnaInvoiceFeeInfo()
324
  {
325
+ return Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote(), false);
326
  }
327
 
328
  public function getTermsUrlLink()
342
  */
343
  public function getMethodLabelAfterHtml()
344
  {
345
+ $str = "";
346
  $method = $this->getMethod()->getCode();
347
  $klarnaForm = Mage::getModel('klarna/klarna_form');
348
  $klarnaForm->setQuote($this->getQuote(), $method);
app/code/community/Vaimo/Klarna/Helper/Data.php CHANGED
@@ -171,10 +171,10 @@ class Vaimo_Klarna_Helper_Data extends Mage_Core_Helper_Abstract
171
  *
172
  * @return bool
173
  */
174
- public function isOneStepCheckout()
175
  {
176
  $res = false;
177
- if (Mage::getStoreConfig('onestepcheckout/general/rewrite_checkout_links')) {
178
  $res = true;
179
  if (isset($_SERVER['REQUEST_URI'])) {
180
  if (stristr($_SERVER['REQUEST_URI'],'checkout/onepage')) {
@@ -203,9 +203,7 @@ class Vaimo_Klarna_Helper_Data extends Mage_Core_Helper_Abstract
203
  */
204
  public function isOneStepCheckoutTaxIncluded()
205
  {
206
- return (bool) Mage::getStoreConfig(
207
- 'onestepcheckout/general/display_tax_included'
208
- );
209
  }
210
 
211
  protected function _feePriceIncludesTax($store = null)
@@ -240,18 +238,18 @@ class Vaimo_Klarna_Helper_Data extends Mage_Core_Helper_Abstract
240
  * @param $store
241
  * @return int
242
  */
243
- protected function _getVaimoKlarnaFee($quote, $store, $force = false)
244
  {
245
  $localFee = 0;
246
  $fee = $this->_getVaimoKlarnaFeeForMethod($quote, $store, $force);
247
  if ($fee) {
248
- if ($store->getCurrentCurrency() != $store->getBaseCurrency()) {
249
  $rate = $store->getBaseCurrency()->getRate($store->getCurrentCurrency());
250
- $baseKlarnaFee = $fee / $rate;
251
  } else {
252
- $baseKlarnaFee = $fee;
253
  }
254
- $localFee = $store->roundPrice($baseKlarnaFee);
255
  }
256
  return $localFee;
257
  }
@@ -347,11 +345,11 @@ class Vaimo_Klarna_Helper_Data extends Mage_Core_Helper_Abstract
347
  *
348
  * @return float
349
  */
350
- public function getVaimoKlarnaFeeInclVat($quote)
351
  {
352
  $shippingAddress = $quote->getShippingAddress();
353
  $store = $quote->getStore();
354
- $fee = $this->_getVaimoKlarnaFee($quote, $store, true);
355
  if ($fee && !$this->_feePriceIncludesTax($store)) {
356
  $custTaxClassId = $quote->getCustomerTaxClassId();
357
  $taxCalculationModel = Mage::getSingleton('tax/calculation');
@@ -367,5 +365,51 @@ class Vaimo_Klarna_Helper_Data extends Mage_Core_Helper_Abstract
367
  return $fee;
368
  }
369
 
370
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
371
  }
171
  *
172
  * @return bool
173
  */
174
+ public function isOneStepCheckout($store = null)
175
  {
176
  $res = false;
177
+ if (Mage::getStoreConfig('onestepcheckout/general/rewrite_checkout_links', $store)) {
178
  $res = true;
179
  if (isset($_SERVER['REQUEST_URI'])) {
180
  if (stristr($_SERVER['REQUEST_URI'],'checkout/onepage')) {
203
  */
204
  public function isOneStepCheckoutTaxIncluded()
205
  {
206
+ return (bool) Mage::getStoreConfig( 'onestepcheckout/general/display_tax_included' );
 
 
207
  }
208
 
209
  protected function _feePriceIncludesTax($store = null)
238
  * @param $store
239
  * @return int
240
  */
241
+ protected function _getVaimoKlarnaFee($quote, $store, $force = false, $inBaseCurrency = true)
242
  {
243
  $localFee = 0;
244
  $fee = $this->_getVaimoKlarnaFeeForMethod($quote, $store, $force);
245
  if ($fee) {
246
+ if (!$inBaseCurrency && $store->getCurrentCurrency() != $store->getBaseCurrency()) {
247
  $rate = $store->getBaseCurrency()->getRate($store->getCurrentCurrency());
248
+ $curKlarnaFee = $fee * $rate;
249
  } else {
250
+ $curKlarnaFee = $fee;
251
  }
252
+ $localFee = $store->roundPrice($curKlarnaFee);
253
  }
254
  return $localFee;
255
  }
345
  *
346
  * @return float
347
  */
348
+ public function getVaimoKlarnaFeeInclVat($quote, $inBaseCurrency = true)
349
  {
350
  $shippingAddress = $quote->getShippingAddress();
351
  $store = $quote->getStore();
352
+ $fee = $this->_getVaimoKlarnaFee($quote, $store, true, $inBaseCurrency);
353
  if ($fee && !$this->_feePriceIncludesTax($store)) {
354
  $custTaxClassId = $quote->getCustomerTaxClassId();
355
  $taxCalculationModel = Mage::getSingleton('tax/calculation');
365
  return $fee;
366
  }
367
 
368
+ /*
369
+ * The following functions shouldn't really need to exist...
370
+ * Either I have done something wrong or the versions have changed how they work...
371
+ *
372
+ */
373
+
374
+ /*
375
+ * Add tax to grand total on invoice collect or not
376
+ */
377
+ public function collectInvoiceAddTaxToInvoice()
378
+ {
379
+ $currentVersion = Mage::getVersion();
380
+ if ((version_compare($currentVersion, '1.10.0')>=0) && (version_compare($currentVersion, '1.12.0')<0)) {
381
+ return false;
382
+ } else {
383
+ return true;
384
+ }
385
+ }
386
+
387
+ /*
388
+ * Call parent of quote collect or not
389
+ */
390
+ public function collectQuoteRunParentFunction()
391
+ {
392
+ return false; // Seems the code was wrong, this function is no longer required
393
+ $currentVersion = Mage::getVersion();
394
+ if (version_compare($currentVersion, '1.11.0')>=0) {
395
+ return true;
396
+ } else {
397
+ return false;
398
+ }
399
+ }
400
+
401
+ /*
402
+ * Use extra tax in quote instead of adding to Tax, I don't know why this has to be
403
+ * different in EE, but it clearly seems to be...
404
+ */
405
+ public function collectQuoteUseExtraTaxInCheckout()
406
+ {
407
+ return false; // Seems the code was wrong, this function is no longer required
408
+ $currentVersion = Mage::getVersion();
409
+ if (version_compare($currentVersion, '1.11.0')>=0) {
410
+ return true;
411
+ } else {
412
+ return false;
413
+ }
414
+ }
415
  }
app/code/community/Vaimo/Klarna/Model/Invoice/Tax.php CHANGED
@@ -49,6 +49,10 @@ class Vaimo_Klarna_Model_Invoice_Tax extends Mage_Sales_Model_Order_Invoice_Tota
49
  return $this;
50
  }
51
 
 
 
 
 
52
  $klarnaFeeTax = $info->getAdditionalInformation(Vaimo_Klarna_Helper_Data::KLARNA_INFO_FIELD_FEE_TAX);
53
 
54
  if (!$klarnaFeeTax){
49
  return $this;
50
  }
51
 
52
+ if (!Mage::helper('klarna')->collectInvoiceAddTaxToInvoice()) {
53
+ return $this;
54
+ }
55
+
56
  $klarnaFeeTax = $info->getAdditionalInformation(Vaimo_Klarna_Helper_Data::KLARNA_INFO_FIELD_FEE_TAX);
57
 
58
  if (!$klarnaFeeTax){
app/code/community/Vaimo/Klarna/Model/Invoice/Total.php CHANGED
@@ -62,8 +62,13 @@ class Vaimo_Klarna_Model_Invoice_Total extends Mage_Sales_Model_Order_Invoice_To
62
  $baseInvoiceTotal = $invoice->getBaseGrandTotal();
63
  $invoiceTotal = $invoice->getGrandTotal();
64
 
65
- $baseInvoiceTotal = $baseInvoiceTotal + $baseKlarnaFee + $baseKlarnaFeeTax;
66
- $invoiceTotal = $invoiceTotal + $klarnaFee + $klarnaFeeTax;
 
 
 
 
 
67
 
68
  $invoice->setBaseGrandTotal($baseInvoiceTotal);
69
  $invoice->setGrandTotal($invoiceTotal);
62
  $baseInvoiceTotal = $invoice->getBaseGrandTotal();
63
  $invoiceTotal = $invoice->getGrandTotal();
64
 
65
+ if (Mage::helper('klarna')->collectInvoiceAddTaxToInvoice()) {
66
+ $baseInvoiceTotal = $baseInvoiceTotal + $baseKlarnaFee + $baseKlarnaFeeTax;
67
+ $invoiceTotal = $invoiceTotal + $klarnaFee + $klarnaFeeTax;
68
+ } else {
69
+ $baseInvoiceTotal = $baseInvoiceTotal + $baseKlarnaFee ;
70
+ $invoiceTotal = $invoiceTotal + $klarnaFee;
71
+ }
72
 
73
  $invoice->setBaseGrandTotal($baseInvoiceTotal);
74
  $invoice->setGrandTotal($invoiceTotal);
app/code/community/Vaimo/Klarna/Model/Klarna/Tools/Abstract.php CHANGED
@@ -841,7 +841,7 @@ class Vaimo_Klarna_Model_Klarna_Tools_Abstract extends Varien_Object
841
  {
842
  $res = Mage::helper('klarna')->__($this->_getConfigData('title'));
843
  if ($this->getQuote() && $this->getMethod()==Vaimo_Klarna_Helper_Data::KLARNA_METHOD_INVOICE) {
844
- $fee = Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote());
845
  if ($fee) {
846
  $res .= ' (' . Mage::app()->getStore($this->getQuote()->getStoreId())->formatPrice($fee, false) . ')';
847
  }
@@ -870,7 +870,7 @@ class Vaimo_Klarna_Model_Klarna_Tools_Abstract extends Varien_Object
870
  {
871
  try {
872
  if (!$this->_getConfigData("active")) {
873
- Mage::throwException($this->helper('klarna')->__('Current payment method not available'));
874
  }
875
  $res = new Varien_Object(
876
  array(
841
  {
842
  $res = Mage::helper('klarna')->__($this->_getConfigData('title'));
843
  if ($this->getQuote() && $this->getMethod()==Vaimo_Klarna_Helper_Data::KLARNA_METHOD_INVOICE) {
844
+ $fee = Mage::helper('klarna')->getVaimoKlarnaFeeInclVat($this->getQuote(), false);
845
  if ($fee) {
846
  $res .= ' (' . Mage::app()->getStore($this->getQuote()->getStoreId())->formatPrice($fee, false) . ')';
847
  }
870
  {
871
  try {
872
  if (!$this->_getConfigData("active")) {
873
+ Mage::throwException(Mage::helper('klarna')->__('Current payment method not available'));
874
  }
875
  $res = new Varien_Object(
876
  array(
app/code/community/Vaimo/Klarna/Model/Klarna/Tools/Api.php CHANGED
@@ -157,8 +157,7 @@ class Vaimo_Klarna_Model_Klarna_Tools_Api extends Vaimo_Klarna_Model_Klarna_Tool
157
  protected function _getTaxRate($taxClass)
158
  {
159
  // Load the customer so we can retrevice the correct tax class id
160
- $customer = Mage::getModel('customer/customer')
161
- ->load($this->getOrder()->getCustomerId());
162
  $calculation = Mage::getSingleton('tax/calculation');
163
  $request = $calculation->getRateRequest(
164
  $this->getShippingAddress(),
157
  protected function _getTaxRate($taxClass)
158
  {
159
  // Load the customer so we can retrevice the correct tax class id
160
+ $customer = Mage::getModel('customer/customer')->load($this->getOrder()->getCustomerId());
 
161
  $calculation = Mage::getSingleton('tax/calculation');
162
  $request = $calculation->getRateRequest(
163
  $this->getShippingAddress(),
app/code/community/Vaimo/Klarna/Model/Klarna/Widget.php CHANGED
@@ -31,4 +31,12 @@ class Vaimo_Klarna_Model_Klarna_Widget extends Vaimo_Klarna_Model_Klarna_Tools_A
31
  $this->_setFunctionName('widget');
32
  }
33
 
 
 
 
 
 
 
 
 
34
  }
31
  $this->_setFunctionName('widget');
32
  }
33
 
34
+ public function getKlarnaSetup()
35
+ {
36
+ if (!$this->_getConfigData('disable_product_widget')) {
37
+ return parent::getKlarnaSetup();
38
+ } else {
39
+ return NULL;
40
+ }
41
+ }
42
  }
app/code/community/Vaimo/Klarna/Model/Payment/Abstract.php CHANGED
@@ -295,7 +295,7 @@ class Vaimo_Klarna_Model_Payment_Abstract extends Mage_Payment_Model_Method_Abst
295
  }
296
 
297
  $payment->setTransactionId($transactionId)
298
- ->setIsTransactionClosed(1);
299
  return $this;
300
  }
301
 
295
  }
296
 
297
  $payment->setTransactionId($transactionId)
298
+ ->setIsTransactionClosed(0);
299
  return $this;
300
  }
301
 
app/code/community/Vaimo/Klarna/Model/Quote/Tax.php CHANGED
@@ -32,11 +32,8 @@ class Vaimo_Klarna_Model_Quote_Tax extends Mage_Sales_Model_Quote_Address_Total_
32
 
33
  public function collect(Mage_Sales_Model_Quote_Address $address)
34
  {
35
-
36
- $currentVersion = Mage::getVersion();
37
- if (version_compare($currentVersion, '1.13.0')>0) {
38
- // This line is for some wierd reason required when running in EE 1.13... It shouldn't be... or?
39
- parent::collect($address);
40
  }
41
 
42
  if ($address->getQuote()->getId() == NULL) {
@@ -76,19 +73,16 @@ class Vaimo_Klarna_Model_Quote_Tax extends Mage_Sales_Model_Quote_Address_Total_
76
  $klarnaFeeTax = $taxCalculationModel->calcTaxAmount($address->getVaimoKlarnaFee(), $rate, false, true);
77
  $klarnaFeeBaseTax = $taxCalculationModel->calcTaxAmount($address->getVaimoKlarnaBaseFee(), $rate, false, true);
78
 
79
- $address->setTaxAmount($address->getTaxAmount() + $klarnaFeeTax);
80
- $address->setBaseTaxAmount($address->getBaseTaxAmount() + $klarnaFeeBaseTax);
81
-
82
- $address->setGrandTotal($address->getGrandTotal() + $klarnaFeeTax);
83
- $address->setBaseGrandTotal($address->getBaseGrandTotal() + $klarnaFeeBaseTax);
84
-
85
- $this->_saveAppliedTaxes(
86
- $address,
87
- $taxCalculationModel->getAppliedRates($request),
88
- $klarnaFeeTax,
89
- $klarnaFeeBaseTax,
90
- $rate
91
- );
92
  }
93
  }
94
 
32
 
33
  public function collect(Mage_Sales_Model_Quote_Address $address)
34
  {
35
+ if (Mage::helper('klarna')->collectQuoteRunParentFunction()) {
36
+ // parent::collect($address);
 
 
 
37
  }
38
 
39
  if ($address->getQuote()->getId() == NULL) {
73
  $klarnaFeeTax = $taxCalculationModel->calcTaxAmount($address->getVaimoKlarnaFee(), $rate, false, true);
74
  $klarnaFeeBaseTax = $taxCalculationModel->calcTaxAmount($address->getVaimoKlarnaBaseFee(), $rate, false, true);
75
 
76
+ if (Mage::helper('klarna')->collectQuoteUseExtraTaxInCheckout()) {
77
+ $address->setExtraTaxAmount($address->getExtraTaxAmount() + $klarnaFeeTax);
78
+ $address->setBaseExtraTaxAmount($address->getBaseExtraTaxAmount() + $klarnaFeeBaseTax);
79
+ } else {
80
+ $address->setTaxAmount($address->getTaxAmount() + $klarnaFeeTax);
81
+ $address->setBaseTaxAmount($address->getBaseTaxAmount() + $klarnaFeeBaseTax);
82
+
83
+ $address->setGrandTotal($address->getGrandTotal() + $klarnaFeeTax);
84
+ $address->setBaseGrandTotal($address->getBaseGrandTotal() + $klarnaFeeBaseTax);
85
+ }
 
 
 
86
  }
87
  }
88
 
app/code/community/Vaimo/Klarna/Model/Quote/Total.php CHANGED
@@ -32,9 +32,7 @@ class Vaimo_Klarna_Model_Quote_Total extends Mage_Sales_Model_Quote_Address_Tota
32
 
33
  public function collect(Mage_Sales_Model_Quote_Address $address)
34
  {
35
- $currentVersion = Mage::getVersion();
36
- if (version_compare($currentVersion, '1.13.0')>0) {
37
- // This line is for some wierd reason required when running in EE 1.13... It shouldn't be... or?
38
  parent::collect($address);
39
  }
40
 
@@ -65,16 +63,16 @@ class Vaimo_Klarna_Model_Quote_Total extends Mage_Sales_Model_Quote_Address_Tota
65
  return $this;
66
  }
67
 
68
- $klarnaFee = Mage::helper('klarna')->getVaimoKlarnaFeeExclVat($address);
69
 
70
- if (!$klarnaFee > 0 ) {
71
  return $this;
72
  }
73
 
74
  $quote = $address->getQuote();
75
  $store = $quote->getStore();
76
 
77
- $baseKlarnaFee = $store->convertPrice($klarnaFee, false);
78
 
79
  $address->setVaimoKlarnaBaseFee($baseKlarnaFee);
80
  $address->setVaimoKlarnaFee($klarnaFee);
@@ -91,6 +89,12 @@ class Vaimo_Klarna_Model_Quote_Total extends Mage_Sales_Model_Quote_Address_Tota
91
  public function fetch(Mage_Sales_Model_Quote_Address $address)
92
  {
93
  $amount = $address->getVaimoKlarnaFee();
 
 
 
 
 
 
94
 
95
  if ($amount!=0) {
96
  $quote = $address->getQuote();
32
 
33
  public function collect(Mage_Sales_Model_Quote_Address $address)
34
  {
35
+ if (Mage::helper('klarna')->collectQuoteRunParentFunction()) {
 
 
36
  parent::collect($address);
37
  }
38
 
63
  return $this;
64
  }
65
 
66
+ $baseKlarnaFee = Mage::helper('klarna')->getVaimoKlarnaFeeExclVat($address);
67
 
68
+ if (!$baseKlarnaFee > 0 ) {
69
  return $this;
70
  }
71
 
72
  $quote = $address->getQuote();
73
  $store = $quote->getStore();
74
 
75
+ $klarnaFee = $store->convertPrice($baseKlarnaFee, false);
76
 
77
  $address->setVaimoKlarnaBaseFee($baseKlarnaFee);
78
  $address->setVaimoKlarnaFee($klarnaFee);
89
  public function fetch(Mage_Sales_Model_Quote_Address $address)
90
  {
91
  $amount = $address->getVaimoKlarnaFee();
92
+
93
+ if (Mage::helper('klarna')->isOneStepCheckout()) {
94
+ if (Mage::helper('klarna')->isOneStepCheckoutTaxIncluded()) {
95
+ $amount = $amount + $address->getVaimoKlarnaFeeTax();
96
+ }
97
+ }
98
 
99
  if ($amount!=0) {
100
  $quote = $address->getQuote();
app/code/community/Vaimo/Klarna/etc/config.xml CHANGED
@@ -25,7 +25,7 @@
25
  --><config>
26
  <modules>
27
  <Vaimo_Klarna>
28
- <version>5.1.0</version>
29
  <name>Vaimo Klarna Module</name>
30
  <depends>
31
  <Mage_Payment/>
@@ -78,8 +78,8 @@
78
  <totals>
79
  <vaimo_klarna_fee>
80
  <class>klarna/quote_total</class>
81
- <after>subtotal,discount</after>
82
- <before>shipping,tax,grand_total</before>
83
  <renderer>klarna/checkout_fee</renderer>
84
  </vaimo_klarna_fee>
85
  <vaimo_klarna_fee_tax>
25
  --><config>
26
  <modules>
27
  <Vaimo_Klarna>
28
+ <version>5.1.5</version>
29
  <name>Vaimo Klarna Module</name>
30
  <depends>
31
  <Mage_Payment/>
78
  <totals>
79
  <vaimo_klarna_fee>
80
  <class>klarna/quote_total</class>
81
+ <after>subtotal,discount,shipping</after>
82
+ <before>tax,grand_total</before>
83
  <renderer>klarna/checkout_fee</renderer>
84
  </vaimo_klarna_fee>
85
  <vaimo_klarna_fee_tax>
app/code/community/Vaimo/Klarna/etc/system.xml CHANGED
@@ -290,6 +290,16 @@
290
  <show_in_website>1</show_in_website>
291
  <comment>Allow shipping address to be different from billing address. You might need acceptance from Klarna if activated</comment>
292
  </allow_separate_address>
 
 
 
 
 
 
 
 
 
 
293
  <terms_url translate="label">
294
  <label>URL to terms and conditions</label>
295
  <frontend_type>text</frontend_type>
290
  <show_in_website>1</show_in_website>
291
  <comment>Allow shipping address to be different from billing address. You might need acceptance from Klarna if activated</comment>
292
  </allow_separate_address>
293
+ <disable_product_widget translate="label">
294
+ <label>Disable payment widget on product page</label>
295
+ <frontend_type>select</frontend_type>
296
+ <source_model>adminhtml/system_config_source_yesno</source_model>
297
+ <sort_order>220</sort_order>
298
+ <show_in_default>1</show_in_default>
299
+ <show_in_store>1</show_in_store>
300
+ <show_in_website>1</show_in_website>
301
+ <comment>If set to yes, the payment information from Klarna will not appear on the product page</comment>
302
+ </disable_product_widget>
303
  <terms_url translate="label">
304
  <label>URL to terms and conditions</label>
305
  <frontend_type>text</frontend_type>
app/design/frontend/base/default/template/vaimo/klarna/catalog/product/pricewidget.phtml CHANGED
@@ -25,17 +25,17 @@
25
 
26
  $_widgetParameters = $this->getWidgetParameters();
27
  $_invoiceFee = $this->getKlarnaInvoiceFeeInfo();
 
28
 
29
  ?>
30
 
31
  <?php // Dynamically priced products is an issue ?>
32
  <?php if ($_widgetParameters): ?>
33
- <?php $_product = $this->getProduct(); ?>
34
- <div style="width:160px; height:64px"
35
  class="klarna-widget klarna-part-payment"
36
  data-eid="<?php echo $_widgetParameters->getMerchantId(); ?>"
37
  data-locale="<?php echo strtolower($_widgetParameters->getLocaleCode()); ?>"
38
- data-price="<?php echo $_product->getFinalPrice(); ?>"
39
  <?php if ($_invoiceFee): ?>
40
  data-invoice-fee="<?php echo $_invoiceFee; ?>"
41
  <?php endif; ?>
25
 
26
  $_widgetParameters = $this->getWidgetParameters();
27
  $_invoiceFee = $this->getKlarnaInvoiceFeeInfo();
28
+ $_productPrice = $this->getProductPriceInclVat();
29
 
30
  ?>
31
 
32
  <?php // Dynamically priced products is an issue ?>
33
  <?php if ($_widgetParameters): ?>
34
+ <div style="width:160px; height:64px"
 
35
  class="klarna-widget klarna-part-payment"
36
  data-eid="<?php echo $_widgetParameters->getMerchantId(); ?>"
37
  data-locale="<?php echo strtolower($_widgetParameters->getLocaleCode()); ?>"
38
+ data-price="<?php echo $_productPrice ?>"
39
  <?php if ($_invoiceFee): ?>
40
  data-invoice-fee="<?php echo $_invoiceFee; ?>"
41
  <?php endif; ?>
app/locale/da_DK/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/de_AT/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Monat"
97
  "Day","Tag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Monat"
97
  "Day","Tag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/de_DE/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Monat"
97
  "Day","Tag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Monat"
97
  "Day","Tag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/fi_FI/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Kuukausi"
97
  "Day","Päivä"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Kuukausi"
97
  "Day","Päivä"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/nb_NO/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/nl_NL/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Maand"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Maand"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/nn_NO/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
 
 
 
96
  "Month","Måned"
97
  "Day","Dag"
98
  "07xxxxxxxx",""
99
+
100
+ "Disable payment widget on product page","Disable payment widget on product page"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","If set to yes, the payment information from Klarna will not appear on the product page"
app/locale/sv_SE/Vaimo_Klarna.csv CHANGED
@@ -96,3 +96,6 @@
96
  "Month","Månad"
97
  "Day","Dag"
98
  "07xxxxxxxx","07xxxxxxxx"
 
 
 
96
  "Month","Månad"
97
  "Day","Dag"
98
  "07xxxxxxxx","07xxxxxxxx"
99
+
100
+ "Disable payment widget on product page","Deaktivera betal-widget på produkt sidan"
101
+ "If set to yes, the payment information from Klarna will not appear on the product page","Om ja, så kommer inte betalinformation från Klarna att presenteras på produkt sidan"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>klarnapayments</name>
4
- <version>5.1.0</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Klarna payment module for invoice and part payments. This module works with both invoice and part payments in Sweden, Finland, Denmark, Norway, Germany, Austria and Netherlands. To use this module requires that you have a contract with Klarna.</description>
11
  <notes>This version is not compatible with any Klarna module version of 4.x or earlier.</notes>
12
  <authors><author><name>Klarna</name><user>Klarna</user><email>magento@klarna.com</email></author><author><name>Vaimo</name><user>VAIMO</user><email>info@vaimo.com</email></author></authors>
13
- <date>2014-05-21</date>
14
- <time>15:21:24</time>
15
- <contents><target name="magecommunity"><dir name="Vaimo"><dir name="Klarna"><dir name="Block"><dir name="Adminhtml"><dir name="Pclass"><file name="List.php" hash="50db355e3da129c8870fb1385c7e346f"/><file name="Update.php" hash="fd444645b9f78fc4ea65c91ee3fc0044"/></dir><dir name="Sales"><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="12074f6aabbe90f14b8d30b7f65da9dc"/></dir><file name="Totals.php" hash="198afd117e90e17999f24c419a92b24b"/></dir><dir name="Invoice"><file name="Totals.php" hash="bc28f21c484fe2b4ca6d7a06da726fc3"/></dir><dir name="Order"><file name="Totals.php" hash="c80ca5283b0341964c36e70a850faaf6"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="Pricewidget.php" hash="a67bdc5337cf35bc348ea2cb0e5ed571"/></dir></dir><dir name="Checkout"><file name="Fee.php" hash="1ffae1896b12e6d87fbbd2d3843fef75"/><file name="Top.php" hash="d78c1004e5163976b01493f5ecaade05"/></dir><dir name="Form"><file name="Abstract.php" hash="66e201e5c0daeff525f409a623cbc45e"/><file name="Account.php" hash="f6bf008c1af0b93ead5b5a2577b59ea5"/><dir name="Address"><file name="Search.php" hash="600b472559cbcec011f03244eed499b5"/></dir><file name="Invoice.php" hash="105a41b84e52b45f26f3c5de2d4bdd4a"/><dir name="Paymentplan"><file name="Information.php" hash="7c66acd887a1e3a165e3cd967d0f3331"/></dir><file name="Special.php" hash="8db5a5f33510cd32d724c6ecd6368aa2"/></dir><dir name="Info"><file name="Abstract.php" hash="caf208862b2336027ca2d498008603fe"/><file name="Account.php" hash="d302c2fc556e05858464fadd51cd4854"/><file name="Invoice.php" hash="f98adb5521f6c546c462f2e5bde31295"/><file name="Special.php" hash="e07662f39f0ff65505bfd627045c7766"/></dir><dir name="Invoice"><file name="Totals.php" hash="2437d7c7d7499d3ee2fcb7e0426ad64d"/></dir><dir name="Order"><file name="Totals.php" hash="2e56335ff1b4a1d6752e7336b107bd13"/></dir><dir name="Page"><dir name="Html"><file name="Logo.php" hash="2a04f0f8e3be0df5bb5be7bbaa8ebb0b"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="56d7a8cfd04bafa85c31c8545b254d4c"/></dir><dir name="Model"><dir name="Creditmemo"><file name="Tax.php" hash="3a6bc7530bff27bf459661e0d1e9fd0a"/><file name="Total.php" hash="f328960e057bbb5d548521af44059a13"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="4a436823d6d97eefc32e37425a290e6e"/></dir><file name="Tax.php" hash="ec85abacc1f98520c73bd747e331eff6"/><file name="Total.php" hash="fe6393bb1d9d8a0e91deb7b759e31434"/></dir><dir name="Klarna"><file name="Addresssearch.php" hash="e3387ff4a122a664482bd5fee40c1813"/><file name="Api.php" hash="2864e0575779ab19dcc056f8e3134165"/><file name="Assign.php" hash="aa4689397bed9888a1a238ab6d971c4d"/><file name="Authorize.php" hash="bc17198adec7bcfd2f05709f326b82df"/><file name="Available.php" hash="0aec5ebf162c459e645d84e02b255e11"/><file name="Cancel.php" hash="4632675d11ca981c5052db1f0cca184b"/><file name="Capture.php" hash="2beb7bced6bb2055c13c5b92883ca33a"/><file name="Form.php" hash="ac6255922a3af1f4d176cde1798e47be"/><file name="Info.php" hash="4957a14af1c087b35dbd594535f8b126"/><file name="Pclass.php" hash="46cf1bc8f4a3c659283856567b61d6e8"/><file name="Refund.php" hash="5cb1d208f8fbd63a775209d46120f434"/><dir name="Tools"><file name="Abstract.php" hash="e9756dd47189740ad16fe3967b4cdaad"/><file name="Address.php" hash="a0158b7d2cc0eafb44a8c4f5467044d1"/><file name="Api.php" hash="afe28b6d16f3c0365cc33718ad95b458"/></dir><file name="Validate.php" hash="94ee56e3431c5b1aad762729988aa646"/><file name="Widget.php" hash="c18e1ef40de862cccd32bfb6b3dedbcb"/></dir><file name="Observer.php" hash="0e5a24a6cb75f8d9e7ffd2e1cf490d35"/><dir name="Payment"><file name="Abstract.php" hash="b61dc3a2901f82a86a7b2ce0664114ba"/><file name="Account.php" hash="6c905fbd93ae0c198b1c1d7d4865b8a0"/><file name="Invoice.php" hash="e77f59b136528a64c7e9a1f5ce28b850"/><file name="Special.php" hash="fa6767acffd19a5411c3a547c644b85b"/></dir><dir name="Quote"><file name="Tax.php" hash="1f6bfc08d0b491e9a227c4b6ae2632e4"/><file name="Total.php" hash="a5eb83fdfe3ab9af9b82422b31492c84"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="0a40d43403823a6053d74bd2d2f688e7"/></dir></dir><dir name="Source"><file name="Capture.php" hash="f491dd88120e191d65d7d2ff53860236"/><file name="Country.php" hash="7be59711122331a8c79b588ec2eb8afb"/><file name="Language.php" hash="8e425aad2a21c0d2ffa450a376735451"/><file name="Servermode.php" hash="702a23f9fbac1c5618e3d7f234bff7c8"/><file name="Taxclass.php" hash="836424e4e3569d41e4321a846c59c98b"/></dir><dir name="Tax"><file name="Config.php" hash="7ac7e62c358331e99e3439a12cb9f852"/></dir></dir><dir name="Tests"><dir name="Model"><dir name="Klarna"><file name="ApiTest.php" hash="1a8617c031cda61a4b10e67d448e1e99"/><file name="ValidateTest.php" hash="b252d4600110b09c9d11dfa9642c0a8c"/></dir></dir><file name="TestCase.php" hash="2eb43dd276ab9489a7adc49665fdba7e"/><file name="bootstrap.php" hash="15c72bd1a5e73d91f9272166684e35c6"/></dir><dir name="controllers"><file name="AddressController.php" hash="0d6ceb7ca9ee6dce08d316cecd84c990"/><dir name="Adminhtml"><dir name="Klarna"><file name="PclassController.php" hash="1b2e714da75b47e6eddb18b004b0c8ec"/></dir></dir><file name="PaymentplanController.php" hash="89128f42495bbfb81028b5e37d1465ea"/></dir><dir name="etc"><file name="config.xml" hash="0ce20b7a53392b611440d06436b56ab8"/><file name="system.xml" hash="1c9a995f974ec50f9acfb26f91a9091a"/></dir><dir name="sql"><dir name="klarna_setup"><file name="mysql4-install-0.1.0.php" hash="d36b51433fd28241386594f39def3080"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="vaimo_klarna.xml" hash="19a196d33bcc2e1eaf4413dcefeb5f04"/></dir><dir name="template"><dir name="vaimo"><dir name="klarna"><dir name="creditmemo"><dir name="totals"><file name="adjustments.phtml" hash="b0299ac0b1ca75b4d143413cc8eb8217"/></dir></dir><dir name="info"><file name="account.phtml" hash="14225b9a0b95d52926d5ccee339b445a"/><dir name="children"><file name="invoicefee.phtml" hash="2b721be479706716f6468c8395455fa5"/><file name="invoices.phtml" hash="3d3c653a28bfa95e821abb67c9e06dba"/><file name="paymentplan.phtml" hash="885c020c05afd4516a42a33a6986f32f"/><file name="reservation.phtml" hash="7beb37cc5df2cda75626d6975beb6829"/></dir><file name="invoice.phtml" hash="1f417e5d0380b53d64966b21bebd4419"/><file name="special.phtml" hash="14225b9a0b95d52926d5ccee339b445a"/></dir><dir name="pclass"><file name="list.phtml" hash="5cef6b0093bb5da18dbf1f9fd7316c66"/><file name="update.phtml" hash="ed53d5eb248f8181cd601e7b10cb170f"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="vaimo_klarna.xml" hash="b4fdb67bdad6d422c1ce86164eb62ece"/></dir><dir name="template"><dir name="vaimo"><dir name="klarna"><dir name="catalog"><dir name="product"><file name="pricewidget.phtml" hash="711e800ae367bdd01f2bb104bd930d73"/></dir></dir><dir name="checkout"><file name="fee.phtml" hash="3a58d7e7278bf9fcae1cdb9d836d4ff3"/><file name="header.phtml" hash="51a7f95f2fcb5f7b02e19b13690631a8"/><file name="top.phtml" hash="9cc1ce32346bd6ed7c16139f3f960a95"/></dir><dir name="form"><file name="account.phtml" hash="25386497892129effff92a64f326ff42"/><dir name="address"><file name="search.phtml" hash="36aa810e587da54995e961f77aa11a72"/></dir><dir name="children"><file name="addressresult.phtml" hash="7ed16bca431a8146139ce51fd7001d11"/><file name="consent.phtml" hash="a4f446258fa20a453d3566cffc20085d"/><file name="dateofbirth.phtml" hash="e1dbe367ce43029d671dae6f7d3ca956"/><file name="gender.phtml" hash="c8428e9b76db957a866cfc109d7a0c09"/><file name="notifications.phtml" hash="485d9f8e90ca6ff3c8152d2c3a0ee138"/><file name="paymentplan_information.phtml" hash="8f28c418c08df3e664744ef28bc283c3"/><file name="pclass.phtml" hash="848a7e485badbdf11d10628c93906b21"/><file name="personalnumber.phtml" hash="a8d723a0ff1b71f07ccdd1aed1dba5fb"/><file name="phonenumber.phtml" hash="6348b12795e073d8881ab0b74d7df175"/></dir><file name="invoice.phtml" hash="43a3a4aaae78b3a835c8de7d9edff8b4"/><dir name="paymentplan"><file name="information.phtml" hash="d19f6766d1bebdacb367aee65edb06fd"/></dir><file name="special.phtml" hash="68561f42f556c496fb46c2c12f35b410"/></dir><dir name="info"><file name="account.phtml" hash="a848c9544a5e400bc27e26d050eafa3c"/><dir name="children"><file name="invoicefee.phtml" hash="c6b4ccff75e220c5641a8fadd6753131"/><file name="invoices.phtml" hash="cbdd0256b8e1d742257bcba9b1eef67a"/><file name="paymentplan.phtml" hash="3a73d918dc733c0888f18e442f9eb64c"/><file name="reservation.phtml" hash="9880ef8208f672d531cc10eef8467856"/></dir><file name="invoice.phtml" hash="cd3514e43dd441b4530b95e408784d84"/><file name="special.phtml" hash="c472684055c8839b8e365b80a5e1ee0c"/></dir><dir name="page"><dir name="html"><file name="logo.phtml" hash="4b67e622b6b5f0421078c2324efd55a3"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Vaimo_Klarna.xml" hash="fece558fa050794401aca834b1b12fd4"/></dir></target><target name="magelocale"><dir name="da_DK"><file name="Vaimo_Klarna.csv" hash="a3b107cd8212b3e446c83e84503b1784"/></dir><dir name="de_AT"><file name="Vaimo_Klarna.csv" hash="2ee3f269c4f4def7b20d217654fe05cf"/></dir><dir name="de_DE"><file name="Vaimo_Klarna.csv" hash="4a579c06e80a036010909959d3e8012b"/></dir><dir name="fi_FI"><file name="Vaimo_Klarna.csv" hash="301eb5f3e50ec1deff3f6f0d83a0c68f"/></dir><dir name="nb_NO"><file name="Vaimo_Klarna.csv" hash="0608c0a76dd904ec57732a5fc43e818d"/></dir><dir name="nl_NL"><file name="Vaimo_Klarna.csv" hash="8b40598318c5d2e0f86826633a4eaa87"/></dir><dir name="nn_NO"><file name="Vaimo_Klarna.csv" hash="6d14a06b04632633c2859ccf7268af5e"/></dir><dir name="sv_SE"><file name="Vaimo_Klarna.csv" hash="19dcd824e0f9546c11839580eb9ab287"/></dir></target><target name="mage"><dir name="js"><dir name="vaimo"><dir name="klarna"><file name="klarna.js" hash="580f2f4f363461734c578b0297a33b2e"/></dir></dir></dir></target><target name="magelib"><dir name="Klarna"><file name="CHANGELOG" hash="7c2deef157ef77304e1d0efc970d6c48"/><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="1fbeb52770b21cd6dd1fde92c734d928"/><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="b49a0bd5c5a57577b9765d657dad7b78"/><file name="activateInvoice.php" hash="31061b3cf79a6fd32f580f3aa6b603ad"/><file name="activatePart.php" hash="72af1ee8d312df08e24cdc7b01cc72ed"/><file name="activateReservation.php" hash="6380e346db2466a655df17cbe4078b3a"/><file name="addTransaction.php" hash="015cdd7663d7bbe0716f8ed8f700e13e"/><file name="calc_monthly_cost.php" hash="9a45009fe051f76bd2d23db854f67cad"/><file name="cancelReservation.php" hash="219504c253caa372f479af8f6bf452eb"/><file name="changeReservation.php" hash="cdf4f971d74570e2ba9191792f69bf79"/><file name="checkOrderStatus.php" hash="b9d12df62f9619cb791bc4db9b2e19c4"/><file name="creditInvoice.php" hash="f174d28d812f5139c4a0397a27f419d9"/><file name="creditPart.php" hash="4c1a6397eb2bc7ee0bac5ed1a76aa7d8"/><file name="deleteInvoice.php" hash="b59be611d1ba7439d0c9ec43f38e8f95"/><file name="emailInvoice.php" hash="31f644dc6b1a97181d3ba474f2d77517"/><file name="fetchPClasses.php" hash="18a60ab1bde9ace0765c58f3343c4165"/><file name="getAddresses.php" hash="bf80e3108d51dcf4c581bff291e4a2fc"/><file name="getPClasses.php" hash="18b7bc054ceb36c8f004d21804fea832"/><file name="invoiceAddress.php" hash="a7a9c89f6ee017d72f9d9d5a959c7416"/><file name="invoiceAmount.php" hash="d404dba99dd5efd2954bec58eab720ca"/><file name="invoicePartAmount.php" hash="37e3726190f1fb403fbba19de2088dd5"/><file name="reserveAmount.php" hash="4c93a455264dafc93a2cd9ce41c8aaaa"/><file name="reserveOCR.php" hash="a67258e40b080027c5e60490a15d3347"/><file name="returnAmount.php" hash="ae01bab7225bdd6529593d499247e8f6"/><file name="sendInvoice.php" hash="46584ac7995d779ff4fa2a4a4b109df9"/><file name="splitReservation.php" hash="35c495a8bfc1e29b109a0de3800d4d44"/><file name="update.php" hash="1275db160660e97a6eb1328cf1f9c6b4"/><file name="updateChargeAmount.php" hash="ae4cf8072078cc8e527b786ea03a8337"/><file name="updateGoodsQty.php" hash="6e10c98895fe94f842ee45673ec790b3"/><file name="updateOrderNo.php" hash="e9d7a59d10b4be660b2cfd700ecc992d"/></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></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="vaimo"><dir name="klarna"><dir name="css"><file name="admin.css" hash="ef4915be839e2039fb037f29c1506d30"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="vaimo"><dir name="klarna"><file name="checkout.css" hash="e133a0576c4a69adc210e9103725790b"/><file name="checkout_osc.css" hash="7f621724b0cb096f11d6cc42870bd544"/><file name="global.css" hash="22b6a446e6e874e6a95608f7046eac2a"/><file name="product.css" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></dir><dir name="images"><dir name="vaimo"><dir name="klarna"><file name="balk_afm3.jpg" hash="8855567960bff35b1e3ba486670b5878"/></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name></name><channel>connect.magentocommerce.com/core</channel><min></min><max></max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>klarnapayments</name>
4
+ <version>5.1.5</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
10
  <description>Klarna payment module for invoice and part payments. This module works with both invoice and part payments in Sweden, Finland, Denmark, Norway, Germany, Austria and Netherlands. To use this module requires that you have a contract with Klarna.</description>
11
  <notes>This version is not compatible with any Klarna module version of 4.x or earlier.</notes>
12
  <authors><author><name>Klarna</name><user>Klarna</user><email>magento@klarna.com</email></author><author><name>Vaimo</name><user>VAIMO</user><email>info@vaimo.com</email></author></authors>
13
+ <date>2014-07-11</date>
14
+ <time>08:38:17</time>
15
+ <contents><target name="magecommunity"><dir name="Vaimo"><dir name="Klarna"><dir name="Block"><dir name="Adminhtml"><dir name="Pclass"><file name="List.php" hash="50db355e3da129c8870fb1385c7e346f"/><file name="Update.php" hash="fd444645b9f78fc4ea65c91ee3fc0044"/></dir><dir name="Sales"><dir name="Creditmemo"><dir name="Create"><file name="Adjustments.php" hash="12074f6aabbe90f14b8d30b7f65da9dc"/></dir><file name="Totals.php" hash="198afd117e90e17999f24c419a92b24b"/></dir><dir name="Invoice"><file name="Totals.php" hash="bc28f21c484fe2b4ca6d7a06da726fc3"/></dir><dir name="Order"><file name="Totals.php" hash="c80ca5283b0341964c36e70a850faaf6"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><file name="Pricewidget.php" hash="f3235ed383b06cc8a5b1f587aab3e581"/></dir></dir><dir name="Checkout"><file name="Fee.php" hash="1ffae1896b12e6d87fbbd2d3843fef75"/><file name="Top.php" hash="c28060443f710ab345ec2a742b4477b8"/></dir><dir name="Form"><file name="Abstract.php" hash="733aafd4a3ded20eba9c04a76213882c"/><file name="Account.php" hash="f6bf008c1af0b93ead5b5a2577b59ea5"/><dir name="Address"><file name="Search.php" hash="600b472559cbcec011f03244eed499b5"/></dir><file name="Invoice.php" hash="105a41b84e52b45f26f3c5de2d4bdd4a"/><dir name="Paymentplan"><file name="Information.php" hash="7c66acd887a1e3a165e3cd967d0f3331"/></dir><file name="Special.php" hash="8db5a5f33510cd32d724c6ecd6368aa2"/></dir><dir name="Info"><file name="Abstract.php" hash="caf208862b2336027ca2d498008603fe"/><file name="Account.php" hash="d302c2fc556e05858464fadd51cd4854"/><file name="Invoice.php" hash="f98adb5521f6c546c462f2e5bde31295"/><file name="Special.php" hash="e07662f39f0ff65505bfd627045c7766"/></dir><dir name="Invoice"><file name="Totals.php" hash="2437d7c7d7499d3ee2fcb7e0426ad64d"/></dir><dir name="Order"><file name="Totals.php" hash="2e56335ff1b4a1d6752e7336b107bd13"/></dir><dir name="Page"><dir name="Html"><file name="Logo.php" hash="2a04f0f8e3be0df5bb5be7bbaa8ebb0b"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="092dbb1b42a02311add8e6e9e76901f2"/></dir><dir name="Model"><dir name="Creditmemo"><file name="Tax.php" hash="3a6bc7530bff27bf459661e0d1e9fd0a"/><file name="Total.php" hash="f328960e057bbb5d548521af44059a13"/></dir><dir name="Invoice"><dir name="Pdf"><file name="Total.php" hash="4a436823d6d97eefc32e37425a290e6e"/></dir><file name="Tax.php" hash="3baf99ade36b04f384d1c15cb4d7ed67"/><file name="Total.php" hash="2f6a6cd43221fd19b35b15cd2e7c3640"/></dir><dir name="Klarna"><file name="Addresssearch.php" hash="e3387ff4a122a664482bd5fee40c1813"/><file name="Api.php" hash="2864e0575779ab19dcc056f8e3134165"/><file name="Assign.php" hash="aa4689397bed9888a1a238ab6d971c4d"/><file name="Authorize.php" hash="bc17198adec7bcfd2f05709f326b82df"/><file name="Available.php" hash="0aec5ebf162c459e645d84e02b255e11"/><file name="Cancel.php" hash="4632675d11ca981c5052db1f0cca184b"/><file name="Capture.php" hash="2beb7bced6bb2055c13c5b92883ca33a"/><file name="Form.php" hash="ac6255922a3af1f4d176cde1798e47be"/><file name="Info.php" hash="4957a14af1c087b35dbd594535f8b126"/><file name="Pclass.php" hash="46cf1bc8f4a3c659283856567b61d6e8"/><file name="Refund.php" hash="5cb1d208f8fbd63a775209d46120f434"/><dir name="Tools"><file name="Abstract.php" hash="c3aa98e7144ae88d0f97d959d0b1b354"/><file name="Address.php" hash="a0158b7d2cc0eafb44a8c4f5467044d1"/><file name="Api.php" hash="f6fb0ff57b2508ac6e8f716ab67d86b2"/></dir><file name="Validate.php" hash="94ee56e3431c5b1aad762729988aa646"/><file name="Widget.php" hash="5ba02191e1d74244626e74ca5393906a"/></dir><file name="Observer.php" hash="0e5a24a6cb75f8d9e7ffd2e1cf490d35"/><dir name="Payment"><file name="Abstract.php" hash="1f1c1639928b0f0bdb624b72e2d07871"/><file name="Account.php" hash="6c905fbd93ae0c198b1c1d7d4865b8a0"/><file name="Invoice.php" hash="e77f59b136528a64c7e9a1f5ce28b850"/><file name="Special.php" hash="fa6767acffd19a5411c3a547c644b85b"/></dir><dir name="Quote"><file name="Tax.php" hash="7a4eab3cd02115cfedb1ba7af3358b73"/><file name="Total.php" hash="6bac56d746083634d31decb568e8362e"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="0a40d43403823a6053d74bd2d2f688e7"/></dir></dir><dir name="Source"><file name="Capture.php" hash="f491dd88120e191d65d7d2ff53860236"/><file name="Country.php" hash="7be59711122331a8c79b588ec2eb8afb"/><file name="Language.php" hash="8e425aad2a21c0d2ffa450a376735451"/><file name="Servermode.php" hash="702a23f9fbac1c5618e3d7f234bff7c8"/><file name="Taxclass.php" hash="836424e4e3569d41e4321a846c59c98b"/></dir><dir name="Tax"><file name="Config.php" hash="7ac7e62c358331e99e3439a12cb9f852"/></dir></dir><dir name="Tests"><dir name="Model"><dir name="Klarna"><file name="ApiTest.php" hash="1a8617c031cda61a4b10e67d448e1e99"/><file name="ValidateTest.php" hash="b252d4600110b09c9d11dfa9642c0a8c"/></dir></dir><file name="TestCase.php" hash="2eb43dd276ab9489a7adc49665fdba7e"/><file name="bootstrap.php" hash="15c72bd1a5e73d91f9272166684e35c6"/></dir><dir name="controllers"><file name="AddressController.php" hash="0d6ceb7ca9ee6dce08d316cecd84c990"/><dir name="Adminhtml"><dir name="Klarna"><file name="PclassController.php" hash="1b2e714da75b47e6eddb18b004b0c8ec"/></dir></dir><file name="PaymentplanController.php" hash="89128f42495bbfb81028b5e37d1465ea"/></dir><dir name="etc"><file name="config.xml" hash="cb15c5f8a5e23ae213a5c1fdaf41c377"/><file name="system.xml" hash="78cb4b46a4abd20df1520ac1ff8a2b7d"/></dir><dir name="sql"><dir name="klarna_setup"><file name="mysql4-install-0.1.0.php" hash="d36b51433fd28241386594f39def3080"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="vaimo_klarna.xml" hash="19a196d33bcc2e1eaf4413dcefeb5f04"/></dir><dir name="template"><dir name="vaimo"><dir name="klarna"><dir name="creditmemo"><dir name="totals"><file name="adjustments.phtml" hash="b0299ac0b1ca75b4d143413cc8eb8217"/></dir></dir><dir name="info"><file name="account.phtml" hash="14225b9a0b95d52926d5ccee339b445a"/><dir name="children"><file name="invoicefee.phtml" hash="2b721be479706716f6468c8395455fa5"/><file name="invoices.phtml" hash="3d3c653a28bfa95e821abb67c9e06dba"/><file name="paymentplan.phtml" hash="885c020c05afd4516a42a33a6986f32f"/><file name="reservation.phtml" hash="7beb37cc5df2cda75626d6975beb6829"/></dir><file name="invoice.phtml" hash="1f417e5d0380b53d64966b21bebd4419"/><file name="special.phtml" hash="14225b9a0b95d52926d5ccee339b445a"/></dir><dir name="pclass"><file name="list.phtml" hash="5cef6b0093bb5da18dbf1f9fd7316c66"/><file name="update.phtml" hash="ed53d5eb248f8181cd601e7b10cb170f"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="vaimo_klarna.xml" hash="b4fdb67bdad6d422c1ce86164eb62ece"/></dir><dir name="template"><dir name="vaimo"><dir name="klarna"><dir name="catalog"><dir name="product"><file name="pricewidget.phtml" hash="f5838b8bb129634487a398ca2557f48b"/></dir></dir><dir name="checkout"><file name="fee.phtml" hash="3a58d7e7278bf9fcae1cdb9d836d4ff3"/><file name="header.phtml" hash="51a7f95f2fcb5f7b02e19b13690631a8"/><file name="top.phtml" hash="9cc1ce32346bd6ed7c16139f3f960a95"/></dir><dir name="form"><file name="account.phtml" hash="25386497892129effff92a64f326ff42"/><dir name="address"><file name="search.phtml" hash="36aa810e587da54995e961f77aa11a72"/></dir><dir name="children"><file name="addressresult.phtml" hash="7ed16bca431a8146139ce51fd7001d11"/><file name="consent.phtml" hash="a4f446258fa20a453d3566cffc20085d"/><file name="dateofbirth.phtml" hash="e1dbe367ce43029d671dae6f7d3ca956"/><file name="gender.phtml" hash="c8428e9b76db957a866cfc109d7a0c09"/><file name="notifications.phtml" hash="485d9f8e90ca6ff3c8152d2c3a0ee138"/><file name="paymentplan_information.phtml" hash="8f28c418c08df3e664744ef28bc283c3"/><file name="pclass.phtml" hash="848a7e485badbdf11d10628c93906b21"/><file name="personalnumber.phtml" hash="a8d723a0ff1b71f07ccdd1aed1dba5fb"/><file name="phonenumber.phtml" hash="6348b12795e073d8881ab0b74d7df175"/></dir><file name="invoice.phtml" hash="43a3a4aaae78b3a835c8de7d9edff8b4"/><dir name="paymentplan"><file name="information.phtml" hash="d19f6766d1bebdacb367aee65edb06fd"/></dir><file name="special.phtml" hash="68561f42f556c496fb46c2c12f35b410"/></dir><dir name="info"><file name="account.phtml" hash="a848c9544a5e400bc27e26d050eafa3c"/><dir name="children"><file name="invoicefee.phtml" hash="c6b4ccff75e220c5641a8fadd6753131"/><file name="invoices.phtml" hash="cbdd0256b8e1d742257bcba9b1eef67a"/><file name="paymentplan.phtml" hash="3a73d918dc733c0888f18e442f9eb64c"/><file name="reservation.phtml" hash="9880ef8208f672d531cc10eef8467856"/></dir><file name="invoice.phtml" hash="cd3514e43dd441b4530b95e408784d84"/><file name="special.phtml" hash="c472684055c8839b8e365b80a5e1ee0c"/></dir><dir name="page"><dir name="html"><file name="logo.phtml" hash="4b67e622b6b5f0421078c2324efd55a3"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Vaimo_Klarna.xml" hash="fece558fa050794401aca834b1b12fd4"/></dir></target><target name="magelocale"><dir name="da_DK"><file name="Vaimo_Klarna.csv" hash="7590945039574b9fdb07e6ae908daeb4"/></dir><dir name="de_AT"><file name="Vaimo_Klarna.csv" hash="9224130faa53ae4c3a3cc309284a060f"/></dir><dir name="de_DE"><file name="Vaimo_Klarna.csv" hash="7add3d01d4983e594430a276a7f3a85e"/></dir><dir name="fi_FI"><file name="Vaimo_Klarna.csv" hash="00279a35385251c35004aee655267550"/></dir><dir name="nb_NO"><file name="Vaimo_Klarna.csv" hash="9c689e7554c482bd8f8c5a3e20fbb01d"/></dir><dir name="nl_NL"><file name="Vaimo_Klarna.csv" hash="f1982c7a1b84a97eb7809a5d2e221374"/></dir><dir name="nn_NO"><file name="Vaimo_Klarna.csv" hash="0e9e6e7afac9ce173ff594ca4b86db73"/></dir><dir name="sv_SE"><file name="Vaimo_Klarna.csv" hash="22efa082b3917e869c4f7fb37b121aca"/></dir></target><target name="mage"><dir name="js"><dir name="vaimo"><dir name="klarna"><file name="klarna.js" hash="580f2f4f363461734c578b0297a33b2e"/></dir></dir></dir></target><target name="magelib"><dir name="Klarna"><file name="CHANGELOG" hash="7c2deef157ef77304e1d0efc970d6c48"/><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="1fbeb52770b21cd6dd1fde92c734d928"/><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="b49a0bd5c5a57577b9765d657dad7b78"/><file name="activateInvoice.php" hash="31061b3cf79a6fd32f580f3aa6b603ad"/><file name="activatePart.php" hash="72af1ee8d312df08e24cdc7b01cc72ed"/><file name="activateReservation.php" hash="6380e346db2466a655df17cbe4078b3a"/><file name="addTransaction.php" hash="015cdd7663d7bbe0716f8ed8f700e13e"/><file name="calc_monthly_cost.php" hash="9a45009fe051f76bd2d23db854f67cad"/><file name="cancelReservation.php" hash="219504c253caa372f479af8f6bf452eb"/><file name="changeReservation.php" hash="cdf4f971d74570e2ba9191792f69bf79"/><file name="checkOrderStatus.php" hash="b9d12df62f9619cb791bc4db9b2e19c4"/><file name="creditInvoice.php" hash="f174d28d812f5139c4a0397a27f419d9"/><file name="creditPart.php" hash="4c1a6397eb2bc7ee0bac5ed1a76aa7d8"/><file name="deleteInvoice.php" hash="b59be611d1ba7439d0c9ec43f38e8f95"/><file name="emailInvoice.php" hash="31f644dc6b1a97181d3ba474f2d77517"/><file name="fetchPClasses.php" hash="18a60ab1bde9ace0765c58f3343c4165"/><file name="getAddresses.php" hash="bf80e3108d51dcf4c581bff291e4a2fc"/><file name="getPClasses.php" hash="18b7bc054ceb36c8f004d21804fea832"/><file name="invoiceAddress.php" hash="a7a9c89f6ee017d72f9d9d5a959c7416"/><file name="invoiceAmount.php" hash="d404dba99dd5efd2954bec58eab720ca"/><file name="invoicePartAmount.php" hash="37e3726190f1fb403fbba19de2088dd5"/><file name="reserveAmount.php" hash="4c93a455264dafc93a2cd9ce41c8aaaa"/><file name="reserveOCR.php" hash="a67258e40b080027c5e60490a15d3347"/><file name="returnAmount.php" hash="ae01bab7225bdd6529593d499247e8f6"/><file name="sendInvoice.php" hash="46584ac7995d779ff4fa2a4a4b109df9"/><file name="splitReservation.php" hash="35c495a8bfc1e29b109a0de3800d4d44"/><file name="update.php" hash="1275db160660e97a6eb1328cf1f9c6b4"/><file name="updateChargeAmount.php" hash="ae4cf8072078cc8e527b786ea03a8337"/><file name="updateGoodsQty.php" hash="6e10c98895fe94f842ee45673ec790b3"/><file name="updateOrderNo.php" hash="e9d7a59d10b4be660b2cfd700ecc992d"/></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></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="vaimo"><dir name="klarna"><dir name="css"><file name="admin.css" hash="ef4915be839e2039fb037f29c1506d30"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="vaimo"><dir name="klarna"><file name="checkout.css" hash="e133a0576c4a69adc210e9103725790b"/><file name="checkout_osc.css" hash="7f621724b0cb096f11d6cc42870bd544"/><file name="global.css" hash="22b6a446e6e874e6a95608f7046eac2a"/><file name="product.css" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></dir><dir name="images"><dir name="vaimo"><dir name="klarna"><file name="balk_afm3.jpg" hash="8855567960bff35b1e3ba486670b5878"/></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name></name><channel>connect.magentocommerce.com/core</channel><min></min><max></max></package></required></dependencies>
18
  </package>