FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Models/lightConnector.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     protected $transactionId = null;
     
-    protected $apiUrl = array('live'=>'https://api.klarna.com/','test'=>'https://api.playground.klarna.com/');
+    protected $apiUrl = array('live'=>'https://api.klarna.com/', 'test'=>'https://api.playground.klarna.com/');
 
     /**
      * Creates an instance of light connector

Bootstrap.php

Spacing +46 added lines, -46 removed lines

@@ -400,8 +400,8 @@ 
             
             $klarnaService = $this->getService();
 
-            $klarnaAddrBilling = $this->getKlarnaAddrByRawOrderData($orderDataRaw,'billing');
-            $klarnaAddrShipping = $this->getKlarnaAddrByRawOrderData($orderDataRaw,'shipping');
+            $klarnaAddrBilling = $this->getKlarnaAddrByRawOrderData($orderDataRaw, 'billing');
+            $klarnaAddrShipping = $this->getKlarnaAddrByRawOrderData($orderDataRaw, 'shipping');
 
             $transactionId = $orderDataRaw['transactionId'];
             
@@ -509,27 +509,27 @@ 
      * @param mixed $mPrintableElement
      * @return void
      */
-    public function klarnaLog($message, $logLevelMessage=1, $mPrintableElement=null) {
+    public function klarnaLog($message, $logLevelMessage = 1, $mPrintableElement = null) {
         $configname = 'klarnaLogLevel';
         $elementId = Shopware()->Db()->fetchOne('SELECT id FROM s_core_config_elements WHERE name = ?', [$configname]);
         $logLevelConfigSetting = Shopware()->Db()->fetchOne('SELECT value FROM s_core_config_values WHERE element_id = ?', [$elementId]);
         $logLevelConfigSetting = unserialize($logLevelConfigSetting);
-        $logLevelSetting = (is_numeric($logLevelConfigSetting) && $logLevelConfigSetting >=0 && $logLevelConfigSetting <=4) ? (int)$logLevelConfigSetting : 1;
+        $logLevelSetting = (is_numeric($logLevelConfigSetting) && $logLevelConfigSetting >= 0 && $logLevelConfigSetting <= 4) ? (int) $logLevelConfigSetting : 1;
         
         if ($logLevelMessage <= $logLevelSetting) {
-            $prefix = "[".date('Y-m-d H:i:s')."] ";
+            $prefix = "[" . date('Y-m-d H:i:s') . "] ";
             $debugBacktrace = '';
             if ($logLevelSetting >= 4) {
-                $debugBacktrace = print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true);
+                $debugBacktrace = print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), true);
             }
             $sPrintableElementMessage = '';
             if ($mPrintableElement !== null) {
-                $sPrintableElementMessage = print_r($mPrintableElement,true);
+                $sPrintableElementMessage = print_r($mPrintableElement, true);
             }
-            $fullMessage = $prefix.$message."\n".$sPrintableElementMessage.$debugBacktrace;
+            $fullMessage = $prefix . $message . "\n" . $sPrintableElementMessage . $debugBacktrace;
             $shopPath = Shopware()->DocPath();
-            $logfilePath = $shopPath.'/var/log/klarnaTrace.log';
-            $fileHandler = fopen($logfilePath,'a');
+            $logfilePath = $shopPath . '/var/log/klarnaTrace.log';
+            $fileHandler = fopen($logfilePath, 'a');
             fwrite($fileHandler, $fullMessage);
             fclose($fileHandler);
         }
@@ -555,7 +555,7 @@ 
             $country = $repository->findOneBy(array('id' => $baseData['countryId']));
             $countryiso = $country->getIso();
 
-            $klarnaAddr =  new KlarnaAddr();
+            $klarnaAddr = new KlarnaAddr();
             $klarnaAddr->setEmail($orderDataRaw['customerEmail']);
             $klarnaAddr->setFirstName($baseData['firstName']);
             $klarnaAddr->setLastName($baseData['lastName']);
@@ -570,7 +570,7 @@ 
             $klarnaAddr->setCountry($countryiso);
         }
 
-        $this->klarnaLog('Update order address from backend with following address data:',3,$klarnaAddr);
+        $this->klarnaLog('Update order address from backend with following address data:', 3, $klarnaAddr);
         return $klarnaAddr;
     }
 
@@ -598,10 +598,10 @@ 
             if ($index == count($addressParts) || $houseNumberFound) {
                 // at least last element should be streetnr
                 if (!empty($streetnr)) $streetnr .= ' ';
-                $streetnr .= (string)$addressPart;
+                $streetnr .= (string) $addressPart;
             }
-            else  {
-                $street .= (string)' '.$addressPart;
+            else {
+                $street .= (string) ' ' . $addressPart;
             }
         }
 
@@ -610,7 +610,7 @@ 
             $streetnr_extension .= $baseData['additionalAddressLine1'];
         }
         if (!empty($baseData['additionalAddressLine2'])) {
-            $streetnr_extension .= "\n".$baseData['additionalAddressLine2'];
+            $streetnr_extension .= "\n" . $baseData['additionalAddressLine2'];
         }
 
         $return = array(
@@ -1289,7 +1289,7 @@ 
 
         // just return in case kco payment is deactivated in backend
 
-        if (!$this->isKcoPaymentActive()){
+        if (!$this->isKcoPaymentActive()) {
             return;
         }
         $user = $view->getAssign('sUserData');
@@ -1300,7 +1300,7 @@ 
             && ($request->getActionName() == 'cart' || $request->getActionName() == 'ajaxCart')
         ) {
             $this->registerMyTemplateDir();
-            $view->assign('KlarnaEnableButton', (bool)$config->get('showKlarnaButton'));
+            $view->assign('KlarnaEnableButton', (bool) $config->get('showKlarnaButton'));
             $view->assign('KlarnaShowCheckoutButton', $this->getShowCheckoutButton($user));
             $view->assign('klarnaKcoPaymentActive', $this->isKlarnaKcoPaymentActive($user));
             $view->assign('KlarnaPaymentDescription', $this->getPayment()->getDescription());
@@ -1329,7 +1329,7 @@ 
             $view->assign('KlarnaMerchantId', $config->get('merchantId'));
             $view->assign('KlarnaHideCheckoutSteps', true);
             
-            if (version_compare(Shopware::VERSION, '5.2.0', '<')){
+            if (version_compare(Shopware::VERSION, '5.2.0', '<')) {
                 $view->assign('KlarnaSkipLoginFix', true);
             }
             if (!$this->isTemplateResponsive()) {
@@ -1449,15 +1449,15 @@ 
             $userData['additional']
         );
         
-        if (isset($session['sChangedCountry'])){
+        if (isset($session['sChangedCountry'])) {
             
             /** @var \Shopware\Components\Model\ModelManager $em */
             $em = $this->get('models');
 
             /** @var \Shopware\Models\Customer\Customer $customer */
             $country = $em->getRepository('Shopware\Models\Country\Country')->findOneBy(array('id' => $session['sChangedCountry']));            
-            $userData['shippingaddress']['country'] =$country;     
-            $userData['billingaddress']['country'] =$country;   
+            $userData['shippingaddress']['country'] = $country;     
+            $userData['billingaddress']['country'] = $country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
          }
@@ -1477,10 +1477,10 @@ 
         $this->klarnaLog("Entering Bootstrap::getCountryByShop", 3);
         $locale = explode('_', $locale);
         $locale = isset($locale[1]) ? $locale[1] : $locale[0];
-        $this->klarnaLog("Bootstrap::getCountryByShop locale to request for:".$locale,3);
+        $this->klarnaLog("Bootstrap::getCountryByShop locale to request for:" . $locale, 3);
         $sql = 'SELECT id FROM s_core_countries WHERE countryiso=?';
         $countryId = Shopware()->Db()->fetchOne($sql, array($locale));
-        $countryId = ($countryId) ? (int)$countryId : null;
+        $countryId = ($countryId) ? (int) $countryId : null;
                 
         return $countryId;
     }
@@ -1511,7 +1511,7 @@ 
         $locale = $locale == 'nn-no' ? 'nb-no' : $locale;
 
         if ($locale == 'de-de') {
-            if($countryIso == 'CH') {
+            if ($countryIso == 'CH') {
                 $locale = 'de-ch';
             } elseif ($countryIso == 'AT') {
                 $locale = 'de-at';
@@ -1526,10 +1526,10 @@ 
         $config = $this->Config();
         $options = $this->getColorConfigOptions($config);
 
-        $options['allow_separate_shipping_address'] = (bool)$config->get('allowSeparateShippingAddress');
-        $options['packstation_enabled'] = (bool)$config->get('supportPackstation') && $allowPackstation;
-        $options['phone_mandatory'] = (bool)$config->get('mandatoryPhone');
-        $options['date_of_birth_mandatory'] = (bool)$config->get('mandatoryBirthday');
+        $options['allow_separate_shipping_address'] = (bool) $config->get('allowSeparateShippingAddress');
+        $options['packstation_enabled'] = (bool) $config->get('supportPackstation') && $allowPackstation;
+        $options['phone_mandatory'] = (bool) $config->get('mandatoryPhone');
+        $options['date_of_birth_mandatory'] = (bool) $config->get('mandatoryBirthday');
 
         if (!empty($dispatch)) {
             $options['shipping_details'] = $dispatch['description'];
@@ -1544,19 +1544,19 @@ 
         foreach ($basket['content'] as $index=>$basketItem) {
             // compatibility to shopware plugin custom products
             if (isset($basketItem['custom_product_prices'])) {
-                $basketItemPrice = (double)$basketItem['custom_product_prices']['total'];
+                $basketItemPrice = (double) $basketItem['custom_product_prices']['total'];
             }
             else {
-                $basketItemPrice = (double)str_replace(',', '.', $basketItem['price']);
+                $basketItemPrice = (double) str_replace(',', '.', $basketItem['price']);
             }
             $unitPrice = round($basketItemPrice * 100);
             $cart[] = array(
                 'type' => $unitPrice >= 0 ? 'physical' : 'discount',
                 'reference' => $basketItem['ordernumber'],
                 'name' => $basketItem['articlename'],
-                'quantity' => (int)$basketItem['quantity'],
-                'unit_price' => (int)$unitPrice,
-                'tax_rate' => (int)round($basketItem['tax_rate'] * 100)
+                'quantity' => (int) $basketItem['quantity'],
+                'unit_price' => (int) $unitPrice,
+                'tax_rate' => (int) round($basketItem['tax_rate'] * 100)
             );
         }
         if (!empty($basket['sShippingcosts'])) {
@@ -1567,8 +1567,8 @@ 
                 'reference' => 'SHIPPING',
                 'name' => 'Shipping Fee',
                 'quantity' => 1,
-                'unit_price' => (int)round($shippingAmount * 100),
-                'tax_rate' => (int)round($basket['sShippingcostsTax'] * 100),
+                'unit_price' => (int) round($shippingAmount * 100),
+                'tax_rate' => (int) round($basket['sShippingcostsTax'] * 100),
             );
         }
 
@@ -1654,7 +1654,7 @@ 
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -1824,7 +1824,7 @@ 
 
         $salutation = $form['register']['personal']['salutation'];
         if (!empty($salutation) && ($countryIso == 'DE' || $countryIso == 'NL')) {
-            $create['shipping_address']['title'] = ($salutation == 'ms' ? 'Frau' : 'Herr');//German names
+            $create['shipping_address']['title'] = ($salutation == 'ms' ? 'Frau' : 'Herr'); //German names
         }
 
         $billingStreet = $form['register']['billing']['street'];
@@ -1900,9 +1900,9 @@ 
         $view->assign('sPayments', $this->filterPayments($adminModule->sGetPaymentMeans()));
         $view->assign('sCountryList', $adminModule->sGetCountryList());
         $view->assign('KlarnaHideCheckoutSteps', true);
-        $view->assign('KlarnaShowB2bSelect', (bool)$config->get('showB2bSelect'));
-        $view->assign('KlarnaShowBasket', (bool)$config->get('showMiniBasket'));
-        $view->assign('KlarnaShowDispatch', (bool)$config->get('showDispatch'));
+        $view->assign('KlarnaShowB2bSelect', (bool) $config->get('showB2bSelect'));
+        $view->assign('KlarnaShowBasket', (bool) $config->get('showMiniBasket'));
+        $view->assign('KlarnaShowDispatch', (bool) $config->get('showDispatch'));
         $view->assign(
             'KlarnaCDNLink',
             $this->buildCDNLink()
@@ -1912,7 +1912,7 @@ 
             $view->sUserData['billingaddress']['lastname'] == 'Klarna Checkout'
         );
         $debugShowLogin = !empty($session->sUserId);
-        $debugShowLogin2 = $this->getShowLoginConfig($config,!empty($session->sUserId));
+        $debugShowLogin2 = $this->getShowLoginConfig($config, !empty($session->sUserId));
         $view->assign(
             'KlarnaShowLogin',
             $this->getShowLoginConfig($config, !empty($session->sUserId))
@@ -1936,7 +1936,7 @@ 
      */
     private function getShowLoginConfig($config, $userLoggedIn)
     {
-        return (bool)$config->get('showLoginPanel') && !($userLoggedIn);
+        return (bool) $config->get('showLoginPanel') && !($userLoggedIn);
     }
 
     /**demo
@@ -2295,13 +2295,13 @@ 
         /** @var Shopware\Models\Attribute\Payment $payment */
         foreach ($payments as $payment) {
             $paymentObj = $payment->getPayment();
-            if (is_null($paymentObj)){
+            if (is_null($paymentObj)) {
                 $paymentName = false;
             } else {
                 $paymentName = $paymentObj->getName();
             }
             
-            if(!$paymentName){
+            if (!$paymentName) {
                 continue;
             }            
             
@@ -2379,7 +2379,7 @@ 
     {
         $media = $payment->getSwagKlarnaKlarnaMedia();
         if (!$payment->getSwagKlarnaShowInKlarnaIframe() || !empty($media)) {
-            if ($this->assertMinimumVersion('5.1') && version_compare(Shopware::VERSION, '5.2.0', '<=') ) {
+            if ($this->assertMinimumVersion('5.1') && version_compare(Shopware::VERSION, '5.2.0', '<=')) {
                 $media = $this->get('shopware_media.media_service')->getUrl($media);
             } else {
                 /** @var Enlight_Controller_Front $front */

Controllers/Frontend/PaymentKlarna.php

Spacing +10 added lines, -10 removed lines

@@ -112,13 +112,13 @@ 
         }
         
         if ($this->Request()->getPost('sCountry')) {
-            $this->session['sCountry'] = (int)$this->Request()->getPost('sCountry');
+            $this->session['sCountry'] = (int) $this->Request()->getPost('sCountry');
             $this->session["sState"] = 0;
             $this->session["sArea"] = Shopware()->Db()->fetchOne("
                 SELECT areaID FROM s_core_countries WHERE id = ?
             ", [$this->session['sCountry']]);
             unset($this->session->KlarnaOrder);
-            $this->session['sChangedCountry'] = (int)$this->Request()->getPost('sCountry');
+            $this->session['sChangedCountry'] = (int) $this->Request()->getPost('sCountry');
         }
         $this->forward('index');
     }
@@ -158,7 +158,7 @@ 
                     $this->redirect(['controller' => 'payment_klarna', 'action' => 'otherPayment']);
                     return;
                 }
-                $shopCountryId = (string)$shopCountryId;
+                $shopCountryId = (string) $shopCountryId;
                 if ($shopCountryId != $postedCountry) {
                     $this->session['sCountry'] = $postedCountry;
                     // unset klarnaOrder so it will be created with new countryID
@@ -313,10 +313,10 @@ 
 
         $this->basket['sAmountTax'] = 1.9;
         $this->View()->sShippingcosts = $debugShipping['brutto'];
-        $this->View()->sShippingcostsWithTax =  $debugShipping['brutto'];
+        $this->View()->sShippingcostsWithTax = $debugShipping['brutto'];
         $this->View()->sShippingcostsNet = $debugShipping['netto'];
         $this->View()->sShippingcostsTax = $debugShipping['tax'];
-        $this->View()->sAmount = $this->basket['AmountWithTaxNumeric'] ;
+        $this->View()->sAmount = $this->basket['AmountWithTaxNumeric'];
 
         $this->View()->sAmountNet = $this->basket['sAmountNet'];
         $this->View()->sAmountTax = $this->basket['sAmountTax'];
@@ -790,7 +790,7 @@ 
                         );
                     }
                 } catch (\Exception $ex) { /* do nothing */
-                    $this->plugin->klarnaLog("ERROR while creating User. Exception information:". $ex->getMessage(), 1);
+                    $this->plugin->klarnaLog("ERROR while creating User. Exception information:" . $ex->getMessage(), 1);
                 }
             }
         }
@@ -1036,8 +1036,8 @@ 
 
                 $update['status'] = 'created';
                 $update['merchant_reference'] = [
-                    'orderid1' => (string)$orderNumber,
-                    'orderid2' => (string)$order['reference']
+                    'orderid1' => (string) $orderNumber,
+                    'orderid2' => (string) $order['reference']
                 ];
                 $order->update($update);
             }
@@ -1366,8 +1366,8 @@ 
 
             $update['status'] = 'created';
             $update['merchant_reference'] = [
-                'orderid1' => (string)$orderNumber,
-                'orderid2' => (string)$order['reference']
+                'orderid1' => (string) $orderNumber,
+                'orderid2' => (string) $order['reference']
             ];
             $order->update($update);
         }

Controllers/Backend/PaymentKlarna.php

Spacing +1 added lines, -1 removed lines

@@ -449,7 +449,7 @@
         $orderId = $this->Request()->getParam('orderId');
         $this->registerShopByOrderId($orderId);
         $order = $this->getOrderById($orderId);
-        $value = (float)str_replace(',', '.', $this->Request()->getParam('value'));
+        $value = (float) str_replace(',', '.', $this->Request()->getParam('value'));
         $service = $this->getService($order);
 
         /** @noinspection PhpUndefinedMethodInspection */