@@ -122,8 +122,11 @@ |
||
122 | 122 | <span class="value col-sm-6"> |
123 | 123 | <?php if( isset( $intervals[$item->getInterval()] ) ) : ?> |
124 | 124 | <?= $enc->html( $intervals[$item->getInterval()]->getName(), $enc::TRUST ); ?> |
125 | - <?php else : ?> |
|
126 | - <?= $enc->html( $item->getInterval(), $enc::TRUST ); ?> |
|
125 | + <?php else { |
|
126 | + : ?> |
|
127 | + <?= $enc->html( $item->getInterval(), $enc::TRUST ); |
|
128 | +} |
|
129 | +?> |
|
127 | 130 | <?php endif; ?> |
128 | 131 | </span> |
129 | 132 | </div> |
@@ -402,8 +402,7 @@ discard block |
||
402 | 402 | $controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' ); |
403 | 403 | $action = $view->config( 'client/html/catalog/detail/url/action', 'detail' ); |
404 | 404 | $config = $view->config( 'client/html/catalog/detail/url/config', [] ); |
405 | - } |
|
406 | - else |
|
405 | + } else |
|
407 | 406 | { |
408 | 407 | $params = $context->getSession()->get( 'aimeos/catalog/lists/params/last/' . $site, [] ); |
409 | 408 | |
@@ -465,8 +464,7 @@ discard block |
||
465 | 464 | $view->param( 'b_stocktype', 'default' ), |
466 | 465 | $view->param( 'b_supplier' ) |
467 | 466 | ); |
468 | - } |
|
469 | - else |
|
467 | + } else |
|
470 | 468 | { |
471 | 469 | $list = []; |
472 | 470 | $entries = (array) $view->param( 'b_prod', [] ); |
@@ -86,22 +86,22 @@ discard block |
||
86 | 86 | catch( \Aimeos\Client\Html\Exception $e ) |
87 | 87 | { |
88 | 88 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
89 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
89 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
90 | 90 | } |
91 | 91 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
92 | 92 | { |
93 | 93 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
94 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
94 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
95 | 95 | } |
96 | 96 | catch( \Aimeos\MShop\Exception $e ) |
97 | 97 | { |
98 | 98 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
99 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
99 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
100 | 100 | } |
101 | 101 | catch( \Exception $e ) |
102 | 102 | { |
103 | 103 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
104 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
104 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
105 | 105 | $this->logException( $e ); |
106 | 106 | } |
107 | 107 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
346 | 346 | { |
347 | 347 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
348 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
348 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
349 | 349 | } |
350 | 350 | catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
351 | 351 | { |
@@ -353,17 +353,17 @@ discard block |
||
353 | 353 | $errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) ); |
354 | 354 | |
355 | 355 | $view->standardErrorCodes = $e->getErrorCodes(); |
356 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $errors); |
|
356 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $errors ); |
|
357 | 357 | } |
358 | 358 | catch( \Aimeos\MShop\Exception $e ) |
359 | 359 | { |
360 | 360 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
361 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
361 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
362 | 362 | } |
363 | 363 | catch( \Exception $e ) |
364 | 364 | { |
365 | 365 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
366 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
366 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
367 | 367 | $this->logException( $e ); |
368 | 368 | } |
369 | 369 |
@@ -577,15 +577,16 @@ discard block |
||
577 | 577 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
578 | 578 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
579 | 579 | |
580 | - if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
580 | + if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) { |
|
581 | + // new address |
|
581 | 582 | { |
582 | 583 | $params = $view->param( 'ca_billing', [] ); |
584 | + } |
|
583 | 585 | |
584 | 586 | if( ( $view->billingError = $this->checkFields( $params ) ) !== [] ) { |
585 | 587 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one billing address part is missing or invalid' ) ); |
586 | 588 | } |
587 | - } |
|
588 | - else // existing address |
|
589 | + } else // existing address |
|
589 | 590 | { |
590 | 591 | $params = $view->param( 'ca_billing_' . $option, [] ) + $view->param( 'ca_extra', [] ); |
591 | 592 | |
@@ -729,8 +730,7 @@ discard block |
||
729 | 730 | $invalid[$key] = $name; |
730 | 731 | unset( $params[$key] ); |
731 | 732 | } |
732 | - } |
|
733 | - else |
|
733 | + } else |
|
734 | 734 | { |
735 | 735 | unset( $params[$key] ); |
736 | 736 | } |
@@ -71,13 +71,16 @@ |
||
71 | 71 | $currency ) |
72 | 72 | ); ?> |
73 | 73 | </span> |
74 | - <?php else : ?> |
|
74 | + <?php else { |
|
75 | + : ?> |
|
75 | 76 | <span class="price-value"> |
76 | 77 | <?= $enc->html( sprintf( |
77 | 78 | $priceFormat, |
78 | 79 | $this->number( $servicePrices[$id]->getCosts() > 0 ? $servicePrices[$id]->getCosts() : 0, $servicePrices[$id]->getPrecision() ), |
79 | 80 | $currency ) |
80 | - ); ?> |
|
81 | + ); |
|
82 | +} |
|
83 | +?> |
|
81 | 84 | </span> |
82 | 85 | <?php endif; ?> |
83 | 86 |
@@ -319,8 +319,7 @@ |
||
319 | 319 | { |
320 | 320 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
321 | 321 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
322 | - } |
|
323 | - else |
|
322 | + } else |
|
324 | 323 | { |
325 | 324 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
326 | 325 | $orderItem = $orderCntl->get( $orderid ); |
@@ -108,22 +108,22 @@ discard block |
||
108 | 108 | catch( \Aimeos\Client\Html\Exception $e ) |
109 | 109 | { |
110 | 110 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
111 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
111 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
112 | 112 | } |
113 | 113 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
114 | 114 | { |
115 | 115 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
116 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
116 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
117 | 117 | } |
118 | 118 | catch( \Aimeos\MShop\Exception $e ) |
119 | 119 | { |
120 | 120 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
121 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
121 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
122 | 122 | } |
123 | 123 | catch( \Exception $e ) |
124 | 124 | { |
125 | 125 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
126 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
126 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
127 | 127 | $this->logException( $e ); |
128 | 128 | } |
129 | 129 | |
@@ -343,22 +343,22 @@ discard block |
||
343 | 343 | catch( \Aimeos\Client\Html\Exception $e ) |
344 | 344 | { |
345 | 345 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
346 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
346 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
347 | 347 | } |
348 | 348 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
349 | 349 | { |
350 | 350 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
351 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
351 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
352 | 352 | } |
353 | 353 | catch( \Aimeos\MShop\Exception $e ) |
354 | 354 | { |
355 | 355 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
356 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
356 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
357 | 357 | } |
358 | 358 | catch( \Exception $e ) |
359 | 359 | { |
360 | 360 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
361 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
361 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
362 | 362 | $this->logException( $e ); |
363 | 363 | } |
364 | 364 | } |
@@ -14,8 +14,7 @@ |
||
14 | 14 | $listController = $this->config( 'client/html/catalog/tree/url/controller', 'catalog' ); |
15 | 15 | $listAction = $this->config( 'client/html/catalog/tree/url/action', 'tree' ); |
16 | 16 | $listConfig = $this->config( 'client/html/catalog/tree/url/config', [] ); |
17 | -} |
|
18 | -else |
|
17 | +} else |
|
19 | 18 | { |
20 | 19 | $listTarget = $this->config( 'client/html/catalog/lists/url/target' ); |
21 | 20 | $listController = $this->config( 'client/html/catalog/lists/url/controller', 'catalog' ); |
@@ -16,8 +16,7 @@ discard block |
||
16 | 16 | $cntl = $this->config( 'client/html/catalog/tree/url/controller', 'catalog' ); |
17 | 17 | $action = $this->config( 'client/html/catalog/tree/url/action', 'tree' ); |
18 | 18 | $config = $this->config( 'client/html/catalog/tree/url/config', [] ); |
19 | -} |
|
20 | -else |
|
19 | +} else |
|
21 | 20 | { |
22 | 21 | $target = $this->config( 'client/html/catalog/lists/url/target' ); |
23 | 22 | $cntl = $this->config( 'client/html/catalog/lists/url/controller', 'catalog' ); |
@@ -159,14 +158,17 @@ discard block |
||
159 | 158 | $searchText, |
160 | 159 | $total |
161 | 160 | ), $enc::TRUST ); ?> |
162 | - <?php else : ?> |
|
161 | + <?php else { |
|
162 | + : ?> |
|
163 | 163 | <?= $enc->html( sprintf( |
164 | 164 | $this->translate( |
165 | 165 | 'client', |
166 | 166 | 'No articles found for <span class="searchstring">"%1$s"</span>. Please try again with a different keyword.' |
167 | 167 | ), |
168 | 168 | $searchText |
169 | - ), $enc::TRUST ); ?> |
|
169 | + ), $enc::TRUST ); |
|
170 | +} |
|
171 | +?> |
|
170 | 172 | <?php endif; ?> |
171 | 173 | |
172 | 174 | </div> |
@@ -187,8 +187,7 @@ |
||
187 | 187 | $html = $lastSeen[$name]; |
188 | 188 | unset( $lastSeen[$name] ); |
189 | 189 | $lastSeen[$name] = $html; |
190 | - } |
|
191 | - else |
|
190 | + } else |
|
192 | 191 | { |
193 | 192 | /** client/html/catalog/session/seen/standard/maxitems |
194 | 193 | * Maximum number of products displayed in the "last seen" section |
@@ -304,7 +304,9 @@ |
||
304 | 304 | $controller = \Aimeos\Controller\Frontend::create( $context, 'customer' ); |
305 | 305 | $view->summaryCustomerId = $controller->find( $addr->getEmail() )->getId(); |
306 | 306 | } |
307 | - catch( \Exception $e ) {} |
|
307 | + catch( \Exception $e ) |
|
308 | + { |
|
309 | +} |
|
308 | 310 | } |
309 | 311 | |
310 | 312 | $view->summaryCostsDelivery = $this->getCostsDelivery( $basket ); |
@@ -256,7 +256,7 @@ |
||
256 | 256 | |
257 | 257 | $view->summaryErrorCodes = $errors; |
258 | 258 | $view->standardStepActive = 'summary'; |
259 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), array( $error )); |
|
259 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), array( $error ) ); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 |