@@ -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'] = ''; |
@@ -454,8 +454,7 @@ |
||
454 | 454 | { |
455 | 455 | $this->checkSite( $super, $data['locale.site.id'] ); |
456 | 456 | $item = $manager->get( $data['locale.site.id'] ); |
457 | - } |
|
458 | - else |
|
457 | + } else |
|
459 | 458 | { |
460 | 459 | $this->checkSite( $super ); |
461 | 460 | $item = $manager->create(); |
@@ -278,8 +278,7 @@ |
||
278 | 278 | { |
279 | 279 | $propItem = $propItems[$entry['media.property.id']]; |
280 | 280 | unset( $propItems[$entry['media.property.id']] ); |
281 | - } |
|
282 | - else |
|
281 | + } else |
|
283 | 282 | { |
284 | 283 | $propItem = $propManager->create(); |
285 | 284 | } |
@@ -366,9 +366,12 @@ |
||
366 | 366 | { |
367 | 367 | $manager = \Aimeos\MShop::create( $this->context(), 'catalog' ); |
368 | 368 | |
369 | - try { |
|
369 | + try |
|
370 | + { |
|
370 | 371 | return $manager->getTree( null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )->getId(); |
371 | - } catch( \Exception $e ) { |
|
372 | + } |
|
373 | + catch( \Exception $e ) |
|
374 | + { |
|
372 | 375 | return null; |
373 | 376 | } |
374 | 377 | } |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2022 |
6 | 6 | */ |
7 | 7 | |
8 | -$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) |
|
9 | -{ |
|
8 | +$price = function( \Aimeos\MShop\Order\Item\Iface $item, $priceFormat ) { |
|
10 | 9 | if( $order = $item->getBaseItem() ) |
11 | 10 | { |
12 | 11 | $price = 0; |
@@ -23,8 +22,7 @@ discard block |
||
23 | 22 | }; |
24 | 23 | |
25 | 24 | |
26 | -$name = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
27 | -{ |
|
25 | +$name = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
28 | 26 | if( $order = $item->getBaseItem() ) |
29 | 27 | { |
30 | 28 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -42,8 +40,7 @@ discard block |
||
42 | 40 | }; |
43 | 41 | |
44 | 42 | |
45 | -$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
46 | -{ |
|
43 | +$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
47 | 44 | if( $order = $item->getBaseItem() ) |
48 | 45 | { |
49 | 46 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -59,8 +56,7 @@ discard block |
||
59 | 56 | }; |
60 | 57 | |
61 | 58 | |
62 | -$status = function( array $list, $key ) |
|
63 | -{ |
|
59 | +$status = function( array $list, $key ) { |
|
64 | 60 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
65 | 61 | }; |
66 | 62 |
@@ -355,7 +355,8 @@ discard block |
||
355 | 355 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ) ?></span></div> |
356 | 356 | </div> |
357 | 357 | <?php endforeach ?> |
358 | - <?php else : ?> |
|
358 | + <?php else { |
|
359 | + : ?> |
|
359 | 360 | <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ) ?> |
360 | 361 | <?php endif ?> |
361 | 362 | </div> |
@@ -389,6 +390,7 @@ discard block |
||
389 | 390 | /// short order address with company (%1$s), first name (%2$s), last name (%3$s), street (%4$s), house number (%5$s), |
390 | 391 | /// zip code (%6$s), city (%7$s),state (%8$s), countryid (%9$s), e-mail (%10$s), telephone (%11$s), VAT ID (%12$s) |
391 | 392 | $addrFormat = $this->translate( 'admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s" ); |
393 | +} |
|
392 | 394 | ?> |
393 | 395 | <span class="address-text" data-format="<?= $enc->attr( $addrFormat ) ?>"><!-- inserted by order.js --></span> |
394 | 396 | <span class="address-edit"></span> |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2022 |
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 |
@@ -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 | } |
@@ -55,8 +54,7 @@ discard block |
||
55 | 54 | } else { |
56 | 55 | $key = 'admin/jqadm/url/create'; |
57 | 56 | } |
58 | -} |
|
59 | -else |
|
57 | +} else |
|
60 | 58 | { |
61 | 59 | $key = 'admin/jqadm/url/search'; |
62 | 60 | } |
@@ -54,8 +54,7 @@ |
||
54 | 54 | } else { |
55 | 55 | $cfgkey = 'admin/jqadm/url/create'; |
56 | 56 | } |
57 | -} |
|
58 | -else |
|
57 | +} else |
|
59 | 58 | { |
60 | 59 | $cfgkey = 'admin/jqadm/url/search'; |
61 | 60 | } |