@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | $args->setReturn($builder); |
492 | 492 | } |
493 | 493 | |
494 | - public function onGetStreetSplitService() |
|
494 | + public function onGetStreetSplitService() |
|
495 | 495 | { |
496 | 496 | $this->Application()->Loader()->registerNamespace( |
497 | 497 | 'Shopware\Components', |
@@ -1364,12 +1364,12 @@ discard block |
||
1364 | 1364 | /** @var Enlight_Components_Session_Namespace $session */ |
1365 | 1365 | $session = $this->Application()->Session(); |
1366 | 1366 | |
1367 | - // Switch User to external PaymentId after registration |
|
1368 | - if (isset($session['KlarnaExternalPaymentId'])) { |
|
1367 | + // Switch User to external PaymentId after registration |
|
1368 | + if (isset($session['KlarnaExternalPaymentId'])) { |
|
1369 | 1369 | $this->savePayment($session['KlarnaExternalPaymentId']); |
1370 | 1370 | } |
1371 | 1371 | |
1372 | - $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1); |
|
1372 | + $view->assign('klarnaRedirect', $request->has('klarnaRedirect') && $request->getParam('klarnaRedirect') == 1); |
|
1373 | 1373 | } |
1374 | 1374 | |
1375 | 1375 | |
@@ -1460,7 +1460,7 @@ discard block |
||
1460 | 1460 | $userData['billingaddress']['country'] =$country; |
1461 | 1461 | $userData['shippingaddress']['countryID'] = $session['sChangedCountry']; |
1462 | 1462 | $userData['billingaddress']['countryID'] = $session['sChangedCountry']; |
1463 | - } |
|
1463 | + } |
|
1464 | 1464 | |
1465 | 1465 | $orderVariables['sUserData'] = $userData; |
1466 | 1466 | $testbreakpoint = 0; |
@@ -2385,14 +2385,14 @@ discard block |
||
2385 | 2385 | } else { |
2386 | 2386 | $url = $front->Router()->assemble(array('controller' => 'index', 'module' => 'frontend')); |
2387 | 2387 | } |
2388 | - if (version_compare(Shopware::VERSION, '5.2.0', '>=')) { |
|
2388 | + if (version_compare(Shopware::VERSION, '5.2.0', '>=')) { |
|
2389 | 2389 | # make sure me get only the image name, path is set in case of upgarde from SW.5.1 to 5.2 |
2390 | 2390 | $parts = explode('/', $media); |
2391 | 2391 | $end = end($parts); |
2392 | - $media = $url . 'media/image/' . $end; |
|
2393 | - } else { |
|
2394 | - $media = $url . $media; |
|
2395 | - } |
|
2392 | + $media = $url . 'media/image/' . $end; |
|
2393 | + } else { |
|
2394 | + $media = $url . $media; |
|
2395 | + } |
|
2396 | 2396 | } |
2397 | 2397 | |
2398 | 2398 | return $media; |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | public function showIframeAction() |
131 | 131 | { |
132 | 132 | $this->basket = $this->get('modules')->Basket()->sGetBasket(); |
133 | - $preFill = $this->config['preFillCheckout']; |
|
133 | + $preFill = $this->config['preFillCheckout']; |
|
134 | 134 | if ($this->isUserLoggedIn()) { |
135 | 135 | $user = Shopware()->Modules()->Admin()->sGetUserData(); |
136 | 136 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | |
289 | 289 | // Klarna Prefill checkBox |
290 | 290 | if ($this->isUserLoggedIn()) { |
291 | - $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']); |
|
291 | + $this->View()->assign('KlarnaPreFillSelect', !$this->session['klarnaPreFill']); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | // Iframe Backend Config |
@@ -702,8 +702,8 @@ discard block |
||
702 | 702 | } |
703 | 703 | $module->sSYSTEM->_POST = $data['billing']; |
704 | 704 | if (Shopware::VERSION === '___VERSION___' || version_compare(Shopware::VERSION, '5.2.0', '>=')) { |
705 | - $userId = $session->offsetGet('sUserId'); |
|
706 | - $this->updateBilling($userId, $data['billing']); |
|
705 | + $userId = $session->offsetGet('sUserId'); |
|
706 | + $this->updateBilling($userId, $data['billing']); |
|
707 | 707 | } else { |
708 | 708 | $module->sUpdateBilling(); |
709 | 709 | } |
@@ -883,12 +883,12 @@ discard block |
||
883 | 883 | } |
884 | 884 | |
885 | 885 | |
886 | - /** |
|
887 | - * Updates the shipping address |
|
888 | - * |
|
889 | - * @param int $userId |
|
890 | - * @param array $shippingData |
|
891 | - */ |
|
886 | + /** |
|
887 | + * Updates the shipping address |
|
888 | + * |
|
889 | + * @param int $userId |
|
890 | + * @param array $shippingData |
|
891 | + */ |
|
892 | 892 | private function updateShipping($userId, $shippingData) |
893 | 893 | { |
894 | 894 | /** @var \Shopware\Components\Model\ModelManager $em */ |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | $addressold = $customer->getDefaultShippingAddress(); |
902 | 902 | $address = new \Shopware\Models\Customer\Address(); |
903 | 903 | |
904 | - /** @var \Shopware\Models\Country\Country $country */ |
|
904 | + /** @var \Shopware\Models\Country\Country $country */ |
|
905 | 905 | $country = $addressold->getCountry(); |
906 | 906 | $shippingData['country'] = $country; |
907 | 907 | if ($shippingData['phone'] === null) { |
@@ -937,7 +937,7 @@ discard block |
||
937 | 937 | /** @var \Shopware\Models\Customer\Address $address */ |
938 | 938 | $address = $customer->getDefaultBillingAddress(); |
939 | 939 | |
940 | - /** @var \Shopware\Models\Country\Country $country */ |
|
940 | + /** @var \Shopware\Models\Country\Country $country */ |
|
941 | 941 | $country = $address->getCountry(); |
942 | 942 | $billingData['country'] = $country; |
943 | 943 | $address->fromArray($billingData); |
@@ -1512,7 +1512,7 @@ discard block |
||
1512 | 1512 | */ |
1513 | 1513 | protected function isUserLoggedIn() |
1514 | 1514 | { |
1515 | - return (isset($this->session->sUserId) && !empty($this->session->sUserId)); |
|
1515 | + return (isset($this->session->sUserId) && !empty($this->session->sUserId)); |
|
1516 | 1516 | } |
1517 | 1517 | |
1518 | 1518 | /** |