@@ -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 ) { |
@@ -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 ) { |
@@ -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> |
@@ -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 ); |
@@ -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> |