@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | public function showIframeAction() { |
133 | 133 | |
134 | 134 | $this->basket = $this->get('modules')->Basket()->sGetBasket(); |
135 | - $preFill = $this->config['preFillCheckout']; |
|
135 | + $preFill = $this->config['preFillCheckout']; |
|
136 | 136 | if ($this->isUserLoggedIn()){ |
137 | 137 | $user = Shopware()->Modules()->Admin()->sGetUserData(); |
138 | 138 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | |
284 | 284 | // Klarna Prefill checkBox |
285 | 285 | if ($this->isUserLoggedIn()) { |
286 | - $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']); |
|
286 | + $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | // Iframe Backend Config |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | if ($this->Request()->getParam('sArticle') && $this->Request()->getParam('sQuantity')) { |
404 | 404 | $this->View()->sBasketInfo = $basketObj->sUpdateArticle($this->Request()->getParam('sArticle'), $this->Request()->getParam('sQuantity')); |
405 | 405 | } |
406 | - $this->redirect(['action' => $this->Request()->getParam('sTargetAction', 'showIframe')]); |
|
406 | + $this->redirect(['action' => $this->Request()->getParam('sTargetAction', 'showIframe')]); |
|
407 | 407 | } |
408 | 408 | |
409 | 409 | /** |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | return array("id" => $this->session['sState']); |
577 | 577 | } |
578 | 578 | |
579 | - /** |
|
579 | + /** |
|
580 | 580 | * @param Klarna_Checkout_Order $order |
581 | 581 | */ |
582 | 582 | public function createAccount($order = null, $checkLoginState=true) |
@@ -704,8 +704,8 @@ discard block |
||
704 | 704 | } |
705 | 705 | $module->sSYSTEM->_POST = $data['billing']; |
706 | 706 | if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) { |
707 | - $userId = $session->offsetGet('sUserId'); |
|
708 | - $this->updateBilling($userId, $data['billing']); |
|
707 | + $userId = $session->offsetGet('sUserId'); |
|
708 | + $this->updateBilling($userId, $data['billing']); |
|
709 | 709 | } else{ |
710 | 710 | $module->sUpdateBilling(); |
711 | 711 | } |
@@ -817,13 +817,13 @@ discard block |
||
817 | 817 | |
818 | 818 | // get updated password; it is md5 randomized after register |
819 | 819 | $getUser = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')->findOneBy( |
820 | - array('email' => $data['auth']['email']) |
|
821 | - ); |
|
820 | + array('email' => $data['auth']['email']) |
|
821 | + ); |
|
822 | 822 | |
823 | - $data['auth']['password']= $getUser->getPassword(); |
|
824 | - $data['auth']['passwordMD5']= $getUser->getPassword(); |
|
825 | - $data['auth']['encoderName'] = 'md5'; |
|
826 | - return $data; |
|
823 | + $data['auth']['password']= $getUser->getPassword(); |
|
824 | + $data['auth']['passwordMD5']= $getUser->getPassword(); |
|
825 | + $data['auth']['encoderName'] = 'md5'; |
|
826 | + return $data; |
|
827 | 827 | } |
828 | 828 | |
829 | 829 | |
@@ -845,19 +845,19 @@ discard block |
||
845 | 845 | unset ($data['billing']); |
846 | 846 | |
847 | 847 | $customer = Shopware()->Models()->getRepository('Shopware\Models\Customer\Customer')->findOneBy( |
848 | - array('id' => $userId) |
|
849 | - ); |
|
848 | + array('id' => $userId) |
|
849 | + ); |
|
850 | 850 | $customer->fromArray($data); |
851 | 851 | Shopware()->Container()->get('shopware_account.customer_service')->update($customer); |
852 | 852 | } |
853 | 853 | |
854 | 854 | |
855 | - /** |
|
856 | - * Updates the shipping address |
|
857 | - * |
|
858 | - * @param int $userId |
|
859 | - * @param array $shippingData |
|
860 | - */ |
|
855 | + /** |
|
856 | + * Updates the shipping address |
|
857 | + * |
|
858 | + * @param int $userId |
|
859 | + * @param array $shippingData |
|
860 | + */ |
|
861 | 861 | private function updateShipping($userId, $shippingData) |
862 | 862 | { |
863 | 863 | /** @var \Shopware\Components\Model\ModelManager $em */ |
@@ -870,7 +870,7 @@ discard block |
||
870 | 870 | $addressold = $customer->getDefaultShippingAddress(); |
871 | 871 | $address = new \Shopware\Models\Customer\Address(); |
872 | 872 | |
873 | - /** @var \Shopware\Models\Country\Country $country */ |
|
873 | + /** @var \Shopware\Models\Country\Country $country */ |
|
874 | 874 | $country = $addressold->getCountry(); |
875 | 875 | $shippingData['country'] = $country; |
876 | 876 | if ($shippingData['phone'] === null) { |
@@ -904,7 +904,7 @@ discard block |
||
904 | 904 | /** @var \Shopware\Models\Customer\Address $address */ |
905 | 905 | $address = $customer->getDefaultBillingAddress(); |
906 | 906 | |
907 | - /** @var \Shopware\Models\Country\Country $country */ |
|
907 | + /** @var \Shopware\Models\Country\Country $country */ |
|
908 | 908 | $country = $address->getCountry(); |
909 | 909 | $billingData['country'] = $country; |
910 | 910 | $address->fromArray($billingData); |
@@ -963,14 +963,14 @@ discard block |
||
963 | 963 | |
964 | 964 | if ($order['status'] == 'checkout_complete') { |
965 | 965 | $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: checkout_complete. Save oder if session values match.",3); |
966 | - if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){ |
|
966 | + if (Shopware()->Session()->offsetGet('KlarnaTransactionId') == null){ |
|
967 | 967 | $this->plugin->klarnaLog("Entering Shopware_Controllers_Frontend_PaymentKlarna::returnAction: Session matches. Order will be saved",3); |
968 | 968 | Shopware()->Session()->offsetSet('KlarnaTransactionId', $transactionId ); |
969 | 969 | $orderNumber = $this->saveOrder( |
970 | 970 | $order['reservation'], |
971 | 971 | $order['reference'] |
972 | 972 | ); |
973 | - Shopware()->Session()->offsetSet('KlarnaTransactionId', null ); |
|
973 | + Shopware()->Session()->offsetSet('KlarnaTransactionId', null ); |
|
974 | 974 | } |
975 | 975 | } |
976 | 976 | |
@@ -1400,7 +1400,7 @@ discard block |
||
1400 | 1400 | |
1401 | 1401 | protected function isUserLoggedIn() |
1402 | 1402 | { |
1403 | - return (isset($this->session->sUserId) && !empty($this->session->sUserId)); |
|
1403 | + return (isset($this->session->sUserId) && !empty($this->session->sUserId)); |
|
1404 | 1404 | } |
1405 | 1405 | |
1406 | 1406 | /** |