@@ -445,8 +445,7 @@ |
||
445 | 445 | $listItem = \Aimeos\MShop::create( $context, 'product' )->createListItem(); |
446 | 446 | $item = $item->addListItem( 'attribute', $listItem->setType( 'custom' ), $attrItem ); |
447 | 447 | } |
448 | - } |
|
449 | - else |
|
448 | + } else |
|
450 | 449 | { |
451 | 450 | if( ( $litem = $item->getListItem( 'attribute', 'custom', $attrItem->getId(), false ) ) !== null ) { |
452 | 451 | $item = $item->deleteListItem( 'attribute', $litem ); |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2016-2020 |
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; |
@@ -20,8 +19,7 @@ discard block |
||
20 | 19 | }; |
21 | 20 | |
22 | 21 | |
23 | -$name = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
24 | -{ |
|
22 | +$name = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
25 | 23 | if( $order = $item->getBaseItem() ) |
26 | 24 | { |
27 | 25 | $type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT; |
@@ -39,8 +37,7 @@ discard block |
||
39 | 37 | }; |
40 | 38 | |
41 | 39 | |
42 | -$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) |
|
43 | -{ |
|
40 | +$payment = function( \Aimeos\MShop\Order\Item\Iface $item ) { |
|
44 | 41 | if( $order = $item->getBaseItem() ) |
45 | 42 | { |
46 | 43 | $type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT; |
@@ -56,8 +53,7 @@ discard block |
||
56 | 53 | }; |
57 | 54 | |
58 | 55 | |
59 | -$status = function( array $list, $key ) |
|
60 | -{ |
|
56 | +$status = function( array $list, $key ) { |
|
61 | 57 | return ( isset( $list[$key] ) ? $list[$key] : '' ); |
62 | 58 | }; |
63 | 59 |
@@ -35,8 +35,11 @@ |
||
35 | 35 | <span class="navbar-label"> |
36 | 36 | <?php if( $this->get( 'itemData/locale.id' ) ) : ?> |
37 | 37 | <?= $enc->html( $this->get( 'itemData/locale.languageid' ) . '/' . $this->get( 'itemData/locale.currencyid' ) ); ?> |
38 | - <?php else : ?> |
|
39 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
38 | + <?php else { |
|
39 | + : ?> |
|
40 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
41 | +} |
|
42 | +?> |
|
40 | 43 | <?php endif; ?> |
41 | 44 | </span> |
42 | 45 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/locale.siteid' ) ) ); ?></span> |
@@ -45,8 +45,11 @@ |
||
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 : ?> |
|
49 | - <?= $enc->html( $this->translate( 'admin', 'New' ) ); ?> |
|
48 | + <?php else { |
|
49 | + : ?> |
|
50 | + <?= $enc->html( $this->translate( 'admin', 'New' ) ); |
|
51 | +} |
|
52 | +?> |
|
50 | 53 | <?php endif; ?> |
51 | 54 | </span> |
52 | 55 | <span class="navbar-site"><?= $enc->html( $this->site()->match( $this->get( 'itemData/subscription.siteid' ) ) ); ?></span> |
@@ -187,8 +187,11 @@ discard block |
||
187 | 187 | <?php foreach( $this->pageSiteList as $siteItem ) : ?> |
188 | 188 | <?php if( $siteItem->getId() === $this->pageSiteTree->getId() ) : ?> |
189 | 189 | <?php $siteFcn( $this->pageSiteTree ); ?> |
190 | - <?php else : ?> |
|
191 | - <?php $siteFcn( $siteItem ); ?> |
|
190 | + <?php else { |
|
191 | + : ?> |
|
192 | + <?php $siteFcn( $siteItem ); |
|
193 | +} |
|
194 | +?> |
|
192 | 195 | <?php endif; ?> |
193 | 196 | <?php endforeach; ?> |
194 | 197 | </ul> |
@@ -219,9 +222,12 @@ discard block |
||
219 | 222 | </li> |
220 | 223 | |
221 | 224 | <?php endif; ?> |
222 | - <?php else : ?> |
|
225 | + <?php else { |
|
226 | + : ?> |
|
223 | 227 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
224 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
228 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
229 | +} |
|
230 | +?> |
|
225 | 231 | |
226 | 232 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
227 | 233 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
@@ -267,9 +273,12 @@ discard block |
||
267 | 273 | </li> |
268 | 274 | |
269 | 275 | <?php endif; ?> |
270 | - <?php else : ?> |
|
276 | + <?php else { |
|
277 | + : ?> |
|
271 | 278 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
272 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
279 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
280 | +} |
|
281 | +?> |
|
273 | 282 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
274 | 283 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
275 | 284 | title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |