@@ -522,12 +522,10 @@ |
||
| 522 | 522 | { |
| 523 | 523 | throw new \Aimeos\Client\Html\Exception( $e->getMessage() ); |
| 524 | 524 | } |
| 525 | - } |
|
| 526 | - else if( function_exists( 'mime_content_type' ) ) |
|
| 525 | + } else if( function_exists( 'mime_content_type' ) ) |
|
| 527 | 526 | { |
| 528 | 527 | $mimetype = mime_content_type( $filename ); |
| 529 | - } |
|
| 530 | - else |
|
| 528 | + } else |
|
| 531 | 529 | { |
| 532 | 530 | $mimetype = 'application/binary'; |
| 533 | 531 | } |
@@ -190,8 +190,7 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 193 | - } |
|
| 194 | - else |
|
| 193 | + } else |
|
| 195 | 194 | { |
| 196 | 195 | $html = $this->modifyBody( $html, $uid ); |
| 197 | 196 | } |
@@ -261,8 +260,7 @@ discard block |
||
| 261 | 260 | { |
| 262 | 261 | $this->logException( $e ); |
| 263 | 262 | } |
| 264 | - } |
|
| 265 | - else |
|
| 263 | + } else |
|
| 266 | 264 | { |
| 267 | 265 | $html = $this->modifyHeader( $html, $uid ); |
| 268 | 266 | } |
@@ -159,22 +159,22 @@ discard block |
||
| 159 | 159 | catch( \Aimeos\Client\Html\Exception $e ) |
| 160 | 160 | { |
| 161 | 161 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 162 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 162 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 163 | 163 | } |
| 164 | 164 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
| 165 | 165 | { |
| 166 | 166 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 167 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 167 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 168 | 168 | } |
| 169 | 169 | catch( \Aimeos\MShop\Exception $e ) |
| 170 | 170 | { |
| 171 | 171 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 172 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 172 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 173 | 173 | } |
| 174 | 174 | catch( \Exception $e ) |
| 175 | 175 | { |
| 176 | 176 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 177 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 177 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 178 | 178 | $this->logException( $e ); |
| 179 | 179 | } |
| 180 | 180 | |
@@ -362,22 +362,22 @@ discard block |
||
| 362 | 362 | catch( \Aimeos\Client\Html\Exception $e ) |
| 363 | 363 | { |
| 364 | 364 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 365 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 365 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 366 | 366 | } |
| 367 | 367 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
| 368 | 368 | { |
| 369 | 369 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 370 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 370 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 371 | 371 | } |
| 372 | 372 | catch( \Aimeos\MShop\Exception $e ) |
| 373 | 373 | { |
| 374 | 374 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 375 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 375 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 376 | 376 | } |
| 377 | 377 | catch( \Exception $e ) |
| 378 | 378 | { |
| 379 | 379 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 380 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
| 380 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
| 381 | 381 | $this->logException( $e ); |
| 382 | 382 | } |
| 383 | 383 | } |
@@ -190,8 +190,7 @@ discard block |
||
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 193 | - } |
|
| 194 | - else |
|
| 193 | + } else |
|
| 195 | 194 | { |
| 196 | 195 | $html = $this->modifyBody( $html, $uid ); |
| 197 | 196 | } |
@@ -261,8 +260,7 @@ discard block |
||
| 261 | 260 | { |
| 262 | 261 | $this->logException( $e ); |
| 263 | 262 | } |
| 264 | - } |
|
| 265 | - else |
|
| 263 | + } else |
|
| 266 | 264 | { |
| 267 | 265 | $html = $this->modifyHeader( $html, $uid ); |
| 268 | 266 | } |
@@ -193,22 +193,22 @@ discard block |
||
| 193 | 193 | catch( \Aimeos\Client\Html\Exception $e ) |
| 194 | 194 | { |
| 195 | 195 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 196 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 196 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 197 | 197 | } |
| 198 | 198 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
| 199 | 199 | { |
| 200 | 200 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 201 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 201 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 202 | 202 | } |
| 203 | 203 | catch( \Aimeos\MShop\Exception $e ) |
| 204 | 204 | { |
| 205 | 205 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 206 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 206 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 207 | 207 | } |
| 208 | 208 | catch( \Exception $e ) |
| 209 | 209 | { |
| 210 | 210 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 211 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 211 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 212 | 212 | $this->logException( $e ); |
| 213 | 213 | } |
| 214 | 214 | |
@@ -418,22 +418,22 @@ discard block |
||
| 418 | 418 | catch( \Aimeos\MShop\Exception $e ) |
| 419 | 419 | { |
| 420 | 420 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 421 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 421 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 422 | 422 | } |
| 423 | 423 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
| 424 | 424 | { |
| 425 | 425 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 426 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 426 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 427 | 427 | } |
| 428 | 428 | catch( \Aimeos\Client\Html\Exception $e ) |
| 429 | 429 | { |
| 430 | 430 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 431 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 431 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 432 | 432 | } |
| 433 | 433 | catch( \Exception $e ) |
| 434 | 434 | { |
| 435 | 435 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 436 | - $view->filterErrorList = array_merge($view->get( 'filterErrorList', [] ), $error); |
|
| 436 | + $view->filterErrorList = array_merge( $view->get( 'filterErrorList', [] ), $error ); |
|
| 437 | 437 | $this->logException( $e ); |
| 438 | 438 | } |
| 439 | 439 | } |
@@ -87,8 +87,11 @@ |
||
| 87 | 87 | $this->config( 'client/html/checkout/standard/summary/address', 'common/summary/address-standard' ), |
| 88 | 88 | array( 'addresses' => $addresses['delivery'], 'type' => 'delivery' ) |
| 89 | 89 | ); ?> |
| 90 | - <?php else : ?> |
|
| 91 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
| 90 | + <?php else { |
|
| 91 | + : ?> |
|
| 92 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
| 93 | +} |
|
| 94 | +?> |
|
| 92 | 95 | <?php endif; ?> |
| 93 | 96 | </div> |
| 94 | 97 | </div> |
@@ -58,8 +58,11 @@ |
||
| 58 | 58 | $this->config( 'client/html/checkout/confirm/summary/address', 'common/summary/address-standard' ), |
| 59 | 59 | array( 'addresses' => $addresses['delivery'], 'type' => 'delivery' ) |
| 60 | 60 | ); ?> |
| 61 | - <?php else : ?> |
|
| 62 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
| 61 | + <?php else { |
|
| 62 | + : ?> |
|
| 63 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
| 64 | +} |
|
| 65 | +?> |
|
| 63 | 66 | <?php endif; ?> |
| 64 | 67 | </div> |
| 65 | 68 | </div> |
@@ -68,8 +68,11 @@ |
||
| 68 | 68 | $this->config( 'client/html/account/subscription/summary/address', 'common/summary/address-standard' ), |
| 69 | 69 | array( 'addresses' => $addresses['delivery'], 'type' => 'delivery' ) |
| 70 | 70 | ); ?> |
| 71 | - <?php else : ?> |
|
| 72 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
| 71 | + <?php else { |
|
| 72 | + : ?> |
|
| 73 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
| 74 | +} |
|
| 75 | +?> |
|
| 73 | 76 | <?php endif; ?> |
| 74 | 77 | </div> |
| 75 | 78 | </div> |
@@ -70,8 +70,11 @@ |
||
| 70 | 70 | $this->config( 'client/html/account/history/summary/address', 'common/summary/address-standard' ), |
| 71 | 71 | array( 'addresses' => $addresses['delivery'], 'type' => 'delivery' ) |
| 72 | 72 | ); ?> |
| 73 | - <?php else : ?> |
|
| 74 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
| 73 | + <?php else { |
|
| 74 | + : ?> |
|
| 75 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
| 76 | +} |
|
| 77 | +?> |
|
| 75 | 78 | <?php endif; ?> |
| 76 | 79 | </div> |
| 77 | 80 | </div> |
@@ -14,8 +14,7 @@ |
||
| 14 | 14 | |
| 15 | 15 | $enc = $this->encoder(); |
| 16 | 16 | |
| 17 | -$getVariantData = function( \Aimeos\MShop\Media\Item\Iface $mediaItem ) use ( $enc ) |
|
| 18 | -{ |
|
| 17 | +$getVariantData = function( \Aimeos\MShop\Media\Item\Iface $mediaItem ) use ( $enc ) { |
|
| 19 | 18 | $string = ''; |
| 20 | 19 | |
| 21 | 20 | foreach( $mediaItem->getRefItems( 'attribute', null, 'variant' ) as $id => $item ) { |
@@ -13,8 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | |
| 16 | -$getProductList = function( array $posItems, array $items ) |
|
| 17 | -{ |
|
| 16 | +$getProductList = function( array $posItems, array $items ) { |
|
| 18 | 17 | $list = []; |
| 19 | 18 | |
| 20 | 19 | foreach( $posItems as $id => $posItem ) |