@@ -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> |
@@ -7,7 +7,7 @@ |
||
7 | 7 | |
8 | 8 | |
9 | 9 | $enc = $this->encoder(); |
10 | -$prefix =$this->get( 'standardUrlExternal', true ); |
|
10 | +$prefix = $this->get( 'standardUrlExternal', true ); |
|
11 | 11 | |
12 | 12 | |
13 | 13 | /** client/html/checkout/standard/process/validate |
@@ -57,9 +57,12 @@ discard block |
||
57 | 57 | <p class="order-notice"> |
58 | 58 | <?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?> |
59 | 59 | </p> |
60 | - <?php else : ?> |
|
60 | + <?php else { |
|
61 | + : ?> |
|
61 | 62 | <p class="order-notice"> |
62 | - <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?> |
|
63 | + <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); |
|
64 | +} |
|
65 | +?> |
|
63 | 66 | </p> |
64 | 67 | <?php endif; ?> |
65 | 68 | |
@@ -158,10 +161,13 @@ discard block |
||
158 | 161 | <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?> |
159 | 162 | </a> |
160 | 163 | |
161 | - <?php else : ?> |
|
164 | + <?php else { |
|
165 | + : ?> |
|
162 | 166 | |
163 | 167 | <button class="btn btn-primary btn-lg btn-action"> |
164 | - <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?> |
|
168 | + <?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); |
|
169 | +} |
|
170 | +?> |
|
165 | 171 | </button> |
166 | 172 | |
167 | 173 | <?php endif; ?> |