FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Bootstrap.php

Doc Comments +6 added lines, -5 removed lines

@@ -1678,7 +1678,7 @@ 
 
     /**
      *
-     * @return array
+     * @return string
      */
     public function getLabel()
     {
@@ -1715,7 +1715,7 @@ 
     /**
      * Creates and returns the klarna client for an event.
      *
-     * @return \Klarna_Checkout_Connector
+     * @return Klarna_Checkout_ConnectorInterface
      */
     public function onInitResourceKlarnaCheckoutConnector()
     {
@@ -1768,7 +1768,7 @@ 
 
     /**
      * @param string $requiredVersion
-     * @return bool|mixed
+     * @return boolean
      */
     protected function assertMinimumVersion($requiredVersion)
     {
@@ -1932,6 +1932,7 @@ 
      *
      * @param $config Enlight_Config
      * @param $lastName string
+     * @param boolean $userLoggedIn
      * @return bool
      */
     private function getShowLoginConfig($config, $userLoggedIn)
@@ -2035,7 +2036,7 @@ 
      * Helper method to get the correct order for the elements
      *
      * @param $config Enlight_Config
-     * @return array Array with the order of the elements
+     * @return string[] Array with the order of the elements
      */
     private function getPositionOrder($config)
     {
@@ -2334,7 +2335,7 @@ 
     /**
      * @param Shopware\Models\Payment\Payment $payment
      * @param $basket
-     * @return bool
+     * @return double
      */
     private function getFee($payment, $basket)
     {

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
  * our trademarks remain entirely with us.
  */
 
-use Doctrine\DBAL\Connection;
 use Shopware\Components\StreetSplitService;
 
 # Load dummy interface CSRFWhitelistAware for SW < 5.2

Indentation +10 added lines, -10 removed lines

@@ -491,7 +491,7 @@ 
         $args->setReturn($builder);
     }
 
-     public function onGetStreetSplitService()
+        public function onGetStreetSplitService()
     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
@@ -1364,12 +1364,12 @@ 
         /** @var Enlight_Components_Session_Namespace $session */
         $session = $this->Application()->Session();
 
-         // Switch User to external PaymentId after registration
-         if (isset($session['KlarnaExternalPaymentId'])) {
+            // Switch User to external PaymentId after registration
+            if (isset($session['KlarnaExternalPaymentId'])) {
                 $this->savePayment($session['KlarnaExternalPaymentId']);
         }
 
-       $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1);
+        $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1);
     }
     
 
@@ -1460,7 +1460,7 @@ 
             $userData['billingaddress']['country'] =$country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
-         }
+            }
         
         $orderVariables['sUserData'] = $userData;
         $testbreakpoint = 0;
@@ -2385,14 +2385,14 @@ 
                 } else {
                     $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend'));
                 }
-		if (version_compare(Shopware::VERSION, '5.2.0', '>=')) {
+        if (version_compare(Shopware::VERSION, '5.2.0', '>=')) {
             # make sure me get only the image name, path is set in case of upgarde from SW.5.1 to 5.2
             $parts = explode('/', $media);
             $end = end($parts);
-			$media = $url . 'media/image/' . $end;
-		} else {
-	                $media = $url . $media;
-		}
+            $media = $url . 'media/image/' . $end;
+        } else {
+                    $media = $url . $media;
+        }
             }
 
             return $media;

Spacing +79 added lines, -79 removed lines

@@ -26,7 +26,7 @@ 
 use Shopware\Components\StreetSplitService;
 
 # Load dummy interface CSRFWhitelistAware for SW < 5.2
-require_once __DIR__ . '/Components/CSRFWhitelistAware.php';
+require_once __DIR__.'/Components/CSRFWhitelistAware.php';
 
 /**
  * Shopware Klarna Plugin
@@ -252,8 +252,8 @@ 
      */
     public function getKLarnaService() {
         if ($this->klarnaService === null) {
-            require_once __DIR__ . '/Components/Klarna/Klarna.php';
-            require_once __DIR__ . '/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
+            require_once __DIR__.'/Components/Klarna/Klarna.php';
+            require_once __DIR__.'/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
             $this->klarnaService = new Klarna();
         }
 
@@ -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'];
             
@@ -495,7 +495,7 @@ 
     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
-            __DIR__ . '/Components/'
+            __DIR__.'/Components/'
         );
 
         return new StreetSplitService();
@@ -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')."] ";
             $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;
             $shopPath = Shopware()->DocPath();
             $logfilePath = $shopPath.'/var/log/klarnaTrace.log';
-            $fileHandler = fopen($logfilePath,'a');
+            $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;
             }
         }
 
@@ -1218,11 +1218,11 @@ 
     public function registerMyTemplateDir($isBackend = false)
     {
         if ($isBackend) {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/', 'klarna');
         } elseif ($this->isTemplateResponsive()) {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/responsive', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/responsive', 'klarna');
         } else {
-            $this->get('template')->addTemplateDir(__DIR__ . '/Views/_emotion', 'klarna');
+            $this->get('template')->addTemplateDir(__DIR__.'/Views/_emotion', 'klarna');
         }
     }
 
@@ -1250,7 +1250,7 @@ 
     {
         $this->registerMyTemplateDir();
 
-        return __DIR__ . '/Controllers/Frontend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Frontend/PaymentKlarna.php';
     }
 
     /**
@@ -1262,10 +1262,10 @@ 
     {
         $this->registerMyTemplateDir(true);
         $this->Application()->Snippets()->addConfigDir(
-            __DIR__ . '/Snippets/'
+            __DIR__.'/Snippets/'
         );
 
-        return __DIR__ . '/Controllers/Backend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Backend/PaymentKlarna.php';
     }
 
     /**
@@ -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()) {
@@ -1390,7 +1390,7 @@ 
     public function addJsFiles()
     {
         $jsPath = array(
-            __DIR__ . '/Views/responsive/frontend/_public/src/js/jquery.klarna_checkout.js'
+            __DIR__.'/Views/responsive/frontend/_public/src/js/jquery.klarna_checkout.js'
         );
 
         return new Doctrine\Common\Collections\ArrayCollection($jsPath);
@@ -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),
             );
         }
 
@@ -1599,7 +1599,7 @@ 
                 'action' => 'return',
                 'forceSecure' => true
             )
-        ) . "?transactionId={checkout.order.uri}";
+        )."?transactionId={checkout.order.uri}";
         $merchant['push_uri'] = $router->assemble(
             array(
                 'controller' => 'payment_klarna',
@@ -1607,7 +1607,7 @@ 
                 'forceSecure' => true,
                 'appendSession' => true
             )
-        ) . "&transactionId={checkout.order.uri}";
+        )."&transactionId={checkout.order.uri}";
         $merchant['back_to_store_uri'] = $router->assemble(
             array(
                 'controller' => 'index',
@@ -1620,41 +1620,41 @@ 
 
     public function getCheckoutAddress($user, $type = 'billing')
     {
-        if (empty($user[$type . 'address']['zipcode']) || $user[$type . 'address']['zipcode'] == '00000') {
+        if (empty($user[$type.'address']['zipcode']) || $user[$type.'address']['zipcode'] == '00000') {
             return array();
         }
 
         $address = array(
-            'given_name' => $user[$type . 'address']['firstname'],
-            'family_name' => $user[$type . 'address']['lastname'],
-            'postal_code' => $user[$type . 'address']['zipcode'],
-            'city' => $user[$type . 'address']['city'],
+            'given_name' => $user[$type.'address']['firstname'],
+            'family_name' => $user[$type.'address']['lastname'],
+            'postal_code' => $user[$type.'address']['zipcode'],
+            'city' => $user[$type.'address']['city'],
             'country' => $user['additional'][$type == 'billing' ? 'country' : 'countryShipping']['countryiso'],
             'email' => $user['additional']['user']['email'],
             'phone' => $user['billingaddress']['phone'],
         );
         $address['country'] = strtolower($address['country']);
         if ($address['country'] == 'de' || $address['country'] == 'nl') {
-            $address['title'] = $user[$type . 'address']['salutation'] == 'ms' ? 'Frau' : 'Herr';
+            $address['title'] = $user[$type.'address']['salutation'] == 'ms' ? 'Frau' : 'Herr';
             if ($this->assertMinimumVersion('5.0.0')) {
                 /** @var StreetSplitService $streetSplitService */
                 $streetSplitService = Shopware()->StreetSplitService();
-                $streetAndNumber = $streetSplitService->split($user[$type . 'address']['street']);
+                $streetAndNumber = $streetSplitService->split($user[$type.'address']['street']);
 
                 $address['street_name'] = $streetAndNumber['streetName'];
                 $address['street_number'] = $streetAndNumber['streetNumber'];
             } else {
-                $address['street_name'] = $user[$type . 'address']['street'];
-                $address['street_number'] = $user[$type . 'address']['streetnumber'];
+                $address['street_name'] = $user[$type.'address']['street'];
+                $address['street_number'] = $user[$type.'address']['streetnumber'];
             }
         } else {
             $address['street_address'] = trim(
-                $user[$type . 'address']['street'] . ' ' . $user[$type . 'address']['streetnumber']
+                $user[$type.'address']['street'].' '.$user[$type.'address']['streetnumber']
             );
         }
 
         // Make sure phone number is unset if empty
-        if ($address['phone'] === null){
+        if ($address['phone'] === null) {
             unset($address['phone']);
         }
         return $address;
@@ -1691,7 +1691,7 @@ 
      */
     public function getVersion()
     {
-        $info = json_decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'plugin.json'), true);
+        $info = json_decode(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'plugin.json'), true);
 
         if ($info) {
             return $info['currentVersion'];
@@ -1708,7 +1708,7 @@ 
         return array(
             'version' => $this->getVersion(),
             'label' => $this->getLabel(),
-            'description' => file_get_contents(__DIR__ . '/info.txt')
+            'description' => file_get_contents(__DIR__.'/info.txt')
         );
     }
 
@@ -1719,7 +1719,7 @@ 
      */
     public function onInitResourceKlarnaCheckoutConnector()
     {
-        require_once __DIR__ . '/Components/KlarnaCheckout/Checkout.php';
+        require_once __DIR__.'/Components/KlarnaCheckout/Checkout.php';
         if ($this->Config()->get('testDrive')) {
             Klarna_Checkout_Order::$baseUri = 'https://checkout.testdrive.klarna.com/checkout/orders';
         } else {
@@ -1738,8 +1738,8 @@ 
      */
     public function onInitResourceKlarnaService()
     {
-        require_once __DIR__ . '/Components/Klarna/Klarna.php';
-        require_once __DIR__ . '/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
+        require_once __DIR__.'/Components/Klarna/Klarna.php';
+        require_once __DIR__.'/Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc';
 
         $k = new Klarna();
         return $k;
@@ -1757,7 +1757,7 @@ 
             array(),
             //less files to compile
             array(
-                __DIR__ . '/Views/responsive/frontend/_public/src/less/all.less'
+                __DIR__.'/Views/responsive/frontend/_public/src/less/all.less'
             ),
             //import directory
             __DIR__
@@ -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'];
@@ -1841,7 +1841,7 @@ 
                     $create['shipping_address']['street_number'] = $billingStreetNumber;
                 }
             } else {
-                $create['shipping_address']['street_address'] = $billingStreet . ' ' . $billingStreetNumber;
+                $create['shipping_address']['street_address'] = $billingStreet.' '.$billingStreetNumber;
             }
         }
 
@@ -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
@@ -1978,7 +1978,7 @@ 
             $result = Shopware()->Db()->fetchAssoc($sql, array());
 
             // Load translations if available
-            $this->countries = array_map(function ($country) {
+            $this->countries = array_map(function($country) {
                 $country['id'] = $country['countryId'];
                 return Shopware()->Modules()->Admin()->sGetCountryTranslation($country);
             }, $result);
@@ -2099,7 +2099,7 @@ 
                 'phone' => $billingAddress['phone']
             ),
             'billing' => array(
-                'street' => $billingAddress['street_name'] . ' ' . $billingAddress['street_number'],
+                'street' => $billingAddress['street_name'].' '.$billingAddress['street_number'],
                 'zipcode' => $billingAddress['postal_code'],
                 'city' => $billingAddress['city']
             )
@@ -2290,13 +2290,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;
             }            
             
@@ -2305,7 +2305,7 @@ 
             }
             $paymentArray = array(
                 'name' => $payment->getPayment()->getDescription(),
-                'redirect_uri' => $this->getRedirectUri() . '/paymentId/' . $payment->getPaymentId()
+                'redirect_uri' => $this->getRedirectUri().'/paymentId/'.$payment->getPaymentId()
             );
 
             if ($fee = $this->getFee($payment->getPayment(), $basket)) {
@@ -2316,7 +2316,7 @@ 
                 //Shorten the description to max. 500 characters
                 $description = strip_tags($description);
                 $description = preg_replace('#<!--.*-->#ms', '', $description);
-                $paymentArray['description'] = substr($description, 0, 497) . '...';
+                $paymentArray['description'] = substr($description, 0, 497).'...';
             }
 
             //Only add to external checkouts if an image is set and if the shop supports SSL
@@ -2374,14 +2374,14 @@ 
     {
         $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 */
                 $front = $this->get('front');
                 $request = $front->Request();
                 if ($request && $request->getHttpHost()) {
-                    $url = ($request->isSecure() ? 'https' : 'http') . '://' . $request->getHttpHost() . $request->getBasePath() . "/";
+                    $url = ($request->isSecure() ? 'https' : 'http').'://'.$request->getHttpHost().$request->getBasePath()."/";
                 } else {
                     $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend'));
                 }
@@ -2389,9 +2389,9 @@ 
             # make sure me get only the image name, path is set in case of upgarde from SW.5.1 to 5.2
             $parts = explode('/', $media);
             $end = end($parts);
-			$media = $url . 'media/image/' . $end;
+			$media = $url.'media/image/'.$end;
 		} else {
-	                $media = $url . $media;
+	                $media = $url.$media;
 		}
             }
 

Braces +5 added lines, -5 removed lines

@@ -597,10 +597,11 @@ 
             $index++;
             if ($index == count($addressParts) || $houseNumberFound) {
                 // at least last element should be streetnr
-                if (!empty($streetnr)) $streetnr .= ' ';
+                if (!empty($streetnr)) {
+                    $streetnr .= ' ';
+                }
                 $streetnr .= (string)$addressPart;
-            }
-            else  {
+            } else  {
                 $street .= (string)' '.$addressPart;
             }
         }
@@ -1545,8 +1546,7 @@ 
             // compatibility to shopware plugin custom products
             if (isset($basketItem['custom_product_prices'])) {
                 $basketItemPrice = (double)$basketItem['custom_product_prices']['total'];
-            }
-            else {
+            } else {
                 $basketItemPrice = (double)str_replace(',', '.', $basketItem['price']);
             }
             $unitPrice = round($basketItemPrice * 100);

Controllers/Frontend/PaymentKlarna.php

Indentation +25 added lines, -25 removed lines

@@ -290,7 +290,7 @@ 
 
         // Klarna Prefill checkBox
         if ($this->isUserLoggedIn()) {
-               $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
+                $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
         }
 
         // Iframe Backend Config
@@ -436,7 +436,7 @@ 
         if ($this->Request()->getParam('sArticle') && $this->Request()->getParam('sQuantity')) {
             $this->View()->sBasketInfo = $basketObj->sUpdateArticle($this->Request()->getParam('sArticle'), $this->Request()->getParam('sQuantity'));
         }
-       $this->redirect(['action' => $this->Request()->getParam('sTargetAction', 'showIframe')]);
+        $this->redirect(['action' => $this->Request()->getParam('sTargetAction', 'showIframe')]);
     }
 
     /**
@@ -610,7 +610,7 @@ 
         return array("id" => $this->session['sState']);
     }
 
-   /**
+    /**
      * @param Klarna_Checkout_Order $order
      */
     public function createAccount($order = null, $checkLoginState=true)
@@ -739,8 +739,8 @@ 
                     }
                     $module->sSYSTEM->_POST = $data['billing'];
                     if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {                
-                         $userId = $session->offsetGet('sUserId');
-                         $this->updateBilling($userId, $data['billing']);
+                            $userId = $session->offsetGet('sUserId');
+                            $this->updateBilling($userId, $data['billing']);
                     } else{
                         $module->sUpdateBilling();
                     }
@@ -851,13 +851,13 @@ 
 
         // get updated password; it is md5 randomized after register
         $getUser = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')->findOneBy(
-		array('email' =>  $data['auth']['email'])
-		);
+        array('email' =>  $data['auth']['email'])
+        );
 
-       $data['auth']['password']= $getUser->getPassword();
-       $data['auth']['passwordMD5']= $getUser->getPassword();
-       $data['auth']['encoderName'] = 'md5';
-       return $data;
+        $data['auth']['password']= $getUser->getPassword();
+        $data['auth']['passwordMD5']= $getUser->getPassword();
+        $data['auth']['encoderName'] = 'md5';
+        return $data;
     }
 
 
@@ -875,19 +875,19 @@ 
         unset ($data['billing']);        
 
         $customer = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')->findOneBy(
-		array('id' =>  $userId)
-		);
+        array('id' =>  $userId)
+        );
         $customer->fromArray($data);
         Shopware()->Container()->get('shopware_account.customer_service')->update($customer);
     }
 
 
-     /**
-     * Updates the shipping address
-     *
-     * @param int $userId
-     * @param array $shippingData
-     */
+        /**
+         * Updates the shipping address
+         *
+         * @param int $userId
+         * @param array $shippingData
+         */
     private function updateShipping($userId, $shippingData)
     {
         /** @var \Shopware\Components\Model\ModelManager $em */
@@ -900,7 +900,7 @@ 
         $addressold = $customer->getDefaultShippingAddress();
         $address = new \Shopware\Models\Customer\Address();
         
-         /** @var \Shopware\Models\Country\Country $country */
+            /** @var \Shopware\Models\Country\Country $country */
         $country = $addressold->getCountry();
         $shippingData['country'] = $country;
         if ($shippingData['phone'] === null) {
@@ -934,7 +934,7 @@ 
         /** @var \Shopware\Models\Customer\Address $address */
         $address = $customer->getDefaultBillingAddress();
         
-         /** @var \Shopware\Models\Country\Country $country */
+            /** @var \Shopware\Models\Country\Country $country */
         $country = $address->getCountry();
         $billingData['country'] = $country;
         $address->fromArray($billingData);
@@ -948,7 +948,7 @@ 
      */
     public function loginAction()
     {
-     //   Shopware()->Session()->offsetSet('KlarnaOrder', null);
+        //   Shopware()->Session()->offsetSet('KlarnaOrder', null);
         $this->redirect(array('controller' => 'payment_klarna', 'action' => 'showIframe'));
     }
 
@@ -997,14 +997,14 @@ 
 
             if ($order['status'] == 'checkout_complete') {
                 $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.",3);
-             if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){
+                if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){
                     $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved",3);
                     Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId );
                     $orderNumber = $this->saveOrder(
                         $order['reservation'],
                         $order['reference']
                     );
-                     Shopware()->Session()->offsetSet('KlarnaTransactionId', null );
+                        Shopware()->Session()->offsetSet('KlarnaTransactionId', null );
                 }
             }
 
@@ -1437,7 +1437,7 @@ 
 
     protected function isUserLoggedIn()
     {        
-         return (isset($this->session->sUserId) && !empty($this->session->sUserId));
+            return (isset($this->session->sUserId) && !empty($this->session->sUserId));
     }
 
     /**

Spacing +86 added lines, -86 removed lines

@@ -101,7 +101,7 @@ 
     public function expressAction()
     {
         $this->plugin = $this->get('plugins')->Frontend()->SwagPaymentKlarna();
-        if (!empty($this->session->PaypalResponse)){
+        if (!empty($this->session->PaypalResponse)) {
             $this->plugin->klarnaLog("Paypal Payment in Progress detected Redirecting To Index Page", 3);
             $this->redirect(
                 array(
@@ -113,13 +113,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 = ?
             ", array($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');
     }
@@ -135,7 +135,7 @@ 
         $this->basket = $this->get('modules')->Basket()->sGetBasket();
 
         $preFill = $this->config['preFillCheckout'];
-        if ($this->isUserLoggedIn()){
+        if ($this->isUserLoggedIn()) {
             $user = Shopware()->Modules()->Admin()->sGetUserData();
         }
 
@@ -151,7 +151,7 @@ 
 
             // set klarnaPrefill, in case User ovverides Setting with checkbox
 
-            if ($this->Request()->getParam('klarnaPreFill') == "on"){
+            if ($this->Request()->getParam('klarnaPreFill') == "on") {
                 $this->session['klarnaUserPreFill'] = true;
             }
 
@@ -164,7 +164,7 @@ 
                     $this->redirect(array('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
@@ -177,22 +177,22 @@ 
         }
         // set shipping costs (Overwrites $session->sCountry!)
         $debugShipping = $this->getShippingCosts();
-        if ($postedCountry){
+        if ($postedCountry) {
             $this->session['sCountry'] = $postedCountry;
         } else {
             // set Default Country
             $this->session['sCountry'] = $this->getCountryByShop(Shopware()->Shop());
         }
 
-        $this->basket['sShippingcosts'] = $debugShipping['brutto'];;
+        $this->basket['sShippingcosts'] = $debugShipping['brutto']; ;
         $this->basket['sShippingcostsWithTax'] = $debugShipping['brutto'];
         $this->basket['sShippingcostsNet'] = $debugShipping['netto'];
         $this->basket['sShippingcostsTax'] = $debugShipping['tax'];
 
         // set missing basket vars for use in view
         // $this->basket['sAmount'] = $this->basket['Amount'] + $debugShipping['brutto'];
-        $this->basket['AmountWithTaxNumeric'] = floatval(str_replace(',','.',$this->basket['Amount'])) + floatval(str_replace(',','.',$debugShipping['brutto']));
-        $this->basket['AmountNetNumeric'] = floatval(str_replace(',','.',$this->basket['AmountNet']));
+        $this->basket['AmountWithTaxNumeric'] = floatval(str_replace(',', '.', $this->basket['Amount'])) + floatval(str_replace(',', '.', $debugShipping['brutto']));
+        $this->basket['AmountNetNumeric'] = floatval(str_replace(',', '.', $this->basket['AmountNet']));
 
         $klarnaConnector = $this->plugin->getConnector();
         $shop = $this->plugin->Application()->Shop();
@@ -239,7 +239,7 @@ 
         }
 
         // In case Customer fills Iframe and then logs in do not update existing klarnaOrder
-        if (!empty($this->session['KlarnaOrder']) && !$this->isUserLoggedIn()){
+        if (!empty($this->session['KlarnaOrder']) && !$this->isUserLoggedIn()) {
             $klarnaOrder = new Klarna_Checkout_Order($klarnaConnector, $this->session['KlarnaOrder']);
             $update = array();
             $update['cart']['items'] = $this->plugin->getCheckoutCart($this->basket);
@@ -261,14 +261,14 @@ 
         } catch (Exception $e) {
             Shopware()->Plugins()->Controller()->ViewRenderer()->setNoRender();
             echo "Entschuldigung, Ein Verbindungsfehler ist aufgetreten, bitte aktualisieren Sie die Seite";
-            $this->plugin->klarnaLog("Verbindungsfehler in onPreDispatchCheckout\nCode:".$e->getCode()."Nachricht:\n".$e->getMessage(),1);
+            $this->plugin->klarnaLog("Verbindungsfehler in onPreDispatchCheckout\nCode:".$e->getCode()."Nachricht:\n".$e->getMessage(), 1);
         }
 
         $this->session->KlarnaOrder = $klarnaOrder->getLocation();
 
         // Delete old perhaps cancelled Klarna Order
 
-        if ($klarnaOrder['status'] !== "checkout_incomplete"){
+        if ($klarnaOrder['status'] !== "checkout_incomplete") {
             unset($this->session->KlarnaOrder);
         }
 
@@ -301,7 +301,7 @@ 
         //$debugDispatches = $this->getDispatches($paymentIdDebug);
         $countryDebug = $this->session['sCountry'];
         $this->View()->sDispatches = $this->getDispatches($paymentIdDebug);
-        if ($postedCountry){
+        if ($postedCountry) {
             $this->session['sCountry'] = $postedCountry;
         }
 
@@ -312,28 +312,28 @@ 
         // Neccessary if user is not logged in
         $this->View()->sPayment = $testPayment;
 
-        $this->basket['sShippingcosts'] = $debugShipping['brutto'];;
+        $this->basket['sShippingcosts'] = $debugShipping['brutto']; ;
         $this->basket['sShippingcostsWithTax'] = $debugShipping['brutto'];
         $this->basket['sShippingcostsNet'] = $debugShipping['netto'];
         $this->basket['sShippingcostsTax'] = $debugShipping['tax'];
 
-        $this->basket['sAmount'] = floatval ($this->basket['Amount']) + floatval($this->basket['sShippingcosts']);
+        $this->basket['sAmount'] = floatval($this->basket['Amount']) + floatval($this->basket['sShippingcosts']);
         //$this->basket['AmountWithTaxNumeric'] = (int) $this->basket['Amount'] + $debugShipping['brutto'];
         //$this->basket['AmountNumeric'] = floatval($this->basket['Amount']) + floatval($debugShipping['brutto'];
         //$this->basket['AmountNetNumeric'] = (int) $this->basket['AmountNet'] + $debugShipping['netto'];
-        $netto1 =  $this->basket['AmountNet'];
-        $netto2 =  $debugShipping['netto'];
-        $netto3 =  (float)$this->basket['AmountNet'];
-        $netto4 =  (float)$debugShipping['netto'];
-        $netto5 = (float)$this->basket['AmountNet'] + (float)$debugShipping['netto'];
+        $netto1 = $this->basket['AmountNet'];
+        $netto2 = $debugShipping['netto'];
+        $netto3 = (float) $this->basket['AmountNet'];
+        $netto4 = (float) $debugShipping['netto'];
+        $netto5 = (float) $this->basket['AmountNet'] + (float) $debugShipping['netto'];
         $this->basket['sAmountNet'] = floatval($this->basket['AmountNetNumeric']) + floatval($debugShipping['netto']);
 
         $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'];
 
 
 
@@ -359,10 +359,10 @@ 
         $this->plugin->klarnaLog("Entering Bootstrap::getCountryByShop", 3);
         $locale = explode('_', $locale);
         $locale = isset($locale[1]) ? $locale[1] : $locale[0];
-        $this->plugin->klarnaLog("Bootstrap::getCountryByShop locale to request for:".$locale,3);
+        $this->plugin->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;
     }
@@ -613,7 +613,7 @@ 
    /**
      * @param Klarna_Checkout_Order $order
      */
-    public function createAccount($order = null, $checkLoginState=true)
+    public function createAccount($order = null, $checkLoginState = true)
     {
         $this->plugin = $this->get('plugins')->Frontend()->SwagPaymentKlarna();
         $this->plugin->klarnaLog('Entering Shopware_Controllers_Frontend_PaymentKlarna::createAccount', 3);
@@ -634,7 +634,7 @@ 
             $sessionId = Shopware()->SessionID();
             // email is only varchar(70) so we cut the sessionid
             //$sessionId = substr($sessionId, 0,49);
-            $data['auth']['email'] = substr($sessionId, 0,49) . '@klarna.com';
+            $data['auth']['email'] = substr($sessionId, 0, 49).'@klarna.com';
             $data['auth']['password'] = $sessionId;
         }
         $data['auth']['accountmode'] = '1';
@@ -649,11 +649,11 @@ 
             );
         }
 
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->order:",4, $order);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->order:", 4, $order);
         
         foreach (array('billing', 'shipping') as $type) {
-            if (isset($order[$type . '_address'])) {
-                $orderAddress = $order[$type . '_address'];
+            if (isset($order[$type.'_address'])) {
+                $orderAddress = $order[$type.'_address'];
                 if (isset($orderAddress['title'])) {
                     $data[$type]['salutation'] = $orderAddress['title'] == 'Frau' ? 'ms' : 'mr';
                 } else {
@@ -663,7 +663,7 @@ 
                 $data[$type]['lastname'] = $orderAddress['family_name'];
                 if (isset($orderAddress['street_name']) && $orderAddress['street_number']) {
                     if (version_compare(Shopware::VERSION, '5.0.0', '>=')) {
-                        $data[$type]['street'] = $orderAddress['street_name'] . ' ' . $orderAddress['street_number'];
+                        $data[$type]['street'] = $orderAddress['street_name'].' '.$orderAddress['street_number'];
                     } else {
                         $data[$type]['street'] = $orderAddress['street_name'];
                         $data[$type]['streetnumber'] = $orderAddress['street_number'];
@@ -689,21 +689,21 @@ 
             }
             $data[$type]['department'] = '';
 
-            if (!empty($order[$type . '_address']['country'])) {
+            if (!empty($order[$type.'_address']['country'])) {
                 $sql = 'SELECT id FROM s_core_countries WHERE countryiso=?';
-                $countryId = Shopware()->Db()->fetchOne($sql, array($order[$type . '_address']['country']));
+                $countryId = Shopware()->Db()->fetchOne($sql, array($order[$type.'_address']['country']));
             } else {
                 $countryId = $session['sCountry'];
             }
             // make sure country is set in case of lost sessions defualt to germany
-            if (empty($countryId)){
+            if (empty($countryId)) {
                 $countryId = 2;
             }            
 
             $data[$type]['country'] = $countryId;
         }
 
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->data AFTER ADDRESSES:",4,$data);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->data AFTER ADDRESSES:", 4, $data);
         $sql = 'SELECT id FROM s_core_paymentmeans WHERE name=?';
         $paymentId = Shopware()->Db()->fetchOne($sql, array('klarna_checkout'));
 
@@ -722,7 +722,7 @@ 
                 $session->offsetSet('sUserPassword', $user['password']);
                 $session->offsetSet('sUserId', $user['id']);
             } else {
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->user Not Found in DB SQL was:" .$sql,1);                
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->user Not Found in DB SQL was:".$sql, 1);                
             }
         }
 
@@ -741,7 +741,7 @@ 
                     if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {                
                          $userId = $session->offsetGet('sUserId');
                          $this->updateBilling($userId, $data['billing']);
-                    } else{
+                    } else {
                         $module->sUpdateBilling();
                     }
                     unset($data['auth']['password']);
@@ -749,10 +749,10 @@ 
                     if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
                         $userId = $session->offsetGet('sUserId');
                         $this->updateCustomer($data, $userId);
-                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->updateCustomer:",3, $data);                                                
-                    } else{
+                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->updateCustomer:", 3, $data);                                                
+                    } else {
                         $module->sUpdateAccount();
-                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->updateAccount:",3, $this->front->Request()->getPost());                                                                        
+                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->updateAccount:", 3, $this->front->Request()->getPost());                                                                        
                     }
                 } else {
                     /** @var Enlight_Controller_Front $front */
@@ -795,22 +795,22 @@ 
                         $newdata = $this->saveUser($data);
                         $module->sSYSTEM->_POST = $newdata['auth'];
                         $errors = $module->sLogin(true);                     
-                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser:",3, $newdata);
+                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser:", 3, $newdata);
                     } else {
-                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser->Register:",3, $session->sRegister);                         
+                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser->Register:", 3, $session->sRegister);                         
                         $module->sSaveRegister();
-                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser->RegisterFinished:",3, $session->offsetGet('sRegisterFinished')); 
+                        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->saveUser->RegisterFinished:", 3, $session->offsetGet('sRegisterFinished')); 
                     }
                     
                 } catch (\Exception $ex) { /* do nothing */
-                    $this->klarnaLog("ERROR while creating User. Exception information:".$ex->getMessage(),1);
+                    $this->klarnaLog("ERROR while creating User. Exception information:".$ex->getMessage(), 1);
                     
                 }
             }
             
         }
         
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->data END OF METHOD:",4, $data);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::createAccount->data END OF METHOD:", 4, $data);
     }
     
     /**
@@ -854,8 +854,8 @@ 
 		array('email' =>  $data['auth']['email'])
 		);
 
-       $data['auth']['password']= $getUser->getPassword();
-       $data['auth']['passwordMD5']= $getUser->getPassword();
+       $data['auth']['password'] = $getUser->getPassword();
+       $data['auth']['passwordMD5'] = $getUser->getPassword();
        $data['auth']['encoderName'] = 'md5';
        return $data;
     }
@@ -912,7 +912,7 @@ 
             $addressService->create($address, $customer);
             $addressService->setDefaultShippingAddress($address);
         } catch (Exception $ex) {
-            $this->klarnaLog("ERROR while creating address via address service. Exception information:".$ex->getMessage(),1);
+            $this->klarnaLog("ERROR while creating address via address service. Exception information:".$ex->getMessage(), 1);
         }
         
     }
@@ -963,13 +963,13 @@ 
         $this->plugin = $this->get('plugins')->Frontend()->SwagPaymentKlarna();
         $this->config = $this->plugin->Config();
 
-        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction",3);
+        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction", 3);
         $transactionId = $this->Request()->getParam('transactionId');
         $connector = $this->plugin->getConnector();
 
         $order = new Klarna_Checkout_Order($connector, $transactionId);
-        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction->transactionId:\n".$transactionId,3);
-        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction->order:",4, $order);
+        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction->transactionId:\n".$transactionId, 3);
+        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction->order:", 4, $order);
         $orderNumber = '';
         $session = Shopware()->Session();
 
@@ -981,8 +981,8 @@ 
 
             // if already created by pushaction just redirect
 
-            if ($order['status'] === 'created'){
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: OrderStatus is already created... nothing to do: " .$orderNumber,1);
+            if ($order['status'] === 'created') {
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: OrderStatus is already created... nothing to do: ".$orderNumber, 1);
                 $this->redirect(array(
                     'controller' => 'payment_klarna',
                     'action' => 'finish',
@@ -996,15 +996,15 @@ 
             Shopware()->Session()->sOrderVariables['sUserData'] = $this->getUserData();
 
             if ($order['status'] == 'checkout_complete') {
-                $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.",3);
-             if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){
-                    $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved",3);
-                    Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId );
+                $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.", 3);
+             if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null) {
+                    $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved", 3);
+                    Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId);
                     $orderNumber = $this->saveOrder(
                         $order['reservation'],
                         $order['reference']
                     );
-                     Shopware()->Session()->offsetSet('KlarnaTransactionId', null );
+                     Shopware()->Session()->offsetSet('KlarnaTransactionId', null);
                 }
             }
 
@@ -1013,13 +1013,13 @@ 
                 $orderNumber = $order['merchant_reference']['orderid1'];
             }
 
-            if (!empty($orderNumber)){
+            if (!empty($orderNumber)) {
                 $update = array();
 
                 $update['status'] = 'created';
                 $update['merchant_reference'] = array(
-                    'orderid1' => (string)$orderNumber,
-                    'orderid2' => (string)$order['reference']
+                    'orderid1' => (string) $orderNumber,
+                    'orderid2' => (string) $order['reference']
                 );
                 $order->update($update);
             }
@@ -1054,7 +1054,7 @@ 
             }
         } catch (Exception $e) {
             Shopware()->Plugins()->Controller()->ViewRenderer()->setNoRender();
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Catch. Searching for Order:",3);   
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Catch. Searching for Order:", 3);   
             $this->checkKlarnaOrderExistsByReservation($order['reservation']);
             $this->checkKlarnaOrderExistsByReference($order['reference']);
             $this->checkKlarnaOrderExistsBySession(Shopware()->Session()->sUserId); 
@@ -1082,9 +1082,9 @@ 
         ));
         
         $orderExists = (empty($order)) ? false : true;
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsBySession:",3);   
-        if ($orderExists){
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsBySession: Order Found: ",3, $order);   
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsBySession:", 3);   
+        if ($orderExists) {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsBySession: Order Found: ", 3, $order);   
         }
         return $orderExists;
     }    
@@ -1107,9 +1107,9 @@ 
         ));
         
         $orderExists = (empty($order)) ? false : true;
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReference:",3);   
-        if ($orderExists){
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReference: Order Found: ",3, $order);   
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReference:", 3);   
+        if ($orderExists) {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReference: Order Found: ", 3, $order);   
         }
         return $orderExists;
     }
@@ -1132,9 +1132,9 @@ 
         ));
         
         $orderExists = (empty($order)) ? false : true;
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReservation:",3);   
-        if ($orderExists){
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReservation: Order Found: ",3, $order);   
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReservation:", 3);   
+        if ($orderExists) {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderExistsByReservation: Order Found: ", 3, $order);   
         }
         return $orderExists;
     }    
@@ -1183,9 +1183,9 @@ 
         ));
         
         $orderExists = (empty($orderDetails)) ? false : true;
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderDetailsBySession:",3);   
-        if ($orderExists){
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderDetailsBySession: OrderDetails Found: ",3, $orderDetails);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderDetailsBySession:", 3);   
+        if ($orderExists) {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::checkKlarnaOrderDetailsBySession: OrderDetails Found: ", 3, $orderDetails);
         }
         return $orderExists;
     }
@@ -1267,14 +1267,14 @@ 
         $this->config = $this->plugin->Config();
         $transactionId = $this->Request()->getParam('transactionId');
 
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->transactionId:\n".$transactionId,3);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->transactionId:\n".$transactionId, 3);
         $connector = $this->plugin->getConnector();
         $order = new Klarna_Checkout_Order($connector, $transactionId);
 
         $order->fetch();
 
-        if ($order['status'] === 'created'){
-            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: OrderStatus is already created... nothing to do: ",1);
+        if ($order['status'] === 'created') {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: OrderStatus is already created... nothing to do: ", 1);
             return;
         }
 
@@ -1284,15 +1284,15 @@ 
         Shopware()->Session()->sOrderVariables['sUserData'] = $this->getUserData();
 
         if ($order['status'] == 'checkout_complete') {
-            $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.",3);
-            if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){
-                $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved",3);
-                Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId );
+            $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.", 3);
+            if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null) {
+                $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved", 3);
+                Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId);
                 $orderNumber = $this->saveOrder(
                     $order['reservation'],
                     $order['reference']
                 );
-                Shopware()->Session()->offsetSet('KlarnaTransactionId', null );
+                Shopware()->Session()->offsetSet('KlarnaTransactionId', null);
             }
         }
 
@@ -1300,13 +1300,13 @@ 
             $orderNumber = $order['merchant_reference']['orderid1'];
         }
 
-        if (!empty($orderNumber)){
+        if (!empty($orderNumber)) {
             $update = array();
 
             $update['status'] = 'created';
             $update['merchant_reference'] = array(
-                'orderid1' => (string)$orderNumber,
-                'orderid2' => (string)$order['reference']
+                'orderid1' => (string) $orderNumber,
+                'orderid2' => (string) $order['reference']
             );
             $order->update($update);
         }
@@ -1331,7 +1331,7 @@ 
                 $orderNumber
             ));
         } catch (Exception $e) {
-            $this->plugin->klarnaLog("PROBLEM SAVING ORDER ATTRIBUTES AFTER KLARNA PUSH!:\n".$e->getMessage(),1);
+            $this->plugin->klarnaLog("PROBLEM SAVING ORDER ATTRIBUTES AFTER KLARNA PUSH!:\n".$e->getMessage(), 1);
         }
     }
 

Braces +1 added lines, -2 removed lines

@@ -220,8 +220,7 @@
             $this->session['klarnaPreFill'] = true;
             if (empty($session['sCountry'])) {
                 $countryId = $this->getCountryByShop($shop);
-            }
-            else {
+            } else {
                 $countryId = $session['sCountry'];
             }
             if ($user ['additional']['countryShipping']['id'] == $countryId