@@ -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 | |
@@ -204,7 +204,7 @@ |
||
| 204 | 204 | { |
| 205 | 205 | if( is_array( $item->getDefault() ) ) |
| 206 | 206 | { |
| 207 | - foreach( (array) $item->getDefault() as $key2 => $value ){ |
|
| 207 | + foreach( (array) $item->getDefault() as $key2 => $value ) { |
|
| 208 | 208 | $urlParams[] = $namefcn( $this, array( $item->getInternalCode(), $key2 ) ) . '=' . urlencode( $value ); |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -7,7 +7,8 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | if( $this->get( 'standardUrlExternal', true ) ) |
| 9 | 9 | { |
| 10 | - $namefcn = function( $view, $key ) { |
|
| 10 | + $namefcn = function( $view, $key ) |
|
| 11 | + { |
|
| 11 | 12 | |
| 12 | 13 | $key = (array) $key; |
| 13 | 14 | $name = array_shift( $key ); |
@@ -18,15 +19,16 @@ discard block |
||
| 18 | 19 | |
| 19 | 20 | return $name; |
| 20 | 21 | }; |
| 21 | -} |
|
| 22 | -else |
|
| 22 | +} else |
|
| 23 | 23 | { |
| 24 | - $namefcn = function( $view, $key ) { |
|
| 24 | + $namefcn = function( $view, $key ) |
|
| 25 | + { |
|
| 25 | 26 | return $view->formparam( (array) $key ); |
| 26 | 27 | }; |
| 27 | 28 | } |
| 28 | 29 | |
| 29 | -$testfcn = function( $list, $key, $default = '' ) { |
|
| 30 | +$testfcn = function( $list, $key, $default = '' ) |
|
| 31 | +{ |
|
| 30 | 32 | return ( isset( $list[$key] ) ? $list[$key] : $default ); |
| 31 | 33 | }; |
| 32 | 34 | |
@@ -93,9 +95,12 @@ discard block |
||
| 93 | 95 | <p class="order-notice"> |
| 94 | 96 | <?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?> |
| 95 | 97 | </p> |
| 96 | - <?php else : ?> |
|
| 98 | + <?php else { |
|
| 99 | + : ?> |
|
| 97 | 100 | <p class="order-notice"> |
| 98 | - <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?> |
|
| 101 | + <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); |
|
| 102 | +} |
|
| 103 | +?> |
|
| 99 | 104 | </p> |
| 100 | 105 | <?php endif; ?> |
| 101 | 106 | |
@@ -112,10 +117,13 @@ discard block |
||
| 112 | 117 | /> |
| 113 | 118 | <?php endforeach; ?> |
| 114 | 119 | |
| 115 | - <?php else : ?> |
|
| 120 | + <?php else { |
|
| 121 | + : ?> |
|
| 116 | 122 | |
| 117 | 123 | <input type="hidden" |
| 118 | - name="<?= $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); ?>" |
|
| 124 | + name="<?= $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); |
|
| 125 | +} |
|
| 126 | +?>" |
|
| 119 | 127 | value="<?= $enc->attr( $item->getDefault() ); ?>" |
| 120 | 128 | /> |
| 121 | 129 | |
@@ -207,8 +215,7 @@ discard block |
||
| 207 | 215 | foreach( (array) $item->getDefault() as $key2 => $value ){ |
| 208 | 216 | $urlParams[] = $namefcn( $this, array( $item->getInternalCode(), $key2 ) ) . '=' . urlencode( $value ); |
| 209 | 217 | } |
| 210 | - } |
|
| 211 | - else |
|
| 218 | + } else |
|
| 212 | 219 | { |
| 213 | 220 | $urlParams[] = $namefcn( $this, $item->getInternalCode() ) . '=' . urlencode( $item->getDefault() ); |
| 214 | 221 | } |
@@ -222,10 +229,13 @@ discard block |
||
| 222 | 229 | <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?> |
| 223 | 230 | </a> |
| 224 | 231 | |
| 225 | - <?php else : ?> |
|
| 232 | + <?php else { |
|
| 233 | + : ?> |
|
| 226 | 234 | |
| 227 | 235 | <button class="btn btn-primary btn-lg btn-action"> |
| 228 | - <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?> |
|
| 236 | + <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); |
|
| 237 | +} |
|
| 238 | +?> |
|
| 229 | 239 | </button> |
| 230 | 240 | |
| 231 | 241 | <?php endif; ?> |
@@ -87,8 +87,11 @@ |
||
| 87 | 87 | $this->config( 'client/html/checkout/standard/summary/address', 'common/summary/address-standard' ), |
| 88 | 88 | array( 'address' => $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> |
@@ -64,8 +64,11 @@ |
||
| 64 | 64 | <a href="<?= $enc->attr( $this->url( $checkoutTarget, $checkoutController, $checkoutAction, array( 'c_step' => $name ), [], $checkoutConfig ) ); ?>"> |
| 65 | 65 | <?= $enc->html( $this->translate( 'client', $name ) ); ?> |
| 66 | 66 | </a> |
| 67 | - <?php else : ?> |
|
| 68 | - <?= $enc->html( $this->translate( 'client', $name ) ); ?> |
|
| 67 | + <?php else { |
|
| 68 | + : ?> |
|
| 69 | + <?= $enc->html( $this->translate( 'client', $name ) ); |
|
| 70 | +} |
|
| 71 | +?> |
|
| 69 | 72 | <?php endif; ?> |
| 70 | 73 | </li> |
| 71 | 74 | |