[*] MO : New features and a few issues addressed

Prestaworks · Prestaworks · commit 345e7f03aa92 · 2016-05-12T10:23:08.000+02:00
Newsletter box
Encoding issue for product names
Documentation
improved
Added support for possible cronjob status checks pending orders
diff --git a/CHANGELOG b/CHANGELOG
@@ -1 +1 @@
-1.8.29Update to carrier validation1.8.28Improvements on documentation1.8.27Removed some notices.Imporved company customer support in KPM.Added purifyHTML to voucher code.Changed the terms text for netherlands1.8.26Changed the flag for discountChanged the terms text for germanyFixed issue with genderlink to kco hidden if kco not active for selected country in default checkout.Fixed settings for checkout logo1.8.25changes to javascript for correct layout of discount prices in cart rows1.8.24Changes to orderstatuses on install1.8.23Autofix of default addresses on checkout pages.1.8.22Improvements to security1.8.21Reverse birthday year-month-day to day-month-year for Germany1.8.20move sum to variable.1.8.19pSQL added to push1.8.18Added simple hook for paymentEU.1.8.17Added issue with special chars in message field1.8.16Change expire field from int to varchar in install script.1.8.15Change expire field from int to varchar, due to Klarna sometimes sending - instead of empty value.1.8.14Added Deactivate for status selections.1.8.13Added support for gb iso code1.8.12Added support for minimum amount on orders.1.8.11Moved SQL Install script to sql folder.Added id_cart to klarna_orders table.Made some changes as to in what order klarna order information is saved to module tables. mainly to support different EIDs for SBM system.1.8.10Changed a link1.8.9Fixed an & sign1.8.8changed some tabs to spaces.1.8.7Added automatic meta on installation.1.8.6Fixed issue in kco_height.tpl1.8.5Name changesfilename changescoding standardsoptimization1.8.4Coding standardsUpdate on library1.8.3Save function for test flag moved.1.8.2moved libraries into libraries folder.1.8.1Removed a link in the backoffice.Moved test flag to common settings.1.8.0Cleaned up some more.1.7.0Added readmeCleaned up markupAdded texts explanations1.6.0Escape variablessome sql changesgetaddress fix1.5.0Fixed pclasses for Denmark1.4.0Added so that links are not replaced when KCO is not active.Added button for KCO address check.1.3.0Fixed some issues with kco UK1.2.0Changes to the layout1.1.0UK EID not always int.1.0.0First version for 1.6
+1.8.31Newsletter boxEncoding issue for product namesDocumentation improvedAdded support for possible cronjob status checks pending orders1.8.30Link to legacy checkout in case of Klarna service interuption.1.8.29Update to carrier validation1.8.28Improvements on documentation1.8.27Removed some notices.Imporved company customer support in KPM.Added purifyHTML to voucher code.Changed the terms text for netherlands1.8.26Changed the flag for discountChanged the terms text for germanyFixed issue with genderlink to kco hidden if kco not active for selected country in default checkout.Fixed settings for checkout logo1.8.25changes to javascript for correct layout of discount prices in cart rows1.8.24Changes to orderstatuses on install1.8.23Autofix of default addresses on checkout pages.1.8.22Improvements to security1.8.21Reverse birthday year-month-day to day-month-year for Germany1.8.20move sum to variable.1.8.19pSQL added to push1.8.18Added simple hook for paymentEU.1.8.17Added issue with special chars in message field1.8.16Change expire field from int to varchar in install script.1.8.15Change expire field from int to varchar, due to Klarna sometimes sending - instead of empty value.1.8.14Added Deactivate for status selections.1.8.13Added support for gb iso code1.8.12Added support for minimum amount on orders.1.8.11Moved SQL Install script to sql folder.Added id_cart to klarna_orders table.Made some changes as to in what order klarna order information is saved to module tables. mainly to support different EIDs for SBM system.1.8.10Changed a link1.8.9Fixed an & sign1.8.8changed some tabs to spaces.1.8.7Added automatic meta on installation.1.8.6Fixed issue in kco_height.tpl1.8.5Name changesfilename changescoding standardsoptimization1.8.4Coding standardsUpdate on library1.8.3Save function for test flag moved.1.8.2moved libraries into libraries folder.1.8.1Removed a link in the backoffice.Moved test flag to common settings.1.8.0Cleaned up some more.1.7.0Added readmeCleaned up markupAdded texts explanations1.6.0Escape variablessome sql changesgetaddress fix1.5.0Fixed pclasses for Denmark1.4.0Added so that links are not replaced when KCO is not active.Added button for KCO address check.1.3.0Fixed some issues with kco UK1.2.0Changes to the layout1.1.0UK EID not always int.1.0.0First version for 1.6
diff --git a/checkpendingorders.php b/checkpendingorders.php
@@ -0,0 +1,28 @@
+<?php
+require_once(dirname(__FILE__). '/../../config/config.inc.php');
+require_once(_PS_ROOT_DIR_.'/init.php');
+require_once(dirname(__FILE__).'/klarnaofficial.php');
+
+$shops = Shop::getShops(true,null,true);
+$order_status_ids = "";
+foreach ($shops as $shop) {
+    $order_status_ids .= Configuration::get('KPM_PENDING_PP', null, null, $shop).",";
+    $order_status_ids .= Configuration::get('KPM_PENDING_INVOICE', null, null, $shop).",";
+}
+$order_status_ids = rtrim($order_status_ids, ",");
+$order_status_ids = pSQL($order_status_ids);
+$sql = "SELECT id_order FROM "._DB_PREFIX_."orders WHERE current_state IN ($order_status_ids);";
+$result = Db::getInstance()->executeS($sql);
+
+foreach ($result as $row) {
+    $id_order = (int)$row["id_order"];
+    try {
+        $klarnaofficial = new KlarnaOfficial();
+        $klarnaofficial->checkPendingStatus($id_order);
+    } catch (Exception $e) {
+        $msg = "Check pending: $id_order " . $e->getMessage();
+        Logger::addLog($msg, 1, null, 'klarnaofficial', $id_order, true);
+    }
+}
+echo "Done";
+?>
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>klarnaofficial</name>
 	<displayName><![CDATA[Klarna]]></displayName>
-	<version><![CDATA[1.8.29]]></version>
+	<version><![CDATA[1.8.31]]></version>
 	<description><![CDATA[Gateway for Klarna (KCO and KPM).]]></description>
 	<author><![CDATA[Prestaworks AB]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>
diff --git a/controllers/front/checkoutklarna.php b/controllers/front/checkoutklarna.php
@@ -136,8 +136,9 @@ public function postProcess()
                         $vouchererrors = Tools::displayError('This voucher does not exists');
                     }
                 }
+                //FORCE html_entity_decode SINCE PRESTASHOP Demand escape:html in tpl files but already does this on displayError..
                 $this->context->smarty->assign(array(
-                    'vouchererrors' => $vouchererrors,
+                    'vouchererrors' => html_entity_decode($vouchererrors),
                     'discount_name' => Tools::safeOutput($code),
                 ));
             } elseif (($id_cart_rule = (int) Tools::getValue('deleteDiscount')) &&
@@ -502,6 +503,15 @@ public function initContent()
                         $create['merchant']['push_uri'] = $pushPage;
                         $create['merchant_reference']['orderid2'] = ''.(int) ($this->context->cart->id);
 
+                        if ((int)Configuration::get('KCO_ADD_NEWSLETTERBOX') == 0) {
+                            $create['options']['additional_checkbox']['text'] = $this->module->getL('Subscribe to our newsletter.');
+                            $create['options']['additional_checkbox']['checked'] = false;
+                            $create['options']['additional_checkbox']['required'] = false;
+                        } elseif ((int)Configuration::get('KCO_ADD_NEWSLETTERBOX') == 1) {
+                            $create['options']['additional_checkbox']['text'] = $this->module->getL('Subscribe to our newsletter.');
+                            $create['options']['additional_checkbox']['checked'] = true;
+                            $create['options']['additional_checkbox']['required'] = false;
+                        }
                         if (Configuration::get('KCO_COLORBUTTON') != '') {
                             $create['options']['color_button'] = ''.
                             Configuration::get('KCO_COLORBUTTON');
@@ -682,7 +692,14 @@ public function initContent()
                         'back' => ''
                     ));
                 } catch (Exception $e) {
-                    $this->context->smarty->assign('klarna_error', $e->getMessage());
+                    $message = $e->getMessage();
+                    if($message == "Connection to 'https://checkout.klarna.com/checkout/orders' failed.") {
+                        $connectionerror = true;
+                    } else {
+                        $connectionerror = false;
+                    }
+                    $this->context->smarty->assign('connectionerror', $connectionerror);
+                    $this->context->smarty->assign('klarna_error', $message);
                 }
             }
         } else {
diff --git a/controllers/front/checkoutklarnauk.php b/controllers/front/checkoutklarnauk.php
@@ -153,8 +153,9 @@ public function postProcess()
                         $vouchererrors = Tools::displayError('This voucher does not exists');
                     }
                 }
+                //FORCE html_entity_decode SINCE PRESTASHOP Demand escape:html in tpl files but already does this on displayError..
                 $this->context->smarty->assign(array(
-                    'vouchererrors' => $vouchererrors,
+                    'vouchererrors' => html_entity_decode($vouchererrors),
                     'discount_name' => Tools::safeOutput($code),
                 ));
             } elseif (($id_cart_rule = (int) Tools::getValue('deleteDiscount')) &&
@@ -518,7 +519,15 @@ public function initContent()
                         $create['merchant_urls']['confirmation'] = $callbackPage;
                         $create['merchant_urls']['push'] = $pushPage;
                         $create['merchant_reference2'] = ''.(int) ($this->context->cart->id);
-
+                        if ((int)Configuration::get('KCO_ADD_NEWSLETTERBOX') == 0) {
+                            $create['options']['additional_checkbox']['text'] = $this->module->getL('Subscribe to our newsletter.');
+                            $create['options']['additional_checkbox']['checked'] = false;
+                            $create['options']['additional_checkbox']['required'] = false;
+                        } elseif ((int)Configuration::get('KCO_ADD_NEWSLETTERBOX') == 1) {
+                            $create['options']['additional_checkbox']['text'] = $this->module->getL('Subscribe to our newsletter.');
+                            $create['options']['additional_checkbox']['checked'] = true;
+                            $create['options']['additional_checkbox']['required'] = false;
+                        }
                         if (Configuration::get('KCO_COLORBUTTON') != '') {
                             $create['options']['color_button'] = ''.Configuration::get('KCO_COLORBUTTON');
                         }
diff --git a/controllers/front/kpmpartpayment.php b/controllers/front/kpmpartpayment.php
@@ -176,7 +176,7 @@ public function initContent()
                 $k->addArticle(
                     1,
                     'shipping',
-                    ''.Tools::getValue('kpmshipping'),
+                    ''.utf8_decode(pSQL(Tools::getValue('kpmshipping'))),
                     $total_shipping_wt,
                     $shipping_tax,
                     0,
@@ -192,7 +192,7 @@ public function initContent()
                 $k->addArticle(
                     1,
                     'wrapping',
-                    ''.Tools::getValue('kpmwrapping'),
+                    ''.utf8_decode(pSQL(Tools::getValue('kpmwrapping'))),
                     $total_wrapping_cost_wt,
                     $wrapping_fees_tax,
                     0,
@@ -217,7 +217,7 @@ public function initContent()
                 $k->addArticle(
                     $product['cart_quantity'],
                     ''.$product['reference'],
-                    ''.$name,
+                    ''.utf8_decode($name),
                     (float)$product['price_wt'],
                     $product['rate'],
                     0,
diff --git a/controllers/front/push.php b/controllers/front/push.php
@@ -155,10 +155,22 @@ public function postProcess()
                 if (!Validate::isEmail($shipping['email'])) {
                     $shipping['email'] = 'ingen_mejl_'.$id_cart.'@ingendoman.cc';
                 }
-
+                $newsletter = 0;
+                $newsletter_setting = (int)Configuration::get('KCO_ADD_NEWSLETTERBOX', null, $cart->id_shop);
+                if ($newsletter_setting == 0 || $newsletter_setting == 1) {
+                    if(isset($klarnaorder['merchant_requested']) && isset($klarnaorder['merchant_requested']['additional_checkbox']) && $klarnaorder['merchant_requested']['additional_checkbox'] == true) {
+                        $newsletter = 1;
+                    }
+                } elseif ($newsletter_setting == 2) {
+                    $newsletter = 1;
+                }
                 $id_customer = (int) (Customer::customerExists($shipping['email'], true, true));
                 if ($id_customer > 0) {
                     $customer = new Customer($id_customer);
+                    if ($newsletter == 1) {
+                        $sql_update_customer = "UPDATE "._DB_PREFIX_."customer SET newsletter=1 WHERE id_customer=$id_customer;";
+                        Db::getInstance()->execute(pSQL($sql_update_customer));
+                    }
                 } else {
                     //add customer
                     $password = Tools::passwdGen(8);
@@ -170,7 +182,7 @@ public function postProcess()
                     $customer->is_guest = 0;
                     $customer->id_default_group = (int) (Configuration::get('PS_CUSTOMER_GROUP', null, $cart->id_shop));
                     //$customer->id_default_group = (int)(Configuration::get('PS_GUEST_GROUP', null, $cart->id_shop));
-                    $customer->newsletter = 0;
+                    $customer->newsletter = $newsletter;
                     $customer->optin = 0;
                     $customer->active = 1;
                     $customer->id_gender = 9;
diff --git a/controllers/front/pushuk.php b/controllers/front/pushuk.php
@@ -136,10 +136,24 @@ public function postProcess()
                     if (!Validate::isEmail($shipping['email'])) {
                         $shipping['email'] = 'ingen_mejl_'.$id_cart.'@ingendoman.cc';
                     }
+                    
+                    $newsletter = 0;
+                    $newsletter_setting = (int)Configuration::get('KCO_ADD_NEWSLETTERBOX', null, $cart->id_shop);
+                    if ($newsletter_setting == 0 || $newsletter_setting == 1) {
+                        if(isset($klarnaorder['merchant_requested']) && isset($klarnaorder['merchant_requested']['additional_checkbox']) && $klarnaorder['merchant_requested']['additional_checkbox'] == true) {
+                            $newsletter = 1;
+                        }
+                    } elseif ($newsletter_setting == 2) {
+                        $newsletter = 1;
+                    }
 
                     $id_customer = (int) (Customer::customerExists($shipping['email'], true, true));
                     if ($id_customer > 0) {
                         $customer = new Customer($id_customer);
+                        if ($newsletter == 1) {
+                            $sql_update_customer = "UPDATE "._DB_PREFIX_."customer SET newsletter=1 WHERE id_customer=$id_customer;";
+                            Db::getInstance()->execute(pSQL($sql_update_customer));
+                        }
                     } else {
                         //add customer
                         $password = Tools::passwdGen(8);
@@ -155,7 +169,7 @@ public function postProcess()
                             $cart->id_shop
                         ));
                         
-                        $customer->newsletter = 0;
+                        $customer->newsletter = $newsletter;
                         $customer->optin = 0;
                         $customer->active = 1;
                         $customer->id_gender = 9;
diff --git a/doc/index.html b/doc/index.html
@@ -205,6 +205,45 @@ <h4 class="alert-heading">NOTE!</h4>
         It is possible to enable both services (KCO & KPM) at the same time in the same store. Just make sure to submit your information in corresponding tab for KCO & KPM. If no information is submitted to e.g. Klarna Payment Method (KPM) tab, it will be disabled in the front-office. 
         The same goes with Klarna Checkout - that require you to set <strong>"Active KCO in this shop"</strong> to <strong>Yes</strong> while you've also make sure to submit your Klarna information to corresponding countries within the tab.
     </div>
+
+    <h3>Configure your store to add a invoice fee for Klarna (KPM only)</h3>
+    <p>To create an invoice fee for Klarna KPM (invoice) orders, you need to create a new product in the store with the following parameters:</p>
+    
+    <ul>
+        <li>Provide a proper name, e.g: Invoice fee</li>
+        <li>Make sure to assign a quiet high quantity for this article, e.g: 99999999</li>
+        <li>Submit the price for the fee in the price field</li>
+        <li>Make sure the product is active and visibility is set to "nowhere"</li>
+        <li><strong>It's very important that this product has the same reference code as you've submitted in the Klarna Official-module under tab KLARNA PAYMENT METHOD (KPM) - field: "Invoice fee product".</strong></li>
+    </ul>
+    
+    <h3>Configure backend calls (activate and cancel)</h3>
+    <p>It is possible to work with backend calls to Klarna to activate and cancel orders. Navigate to the integration configuration page and go to tab <strong>"COMMON SETTINGS"</strong>:</p>
+    
+    <table id="tabs_desc" class="table table-bordered table-striped">
+      <thead>
+        <tr>
+          <th>Setting</th>
+          <th>Description</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="tabs_topic">Activate order status</td>
+          <td>In this drop-down you simply choose which order status you would like to trigger the call to Klarna for activating the invoice at Klarna. If you would like to disable this feature you will have to choose: <strong>"Deactivated"</strong>.</td>
+        </tr>
+        <tr>
+          <td class="tabs_topic">Cancel reservation status</td>
+          <td>In this drop-down you simply choose which order status you would like to trigger the call to Klarna for cancel the invoice at Klarna. If you would like to disable this feature you will have to choose: <strong>"Deactivated"</strong>.</td>
+        </tr>
+      </tbody>
+    </table>
+     
+    <div class="alert alert-block"> 
+        <a class="close" data-dismiss="alert">×</a>
+        <h4 class="alert-heading">NOTE!</h4>
+        This feature concerns KCO and KCO.
+    </div>
     
   </section>
       
@@ -224,6 +263,13 @@ <h3>Template problems</h3>
         <li>Font Icons - Many third party templates use different core for font icons within the template. The font icons used in our integration is mainly built together with default icons used in the bootstrap template. You will have to go through the template files (.tpl) in our integration to patch the source for icons in the integration if the icons won't appear in front-office.</li>
     </ul>
     
+    <h3>Important about callbacks</h3>
+    <p>The following callbacks are not implemented.</p>
+    <ul>
+        <li>Re-send invoice - Handled from Klarna Online.</li>
+        <li>Partial refund - Handled from Klarna Online.</li>
+    </ul>
+
   </section>
       
 <section id="changelog">
diff --git a/klarnaofficial.php b/klarnaofficial.php
diff --git a/translations/de.php b/translations/de.php
diff --git a/views/templates/front/kco_height.tpl b/views/templates/front/kco_height.tpl
diff --git a/views/templates/front/kco_twocolumns.tpl b/views/templates/front/kco_twocolumns.tpl

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-1.8.29Update to carrier validation1.8.28Improvements on documentation1.8.27Removed some notices.Imporved company customer support in KPM.Added purifyHTML to voucher code.Changed the terms text for netherlands1.8.26Changed the flag for discountChanged the terms text for germanyFixed issue with genderlink to kco hidden if kco not active for selected country in default checkout.Fixed settings for checkout logo1.8.25changes to javascript for correct layout of discount prices in cart rows1.8.24Changes to orderstatuses on install1.8.23Autofix of default addresses on checkout pages.1.8.22Improvements to security1.8.21Reverse birthday year-month-day to day-month-year for Germany1.8.20move sum to variable.1.8.19pSQL added to push1.8.18Added simple hook for paymentEU.1.8.17Added issue with special chars in message field1.8.16Change expire field from int to varchar in install script.1.8.15Change expire field from int to varchar, due to Klarna sometimes sending - instead of empty value.1.8.14Added Deactivate for status selections.1.8.13Added support for gb iso code1.8.12Added support for minimum amount on orders.1.8.11Moved SQL Install script to sql folder.Added id_cart to klarna_orders table.Made some changes as to in what order klarna order information is saved to module tables. mainly to support different EIDs for SBM system.1.8.10Changed a link1.8.9Fixed an & sign1.8.8changed some tabs to spaces.1.8.7Added automatic meta on installation.1.8.6Fixed issue in kco_height.tpl1.8.5Name changesfilename changescoding standardsoptimization1.8.4Coding standardsUpdate on library1.8.3Save function for test flag moved.1.8.2moved libraries into libraries folder.1.8.1Removed a link in the backoffice.Moved test flag to common settings.1.8.0Cleaned up some more.1.7.0Added readmeCleaned up markupAdded texts explanations1.6.0Escape variablessome sql changesgetaddress fix1.5.0Fixed pclasses for Denmark1.4.0Added so that links are not replaced when KCO is not active.Added button for KCO address check.1.3.0Fixed some issues with kco UK1.2.0Changes to the layout1.1.0UK EID not always int.1.0.0First version for 1.6
	`1`	+1.8.31Newsletter boxEncoding issue for product namesDocumentation improvedAdded support for possible cronjob status checks pending orders1.8.30Link to legacy checkout in case of Klarna service interuption.1.8.29Update to carrier validation1.8.28Improvements on documentation1.8.27Removed some notices.Imporved company customer support in KPM.Added purifyHTML to voucher code.Changed the terms text for netherlands1.8.26Changed the flag for discountChanged the terms text for germanyFixed issue with genderlink to kco hidden if kco not active for selected country in default checkout.Fixed settings for checkout logo1.8.25changes to javascript for correct layout of discount prices in cart rows1.8.24Changes to orderstatuses on install1.8.23Autofix of default addresses on checkout pages.1.8.22Improvements to security1.8.21Reverse birthday year-month-day to day-month-year for Germany1.8.20move sum to variable.1.8.19pSQL added to push1.8.18Added simple hook for paymentEU.1.8.17Added issue with special chars in message field1.8.16Change expire field from int to varchar in install script.1.8.15Change expire field from int to varchar, due to Klarna sometimes sending - instead of empty value.1.8.14Added Deactivate for status selections.1.8.13Added support for gb iso code1.8.12Added support for minimum amount on orders.1.8.11Moved SQL Install script to sql folder.Added id_cart to klarna_orders table.Made some changes as to in what order klarna order information is saved to module tables. mainly to support different EIDs for SBM system.1.8.10Changed a link1.8.9Fixed an & sign1.8.8changed some tabs to spaces.1.8.7Added automatic meta on installation.1.8.6Fixed issue in kco_height.tpl1.8.5Name changesfilename changescoding standardsoptimization1.8.4Coding standardsUpdate on library1.8.3Save function for test flag moved.1.8.2moved libraries into libraries folder.1.8.1Removed a link in the backoffice.Moved test flag to common settings.1.8.0Cleaned up some more.1.7.0Added readmeCleaned up markupAdded texts explanations1.6.0Escape variablessome sql changesgetaddress fix1.5.0Fixed pclasses for Denmark1.4.0Added so that links are not replaced when KCO is not active.Added button for KCO address check.1.3.0Fixed some issues with kco UK1.2.0Changes to the layout1.1.0UK EID not always int.1.0.0First version for 1.6