@@ -12,8 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | $miniPriceValue = $this->mainPriceItem->getValue() + $this->mainPriceItem->getCosts(); |
| 14 | 14 | $miniPriceCurrency = $this->translate( 'client/currency', $this->mainPriceItem->getCurrencyId() ); |
| 15 | -} |
|
| 16 | -catch( Exception $e ) |
|
| 15 | +} catch( Exception $e ) |
|
| 17 | 16 | { |
| 18 | 17 | $miniPriceValue = '0.00'; |
| 19 | 18 | $miniPriceCurrency = ''; |
@@ -15,8 +15,7 @@ |
||
| 15 | 15 | $priceValue = $priceItem->getValue(); |
| 16 | 16 | $priceService = $priceItem->getCosts(); |
| 17 | 17 | $priceCurrency = $this->translate( 'client/currency', $priceItem->getCurrencyId() ); |
| 18 | -} |
|
| 19 | -catch( Exception $e ) |
|
| 18 | +} catch( Exception $e ) |
|
| 20 | 19 | { |
| 21 | 20 | $priceValue = $priceCosts = '0.00'; |
| 22 | 21 | $priceCurrency = ''; |
@@ -29,9 +29,12 @@ |
||
| 29 | 29 | <div class="media-item" style="background-image: url('<?php echo $mediaUrl; ?>')" itemscope="" itemtype="http://schema.org/ImageObject"> |
| 30 | 30 | <meta itemprop="contentUrl" content="<?php echo $mediaUrl; ?>" /> |
| 31 | 31 | </div> |
| 32 | -<?php else : ?> |
|
| 32 | +<?php else { |
|
| 33 | + : ?> |
|
| 33 | 34 | <div class="media-item"></div> |
| 34 | -<?php endif; ?> |
|
| 35 | +<?php endif; |
|
| 36 | +} |
|
| 37 | +?> |
|
| 35 | 38 | <h3 class="name" itemprop="name"><?php echo $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3> |
| 36 | 39 | <div class="price-list" itemprop="offers" itemscope itemtype="http://schema.org/Offer"> |
| 37 | 40 | <?php echo $this->partial( $this->config( 'client/html/common/partials/price', 'common/partials/price-default.php' ), array( 'prices' => $productItem->getRefItems( 'price', null, 'default' ) ) ); ?> |
@@ -119,8 +119,7 @@ discard block |
||
| 119 | 119 | $priceRebate = $price->getRebate(); |
| 120 | 120 | $priceTaxflag = $price->getTaxFlag(); |
| 121 | 121 | $priceCurrency = $this->translate( 'client/currency', $price->getCurrencyId() ); |
| 122 | -} |
|
| 123 | -else |
|
| 122 | +} else |
|
| 124 | 123 | { |
| 125 | 124 | $priceValue = '0.00'; |
| 126 | 125 | $priceRebate = '0.00'; |
@@ -136,8 +135,7 @@ discard block |
||
| 136 | 135 | $deliveryPriceItem = $deliveryItem->getPrice(); |
| 137 | 136 | $deliveryPriceService = $deliveryPriceItem->getCosts(); |
| 138 | 137 | $deliveryPriceValue = $deliveryPriceItem->getValue(); |
| 139 | -} |
|
| 140 | -catch( Exception $e ) |
|
| 138 | +} catch( Exception $e ) |
|
| 141 | 139 | { |
| 142 | 140 | $deliveryName = ''; |
| 143 | 141 | $deliveryPriceValue = '0.00'; |
@@ -151,8 +149,7 @@ discard block |
||
| 151 | 149 | $paymentPriceItem = $paymentItem->getPrice(); |
| 152 | 150 | $paymentPriceService = $paymentPriceItem->getCosts(); |
| 153 | 151 | $paymentPriceValue = $paymentPriceItem->getValue(); |
| 154 | -} |
|
| 155 | -catch( Exception $e ) |
|
| 152 | +} catch( Exception $e ) |
|
| 156 | 153 | { |
| 157 | 154 | $paymentName = ''; |
| 158 | 155 | $paymentPriceValue = '0.00'; |
@@ -262,14 +259,20 @@ discard block |
||
| 262 | 259 | <?php if( $modify && ( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) == 0 ) : ?> |
| 263 | 260 | <?php if( $product->getQuantity() > 1 ) : ?> |
| 264 | 261 | <a class="minibutton change" href="<?php echo $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() - 1 ) + $backParams, array(), $basketConfig ) ); ?>">−</a> |
| 265 | -<?php else : ?> |
|
| 262 | +<?php else { |
|
| 263 | + : ?> |
|
| 266 | 264 | |
| 267 | -<?php endif; ?> |
|
| 265 | +<?php endif; |
|
| 266 | +} |
|
| 267 | +?> |
|
| 268 | 268 | <input class="value" type="text" name="<?php echo $enc->attr( $this->formparam( array( 'b_prod', $position, 'quantity' ) ) ); ?>" value="<?php echo $enc->attr( $product->getQuantity() ); ?>" maxlength="10" required="required" /> |
| 269 | 269 | <input type="hidden" name="<?php echo $enc->attr( $this->formparam( array( 'b_prod', $position, 'position' ) ) ); ?>" value="<?php echo $enc->attr( $position ); ?>" /> |
| 270 | 270 | <a class="minibutton change" href="<?php echo $enc->attr( $this->url( $basketTarget, $basketController, $basketAction, array( 'b_action' => 'edit', 'b_position' => $position, 'b_quantity' => $product->getQuantity() + 1 ) + $backParams, array(), $basketConfig ) ); ?>">+</a> |
| 271 | -<?php else : ?> |
|
| 272 | -<?php echo $enc->html( $product->getQuantity() ); ?> |
|
| 271 | +<?php else { |
|
| 272 | + : ?> |
|
| 273 | +<?php echo $enc->html( $product->getQuantity() ); |
|
| 274 | +} |
|
| 275 | +?> |
|
| 273 | 276 | <?php endif; ?> |
| 274 | 277 | </td> |
| 275 | 278 | <td class="unitprice"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $prodPrice ), $priceCurrency ) ); ?></td> |
@@ -289,8 +292,11 @@ discard block |
||
| 289 | 292 | <a href="<?php echo $enc->attr( $this->summaryUrlServiceDelivery ); ?>"> |
| 290 | 293 | <?php echo $enc->html( $deliveryName ); ?> |
| 291 | 294 | </a> |
| 292 | -<?php else : ?> |
|
| 293 | - <?php echo $enc->html( $deliveryName ); ?> |
|
| 295 | +<?php else { |
|
| 296 | + : ?> |
|
| 297 | + <?php echo $enc->html( $deliveryName ); |
|
| 298 | +} |
|
| 299 | +?> |
|
| 294 | 300 | <?php endif; ?> |
| 295 | 301 | </td> |
| 296 | 302 | <td class="quantity">1</td> |
@@ -309,8 +315,11 @@ discard block |
||
| 309 | 315 | <a href="<?php echo $enc->attr( $this->summaryUrlServicePayment ); ?>"> |
| 310 | 316 | <?php echo $enc->html( $paymentName ); ?> |
| 311 | 317 | </a> |
| 312 | -<?php else : ?> |
|
| 313 | - <?php echo $enc->html( $paymentName ); ?> |
|
| 318 | +<?php else { |
|
| 319 | + : ?> |
|
| 320 | + <?php echo $enc->html( $paymentName ); |
|
| 321 | +} |
|
| 322 | +?> |
|
| 314 | 323 | <?php endif; ?> |
| 315 | 324 | </td> |
| 316 | 325 | <td class="quantity">1</td> |
@@ -368,8 +377,11 @@ discard block |
||
| 368 | 377 | <tr class="tax"> |
| 369 | 378 | <?php if( $priceItem->getTaxFlag() ) : ?> |
| 370 | 379 | <td colspan="3"><?php echo $enc->html( sprintf( $this->translate( 'client', 'Incl. %1$s%% VAT' ), $this->number( $taxRate ) ) ); ?></td> |
| 371 | -<?php else : ?> |
|
| 372 | - <td colspan="3"><?php echo $enc->html( sprintf( $this->translate( 'client', '+ %1$s%% VAT' ), $this->number( $taxRate ) ) ); ?></td> |
|
| 380 | +<?php else { |
|
| 381 | + : ?> |
|
| 382 | + <td colspan="3"><?php echo $enc->html( sprintf( $this->translate( 'client', '+ %1$s%% VAT' ), $this->number( $taxRate ) ) ); |
|
| 383 | +} |
|
| 384 | +?></td> |
|
| 373 | 385 | <?php endif; ?> |
| 374 | 386 | <td class="price"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $taxValue ), $priceCurrency ) ); ?></td> |
| 375 | 387 | <?php if( $modify ) : ?> |
@@ -71,8 +71,7 @@ discard block |
||
| 71 | 71 | $addr->getWebsite(), |
| 72 | 72 | $addr->getVatID() |
| 73 | 73 | ) ) ) ); |
| 74 | - } |
|
| 75 | - catch( Exception $e ) { ; } |
|
| 74 | + } catch( Exception $e ) { ; } |
|
| 76 | 75 | ?> |
| 77 | 76 | </div> |
| 78 | 77 | </div><div class="item delivery <?php echo ( isset( $errors['address']['delivery'] ) ? 'error' : '' ); ?>"> |
@@ -127,8 +126,7 @@ discard block |
||
| 127 | 126 | $addr->getWebsite(), |
| 128 | 127 | $addr->getVatID() |
| 129 | 128 | ) ) ) ); |
| 130 | - } |
|
| 131 | - catch( Exception $e ) |
|
| 129 | + } catch( Exception $e ) |
|
| 132 | 130 | { |
| 133 | 131 | echo $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
| 134 | 132 | } |
@@ -102,8 +102,11 @@ |
||
| 102 | 102 | <?php endif; ?> |
| 103 | 103 | <?php endforeach; ?> |
| 104 | 104 | </ul> |
| 105 | -<?php else : ?> |
|
| 106 | - <select class="select-list" name="<?php echo $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrvarid', $code ) ) ); ?>" data-index="<?php echo $index++; ?>"> |
|
| 105 | +<?php else { |
|
| 106 | + : ?> |
|
| 107 | + <select class="select-list" name="<?php echo $enc->attr( $this->formparam( array( 'b_prod', 0, 'attrvarid', $code ) ) ); |
|
| 108 | +} |
|
| 109 | +?>" data-index="<?php echo $index++; ?>"> |
|
| 107 | 110 | <?php if( $preselect === false ) : ?> |
| 108 | 111 | <option class="select-option" value=""><?php echo $enc->attr( $this->translate( 'client', 'Please select' ) ); ?></option> |
| 109 | 112 | <?php endif; ?> |
@@ -69,8 +69,11 @@ |
||
| 69 | 69 | <?php $currency = $this->translate( 'client/currency', $priceItem->getCurrencyId() ); ?> |
| 70 | 70 | <?php /// Configurable product attribute name (%1$s) with sign (%4$s, +/-), price value (%2$s) and currency (%3$s) ?> |
| 71 | 71 | <?php echo $enc->html( sprintf( $this->translate( 'client', '%1$s ( %4$s%2$s%3$s )' ), $attribute->getName(), $this->number( abs( $value ) ), $currency, ( $value < 0 ? '−' : '+' ) ), $enc::TRUST ); ?> |
| 72 | -<?php else : ?> |
|
| 73 | -<?php echo $enc->html( $attribute->getName(), $enc::TRUST ); ?> |
|
| 72 | +<?php else { |
|
| 73 | + : ?> |
|
| 74 | +<?php echo $enc->html( $attribute->getName(), $enc::TRUST ); |
|
| 75 | +} |
|
| 76 | +?> |
|
| 74 | 77 | <?php endif; ?> |
| 75 | 78 | </option> |
| 76 | 79 | <?php endforeach; ?> |
@@ -10,8 +10,7 @@ discard block |
||
| 10 | 10 | $namefcn = function( $view, $key ) { |
| 11 | 11 | return $key; |
| 12 | 12 | }; |
| 13 | -} |
|
| 14 | -else |
|
| 13 | +} else |
|
| 15 | 14 | { |
| 16 | 15 | $namefcn = function( $view, $key ) { |
| 17 | 16 | return $view->formparam( array( $key ) ); |
@@ -77,8 +76,11 @@ discard block |
||
| 77 | 76 | <p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'Processing the payment failed' ), $enc::TRUST ); ?></p> |
| 78 | 77 | <?php elseif( !empty( $public ) ) : ?> |
| 79 | 78 | <p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?></p> |
| 80 | -<?php else : ?> |
|
| 81 | - <p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?></p> |
|
| 79 | +<?php else { |
|
| 80 | + : ?> |
|
| 81 | + <p class="order-notice"><?php echo $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); |
|
| 82 | +} |
|
| 83 | +?></p> |
|
| 82 | 84 | <?php endif; ?> |
| 83 | 85 | <?php foreach( $hidden as $key => $item ) : ?> |
| 84 | 86 | <input name="<?php echo $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); ?>" type="hidden" value="<?php echo $enc->attr( $item->getDefault() ); ?>" /> |
@@ -114,8 +116,11 @@ discard block |
||
| 114 | 116 | <?php elseif( !empty( $public ) ) : ?> |
| 115 | 117 | <a class="standardbutton" href="<?php echo $enc->attr( $this->standardUrlPayment ); ?>"><?php echo $enc->html( $this->translate( 'client', 'Change payment' ), $enc::TRUST ); ?></a> |
| 116 | 118 | <button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Pay now' ), $enc::TRUST ); ?></button> |
| 117 | -<?php else : ?> |
|
| 118 | - <button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?></button> |
|
| 119 | +<?php else { |
|
| 120 | + : ?> |
|
| 121 | + <button class="standardbutton btn-action"><?php echo $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); |
|
| 122 | +} |
|
| 123 | +?></button> |
|
| 119 | 124 | <?php endif; ?> |
| 120 | 125 | </div> |
| 121 | 126 | </div> |
@@ -16,8 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | $orderService = $this->standardBasket->getService( 'delivery' ); |
| 18 | 18 | $orderServiceId = $orderService->getServiceId(); |
| 19 | -} |
|
| 20 | -catch( Exception $e ) |
|
| 19 | +} catch( Exception $e ) |
|
| 21 | 20 | { |
| 22 | 21 | $orderService = null; |
| 23 | 22 | $orderServiceId = null; |
@@ -50,8 +49,11 @@ discard block |
||
| 50 | 49 | <?php $currency = $this->translate( 'client/currency', $servicePrices[$id]->getCurrencyId() ); ?> |
| 51 | 50 | <?php if( $servicePrices[$id]->getValue() > 0 ) : /// Service fee value (%1$s) and shipping cost value (%2$s) with currency (%3$s) ?> |
| 52 | 51 | <span class="price-value"><?php echo $enc->html( sprintf( $this->translate( 'client', '%1$s%3$s + %2$s%3$s' ), $this->number( $servicePrices[$id]->getValue() ), $this->number( $servicePrices[$id]->getCosts() ), $currency ) ); ?></span> |
| 53 | -<?php else : ?> |
|
| 54 | - <span class="price-value"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $servicePrices[$id]->getCosts() ), $currency ) ); ?></span> |
|
| 52 | +<?php else { |
|
| 53 | + : ?> |
|
| 54 | + <span class="price-value"><?php echo $enc->html( sprintf( $priceFormat, $this->number( $servicePrices[$id]->getCosts() ), $currency ) ); |
|
| 55 | +} |
|
| 56 | +?></span> |
|
| 55 | 57 | <?php endif; ?> |
| 56 | 58 | <?php endif; ?> |
| 57 | 59 | <div class="icons"> |