@@ -129,9 +129,12 @@ |
||
129 | 129 | <?php $mediaItems = $productItem->getRefItems( 'media', 'default', 'default' ); ?> |
130 | 130 | <?php if( ( $mediaItem = reset( $mediaItems ) ) !== false ) : ?> |
131 | 131 | <div class="media-item" style="background-image: url('<?= $this->content( $mediaItem->getPreview() ); ?>')"></div> |
132 | - <?php else : ?> |
|
132 | + <?php else { |
|
133 | + : ?> |
|
133 | 134 | <div class="media-item"></div> |
134 | - <?php endif; ?> |
|
135 | + <?php endif; |
|
136 | +} |
|
137 | +?> |
|
135 | 138 | |
136 | 139 | <h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3> |
137 | 140 | <div class="price-list"> |
@@ -36,7 +36,7 @@ |
||
36 | 36 | 'label' => $name, |
37 | 37 | 'html' => ' |
38 | 38 | <li class="aimeos catalog-suggest"> |
39 | - <a class="suggest-item" href="' . $enc->attr( $this->url( $target, $cntl, $action, ['d_prodid' => $id, 'd_name' => $name], [], $config ) ).'"> |
|
39 | + <a class="suggest-item" href="' . $enc->attr( $this->url( $target, $cntl, $action, ['d_prodid' => $id, 'd_name' => $name], [], $config ) ) . '"> |
|
40 | 40 | <div class="item-name">' . $enc->html( $name ) . '</div> |
41 | 41 | <div class="item-price">' . $enc->html( $price ) . '</div> |
42 | 42 | <div class="item-image" style="background-image: url(' . $enc->attr( $media ) . ')"></div> |
@@ -149,14 +149,17 @@ |
||
149 | 149 | $searchText, |
150 | 150 | $total |
151 | 151 | ), $enc::TRUST ); ?> |
152 | - <?php else : ?> |
|
152 | + <?php else { |
|
153 | + : ?> |
|
153 | 154 | <?= $enc->html( sprintf( |
154 | 155 | $this->translate( |
155 | 156 | 'client', |
156 | 157 | 'No articles found for <span class="searchstring">"%1$s"</span>. Please try again with a different keyword.' |
157 | 158 | ), |
158 | 159 | $searchText |
159 | - ), $enc::TRUST ); ?> |
|
160 | + ), $enc::TRUST ); |
|
161 | +} |
|
162 | +?> |
|
160 | 163 | <?php endif; ?> |
161 | 164 | |
162 | 165 | </div> |
@@ -35,7 +35,7 @@ |
||
35 | 35 | $params = array( 'd_name' => $productItem->getName( 'url' ), 'd_prodid' => $id ); |
36 | 36 | if( $position !== null ) { $params['d_pos'] = $position++; } |
37 | 37 | |
38 | - $url = $this->url( ($productItem->getTarget() ?: $detailTarget ), $detailController, $detailAction, $params, [], $detailConfig ); |
|
38 | + $url = $this->url( ( $productItem->getTarget() ?: $detailTarget ), $detailController, $detailAction, $params, [], $detailConfig ); |
|
39 | 39 | ?> |
40 | 40 | |
41 | 41 | --><li class="product <?= $enc->attr( $css ); ?>" |
@@ -55,8 +55,11 @@ |
||
55 | 55 | </div> |
56 | 56 | </noscript> |
57 | 57 | <div class="media-item lazy-image" data-src="<?= $mediaUrl; ?>"></div> |
58 | - <?php else : ?> |
|
59 | - <div class="media-item" data-src="<?= $mediaUrl; ?>"></div> |
|
58 | + <?php else { |
|
59 | + : ?> |
|
60 | + <div class="media-item" data-src="<?= $mediaUrl; |
|
61 | +} |
|
62 | +?>"></div> |
|
60 | 63 | <?php endif; ?> |
61 | 64 | <?php endforeach; ?> |
62 | 65 | </a><!-- |
@@ -59,8 +59,11 @@ |
||
59 | 59 | |
60 | 60 | <?php elseif( ( $search = $this->param( 'f_search', null ) ) != null ) : /// Product search hint with user provided search string (%1$s) ?> |
61 | 61 | <title><?= $enc->html( sprintf( $this->translate( 'client', 'Result for "%1$s"' ), strip_tags( $search ) ) ); ?></title> |
62 | - <?php else : ?> |
|
63 | - <title><?= $enc->html( $this->translate( 'client', 'Our products' ) ); ?></title> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
64 | + <title><?= $enc->html( $this->translate( 'client', 'Our products' ) ); |
|
65 | +} |
|
66 | +?></title> |
|
64 | 67 | <?php endif; ?> |
65 | 68 | |
66 | 69 |
@@ -58,8 +58,11 @@ |
||
58 | 58 | $this->config( 'client/html/checkout/confirm/summary/address', 'common/summary/address-standard' ), |
59 | 59 | array( 'address' => $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> |
@@ -69,7 +69,7 @@ |
||
69 | 69 | <h2><?= $enc->html( $this->translate( 'client', 'Billing address' ), $enc::TRUST ); ?></h2> |
70 | 70 | |
71 | 71 | |
72 | - <?php if( isset( $this->addressPaymentItem ) ) : ?> |
|
72 | + <?php if( isset( $this->addressPaymentItem ) ) : ?> |
|
73 | 73 | <div class="item-address"> |
74 | 74 | <div class="header"> |
75 | 75 |
@@ -28,9 +28,12 @@ |
||
28 | 28 | $disablenew = (bool) $this->config( 'client/html/common/address/billing/disable-new', false ); |
29 | 29 | |
30 | 30 | |
31 | -try { |
|
31 | +try |
|
32 | +{ |
|
32 | 33 | $addrArray = $this->standardBasket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT )->toArray(); |
33 | -} catch( Exception $e ) { |
|
34 | +} |
|
35 | +catch( Exception $e ) |
|
36 | +{ |
|
34 | 37 | $addrArray = []; |
35 | 38 | } |
36 | 39 |
@@ -72,13 +72,16 @@ |
||
72 | 72 | $currency ) |
73 | 73 | ); ?> |
74 | 74 | </span> |
75 | - <?php else : ?> |
|
75 | + <?php else { |
|
76 | + : ?> |
|
76 | 77 | <span class="price-value"> |
77 | 78 | <?= $enc->html( sprintf( |
78 | 79 | $priceFormat, |
79 | 80 | $this->number( $servicePrices[$id]->getCosts() ), |
80 | 81 | $currency ) |
81 | - ); ?> |
|
82 | + ); |
|
83 | +} |
|
84 | +?> |
|
82 | 85 | </span> |
83 | 86 | <?php endif; ?> |
84 | 87 |
@@ -33,9 +33,12 @@ |
||
33 | 33 | $action = $this->config( 'client/html/checkout/standard/url/action', 'index' ); |
34 | 34 | $config = $this->config( 'client/html/checkout/standard/url/config', [] ); |
35 | 35 | |
36 | -try { |
|
36 | +try |
|
37 | +{ |
|
37 | 38 | $addrArray = $this->standardBasket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY )->toArray(); |
38 | -} catch( Exception $e ) { |
|
39 | +} |
|
40 | +catch( Exception $e ) |
|
41 | +{ |
|
39 | 42 | $addrArray = []; |
40 | 43 | } |
41 | 44 |