@@ -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> |
@@ -187,8 +187,7 @@ |
||
| 187 | 187 | $html = $lastSeen[$name]; |
| 188 | 188 | unset( $lastSeen[$name] ); |
| 189 | 189 | $lastSeen[$name] = $html; |
| 190 | - } |
|
| 191 | - else |
|
| 190 | + } else |
|
| 192 | 191 | { |
| 193 | 192 | /** client/html/catalog/session/seen/standard/maxitems |
| 194 | 193 | * Maximum number of products displayed in the "last seen" section |
@@ -243,9 +243,12 @@ discard block |
||
| 243 | 243 | <?php if( $product->getQuantity() > 1 ) : ?> |
| 244 | 244 | <?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() - 1 ); ?> |
| 245 | 245 | <a class="minibutton change" href="<?= $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, $basketParams, [], $basketConfig ) ); ?>">−</a> |
| 246 | - <?php else : ?> |
|
| 246 | + <?php else { |
|
| 247 | + : ?> |
|
| 247 | 248 | |
| 248 | - <?php endif; ?> |
|
| 249 | + <?php endif; |
|
| 250 | +} |
|
| 251 | +?> |
|
| 249 | 252 | |
| 250 | 253 | <input class="value" type="text" |
| 251 | 254 | name="<?= $enc->attr( $this->formparam( array( 'b_prod', $position, 'quantity' ) ) ); ?>" |
@@ -259,8 +262,11 @@ discard block |
||
| 259 | 262 | <?php $basketParams = array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() + 1 ); ?> |
| 260 | 263 | <a class="minibutton change" href="<?= $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, $basketParams, [], $basketConfig ) ); ?>">+</a> |
| 261 | 264 | |
| 262 | - <?php else : ?> |
|
| 263 | - <?= $enc->html( $product->getQuantity() ); ?> |
|
| 265 | + <?php else { |
|
| 266 | + : ?> |
|
| 267 | + <?= $enc->html( $product->getQuantity() ); |
|
| 268 | +} |
|
| 269 | +?> |
|
| 264 | 270 | <?php endif; ?> |
| 265 | 271 | </td> |
| 266 | 272 | |
@@ -54,7 +54,8 @@ discard block |
||
| 54 | 54 | array( 'addresses' => $addrItems, 'separator' => "\n" ) |
| 55 | 55 | ); |
| 56 | 56 | ?> |
| 57 | -<?php else : ?> |
|
| 57 | +<?php else { |
|
| 58 | + : ?> |
|
| 58 | 59 | <?= $this->translate( 'client', 'like billing address' ) ?> |
| 59 | 60 | <?php endif ?> |
| 60 | 61 | |
@@ -69,6 +70,7 @@ discard block |
||
| 69 | 70 | <?php foreach( $service->getAttributeItems() as $attribute ) |
| 70 | 71 | { |
| 71 | 72 | $name = ( $attribute->getName() != '' ? $attribute->getName() : $this->translate( 'client/code', $attribute->getCode() ) ); |
| 73 | +} |
|
| 72 | 74 | |
| 73 | 75 | switch( $attribute->getValue() ) |
| 74 | 76 | { |
@@ -241,7 +241,9 @@ |
||
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | - catch( \Exception $e ) {; } // no price available |
|
| 244 | + catch( \Exception $e ) |
|
| 245 | + { |
|
| 246 | +; } // no price available |
|
| 245 | 247 | } |
| 246 | 248 | |
| 247 | 249 | return $result; |
@@ -267,14 +267,12 @@ discard block |
||
| 267 | 267 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); |
| 268 | 268 | |
| 269 | 269 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
| 270 | - } |
|
| 271 | - elseif( $view->param( 'cp_payment', null ) !== null ) |
|
| 270 | + } elseif( $view->param( 'cp_payment', null ) !== null ) |
|
| 272 | 271 | { |
| 273 | 272 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
| 274 | 273 | $orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false ); |
| 275 | 274 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
| 276 | - } |
|
| 277 | - else |
|
| 275 | + } else |
|
| 278 | 276 | { |
| 279 | 277 | return; |
| 280 | 278 | } |
@@ -286,8 +284,7 @@ discard block |
||
| 286 | 284 | $view->standardProcessParams = $form->getValues(); |
| 287 | 285 | $view->standardUrlExternal = $form->getExternal(); |
| 288 | 286 | $view->standardHtml = $form->getHtml(); |
| 289 | - } |
|
| 290 | - else // no payment service available |
|
| 287 | + } else // no payment service available |
|
| 291 | 288 | { |
| 292 | 289 | $orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
| 293 | 290 | $view->standardUrlNext = $this->getUrlConfirm( $view, [], [] ); |
@@ -122,10 +122,13 @@ |
||
| 122 | 122 | href="<?= $enc->attr( $this->url( $checkoutTarget, $checkoutController, $checkoutAction, [], [], $checkoutConfig ) ); ?>"> |
| 123 | 123 | <?= $enc->html( $this->translate( 'client', 'Checkout' ), $enc::TRUST ); ?> |
| 124 | 124 | </a> |
| 125 | - <?php else : ?> |
|
| 125 | + <?php else { |
|
| 126 | + : ?> |
|
| 126 | 127 | <input type="hidden" name="<?= $enc->attr( $this->formparam( 'b_action' ) ) ?>" value="1" /> |
| 127 | 128 | <button class="btn btn-primary btn-lg btn-action" type="submit"> |
| 128 | - <?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST ); ?> |
|
| 129 | + <?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST ); |
|
| 130 | +} |
|
| 131 | +?> |
|
| 129 | 132 | </button> |
| 130 | 133 | <?php endif; ?> |
| 131 | 134 | |
@@ -146,8 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 148 | 148 | $this->setBasketCached( $key, $html ); |
| 149 | - } |
|
| 150 | - else |
|
| 149 | + } else |
|
| 151 | 150 | { |
| 152 | 151 | $html = $this->modifyBody( $html, $uid ); |
| 153 | 152 | } |
@@ -216,8 +215,7 @@ discard block |
||
| 216 | 215 | { |
| 217 | 216 | $this->logException( $e ); |
| 218 | 217 | } |
| 219 | - } |
|
| 220 | - else |
|
| 218 | + } else |
|
| 221 | 219 | { |
| 222 | 220 | $html = $this->modifyHeader( $html, $uid ); |
| 223 | 221 | } |