FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Controllers/Frontend/PaymentKlarna.php

Indentation +100 added lines, -100 removed lines

@@ -97,13 +97,13 @@ 
         }
         
         if (!$this->isUserLoggedIn($session)){
-	        $this->createAccount();
-	}
+            $this->createAccount();
+    }
         
         $user = Shopware()->Modules()->Admin()->sGetUserData();
         if ($this->Request()->getPost('sCountry')) {
-          $session['sCountry'] = $this->Request()->getPost('sCountry'); 
-          $session['sChangedCountry'] = $this->Request()->getPost('sCountry'); 
+            $session['sCountry'] = $this->Request()->getPost('sCountry'); 
+            $session['sChangedCountry'] = $this->Request()->getPost('sCountry'); 
         }
 
         // Switch Paymentmean to Klarna Checkout
@@ -120,7 +120,7 @@ 
         $this->forward('index');
     }
 
-   /**
+    /**
      * @param Klarna_Checkout_Order $order
      */
     public function createAccount($order = null, $checkLoginState=true)
@@ -257,8 +257,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();
                     }
@@ -364,12 +364,12 @@ 
 
         // 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';
+        $data['auth']['password']= $getUser->getPassword();
+        $data['auth']['passwordMD5']= $getUser->getPassword();
+        $data['auth']['encoderName'] = 'md5';
         return $data;
     }
 
@@ -388,19 +388,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 */
@@ -413,7 +413,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) {
@@ -447,7 +447,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);
@@ -794,27 +794,27 @@ 
         );
 
         $firstName = $swUser->getBilling()->getFirstname();
-       if ($firstName === 'Klarna Firstname') {
-           $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order with Klarna Firstname, updating from Klarna data: " .$orderNumber,1);
-           $data['billing']['salutation'] = $order['billing_address']['title'];
-           $data['billing']['firstname'] = $order['billing_address']['given_name'];
-           $data['billing']['lastname'] = $order['billing_address']['family_name'];
-           $data['billing']['street'] = $order['billing_address']['street_name']." ". $order['billing_address']['street_number'];           
-           $data['billing']['zipcode'] = $order['billing_address']['postal_code'];
-           $data['billing']['city'] = $order['billing_address']['city'];
-           $data['billing']['birthday'] = $order['customer']['date_of_birth'];
-           $data['billing']['phone'] = $order['billing_address']['phone'];
-
-           $data['shipping']['salutation'] = $order['shipping_address']['title'];
-           $data['shipping']['firstname'] = $order['shipping_address']['given_name'];
-           $data['shipping']['lastname'] = $order['shipping_address']['family_name'];
-           $data['shipping']['street'] = $order['shipping_address']['street_name']." ". $order['shipping_address']['street_number'];
-           $data['shipping']['zipcode'] = $order['shipping_address']['postal_code'];
-           $data['shipping']['city'] = $order['shipping_address']['city'];
-           $data['shipping']['birthday'] = $order['customer']['date_of_birth'];
-           $data['shipping']['phone'] = $order['shipping_address']['phone'];
-           // Update Customer
-           if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
+        if ($firstName === 'Klarna Firstname') {
+            $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order with Klarna Firstname, updating from Klarna data: " .$orderNumber,1);
+            $data['billing']['salutation'] = $order['billing_address']['title'];
+            $data['billing']['firstname'] = $order['billing_address']['given_name'];
+            $data['billing']['lastname'] = $order['billing_address']['family_name'];
+            $data['billing']['street'] = $order['billing_address']['street_name']." ". $order['billing_address']['street_number'];           
+            $data['billing']['zipcode'] = $order['billing_address']['postal_code'];
+            $data['billing']['city'] = $order['billing_address']['city'];
+            $data['billing']['birthday'] = $order['customer']['date_of_birth'];
+            $data['billing']['phone'] = $order['billing_address']['phone'];
+
+            $data['shipping']['salutation'] = $order['shipping_address']['title'];
+            $data['shipping']['firstname'] = $order['shipping_address']['given_name'];
+            $data['shipping']['lastname'] = $order['shipping_address']['family_name'];
+            $data['shipping']['street'] = $order['shipping_address']['street_name']." ". $order['shipping_address']['street_number'];
+            $data['shipping']['zipcode'] = $order['shipping_address']['postal_code'];
+            $data['shipping']['city'] = $order['shipping_address']['city'];
+            $data['shipping']['birthday'] = $order['customer']['date_of_birth'];
+            $data['shipping']['phone'] = $order['shipping_address']['phone'];
+            // Update Customer
+            if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
                 unset ($data['billing']['birthday']);
                 unset ($data['shipping']['birthday']);
                 unset ($data['shipping']['phone']);                
@@ -825,67 +825,67 @@ 
                 $customer->fromArray($data);
                 Shopware()->Container()->get('shopware_account.customer_service')->update($customer);
                 
-               $this->updateShipping($userId, $data['shipping']);
-               $this->updateBilling($userId, $data['billing']);
+                $this->updateShipping($userId, $data['shipping']);
+                $this->updateBilling($userId, $data['billing']);
                
-               // Update Order Addresses
-
-               $orderShippingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_order_shippingaddress WHERE userID = ? AND orderID = ?',
-                   array($userId, $orderId)
-               );
-               $where = array('id='.(int) $orderShippingID);
-               Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
-
-               $orderBillingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
-                   array($userId, $orderId)
-               );
-               $where = array('id='.(int) $orderBillingID);
-               Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
+                // Update Order Addresses
+
+                $orderShippingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_order_shippingaddress WHERE userID = ? AND orderID = ?',
+                    array($userId, $orderId)
+                );
+                $where = array('id='.(int) $orderShippingID);
+                Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
+
+                $orderBillingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
+                    array($userId, $orderId)
+                );
+                $where = array('id='.(int) $orderBillingID);
+                Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
                
-           } else{
-
-               // Append streetnumber to street and unset field for sw 5.1
-               // unset birthday too
+            } else{
 
-               // Update User Addresses
-               unset ($data['shipping']['birthday']);
-               unset ($data['shipping']['phone']);
+                // Append streetnumber to street and unset field for sw 5.1
+                // unset birthday too
 
-               $shippingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_user_shippingaddress WHERE userID = ?',
-                   array($userId)
-               );
-               $where = array('id='.(int) $shippingID);
-               Shopware()->Db()->update('s_user_shippingaddress',  $data['shipping'], $where);
-
-               $billingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_user_billingaddress WHERE userID = ?',
-                   array($userId)
-               );
-               $where = array('id='.(int) $billingID);
-               Shopware()->Db()->update('s_user_billingaddress',  $data['billing'], $where);
-
-
-               // Update Order Addresses
-
-               $orderShippingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_order_shippingaddress WHERE userID = ? AND orderID = ?',
-                   array($userId, $orderId)
-               );
-               $where = array('id='.(int) $orderShippingID);
-               Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
-
-               $orderBillingID = Shopware()->Db()->fetchOne(
-                   'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
-                   array($userId, $orderId)
-               );
-               $where = array('id='.(int) $orderBillingID);
-               Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
+                // Update User Addresses
+                unset ($data['shipping']['birthday']);
+                unset ($data['shipping']['phone']);
+
+                $shippingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_user_shippingaddress WHERE userID = ?',
+                    array($userId)
+                );
+                $where = array('id='.(int) $shippingID);
+                Shopware()->Db()->update('s_user_shippingaddress',  $data['shipping'], $where);
+
+                $billingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_user_billingaddress WHERE userID = ?',
+                    array($userId)
+                );
+                $where = array('id='.(int) $billingID);
+                Shopware()->Db()->update('s_user_billingaddress',  $data['billing'], $where);
+
+
+                // Update Order Addresses
+
+                $orderShippingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_order_shippingaddress WHERE userID = ? AND orderID = ?',
+                    array($userId, $orderId)
+                );
+                $where = array('id='.(int) $orderShippingID);
+                Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
+
+                $orderBillingID = Shopware()->Db()->fetchOne(
+                    'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
+                    array($userId, $orderId)
+                );
+                $where = array('id='.(int) $orderBillingID);
+                Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
 
-           }
-       }
+            }
+        }
 
         $update = array();
         $update['status'] = 'created';
@@ -1042,6 +1042,6 @@ 
     
     protected function isUserLoggedIn($session)
     {        
-         return (isset($session->sUserId) && !empty($session->sUserId));
+            return (isset($session->sUserId) && !empty($session->sUserId));
     }    
 }

Spacing +69 added lines, -69 removed lines

@@ -75,7 +75,7 @@ 
     {
         $session = Shopware()->Session();
         
-        if (!empty($session->PaypalResponse)){
+        if (!empty($session->PaypalResponse)) {
             $this->plugin->klarnaLog("Paypal Payment in Progress detected Redirecting To Index Page", 3);
             $this->redirect(
                 array(
@@ -87,16 +87,16 @@ 
         }        
         
         if ($this->Request()->getPost('sCountry')) {
-            $session['sCountry'] = (int)$this->Request()->getPost('sCountry');
+            $session['sCountry'] = (int) $this->Request()->getPost('sCountry');
             $session["sState"] = 0;
             $session["sArea"] = Shopware()->Db()->fetchOne("
                 SELECT areaID FROM s_core_countries WHERE id = ?
             ", array($session['sCountry']));
             unset($session->KlarnaOrder);
-            $session['sChangedCountry'] = (int)$this->Request()->getPost('sCountry');
+            $session['sChangedCountry'] = (int) $this->Request()->getPost('sCountry');
         }
         
-        if (!$this->isUserLoggedIn($session)){
+        if (!$this->isUserLoggedIn($session)) {
 	        $this->createAccount();
 	}
         
@@ -123,7 +123,7 @@ 
    /**
      * @param Klarna_Checkout_Order $order
      */
-    public function createAccount($order = null, $checkLoginState=true)
+    public function createAccount($order = null, $checkLoginState = true)
     {
         $this->plugin->klarnaLog('Entering Shopware_Controllers_Frontend_PaymentKlarna::createAccount', 3);
         $module = Shopware()->Modules()->Admin();
@@ -143,7 +143,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';
@@ -158,11 +158,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 {
@@ -172,7 +172,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'];
@@ -207,21 +207,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'));
 
@@ -240,7 +240,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);                
             }
         }
 
@@ -259,7 +259,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']);
@@ -267,10 +267,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 */
@@ -313,23 +313,23 @@ 
                         $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);                        
                         // $this->returnAction();
                     } 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);
     }
     
     /**
@@ -367,8 +367,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;
     }
@@ -425,7 +425,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);
         }
         
     }
@@ -472,7 +472,7 @@ 
      */
     public function returnAction()
     {
-        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction",3);
+        $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction", 3);
         if ($this->getPaymentShortName() != 'klarna_checkout') {
             $this->forward('index');
             return;
@@ -482,8 +482,8 @@ 
         $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 = '';
         
         try {
@@ -493,20 +493,20 @@ 
             $this->plugin->updateOrderVariables();
 
             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);                
                 }
 
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Check if Order was persisted in DB.",3);    
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Check if Order was persisted in DB.", 3);    
 
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Searching for Order:",3);
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Searching for Order:", 3);
                 $this->checkKlarnaOrderExistsByReservation($order['reservation']);
                 $this->checkKlarnaOrderExistsByReference($order['reference']);
                 $this->checkKlarnaOrderExistsBySession(Shopware()->Session()->sUserId);
@@ -551,7 +551,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); 
@@ -577,9 +577,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;
     }    
@@ -602,9 +602,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;
     }
@@ -627,9 +627,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;
     }    
@@ -678,9 +678,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;
     }
@@ -760,22 +760,22 @@ 
     {
         $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();
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->order:",4, $order);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->order:", 4, $order);
         
         $userId = $this->getUserIdByReference($order['reference']);
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->UserID: " .$userId ,3);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction->UserID: ".$userId, 3);
         // before continuing its mandatory to check if order has been persisted
         $orderExists = $this->checkKlarnaOrderExists($order['reservation'], $order['reference'], $userId);
         if (!$orderExists) {
             /**
              * @todo: Adding mechanism so that cancel signal will be send to klarna, if push notifications are over the limit of about 2 calls
              */
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: checkout_complete. Order was not persisted in DB, UserId is" .$userId ,1);    
-                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: checkout_complete. Searching for Order:",1);   
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: checkout_complete. Order was not persisted in DB, UserId is".$userId, 1);    
+                $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: checkout_complete. Searching for Order:", 1);   
                 $this->checkKlarnaOrderExistsByReservation($order['reservation']);
                 $this->checkKlarnaOrderExistsByReference($order['reference']);
                 $this->checkKlarnaOrderExistsBySession($userId);  
@@ -785,21 +785,21 @@ 
         
         $orderNumber = $this->getKlarnaOrderNumber($order['reservation'], $order['reference'], $userId);
         $orderId = $this->getKlarnaOrderId($order['reservation'], $order['reference'], $userId);
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order was found in DB... Sending Update to Klarna: " .$orderNumber,1);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order was found in DB... Sending Update to Klarna: ".$orderNumber, 1);
 
         // Check if Order Username ist false (Klarna Firstname)
 
         $swUser = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')->findOneBy(
-            array('id' =>  $userId )
+            array('id' =>  $userId)
         );
 
         $firstName = $swUser->getBilling()->getFirstname();
        if ($firstName === 'Klarna Firstname') {
-           $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order with Klarna Firstname, updating from Klarna data: " .$orderNumber,1);
+           $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Found Order with Klarna Firstname, updating from Klarna data: ".$orderNumber, 1);
            $data['billing']['salutation'] = $order['billing_address']['title'];
            $data['billing']['firstname'] = $order['billing_address']['given_name'];
            $data['billing']['lastname'] = $order['billing_address']['family_name'];
-           $data['billing']['street'] = $order['billing_address']['street_name']." ". $order['billing_address']['street_number'];           
+           $data['billing']['street'] = $order['billing_address']['street_name']." ".$order['billing_address']['street_number'];           
            $data['billing']['zipcode'] = $order['billing_address']['postal_code'];
            $data['billing']['city'] = $order['billing_address']['city'];
            $data['billing']['birthday'] = $order['customer']['date_of_birth'];
@@ -808,7 +808,7 @@ 
            $data['shipping']['salutation'] = $order['shipping_address']['title'];
            $data['shipping']['firstname'] = $order['shipping_address']['given_name'];
            $data['shipping']['lastname'] = $order['shipping_address']['family_name'];
-           $data['shipping']['street'] = $order['shipping_address']['street_name']." ". $order['shipping_address']['street_number'];
+           $data['shipping']['street'] = $order['shipping_address']['street_name']." ".$order['shipping_address']['street_number'];
            $data['shipping']['zipcode'] = $order['shipping_address']['postal_code'];
            $data['shipping']['city'] = $order['shipping_address']['city'];
            $data['shipping']['birthday'] = $order['customer']['date_of_birth'];
@@ -835,16 +835,16 @@ 
                    array($userId, $orderId)
                );
                $where = array('id='.(int) $orderShippingID);
-               Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
+               Shopware()->Db()->update('s_order_shippingaddress', $data['shipping'], $where);
 
                $orderBillingID = Shopware()->Db()->fetchOne(
                    'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
                    array($userId, $orderId)
                );
                $where = array('id='.(int) $orderBillingID);
-               Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
+               Shopware()->Db()->update('s_order_billingaddress', $data['billing'], $where);
                
-           } else{
+           } else {
 
                // Append streetnumber to street and unset field for sw 5.1
                // unset birthday too
@@ -858,14 +858,14 @@ 
                    array($userId)
                );
                $where = array('id='.(int) $shippingID);
-               Shopware()->Db()->update('s_user_shippingaddress',  $data['shipping'], $where);
+               Shopware()->Db()->update('s_user_shippingaddress', $data['shipping'], $where);
 
                $billingID = Shopware()->Db()->fetchOne(
                    'SELECT id FROM s_user_billingaddress WHERE userID = ?',
                    array($userId)
                );
                $where = array('id='.(int) $billingID);
-               Shopware()->Db()->update('s_user_billingaddress',  $data['billing'], $where);
+               Shopware()->Db()->update('s_user_billingaddress', $data['billing'], $where);
 
 
                // Update Order Addresses
@@ -875,14 +875,14 @@ 
                    array($userId, $orderId)
                );
                $where = array('id='.(int) $orderShippingID);
-               Shopware()->Db()->update('s_order_shippingaddress',  $data['shipping'], $where);
+               Shopware()->Db()->update('s_order_shippingaddress', $data['shipping'], $where);
 
                $orderBillingID = Shopware()->Db()->fetchOne(
                    'SELECT id FROM s_order_billingaddress WHERE userID = ? AND orderID = ?',
                    array($userId, $orderId)
                );
                $where = array('id='.(int) $orderBillingID);
-               Shopware()->Db()->update('s_order_billingaddress',  $data['billing'], $where);
+               Shopware()->Db()->update('s_order_billingaddress', $data['billing'], $where);
 
            }
        }
@@ -893,7 +893,7 @@ 
             'orderid1' => (string) $orderNumber,
             'orderid2' => (string) $order['reference']
         );
-        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Update Klarna ",1, $update);
+        $this->plugin->klarnaLog("Shopware_Controllers_Frontend_PaymentKlarna::pushAction: Update Klarna ", 1, $update);
         $order->update($update);
         $this->savePaymentStatus(
             $order['reservation'],
@@ -915,7 +915,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);
         }
     }
 

Bootstrap.php

Indentation +13 added lines, -13 removed lines

@@ -1603,10 +1603,10 @@ 
                 }
 
                 if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
-                   if  ( isset($user['additional']['user']['birthday']) && $user['additional']['user']['birthday'] !== "0000-00-00") {
-                       $user['billingaddress']['birthday'] = $user['additional']['user']['birthday'];
-                       $user['birthday'] = $user['additional']['user']['birthday'];
-                   }
+                    if  ( isset($user['additional']['user']['birthday']) && $user['additional']['user']['birthday'] !== "0000-00-00") {
+                        $user['billingaddress']['birthday'] = $user['additional']['user']['birthday'];
+                        $user['birthday'] = $user['additional']['user']['birthday'];
+                    }
                 }              
                 if  ( !isset($user['billingaddress']['phone'])) {
                         $user['billingaddress']['phone'] = " ";
@@ -1638,7 +1638,7 @@ 
                     $locale = 'de-at';
                 } elseif ($create['purchase_country'] == 'DE')
                     {
-                     $locale = 'de-de';
+                        $locale = 'de-de';
                 } else {
                     $locale = $this->getLocale(false, $create['purchase_country']);
                 }
@@ -1869,7 +1869,7 @@ 
             $userData['billingaddress']['country'] =$country;   
             $userData['shippingaddress']['countryID'] = $session['sChangedCountry'];
             $userData['billingaddress']['countryID'] = $session['sChangedCountry'];
-         }
+            }
         
         $orderVariables['sUserData'] = $userData;
     }
@@ -2859,13 +2859,13 @@ 
                 } else {
                     $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend'));
                 }
-		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
-		        $end = end((explode('/', $media)));
-			$media = $url . 'media/image/' . $end;
-		} else {
-	                $media = $url . $media;
-		}
+        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
+                $end = end((explode('/', $media)));
+            $media = $url . 'media/image/' . $end;
+        } else {
+                    $media = $url . $media;
+        }
             }
 
             return $media;

Spacing +88 added lines, -88 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();
         }
 
@@ -438,8 +438,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'];
             $klarnaOrderId = $orderDataRaw['temporaryId'];
@@ -581,7 +581,7 @@ 
     {
         $this->Application()->Loader()->registerNamespace(
             'Shopware\Components',
-            __DIR__ . '/Components/'
+            __DIR__.'/Components/'
         );
 
         return new StreetSplitService();
@@ -595,27 +595,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);
         }
@@ -641,7 +641,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']);
@@ -656,7 +656,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;
     }
 
@@ -684,10 +684,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;
             }
         }
 
@@ -1304,11 +1304,11 @@ 
     protected 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');
         }
     }
 
@@ -1336,7 +1336,7 @@ 
     {
         $this->registerMyTemplateDir();
 
-        return __DIR__ . '/Controllers/Frontend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Frontend/PaymentKlarna.php';
     }
 
     /**
@@ -1348,10 +1348,10 @@ 
     {
         $this->registerMyTemplateDir(true);
         $this->Application()->Snippets()->addConfigDir(
-            __DIR__ . '/Snippets/'
+            __DIR__.'/Snippets/'
         );
 
-        return __DIR__ . '/Controllers/Backend/PaymentKlarna.php';
+        return __DIR__.'/Controllers/Backend/PaymentKlarna.php';
     }
 
     /**
@@ -1383,7 +1383,7 @@ 
         $controllerName = $request->getControllerName();
         $actionName = $request->getActionName();
         $fromScope = $request->get('fromScope');
-        $isFromKCO = (bool)($fromScope == 'klarna_checkout');
+        $isFromKCO = (bool) ($fromScope == 'klarna_checkout');
         
         $session = $this->get('session');
         
@@ -1394,9 +1394,9 @@ 
                 $action->redirect(array('controller' => 'payment_klarna', 'action' => 'otherPayment'));
                 return;
             }
-            if ($shopCountryId !== (int) $postedCountry){
-                if ($this->isKlarnaUser()){
-                    if ($postedCountry == '23'){
+            if ($shopCountryId !== (int) $postedCountry) {
+                if ($this->isKlarnaUser()) {
+                    if ($postedCountry == '23') {
                         $session['sCountry'] = '23';
                         
                     } else { 
@@ -1421,7 +1421,7 @@ 
         if ($request->getControllerName() == 'checkout'
             && ($request->getActionName() == 'cart' || $request->getActionName() == 'ajaxCart')
         ) {
-            $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());
@@ -1466,7 +1466,7 @@ 
             $view->assign('KlarnaLocale', $this->getLocale());
             $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()) {
@@ -1560,12 +1560,12 @@ 
                     $update = array();
                     $update['cart']['items'] = $this->getCheckoutCart($basket);
                     $update['options'] = $this->getCheckoutOptions($allowPackstation, $view->sDispatch);
-                    if ($request->get('klarnaPreFill') == "on"){
+                    if ($request->get('klarnaPreFill') == "on") {
                         $update['customer'] = $this->getCheckoutCustomer($user);
-                        if  ( !isset($user['billingaddress']['phone'])) {
+                        if (!isset($user['billingaddress']['phone'])) {
                                 $user['billingaddress']['phone'] = " ";
                         }  
-                        if  ( !isset($user['shippinggaddress']['phone'])) {
+                        if (!isset($user['shippinggaddress']['phone'])) {
                                 $user['shippingaddress']['phone'] = " ";
                         }                        
                         if ($user['additional']['countryShipping']['id'] == $user['additional']['country']['id']) {
@@ -1603,12 +1603,12 @@ 
                 }
 
                 if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) {
-                   if  ( isset($user['additional']['user']['birthday']) && $user['additional']['user']['birthday'] !== "0000-00-00") {
+                   if (isset($user['additional']['user']['birthday']) && $user['additional']['user']['birthday'] !== "0000-00-00") {
                        $user['billingaddress']['birthday'] = $user['additional']['user']['birthday'];
                        $user['birthday'] = $user['additional']['user']['birthday'];
                    }
                 }              
-                if  ( !isset($user['billingaddress']['phone'])) {
+                if (!isset($user['billingaddress']['phone'])) {
                         $user['billingaddress']['phone'] = " ";
                 }        
 
@@ -1735,7 +1735,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);
@@ -1776,7 +1776,7 @@ 
         } catch (Exception $e) {
             Shopware()->Plugins()->Controller()->ViewRenderer()->setNoRender();
             echo "Entschuldigung, Ein Verbindungsfehler ist aufgetreten, bitte aktualisieren Sie die Seite";
-            $this->klarnaLog("Verbindungsfehler in onPreDispatchCheckout\nCode:".$e->getCode()."Nachricht:\n".$e->getMessage(),1);
+            $this->klarnaLog("Verbindungsfehler in onPreDispatchCheckout\nCode:".$e->getCode()."Nachricht:\n".$e->getMessage(), 1);
         }
         
         if ($order['status'] != 'created' && $order['status'] != 'checkout_complete') {
@@ -1791,7 +1791,7 @@ 
         
         try {
             $data['status'] = 'created';
-            $this->klarnaLog("onPreDispatchCheckout: Trying to update order to klarna with state created with following data:",4, $data);
+            $this->klarnaLog("onPreDispatchCheckout: Trying to update order to klarna with state created with following data:", 4, $data);
             $order->update($data);
         } catch (Klarna_Checkout_ConnectionErrorException $e) {
             $view->assign('KlarnaConnectionError', json_decode($e->getMessage(), true));
@@ -1858,15 +1858,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'];
          }
@@ -1884,10 +1884,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;
     }
@@ -1918,7 +1918,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';
@@ -1933,10 +1933,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'];
@@ -1951,19 +1951,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'])) {
@@ -1974,8 +1974,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),
             );
         }
 
@@ -2006,7 +2006,7 @@ 
                 'action' => 'return',
                 'forceSecure' => true
             )
-        ) . "?transactionId={checkout.order.uri}";
+        )."?transactionId={checkout.order.uri}";
         $merchant['push_uri'] = $router->assemble(
             array(
                 'controller' => 'payment_klarna',
@@ -2014,7 +2014,7 @@ 
                 'forceSecure' => true,
                 'appendSession' => true
             )
-        ) . "&transactionId={checkout.order.uri}";
+        )."&transactionId={checkout.order.uri}";
         $merchant['back_to_store_uri'] = $router->assemble(
             array(
                 'controller' => 'index',
@@ -2027,36 +2027,36 @@ 
 
     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']
             );
         }
 
@@ -2094,7 +2094,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'];
@@ -2111,7 +2111,7 @@ 
         return array(
             'version' => $this->getVersion(),
             'label' => $this->getLabel(),
-            'description' => file_get_contents(__DIR__ . '/info.txt')
+            'description' => file_get_contents(__DIR__.'/info.txt')
         );
     }
 
@@ -2122,7 +2122,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 {
@@ -2141,8 +2141,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;
@@ -2160,7 +2160,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__
@@ -2246,7 +2246,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'];
@@ -2263,7 +2263,7 @@ 
                     $create['shipping_address']['street_number'] = $billingStreetNumber;
                 }
             } else {
-                $create['shipping_address']['street_address'] = $billingStreet . ' ' . $billingStreetNumber;
+                $create['shipping_address']['street_address'] = $billingStreet.' '.$billingStreetNumber;
             }
         }
 
@@ -2322,9 +2322,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()
@@ -2356,7 +2356,7 @@ 
      */
     private function getShowLoginConfig($config, $lastName)
     {
-        return (bool)$config->get('showLoginPanel') && $lastName == 'Klarna Checkout';
+        return (bool) $config->get('showLoginPanel') && $lastName == 'Klarna Checkout';
     }
 
     /**
@@ -2398,7 +2398,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);
@@ -2519,7 +2519,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']
             )
@@ -2678,7 +2678,7 @@ 
         }
         $email = $session->offsetGet('sUserMail');
         $sessionId = $session->offsetGet('sessionId');
-        if (!preg_match('#.{' . strlen($sessionId) . '}@klarna.com#', $email)) {
+        if (!preg_match('#.{'.strlen($sessionId).'}@klarna.com#', $email)) {
             return false;
         }
 
@@ -2764,13 +2764,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;
             }            
             
@@ -2779,7 +2779,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)) {
@@ -2790,7 +2790,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
@@ -2848,23 +2848,23 @@ 
     {
         $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'));
                 }
 		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
 		        $end = end((explode('/', $media)));
-			$media = $url . 'media/image/' . $end;
+			$media = $url.'media/image/'.$end;
 		} else {
-	                $media = $url . $media;
+	                $media = $url.$media;
 		}
             }
 

Braces +7 added lines, -9 removed lines

@@ -388,8 +388,7 @@ 
                 'sAdmin::saveRegisterAction::before',
                 'onBeforeRegister'
             );
-        }
-        else {
+        } else {
             $this->subscribeEvent(
                 'sAdmin::sSaveRegister::before',
                 'onBeforeRegister'
@@ -683,10 +682,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;
             }
         }
@@ -1616,8 +1616,7 @@ 
                     $session['klarnaPreFill'] = true;
                     if (empty($session['sCountry'])) {
                         $countryId = $this->getCountryByShop($shop);
-                    }
-                    else {
+                    } else {
                         $countryId = $session['sCountry'];
                     }
                     if ($user['additional']['countryShipping']['id'] == $countryId
@@ -1952,8 +1951,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);