@@ -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 | } |
@@ -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 | } |
@@ -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> |
@@ -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 | |
@@ -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> |