@@ -79,8 +79,7 @@ |
||
| 79 | 79 | { |
| 80 | 80 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
| 81 | 81 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
| 82 | - } |
|
| 83 | - else |
|
| 82 | + } else |
|
| 84 | 83 | { |
| 85 | 84 | $orderItem = $orderCntl->get( $orderid, false ); |
| 86 | 85 | } |
@@ -211,27 +211,26 @@ |
||
| 211 | 211 | $order = $basketCntl->store(); |
| 212 | 212 | |
| 213 | 213 | $context->session()->set( 'aimeos/orderid', $order->getId() ); |
| 214 | - } |
|
| 215 | - elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 214 | + } elseif( ( $orderid = $context->session()->get( 'aimeos/orderid' ) ) !== null ) |
|
| 216 | 215 | { |
| 217 | 216 | $refs = $context->config()->get( 'mshop/order/manager/subdomains', [] ); |
| 218 | 217 | $order = $orderCntl->uses( $refs )->get( $orderid, false ); |
| 219 | - } |
|
| 220 | - else |
|
| 218 | + } else |
|
| 221 | 219 | { |
| 222 | 220 | return; |
| 223 | 221 | } |
| 224 | 222 | |
| 225 | - if( ( $form = $this->processPayment( $order ) ) === null ) // no payment service available |
|
| 223 | + if( ( $form = $this->processPayment( $order ) ) === null ) { |
|
| 224 | + // no payment service available |
|
| 226 | 225 | { |
| 227 | 226 | $services = $order->getService( \Aimeos\MShop\Order\Item\Service\Base::TYPE_PAYMENT ); |
| 227 | + } |
|
| 228 | 228 | $args = ( $service = reset( $services ) ) ? ['code' => $service->getCode()] : []; |
| 229 | 229 | |
| 230 | 230 | $orderCntl->save( $order->setStatusPayment( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) ); |
| 231 | 231 | $view->standardUrlNext = $this->getUrlConfirm( $view, $args, ['absoluteUri' => true] ); |
| 232 | 232 | $view->standardMethod = 'POST'; |
| 233 | - } |
|
| 234 | - else |
|
| 233 | + } else |
|
| 235 | 234 | { |
| 236 | 235 | $this->addFormData( $view, $form ); |
| 237 | 236 | } |
@@ -149,8 +149,7 @@ |
||
| 149 | 149 | $value = $oservice->getAttribute( $key ) ?: $value; |
| 150 | 150 | $item->value = $oservice->getAttribute( $key, 'hidden' ) ?: $value; |
| 151 | 151 | } |
| 152 | - } |
|
| 153 | - else |
|
| 152 | + } else |
|
| 154 | 153 | { |
| 155 | 154 | foreach( $attr as $key => $item ) { |
| 156 | 155 | $item->value = is_array( $item->getDefault() ) ? key( $item->getDefault() ) : $item->getDefault(); |
@@ -76,9 +76,12 @@ |
||
| 76 | 76 | $context = $this->context(); |
| 77 | 77 | $cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' ); |
| 78 | 78 | |
| 79 | - try { |
|
| 79 | + try |
|
| 80 | + { |
|
| 80 | 81 | $customer = $cntl->find( $addr->getEmail() ); |
| 81 | - } catch( \Exception $e ) { |
|
| 82 | + } |
|
| 83 | + catch( \Exception $e ) |
|
| 84 | + { |
|
| 82 | 85 | $customer = $new ? $cntl->add( $addr->toArray() )->store()->get() : null; |
| 83 | 86 | } |
| 84 | 87 | |
@@ -215,8 +215,7 @@ |
||
| 215 | 215 | $msg = $view->translate( 'client', "At least one product couldn't be added to the basket." ); |
| 216 | 216 | $view->errors = array_merge( $view->get( 'errors', [] ), [$msg] ); |
| 217 | 217 | } |
| 218 | - } |
|
| 219 | - else |
|
| 218 | + } else |
|
| 220 | 219 | { |
| 221 | 220 | foreach( (array) $view->param( 'b_prod', [] ) as $values ) |
| 222 | 221 | { |