@@ -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 | }; |
@@ -21,8 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | |
23 | 23 | |
24 | -$pgroup = function( array $params, $group ) |
|
25 | -{ |
|
24 | +$pgroup = function( array $params, $group ) { |
|
26 | 25 | if( $group != null ) { |
27 | 26 | return [$group => ['page' => $params]]; |
28 | 27 | } |
@@ -56,16 +55,14 @@ discard block |
||
56 | 55 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
57 | 56 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
58 | 57 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
59 | - } |
|
60 | - else |
|
58 | + } else |
|
61 | 59 | { |
62 | 60 | $target = $this->config( 'admin/jqadm/url/create/target' ); |
63 | 61 | $controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' ); |
64 | 62 | $action = $this->config( 'admin/jqadm/url/create/action', 'create' ); |
65 | 63 | $config = $this->config( 'admin/jqadm/url/create/config', [] ); |
66 | 64 | } |
67 | -} |
|
68 | -else |
|
65 | +} else |
|
69 | 66 | { |
70 | 67 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
71 | 68 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-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 | $addresses = $orders[$item->getBaseId()]->getAddresses(); |
@@ -36,8 +34,7 @@ discard block |
||
36 | 34 | }; |
37 | 35 | |
38 | 36 | |
39 | -$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) |
|
40 | -{ |
|
37 | +$payment = function( array $orders, \Aimeos\MShop\Order\Item\Iface $item ) { |
|
41 | 38 | if( isset( $orders[$item->getBaseId()] ) ) |
42 | 39 | { |
43 | 40 | $services = $orders[$item->getBaseId()]->getServices(); |
@@ -49,8 +46,7 @@ discard block |
||
49 | 46 | }; |
50 | 47 | |
51 | 48 | |
52 | -$status = function( $list, $key ) |
|
53 | -{ |
|
49 | +$status = function( $list, $key ) { |
|
54 | 50 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
55 | 51 | }; |
56 | 52 |