@@ -421,9 +421,12 @@ |
||
| 421 | 421 | { |
| 422 | 422 | $manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' ); |
| 423 | 423 | |
| 424 | - try { |
|
| 424 | + try |
|
| 425 | + { |
|
| 425 | 426 | return $manager->getTree( null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )->getId(); |
| 426 | - } catch( \Exception $e ) { |
|
| 427 | + } |
|
| 428 | + catch( \Exception $e ) |
|
| 429 | + { |
|
| 427 | 430 | return null; |
| 428 | 431 | } |
| 429 | 432 | } |
@@ -284,8 +284,7 @@ |
||
| 284 | 284 | { |
| 285 | 285 | $addrItem = $addrItems[$entry['supplier.address.id']]; |
| 286 | 286 | unset( $addrItems[$entry['supplier.address.id']] ); |
| 287 | - } |
|
| 288 | - else |
|
| 287 | + } else |
|
| 289 | 288 | { |
| 290 | 289 | $addrItem = $manager->createItem(); |
| 291 | 290 | } |
@@ -541,8 +541,7 @@ discard block |
||
| 541 | 541 | { |
| 542 | 542 | $attrItem = $attrItems[$array['order.base.service.attribute.id']]; |
| 543 | 543 | unset( $attrItems[$array['order.base.service.attribute.id']] ); |
| 544 | - } |
|
| 545 | - else |
|
| 544 | + } else |
|
| 546 | 545 | { |
| 547 | 546 | $attrItem = $attrManager->createItem(); |
| 548 | 547 | } |
@@ -577,9 +576,13 @@ discard block |
||
| 577 | 576 | { |
| 578 | 577 | $manager = \Aimeos\MShop::create( $this->getContext(), 'customer' ); |
| 579 | 578 | |
| 580 | - try { |
|
| 579 | + try |
|
| 580 | + { |
|
| 581 | 581 | $data += $manager->getItem( $item->getCustomerId() )->toArray(); |
| 582 | - } catch( \Exception $e ) {}; |
|
| 582 | + } |
|
| 583 | + catch( \Exception $e ) |
|
| 584 | + { |
|
| 585 | +}; |
|
| 583 | 586 | } |
| 584 | 587 | |
| 585 | 588 | |
@@ -284,8 +284,7 @@ |
||
| 284 | 284 | { |
| 285 | 285 | $addrItem = $addrItems[$entry['customer.address.id']]; |
| 286 | 286 | unset( $addrItems[$entry['customer.address.id']] ); |
| 287 | - } |
|
| 288 | - else |
|
| 287 | + } else |
|
| 289 | 288 | { |
| 290 | 289 | $addrItem = $manager->createItem(); |
| 291 | 290 | } |
@@ -303,8 +303,7 @@ |
||
| 303 | 303 | { |
| 304 | 304 | $propItem = $propItems[$entry['customer.property.id']]; |
| 305 | 305 | unset( $propItems[$entry['customer.property.id']] ); |
| 306 | - } |
|
| 307 | - else |
|
| 306 | + } else |
|
| 308 | 307 | { |
| 309 | 308 | $propItem = $manager->createItem(); |
| 310 | 309 | } |
@@ -407,7 +407,7 @@ |
||
| 407 | 407 | $data['time'] = $fs->time( $data['attribute.code'] ); |
| 408 | 408 | $data['size'] = $fs->size( $data['attribute.code'] ); |
| 409 | 409 | } |
| 410 | - catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
| 410 | + catch( \Exception $e ) {; } // Show product even if file isn't available any more |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | return $data; |
@@ -407,7 +407,9 @@ |
||
| 407 | 407 | $data['time'] = $fs->time( $data['attribute.code'] ); |
| 408 | 408 | $data['size'] = $fs->size( $data['attribute.code'] ); |
| 409 | 409 | } |
| 410 | - catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
| 410 | + catch( \Exception $e ) |
|
| 411 | + { |
|
| 412 | +; } // Show product even if file isn't available any more |
|
| 411 | 413 | } |
| 412 | 414 | |
| 413 | 415 | return $data; |
@@ -351,8 +351,7 @@ |
||
| 351 | 351 | { |
| 352 | 352 | $list['product.lists.siteid'] = (string) $map[$attrId]->getSiteId(); |
| 353 | 353 | $list['product.lists.id'] = (string) $map[$attrId]->getId(); |
| 354 | - } |
|
| 355 | - else |
|
| 354 | + } else |
|
| 356 | 355 | { |
| 357 | 356 | $list['product.lists.siteid'] = $siteId; |
| 358 | 357 | $list['product.lists.id'] = ''; |
@@ -10,8 +10,7 @@ |
||
| 10 | 10 | }; |
| 11 | 11 | |
| 12 | 12 | |
| 13 | -$sortItems = function( array $items ) |
|
| 14 | -{ |
|
| 13 | +$sortItems = function( array $items ) { |
|
| 15 | 14 | krsort( $items ); |
| 16 | 15 | return $items; |
| 17 | 16 | }; |
@@ -5,8 +5,7 @@ discard block |
||
| 5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2018 |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
| 9 | -{ |
|
| 8 | +$price = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
| 10 | 9 | if( isset( $orders[$item->getBaseId()] ) ) |
| 11 | 10 | { |
| 12 | 11 | $price = $orders[$item->getBaseId()]->getPrice(); |
@@ -15,8 +14,7 @@ discard block |
||
| 15 | 14 | }; |
| 16 | 15 | |
| 17 | 16 | |
| 18 | -$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 19 | -{ |
|
| 17 | +$name = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 20 | 18 | if( isset( $orders[$item->getBaseId()] ) ) |
| 21 | 19 | { |
| 22 | 20 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -34,8 +32,7 @@ discard block |
||
| 34 | 32 | }; |
| 35 | 33 | |
| 36 | 34 | |
| 37 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
| 38 | -{ |
|
| 35 | +$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
| 39 | 36 | if( isset( $orders[$item->getBaseId()] ) ) |
| 40 | 37 | { |
| 41 | 38 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -51,8 +48,7 @@ discard block |
||
| 51 | 48 | }; |
| 52 | 49 | |
| 53 | 50 | |
| 54 | -$status = function( $list, $key ) |
|
| 55 | -{ |
|
| 51 | +$status = function( $list, $key ) { |
|
| 56 | 52 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
| 57 | 53 | }; |
| 58 | 54 | |