FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Controllers/Frontend/PaymentKlarna.php

Indentation +25 added lines, -25 removed lines

@@ -132,7 +132,7 @@ 
     public function showIframeAction() {
 
         $this->basket = $this->get('modules')->Basket()->sGetBasket();
-         $preFill = $this->config['preFillCheckout'];
+            $preFill = $this->config['preFillCheckout'];
         if ($this->isUserLoggedIn()){
             $user = Shopware()->Modules()->Admin()->sGetUserData();
         }
@@ -283,7 +283,7 @@ 
 
         // Klarna Prefill checkBox
         if ($this->isUserLoggedIn()) {
-               $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
+                $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']);
         }
 
         // Iframe Backend Config
@@ -403,7 +403,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')]);
     }
 
     /**
@@ -576,7 +576,7 @@ 
         return array("id" => $this->session['sState']);
     }
 
-   /**
+    /**
      * @param Klarna_Checkout_Order $order
      */
     public function createAccount($order = null, $checkLoginState=true)
@@ -704,8 +704,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();
                     }
@@ -817,13 +817,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;
     }
 
 
@@ -845,19 +845,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 */
@@ -870,7 +870,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) {
@@ -904,7 +904,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);
@@ -963,14 +963,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 );
                 }
             }
 
@@ -1400,7 +1400,7 @@ 
 
     protected function isUserLoggedIn()
     {        
-         return (isset($this->session->sUserId) && !empty($this->session->sUserId));
+            return (isset($this->session->sUserId) && !empty($this->session->sUserId));
     }
 
     /**

Spacing +82 added lines, -82 removed lines

@@ -102,7 +102,7 @@ 
      */
     public function expressAction()
     {
-        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(
@@ -114,13 +114,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');
     }
@@ -133,7 +133,7 @@ 
 
         $this->basket = $this->get('modules')->Basket()->sGetBasket();
          $preFill = $this->config['preFillCheckout'];
-        if ($this->isUserLoggedIn()){
+        if ($this->isUserLoggedIn()) {
             $user = Shopware()->Modules()->Admin()->sGetUserData();
         }
 
@@ -149,7 +149,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;
             }
 
@@ -162,7 +162,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
@@ -175,21 +175,21 @@ 
         }
         // 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['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();
@@ -236,7 +236,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);
@@ -258,14 +258,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);
         }
 
@@ -290,7 +290,7 @@ 
         $this->plugin->getViewConfig($this->View(), $this->config);
         $this->View()->sBasket = $this->basket;
         $this->View()->sDispatches = $this->getDispatches($paymentIdDebug);
-        if ($postedCountry){
+        if ($postedCountry) {
             $this->session['sCountry'] = $postedCountry;
         }
         $this->View()->sDispatch = $this->getSelectedDispatch();
@@ -298,20 +298,20 @@ 
         // Neccessary if user is not logged in
         $this->View()->sPayment = $userPayment;
 
-        $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['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'];
 
         $this->View()->sAmountNet = $this->basket['sAmountNet'];
         $this->View()->sAmountTax = $this->basket['sAmountTax'];
@@ -330,10 +330,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;
     }
@@ -579,7 +579,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();
@@ -599,7 +599,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';
@@ -614,11 +614,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 {
@@ -628,7 +628,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'];
@@ -654,21 +654,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'));
 
@@ -687,7 +687,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);                
             }
         }
 
@@ -706,7 +706,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']);
@@ -714,10 +714,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 */
@@ -760,22 +760,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->plugin->klarnaLog("ERROR while creating User. Exception information:".$ex->getMessage(),1);
+                    $this->plugin->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);
     }
     
     /**
@@ -820,8 +820,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;
     }
@@ -832,7 +832,7 @@ 
      */
     public function updateCustomer($data, $userId)
     {
-        if (empty($data['billing']['birthyear']) || empty($data['billing']['birthmonth']) || empty($data['billing']['birthday'])){
+        if (empty($data['billing']['birthyear']) || empty($data['billing']['birthmonth']) || empty($data['billing']['birthday'])) {
             $data['birthdate'] == "0000-00-00";
         } else {
             $data['birthdate'] = $data['billing']['birthyear'].'-'.$data['billing']['birthmonth'].'-'.$data['billing']['birthday'];
@@ -882,7 +882,7 @@ 
             $addressService->create($address, $customer);
             $addressService->setDefaultShippingAddress($address);
         } catch (Exception $ex) {
-            $this->plugin->klarnaLog("ERROR while creating address via address service. Exception information:".$ex->getMessage(),1);
+            $this->plugin->klarnaLog("ERROR while creating address via address service. Exception information:".$ex->getMessage(), 1);
         }
         
     }
@@ -929,13 +929,13 @@ 
      */
     public function returnAction()
     {
-        $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();
 
@@ -947,8 +947,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',
@@ -962,15 +962,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);
                 }
             }
 
@@ -979,13 +979,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);
             }
@@ -1020,7 +1020,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); 
@@ -1048,9 +1048,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;
     }    
@@ -1073,9 +1073,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;
     }
@@ -1098,9 +1098,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;
     }    
@@ -1149,9 +1149,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;
     }
@@ -1231,14 +1231,14 @@ 
     {
         $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;
         }
 
@@ -1248,15 +1248,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);
             }
         }
 
@@ -1264,13 +1264,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);
         }
@@ -1295,7 +1295,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);
         }
     }