@@ -268,28 +268,27 @@ |
||
268 | 268 | $orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store(); |
269 | 269 | |
270 | 270 | $context->session()->set( 'aimeos/orderid', $orderItem->getId() ); |
271 | - } |
|
272 | - elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
271 | + } elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
273 | 272 | { |
274 | 273 | $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL; |
275 | 274 | $orderItem = $orderCntl->get( $orderid, false ); |
276 | 275 | $basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false ); |
277 | - } |
|
278 | - else |
|
276 | + } else |
|
279 | 277 | { |
280 | 278 | return; |
281 | 279 | } |
282 | 280 | |
283 | - if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) // no payment service available |
|
281 | + if( ( $form = $this->processPayment( $basket, $orderItem ) ) === null ) { |
|
282 | + // no payment service available |
|
284 | 283 | { |
285 | 284 | $services = $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ); |
285 | + } |
|
286 | 286 | $args = ( $service = reset( $services ) ) ? ['code' => $service->getCode()] : []; |
287 | 287 | |
288 | 288 | $orderCntl->save( $orderItem->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
289 | 289 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
290 | 290 | $view->standardMethod = 'POST'; |
291 | - } |
|
292 | - else |
|
291 | + } else |
|
293 | 292 | { |
294 | 293 | $view = $this->addFormData( $view, $form ); |
295 | 294 | } |
@@ -389,8 +389,7 @@ discard block |
||
389 | 389 | $controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' ); |
390 | 390 | $action = $view->config( 'client/html/catalog/detail/url/action', 'detail' ); |
391 | 391 | $config = $view->config( 'client/html/catalog/detail/url/config', [] ); |
392 | - } |
|
393 | - else |
|
392 | + } else |
|
394 | 393 | { |
395 | 394 | $params = $context->session()->get( 'aimeos/catalog/lists/params/last/' . $site, [] ); |
396 | 395 | |
@@ -476,8 +475,7 @@ discard block |
||
476 | 475 | (string) $view->param( 'b_supplier', '' ), |
477 | 476 | $view->param( 'b_siteid' ) |
478 | 477 | ); |
479 | - } |
|
480 | - else |
|
478 | + } else |
|
481 | 479 | { |
482 | 480 | $list = []; |
483 | 481 | $entries = (array) $view->param( 'b_prod', [] ); |