@@ -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': ?> |
@@ -95,8 +95,7 @@ |
||
95 | 95 | $textStock[$level], |
96 | 96 | date_create( $date )->format( $dateFormat ) |
97 | 97 | ); |
98 | - } |
|
99 | - else |
|
98 | + } else |
|
100 | 99 | { |
101 | 100 | $text = sprintf( $textStockIn, |
102 | 101 | $typeText[$stockType], |
@@ -37,14 +37,17 @@ |
||
37 | 37 | <span class="name"> |
38 | 38 | <?php if( $attribute->getName() != '' ) : ?> |
39 | 39 | <?= $enc->html( $attribute->getName() ) ?> |
40 | - <?php else : ?> |
|
40 | + <?php else { |
|
41 | + : ?> |
|
41 | 42 | <?= $enc->html( $this->translate( 'client/code', $attribute->getCode() ) ) ?> |
42 | 43 | <?php endif ?> |
43 | 44 | </span> |
44 | 45 | |
45 | 46 | <?php switch( $attribute->getValue() ) : case 'array': case 'object': ?> |
46 | 47 | <span class="value"><?= $enc->html( join( ', ', (array) $attribute->getValue() ) ) ?></span> |
47 | - <?php break; default: ?> |
|
48 | + <?php break; |
|
49 | +} |
|
50 | +default: ?> |
|
48 | 51 | <span class="value"><?= $enc->html( $attribute->getValue() ) ?></span> |
49 | 52 | <?php endswitch ?> |
50 | 53 |
@@ -320,13 +320,11 @@ |
||
320 | 320 | { |
321 | 321 | $item = $item->set( 'checked', true ); |
322 | 322 | unset( $attrparams['f_attrid'][$key] ); |
323 | - } |
|
324 | - elseif( ( $key = array_search( $id, $optIds ) ) !== false ) |
|
323 | + } elseif( ( $key = array_search( $id, $optIds ) ) !== false ) |
|
325 | 324 | { |
326 | 325 | $item = $item->set( 'checked', true ); |
327 | 326 | unset( $attrparams['f_optid'][$key] ); |
328 | - } |
|
329 | - elseif( isset( $oneIds[$type] ) && ( $key = array_search( $id, (array) $oneIds[$type] ) ) !== false ) |
|
327 | + } elseif( isset( $oneIds[$type] ) && ( $key = array_search( $id, (array) $oneIds[$type] ) ) !== false ) |
|
330 | 328 | { |
331 | 329 | $item = $item->set( 'checked', true ); |
332 | 330 | unset( $attrparams['f_oneid'][$key] ); |
@@ -249,13 +249,11 @@ |
||
249 | 249 | $response->withHeader( 'Expires', '0' ); |
250 | 250 | |
251 | 251 | $response->withBody( $response->createStream( $fs->reads( $value ) ) ); |
252 | - } |
|
253 | - elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
252 | + } elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false ) |
|
254 | 253 | { |
255 | 254 | $response->withHeader( 'Location', $value ); |
256 | 255 | $response->withStatus( 303 ); |
257 | - } |
|
258 | - else |
|
256 | + } else |
|
259 | 257 | { |
260 | 258 | $response->withStatus( 404 ); |
261 | 259 | } |
@@ -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', [] ) ) ); ?>"> |
@@ -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(); |
@@ -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 | } |