@@ -375,9 +375,12 @@ |
||
375 | 375 | { |
376 | 376 | $manager = \Aimeos\MShop::create( $this->context(), 'service' ); |
377 | 377 | |
378 | - try { |
|
378 | + try |
|
379 | + { |
|
379 | 380 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
380 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
381 | + } |
|
382 | + catch( \Aimeos\MShop\Exception $e ) |
|
383 | + { |
|
381 | 384 | return []; |
382 | 385 | } |
383 | 386 | } |
@@ -374,9 +374,12 @@ |
||
374 | 374 | { |
375 | 375 | $manager = \Aimeos\MShop::create( $this->context(), 'rule' ); |
376 | 376 | |
377 | - try { |
|
377 | + try |
|
378 | + { |
|
378 | 379 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
379 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
380 | + } |
|
381 | + catch( \Aimeos\MShop\Exception $e ) |
|
382 | + { |
|
380 | 383 | return []; |
381 | 384 | } |
382 | 385 | } |
@@ -489,8 +489,7 @@ discard block |
||
489 | 489 | { |
490 | 490 | $attrItem = $attrItems[$array['order.base.service.attribute.id']]; |
491 | 491 | unset( $attrItems[$array['order.base.service.attribute.id']] ); |
492 | - } |
|
493 | - else |
|
492 | + } else |
|
494 | 493 | { |
495 | 494 | $attrItem = $attrManager->create(); |
496 | 495 | } |
@@ -525,9 +524,13 @@ discard block |
||
525 | 524 | { |
526 | 525 | $manager = \Aimeos\MShop::create( $this->context(), 'customer' ); |
527 | 526 | |
528 | - try { |
|
527 | + try |
|
528 | + { |
|
529 | 529 | $data += $manager->get( $item->getCustomerId() )->toArray(); |
530 | - } catch( \Exception $e ) {}; |
|
530 | + } |
|
531 | + catch( \Exception $e ) |
|
532 | + { |
|
533 | +}; |
|
531 | 534 | } |
532 | 535 | |
533 | 536 |
@@ -365,9 +365,12 @@ |
||
365 | 365 | { |
366 | 366 | $manager = \Aimeos\MShop::create( $this->context(), 'coupon' ); |
367 | 367 | |
368 | - try { |
|
368 | + try |
|
369 | + { |
|
369 | 370 | return $manager->getProvider( $item, '' )->getConfigBE(); |
370 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
371 | + } |
|
372 | + catch( \Aimeos\MShop\Exception $e ) |
|
373 | + { |
|
371 | 374 | return []; |
372 | 375 | } |
373 | 376 | } |
@@ -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 |
@@ -92,7 +92,8 @@ discard block |
||
92 | 92 | <?php if( $logos = $this->get( 'itemData/locale.site.logo' ) ) : ?> |
93 | 93 | <img class="item-preview" |
94 | 94 | src="<?= $enc->attr( $this->content( end( $logos ) ) ) ?>" /> |
95 | - <?php else : ?> |
|
95 | + <?php else { |
|
96 | + : ?> |
|
96 | 97 | <p class="item-preview"> |
97 | 98 | <?= $enc->html( $this->translate( 'admin', 'Upload shop logo' ) ) ?> |
98 | 99 | </p> |
@@ -106,7 +107,9 @@ discard block |
||
106 | 107 | <div class="box"> |
107 | 108 | |
108 | 109 | <div class="form-group media-preview"> |
109 | - <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
110 | + <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); |
|
111 | +} |
|
112 | +?>" |
|
110 | 113 | name="media[icon]" /> |
111 | 114 | <?php if( $icon = $this->get( 'itemData/locale.site.icon' ) ) : ?> |
112 | 115 | <img class="item-preview" |
@@ -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' ); |
@@ -56,16 +56,14 @@ |
||
56 | 56 | $controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' ); |
57 | 57 | $action = $this->config( 'admin/jqadm/url/get/action', 'get' ); |
58 | 58 | $config = $this->config( 'admin/jqadm/url/get/config', [] ); |
59 | - } |
|
60 | - else |
|
59 | + } else |
|
61 | 60 | { |
62 | 61 | $target = $this->config( 'admin/jqadm/url/create/target' ); |
63 | 62 | $controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' ); |
64 | 63 | $action = $this->config( 'admin/jqadm/url/create/action', 'create' ); |
65 | 64 | $config = $this->config( 'admin/jqadm/url/create/config', [] ); |
66 | 65 | } |
67 | -} |
|
68 | -else |
|
66 | +} else |
|
69 | 67 | { |
70 | 68 | $target = $this->config( 'admin/jqadm/url/search/target' ); |
71 | 69 | $controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' ); |
@@ -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> |