@@ -24,9 +24,12 @@ |
||
24 | 24 | |
25 | 25 | <?php if( ( $mediaItem = $productItem->getRefItems( 'media', 'default', 'default' )->first() ) !== null ) : ?> |
26 | 26 | <div class="media-item" style="background-image: url('<?= $this->content( $mediaItem->getPreview() ); ?>')"></div> |
27 | - <?php else : ?> |
|
27 | + <?php else { |
|
28 | + : ?> |
|
28 | 29 | <div class="media-item"></div> |
29 | - <?php endif; ?> |
|
30 | + <?php endif; |
|
31 | +} |
|
32 | +?> |
|
30 | 33 | |
31 | 34 | <h3 class="name"><?= $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3> |
32 | 35 |
@@ -123,9 +123,12 @@ |
||
123 | 123 | |
124 | 124 | </ul> |
125 | 125 | |
126 | - <?php else : ?> |
|
126 | + <?php else { |
|
127 | + : ?> |
|
127 | 128 | |
128 | - <input type="hidden" value="1" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'qty', ''] ) ); ?>" /> |
|
129 | + <input type="hidden" value="1" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'qty', ''] ) ); |
|
130 | +} |
|
131 | +?>" /> |
|
129 | 132 | <select class="form-control select-list" name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrconfid', 'id', ''] ) ); ?>"> |
130 | 133 | |
131 | 134 | <?php if( $this->config( 'client/html/catalog/attribute/preselect/' . $code, false ) === false ) : ?> |
@@ -150,10 +150,13 @@ |
||
150 | 150 | |
151 | 151 | </ul> |
152 | 152 | |
153 | - <?php else : ?> |
|
153 | + <?php else { |
|
154 | + : ?> |
|
154 | 155 | |
155 | 156 | <select class="form-control select-list" |
156 | - name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrvarid', $code] ) ); ?>" |
|
157 | + name="<?= $enc->attr( $this->formparam( ['b_prod', 0, 'attrvarid', $code] ) ); |
|
158 | +} |
|
159 | +?>" |
|
157 | 160 | data-index="<?= $index++; ?>" data-type="<?= $enc->attr( $code ); ?>" > |
158 | 161 | |
159 | 162 | <?php if( !$this->config( 'client/html/catalog/selection/preselect/' . $code, false ) ) : ?> |
@@ -322,8 +322,7 @@ |
||
322 | 322 | { |
323 | 323 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
324 | 324 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
325 | - } |
|
326 | - else |
|
325 | + } else |
|
327 | 326 | { |
328 | 327 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
329 | 328 | $orderItem = $orderCntl->get( $orderid, false ); |
@@ -55,8 +55,11 @@ |
||
55 | 55 | $this->config( 'client/html/checkout/confirm/summary/address', 'common/summary/address-standard' ), |
56 | 56 | ['addresses' => $addresses, 'type' => 'delivery'] |
57 | 57 | ); ?> |
58 | - <?php else : ?> |
|
59 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
58 | + <?php else { |
|
59 | + : ?> |
|
60 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
61 | +} |
|
62 | +?> |
|
60 | 63 | <?php endif; ?> |
61 | 64 | </div> |
62 | 65 | </div> |
@@ -268,14 +268,12 @@ discard block |
||
268 | 268 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); |
269 | 269 | |
270 | 270 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
271 | - } |
|
272 | - elseif( $view->param( 'cp_payment', null ) !== null ) |
|
271 | + } elseif( $view->param( 'cp_payment', null ) !== null ) |
|
273 | 272 | { |
274 | 273 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
275 | 274 | $orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false ); |
276 | 275 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
277 | - } |
|
278 | - else |
|
276 | + } else |
|
279 | 277 | { |
280 | 278 | return; |
281 | 279 | } |
@@ -285,8 +283,7 @@ discard block |
||
285 | 283 | $orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
286 | 284 | $view->standardUrlNext = $this->getUrlConfirm( $view, [], [] ); |
287 | 285 | $view->standardMethod = 'POST'; |
288 | - } |
|
289 | - else // no payment service available |
|
286 | + } else // no payment service available |
|
290 | 287 | { |
291 | 288 | $view = $this->addFormData( $view, $form ); |
292 | 289 | } |
@@ -83,8 +83,11 @@ |
||
83 | 83 | $this->config( 'client/html/checkout/standard/summary/address', 'common/summary/address-standard' ), |
84 | 84 | ['addresses' => $addresses, 'type' => 'delivery'] |
85 | 85 | ); ?> |
86 | - <?php else : ?> |
|
87 | - <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); ?> |
|
86 | + <?php else { |
|
87 | + : ?> |
|
88 | + <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ); |
|
89 | +} |
|
90 | +?> |
|
88 | 91 | <?php endif; ?> |
89 | 92 | </div> |
90 | 93 | </div> |
@@ -41,14 +41,17 @@ |
||
41 | 41 | $this->translate( 'currency', $price->getCurrencyId() ) |
42 | 42 | ) ); ?> |
43 | 43 | </span> |
44 | - <?php else : ?> |
|
44 | + <?php else { |
|
45 | + : ?> |
|
45 | 46 | <span class="price-value"> |
46 | 47 | <?= $enc->html( sprintf( |
47 | 48 | /// Price format with price value (%1$s) and currency (%2$s) |
48 | 49 | $this->translate( 'client/code', 'price:default', null, 0, false ) ?: $this->translate( 'client', '%1$s %2$s' ), |
49 | 50 | $this->number( $price->getCosts() > 0 ? $price->getCosts() : 0, $price->getPrecision() ), |
50 | 51 | $this->translate( 'currency', $price->getCurrencyId() ) |
51 | - ) ); ?> |
|
52 | + ) ); |
|
53 | +} |
|
54 | +?> |
|
52 | 55 | </span> |
53 | 56 | <?php endif; ?> |
54 | 57 |
@@ -219,9 +219,12 @@ |
||
219 | 219 | $context = $this->getContext(); |
220 | 220 | $cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' ); |
221 | 221 | |
222 | - try { |
|
222 | + try |
|
223 | + { |
|
223 | 224 | $id = $cntl->find( $addr->getEmail() )->getId(); |
224 | - } catch( \Exception $e ) { |
|
225 | + } |
|
226 | + catch( \Exception $e ) |
|
227 | + { |
|
225 | 228 | $id = $new ? $cntl->add( $addr->toArray() )->store()->get()->getId() : null; |
226 | 229 | } |
227 | 230 |