@@ -278,8 +278,7 @@ |
||
278 | 278 | { |
279 | 279 | $propItem = $propItems[$entry['price.property.id']]; |
280 | 280 | unset( $propItems[$entry['price.property.id']] ); |
281 | - } |
|
282 | - else |
|
281 | + } else |
|
283 | 282 | { |
284 | 283 | $propItem = $propManager->create(); |
285 | 284 | } |
@@ -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 | } |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2017-2021 |
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 |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2021 |
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 |
@@ -368,9 +368,12 @@ |
||
368 | 368 | { |
369 | 369 | $manager = \Aimeos\MShop::create( $this->getContext(), 'rule' ); |
370 | 370 | |
371 | - try { |
|
371 | + try |
|
372 | + { |
|
372 | 373 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
373 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
374 | + } |
|
375 | + catch( \Aimeos\MShop\Exception $e ) |
|
376 | + { |
|
374 | 377 | return []; |
375 | 378 | } |
376 | 379 | } |
@@ -45,7 +45,8 @@ discard block |
||
45 | 45 | <span class="navbar-label"> |
46 | 46 | <?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
47 | 47 | <?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ) ?> |
48 | - <?php else : ?> |
|
48 | + <?php else { |
|
49 | + : ?> |
|
49 | 50 | <?= $enc->html( $this->translate( 'admin', 'New' ) ) ?> |
50 | 51 | <?php endif ?> |
51 | 52 | </span> |
@@ -324,6 +325,7 @@ discard block |
||
324 | 325 | \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, |
325 | 326 | \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MS, |
326 | 327 | ); |
328 | +} |
|
327 | 329 | |
328 | 330 | echo preg_replace( "/\n+/m", "<br/>", trim( $enc->html( sprintf( |
329 | 331 | /// Address format with company (%1$s), salutation (%2$s), title (%3$s), first name (%4$s), last name (%5$s), |
@@ -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> |
@@ -48,8 +48,7 @@ |
||
48 | 48 | ] ) )->slice( 0, 1 ); |
49 | 49 | |
50 | 50 | $siteItem = $siteManager->search( $search )->first(); |
51 | - } |
|
52 | - else |
|
51 | + } else |
|
53 | 52 | { |
54 | 53 | $siteItem = $siteManager->find( $view->param( 'site', 'default' ) ); |
55 | 54 | } |
@@ -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" |