@@ -211,28 +211,27 @@ |
||
| 211 | 211 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); |
| 212 | 212 | |
| 213 | 213 | $context->session()->set( 'aimeos/orderid', $orderItem->getId() ); |
| 214 | - } |
|
| 215 | - elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 214 | + } elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 216 | 215 | { |
| 217 | 216 | $parts = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service']; |
| 218 | 217 | $orderItem = $orderCntl->get( $orderid, false ); |
| 219 | 218 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
| 220 | - } |
|
| 221 | - else |
|
| 219 | + } else |
|
| 222 | 220 | { |
| 223 | 221 | return; |
| 224 | 222 | } |
| 225 | 223 | |
| 226 | - if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) // no payment service available |
|
| 224 | + if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) { |
|
| 225 | + // no payment service available |
|
| 227 | 226 | { |
| 228 | 227 | $services = $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ); |
| 228 | + } |
|
| 229 | 229 | $args = ( $service = reset( $services ) ) ? ['code' => $service->getCode()] : []; |
| 230 | 230 | |
| 231 | 231 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
| 232 | 232 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
| 233 | 233 | $view->standardMethod = 'POST'; |
| 234 | - } |
|
| 235 | - else |
|
| 234 | + } else |
|
| 236 | 235 | { |
| 237 | 236 | $this->addFormData( $view, $form ); |
| 238 | 237 | } |