@@ -54,7 +54,7 @@ |
||
54 | 54 | { |
55 | 55 | if( $product = $listItem->getRefItem() ) { |
56 | 56 | $varAttr[$product->getId()] = $product->getRefItems( 'attribute', null, 'variant' )->col( 'attribute.id', 'attribute.type' ); |
57 | - } |
|
57 | + } |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 |
@@ -144,10 +144,10 @@ |
||
144 | 144 | $view->summaryBasket = $order; |
145 | 145 | |
146 | 146 | } else { |
147 | - $view->noOrder = true; |
|
148 | - } |
|
147 | + $view->noOrder = true; |
|
148 | + } |
|
149 | 149 | |
150 | - return parent::data($view, $tags, $expire); |
|
150 | + return parent::data($view, $tags, $expire); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | if( $context->session()->get( 'aimeos/basket/list' ) !== null && ( $orderid = $session->get( 'aimeos/orderid' ) ) === null ) { |
73 | 73 | throw new \Aimeos\Client\Html\Exception( 'No order ID available' ); |
74 | - } else if ($orderid !== null) { |
|
74 | + } else if( $orderid !== null ) { |
|
75 | 75 | |
76 | 76 | $ref = $config->get( 'mshop/order/manager/subdomains', [] ); |
77 | 77 | $ref = $config->get( 'client/html/checkout/confirm/domains', $ref ); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | if( $context->session()->get( 'aimeos/basket/list' ) !== null && ( $id = $context->session()->get( 'aimeos/orderid' ) ) === null ) { |
122 | 122 | throw new \Aimeos\Client\Html\Exception( $context->translate( 'client', 'No order ID available in session' ) ); |
123 | - } else if ($id !== null) { |
|
123 | + } else if( $id !== null ) { |
|
124 | 124 | |
125 | 125 | /** client/html/checkout/confirm/domains |
126 | 126 | * List of domains to fetch items related to the order |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $view->noOrder = true; |
148 | 148 | } |
149 | 149 | |
150 | - return parent::data($view, $tags, $expire); |
|
150 | + return parent::data( $view, $tags, $expire ); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 |
@@ -83,8 +83,7 @@ |
||
83 | 83 | |
84 | 84 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
85 | 85 | $orderItem = $serviceCntl->config( ['payment.url-self' => $url] )->updateSync( $view->request(), $code, $orderid ); |
86 | - } |
|
87 | - else |
|
86 | + } else |
|
88 | 87 | { |
89 | 88 | $orderItem = $orderCntl->get( $orderid, false ); |
90 | 89 | } |
@@ -7,11 +7,11 @@ |
||
7 | 7 | |
8 | 8 | $enc = $this->encoder(); |
9 | 9 | |
10 | -if (isset($this->noOrder)): ?> |
|
10 | +if( isset( $this->noOrder ) ): ?> |
|
11 | 11 | <section class="aimeos checkout-confirm"> |
12 | 12 | <div class="container-xxl"> |
13 | 13 | <div class="checkout-confirm-intro"> |
14 | - <p class="note text-center"><?= $enc->html($this->translate('client','There is no order nor basket present!'))?></p> |
|
14 | + <p class="note text-center"><?= $enc->html( $this->translate( 'client', 'There is no order nor basket present!' ) )?></p> |
|
15 | 15 | </div> |
16 | 16 | </div> |
17 | 17 | </section> |
@@ -15,7 +15,8 @@ discard block |
||
15 | 15 | </div> |
16 | 16 | </div> |
17 | 17 | </section> |
18 | -<?php else : ?> |
|
18 | +<?php else { |
|
19 | + : ?> |
|
19 | 20 | ?> |
20 | 21 | <div class="section aimeos checkout-confirm" data-jsonurl="<?= $enc->attr( $this->link( 'client/jsonapi/url' ) ) ?>"> |
21 | 22 | <div class="container-xxl"> |
@@ -25,7 +26,9 @@ discard block |
||
25 | 26 | <div class="checkout-confirm-intro"> |
26 | 27 | <?php switch( $this->confirmOrderItem->getStatusPayment() ) : case \Aimeos\MShop\Order\Item\Base::PAY_CANCELED: ?> |
27 | 28 | <p class="note"><?= nl2br( $enc->html( $this->translate( 'client', "The order was canceled. |
28 | -Do you wish to retry your order?" ), $enc::TRUST ) ); break ?></p> |
|
29 | +Do you wish to retry your order?" ), $enc::TRUST ) ); |
|
30 | +} |
|
31 | +break ?></p> |
|
29 | 32 | <?php case \Aimeos\MShop\Order\Item\Base::PAY_REFUSED: ?> |
30 | 33 | <p class="note"><?= nl2br( $enc->html( $this->translate( 'client', "Unfortunately, the payment for your order was refused. |
31 | 34 | Do you wish to retry?" ), $enc::TRUST ) ); break ?></p> |
@@ -128,7 +131,8 @@ discard block |
||
128 | 131 | $this->config( 'client/html/checkout/confirm/summary/address', 'common/summary/address' ), |
129 | 132 | ['addresses' => $addresses] |
130 | 133 | ) ?> |
131 | - <?php else : ?> |
|
134 | + <?php else { |
|
135 | + : ?> |
|
132 | 136 | <?= $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST ) ?> |
133 | 137 | <?php endif ?> |
134 | 138 | </div> |
@@ -250,4 +254,6 @@ discard block |
||
250 | 254 | </div> |
251 | 255 | </div> |
252 | 256 | </div> |
253 | -<?php endif; ?> |
|
257 | +<?php endif; |
|
258 | +} |
|
259 | +?> |