@@ -58,7 +58,10 @@ |
||
58 | 58 | <?php $current = $params; if( is_array( $current['f_optid'] ) ) { unset( $current['f_optid'][$key] ); } ?> |
59 | 59 | <?php elseif( isset( $oneIds[$attrType] ) && ( $key = array_search( $id, (array) $oneIds[$attrType] ) ) !== false ) : ?> |
60 | 60 | <?php $current = $params; if( is_array( $current['f_oneid'][$attrType] ) ) { unset( $current['f_oneid'][$attrType][$key] ); } ?> |
61 | - <?php else : continue; ?> |
|
61 | + <?php else { |
|
62 | + : continue; |
|
63 | +} |
|
64 | +?> |
|
62 | 65 | <?php endif; ?> |
63 | 66 | |
64 | 67 | <a class="minibutton close" href="<?= $enc->attr( $this->link( $linkKey, $attribute->get( 'params', [] ) ) ); ?>"> |
@@ -43,8 +43,7 @@ |
||
43 | 43 | { |
44 | 44 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
45 | 45 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
46 | - } |
|
47 | - else |
|
46 | + } else |
|
48 | 47 | { |
49 | 48 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
50 | 49 | $orderItem = $orderCntl->get( $orderid, false ); |
@@ -149,8 +149,7 @@ |
||
149 | 149 | $value = $oservice->getAttribute( $key, 'delivery' ) ?: $value; |
150 | 150 | $item->value = $oservice->getAttribute( $key . '/hidden', 'delivery' ) ?: $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(); |
@@ -149,8 +149,7 @@ |
||
149 | 149 | $value = $oservice->getAttribute( $key, 'payment' ) ?: $value; |
150 | 150 | $item->value = $oservice->getAttribute( $key . '/hidden', 'payment' ) ?: $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(); |
@@ -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( $orderItem->setBaseItem( $basket ) ) ) === null ) // no payment service available |
|
224 | + if( ( $form = $this->processPayment( $orderItem->setBaseItem( $basket ) ) ) === 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 | } |