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));
     }    
 }

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;