@@ -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 | } |
@@ -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 | } |
@@ -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 |
@@ -190,8 +190,11 @@ discard block |
||
190 | 190 | <?php foreach( $this->pageSiteList as $siteItem ) : ?> |
191 | 191 | <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> |
192 | 192 | <?php $siteFcn( $this->pageSiteTree ); ?> |
193 | - <?php else : ?> |
|
194 | - <?php $siteFcn( $siteItem ); ?> |
|
193 | + <?php else { |
|
194 | + : ?> |
|
195 | + <?php $siteFcn( $siteItem ); |
|
196 | +} |
|
197 | +?> |
|
195 | 198 | <?php endif; ?> |
196 | 199 | <?php endforeach; ?> |
197 | 200 | </ul> |
@@ -229,9 +232,12 @@ discard block |
||
229 | 232 | </li> |
230 | 233 | |
231 | 234 | <?php endif; ?> |
232 | - <?php else : ?> |
|
235 | + <?php else { |
|
236 | + : ?> |
|
233 | 237 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
234 | - <?php $nav = $navitem; $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
238 | + <?php $nav = $navitem; |
|
239 | +} |
|
240 | +$key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
235 | 241 | |
236 | 242 | <li class="<?= $enc->attr( $navitem ); ?> <?= $nav === $before ? 'before' : '' ?> <?= !strncmp( $resource, $nav, strlen( $nav ) ) ? 'active' : '' ?> <?= $nav === $after ? 'after' : '' ?>"> |
237 | 243 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
@@ -345,8 +345,11 @@ discard block |
||
345 | 345 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div> |
346 | 346 | </div> |
347 | 347 | <?php endforeach; ?> |
348 | - <?php else : ?> |
|
349 | - <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?> |
|
348 | + <?php else { |
|
349 | + : ?> |
|
350 | + <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); |
|
351 | +} |
|
352 | +?> |
|
350 | 353 | <?php endif; ?> |
351 | 354 | </div> |
352 | 355 | </div> |
@@ -777,8 +780,11 @@ discard block |
||
777 | 780 | <div class="col-6 name"> |
778 | 781 | <?php if( $basket->getPrice()->getTaxFlag() ) : ?> |
779 | 782 | <?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?> |
780 | - <?php else : ?> |
|
781 | - <?= $enc->html( $this->translate( 'admin', '+ Tax' ) ); ?> |
|
783 | + <?php else { |
|
784 | + : ?> |
|
785 | + <?= $enc->html( $this->translate( 'admin', '+ Tax' ) ); |
|
786 | +} |
|
787 | +?> |
|
782 | 788 | <?php endif; ?> |
783 | 789 | </div> |
784 | 790 | <div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div> |