@@ -60,7 +60,8 @@ discard block |
||
| 60 | 60 | <p class="order-notice"> |
| 61 | 61 | <?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ) ?> |
| 62 | 62 | </p> |
| 63 | - <?php else : ?> |
|
| 63 | + <?php else { |
|
| 64 | + : ?> |
|
| 64 | 65 | <p class="order-notice"> |
| 65 | 66 | <?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ) ?> |
| 66 | 67 | </p> |
@@ -103,7 +104,9 @@ discard block |
||
| 103 | 104 | <?php endforeach ?> |
| 104 | 105 | </select> |
| 105 | 106 | |
| 106 | - <?php break; case 'container': ?> |
|
| 107 | + <?php break; |
|
| 108 | +} |
|
| 109 | +case 'container': ?> |
|
| 107 | 110 | <div id="process-<?= $key ?>"></div> |
| 108 | 111 | |
| 109 | 112 | <?php break; case 'boolean': ?> |
@@ -267,28 +267,27 @@ |
||
| 267 | 267 | |
| 268 | 268 | $context->getSession()->set( 'aimeos/orderid', $orderItem->getId() ); |
| 269 | 269 | parent::init(); |
| 270 | - } |
|
| 271 | - elseif( ( $orderid = $context->getSession()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 270 | + } elseif( ( $orderid = $context->getSession()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 272 | 271 | { |
| 273 | 272 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
| 274 | 273 | $orderItem = $orderCntl->get( $orderid, false ); |
| 275 | 274 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
| 276 | - } |
|
| 277 | - else |
|
| 275 | + } else |
|
| 278 | 276 | { |
| 279 | 277 | return; |
| 280 | 278 | } |
| 281 | 279 | |
| 282 | - if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) // no payment service available |
|
| 280 | + if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) { |
|
| 281 | + // no payment service available |
|
| 283 | 282 | { |
| 284 | 283 | $services = $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ); |
| 284 | + } |
|
| 285 | 285 | $args = ( $service = reset( $services ) ) ? ['code' => $service->getCode()] : []; |
| 286 | 286 | |
| 287 | 287 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
| 288 | 288 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
| 289 | 289 | $view->standardMethod = 'POST'; |
| 290 | - } |
|
| 291 | - else |
|
| 290 | + } else |
|
| 292 | 291 | { |
| 293 | 292 | $view = $this->addFormData( $view, $form ); |
| 294 | 293 | } |
@@ -221,9 +221,12 @@ |
||
| 221 | 221 | $context = $this->context(); |
| 222 | 222 | $cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' ); |
| 223 | 223 | |
| 224 | - try { |
|
| 224 | + try |
|
| 225 | + { |
|
| 225 | 226 | $id = $cntl->find( $addr->getEmail() )->getId(); |
| 226 | - } catch( \Exception $e ) { |
|
| 227 | + } |
|
| 228 | + catch( \Exception $e ) |
|
| 229 | + { |
|
| 227 | 230 | $id = $new ? $cntl->add( $addr->toArray() )->store()->get()->getId() : null; |
| 228 | 231 | } |
| 229 | 232 | |