@@ -146,8 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $html = $view->render( $view->config( $tplconf, $default ) ); |
148 | 148 | $this->setBasketCached( $key, $html ); |
149 | - } |
|
150 | - else |
|
149 | + } else |
|
151 | 150 | { |
152 | 151 | $html = $this->modifyBody( $html, $uid ); |
153 | 152 | } |
@@ -216,8 +215,7 @@ discard block |
||
216 | 215 | { |
217 | 216 | $this->logException( $e ); |
218 | 217 | } |
219 | - } |
|
220 | - else |
|
218 | + } else |
|
221 | 219 | { |
222 | 220 | $html = $this->modifyHeader( $html, $uid ); |
223 | 221 | } |
@@ -166,8 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | |
168 | 168 | $html = $view->render( $config->get( $tplconf, $default ) ); |
169 | - } |
|
170 | - else |
|
169 | + } else |
|
171 | 170 | { |
172 | 171 | $html = $this->modifyBody( $html, $uid ); |
173 | 172 | } |
@@ -236,8 +235,7 @@ discard block |
||
236 | 235 | { |
237 | 236 | $this->logException( $e ); |
238 | 237 | } |
239 | - } |
|
240 | - else |
|
238 | + } else |
|
241 | 239 | { |
242 | 240 | $html = $this->modifyHeader( $html, $uid ); |
243 | 241 | } |
@@ -322,8 +322,7 @@ |
||
322 | 322 | { |
323 | 323 | $serviceCntl = \Aimeos\Controller\Frontend::create( $context, 'service' ); |
324 | 324 | $orderItem = $serviceCntl->updateSync( $view->request(), $code, $orderid ); |
325 | - } |
|
326 | - else |
|
325 | + } else |
|
327 | 326 | { |
328 | 327 | $orderCntl = \Aimeos\Controller\Frontend::create( $context, 'order' ); |
329 | 328 | $orderItem = $orderCntl->get( $orderid, false ); |
@@ -645,15 +645,16 @@ discard block |
||
645 | 645 | $disable = $view->config( 'client/html/checkout/standard/address/billing/disable-new', false ); |
646 | 646 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
647 | 647 | |
648 | - if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
648 | + if( ( $option = $view->param( 'ca_billingoption', 'null' ) ) === 'null' && $disable === false ) { |
|
649 | + // new address |
|
649 | 650 | { |
650 | 651 | $params = $view->param( 'ca_billing', [] ); |
652 | + } |
|
651 | 653 | |
652 | 654 | if( ( $view->addressBillingError = $this->checkFields( $params ) ) !== [] ) { |
653 | 655 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one billing address part is missing or invalid' ) ); |
654 | 656 | } |
655 | - } |
|
656 | - else // existing address |
|
657 | + } else // existing address |
|
657 | 658 | { |
658 | 659 | $params = $view->param( 'ca_billing_' . $option, [] ) + $view->param( 'ca_extra', [] ); |
659 | 660 | |
@@ -797,8 +798,7 @@ discard block |
||
797 | 798 | $invalid[$key] = $name; |
798 | 799 | unset( $params[$key] ); |
799 | 800 | } |
800 | - } |
|
801 | - else |
|
801 | + } else |
|
802 | 802 | { |
803 | 803 | unset( $params[$key] ); |
804 | 804 | } |
@@ -524,19 +524,22 @@ discard block |
||
524 | 524 | $disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false ); |
525 | 525 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY; |
526 | 526 | |
527 | - if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address |
|
527 | + if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) { |
|
528 | + // new address |
|
528 | 529 | { |
529 | 530 | $params = $view->param( 'ca_delivery', [] ); |
531 | + } |
|
530 | 532 | |
531 | 533 | if( ( $view->addressDeliveryError = $this->checkFields( $params ) ) !== [] ) { |
532 | 534 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
533 | 535 | } |
534 | 536 | |
535 | 537 | $ctrl->addAddress( $type, $params, 0 ); |
536 | - } |
|
537 | - else if( ( $option = $view->param( 'ca_deliveryoption' ) ) !== 'like' ) // existing address |
|
538 | + } else if( ( $option = $view->param( 'ca_deliveryoption' ) ) !== 'like' ) { |
|
539 | + // existing address |
|
538 | 540 | { |
539 | 541 | $params = $view->param( 'ca_delivery_' . $option, [] ); |
542 | + } |
|
540 | 543 | |
541 | 544 | if( !empty( $params ) && ( $view->addressDeliveryError = $this->checkFields( $params ) ) !== [] ) { |
542 | 545 | throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) ); |
@@ -549,13 +552,11 @@ discard block |
||
549 | 552 | $params = array_replace( $address->toArray(), $params + ['order.base.address.addressid' => $option] ); |
550 | 553 | $addr = $ctrl->addAddress( $type, $params, 0 )->get()->getAddress( $type, 0 ); // sanitize address first |
551 | 554 | $custCntl->addAddressItem( $address->copyFrom( $addr ), $option )->store(); // update existing address |
552 | - } |
|
553 | - else |
|
555 | + } else |
|
554 | 556 | { |
555 | 557 | $ctrl->addAddress( $type, $params, 0 ); |
556 | 558 | } |
557 | - } |
|
558 | - else |
|
559 | + } else |
|
559 | 560 | { |
560 | 561 | $ctrl->deleteAddress( $type ); |
561 | 562 | } |
@@ -787,8 +788,7 @@ discard block |
||
787 | 788 | $invalid[$key] = $name; |
788 | 789 | unset( $params[$key] ); |
789 | 790 | } |
790 | - } |
|
791 | - else |
|
791 | + } else |
|
792 | 792 | { |
793 | 793 | unset( $params[$key] ); |
794 | 794 | } |
@@ -319,13 +319,11 @@ |
||
319 | 319 | { |
320 | 320 | $item = $item->set( 'checked', true ); |
321 | 321 | unset( $attrparams['f_attrid'][$key] ); |
322 | - } |
|
323 | - elseif( ( $key = array_search( $id, $oneIds ) ) !== false ) |
|
322 | + } elseif( ( $key = array_search( $id, $oneIds ) ) !== false ) |
|
324 | 323 | { |
325 | 324 | $item = $item->set( 'checked', true ); |
326 | 325 | unset( $attrparams['f_oneid'][$key] ); |
327 | - } |
|
328 | - elseif( ( $key = array_search( $id, $optIds ) ) !== false ) |
|
326 | + } elseif( ( $key = array_search( $id, $optIds ) ) !== false ) |
|
329 | 327 | { |
330 | 328 | $item = $item->set( 'checked', true ); |
331 | 329 | unset( $attrparams['f_optid'][$key] ); |
@@ -166,8 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | |
168 | 168 | $html = $view->render( $config->get( $tplconf, $default ) ); |
169 | - } |
|
170 | - else |
|
169 | + } else |
|
171 | 170 | { |
172 | 171 | $html = $this->modifyBody( $html, $uid ); |
173 | 172 | } |
@@ -236,8 +235,7 @@ discard block |
||
236 | 235 | { |
237 | 236 | $this->logException( $e ); |
238 | 237 | } |
239 | - } |
|
240 | - else |
|
238 | + } else |
|
241 | 239 | { |
242 | 240 | $html = $this->modifyHeader( $html, $uid ); |
243 | 241 | } |
@@ -443,7 +443,7 @@ |
||
443 | 443 | } |
444 | 444 | |
445 | 445 | $tree = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses( $domains ) |
446 | - ->getTree( \Aimeos\Controller\Frontend\Catalog\Iface::LIST ); |
|
446 | + ->getTree( \Aimeos\Controller\Frontend\Catalog\Iface::list ); |
|
447 | 447 | |
448 | 448 | |
449 | 449 | $articles = map(); |
@@ -190,8 +190,7 @@ |
||
190 | 190 | $html = $lastSeen[$name]; |
191 | 191 | unset( $lastSeen[$name] ); |
192 | 192 | $lastSeen[$name] = $html; |
193 | - } |
|
194 | - else |
|
193 | + } else |
|
195 | 194 | { |
196 | 195 | /** client/html/catalog/session/seen/maxitems |
197 | 196 | * Maximum number of products displayed in the "last seen" section |
@@ -190,8 +190,7 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | $html = $view->render( $view->config( $tplconf, $default ) ); |
193 | - } |
|
194 | - else |
|
193 | + } else |
|
195 | 194 | { |
196 | 195 | $html = $this->modifyBody( $html, $uid ); |
197 | 196 | } |
@@ -261,8 +260,7 @@ discard block |
||
261 | 260 | { |
262 | 261 | $this->logException( $e ); |
263 | 262 | } |
264 | - } |
|
265 | - else |
|
263 | + } else |
|
266 | 264 | { |
267 | 265 | $html = $this->modifyHeader( $html, $uid ); |
268 | 266 | } |