@@ -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 ); |
@@ -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> |
@@ -62,8 +62,11 @@ |
||
62 | 62 | name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>" |
63 | 63 | v-bind:value="'<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>'" |
64 | 64 | v-bind:config="Aimeos.flatpickr.daterange" /> |
65 | - <?php else : ?> |
|
66 | - <input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
65 | + <?php else { |
|
66 | + : ?> |
|
67 | + <input class="form-control" type="<?= $enc->attr( $type ); |
|
68 | +} |
|
69 | +?>" tabindex="<?= $this->get( 'tabindex' ); ?>" |
|
67 | 70 | name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>" |
68 | 71 | value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>" /> |
69 | 72 | <?php endif; ?> |
@@ -44,9 +44,12 @@ |
||
44 | 44 | { |
45 | 45 | $view = $this->getView(); |
46 | 46 | |
47 | - try { |
|
47 | + try |
|
48 | + { |
|
48 | 49 | $view->listBody = parent::search(); |
49 | - } catch( \Exception $e ) { |
|
50 | + } |
|
51 | + catch( \Exception $e ) |
|
52 | + { |
|
50 | 53 | $this->report( $e, 'search' ); |
51 | 54 | } |
52 | 55 |
@@ -114,10 +114,13 @@ |
||
114 | 114 | <?= $enc->html( $this->translate( 'mshop/code', 'status:-2' ) ); ?> |
115 | 115 | </option> |
116 | 116 | </select> |
117 | - <?php else : ?> |
|
117 | + <?php else { |
|
118 | + : ?> |
|
118 | 119 | <span class="form-control item-status"> |
119 | 120 | <?php $key = 'status:' . $this->get( 'itemData/review.status' ) ?> |
120 | - <?= $enc->html( $this->translate( 'mshop/code', $key ) ); ?> |
|
121 | + <?= $enc->html( $this->translate( 'mshop/code', $key ) ); |
|
122 | +} |
|
123 | +?> |
|
121 | 124 | </span> |
122 | 125 | <?php endif ?> |
123 | 126 | </div> |
@@ -50,7 +50,7 @@ |
||
50 | 50 | $id = $siteManager->search( $search )->keys()->first() ?: $siteItem->getId(); |
51 | 51 | } |
52 | 52 | } |
53 | - catch( \Exception $e ) { ; } |
|
53 | + catch( \Exception $e ) {; } |
|
54 | 54 | |
55 | 55 | if( $view->access( ['admin', 'super'] ) ) { |
56 | 56 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE; |
@@ -50,7 +50,9 @@ discard block |
||
50 | 50 | $id = $siteManager->search( $search )->keys()->first() ?: $siteItem->getId(); |
51 | 51 | } |
52 | 52 | } |
53 | - catch( \Exception $e ) { ; } |
|
53 | + catch( \Exception $e ) |
|
54 | + { |
|
55 | +; } |
|
54 | 56 | |
55 | 57 | if( $view->access( ['admin', 'super'] ) ) { |
56 | 58 | $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE; |
@@ -78,8 +80,7 @@ discard block |
||
78 | 80 | if( ( $rootItem = $sitePath->first() ) !== null ) { |
79 | 81 | $view->pageSiteTree = $siteManager->getTree( $rootItem->getId(), [], $level ); |
80 | 82 | } |
81 | - } |
|
82 | - else |
|
83 | + } else |
|
83 | 84 | { |
84 | 85 | $view->pageSiteList = map( [$view->pageSiteTree] ); |
85 | 86 | } |
@@ -469,8 +469,7 @@ discard block |
||
469 | 469 | { |
470 | 470 | $attrItem = $attrItems[$array['order.base.service.attribute.id']]; |
471 | 471 | unset( $attrItems[$array['order.base.service.attribute.id']] ); |
472 | - } |
|
473 | - else |
|
472 | + } else |
|
474 | 473 | { |
475 | 474 | $attrItem = $attrManager->create(); |
476 | 475 | } |
@@ -505,9 +504,13 @@ discard block |
||
505 | 504 | { |
506 | 505 | $manager = \Aimeos\MShop::create( $this->getContext(), 'customer' ); |
507 | 506 | |
508 | - try { |
|
507 | + try |
|
508 | + { |
|
509 | 509 | $data += $manager->get( $item->getCustomerId() )->toArray(); |
510 | - } catch( \Exception $e ) {}; |
|
510 | + } |
|
511 | + catch( \Exception $e ) |
|
512 | + { |
|
513 | +}; |
|
511 | 514 | } |
512 | 515 | |
513 | 516 |
@@ -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 | } |