FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Controllers/Frontend/PaymentKlarna.php

Indentation +25 added lines, -25 removed lines

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

Bootstrap.php

Indentation +10 added lines, -10 removed lines

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