@@ -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> |
@@ -221,9 +224,12 @@ discard block |
||
221 | 224 | </li> |
222 | 225 | |
223 | 226 | <?php endif; ?> |
224 | - <?php else : ?> |
|
227 | + <?php else { |
|
228 | + : ?> |
|
225 | 229 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
226 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
230 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
231 | +} |
|
232 | +?> |
|
227 | 233 | |
228 | 234 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
229 | 235 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
@@ -271,9 +277,12 @@ discard block |
||
271 | 277 | </li> |
272 | 278 | |
273 | 279 | <?php endif; ?> |
274 | - <?php else : ?> |
|
280 | + <?php else { |
|
281 | + : ?> |
|
275 | 282 | <?php if( $this->access( $this->config( 'admin/jqadm/resource/' . $navitem . '/groups', [] ) ) ) : ?> |
276 | - <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); ?> |
|
283 | + <?php $key = $this->config( 'admin/jqadm/resource/' . $navitem . '/key' ); |
|
284 | +} |
|
285 | +?> |
|
277 | 286 | <li class="<?= $enc->attr( $navitem ); ?> <?= $this->param( 'resource', $navfirst ) === $navitem ? 'active' : '' ?>"> |
278 | 287 | <a href="<?= $enc->attr( $this->url( $searchTarget, $cntl, $action, array( 'resource' => $navitem ) + $params, [], $config ) ); ?>" |
279 | 288 | title="<?= $enc->attr( sprintf( $title, $this->translate( 'admin', $navitem ), $key ) ); ?>" |
@@ -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 | } |
@@ -454,8 +454,7 @@ |
||
454 | 454 | { |
455 | 455 | $this->checkSite( $super, $data['locale.site.id'] ); |
456 | 456 | $item = $manager->get( $data['locale.site.id'] ); |
457 | - } |
|
458 | - else |
|
457 | + } else |
|
459 | 458 | { |
460 | 459 | $this->checkSite( $super ); |
461 | 460 | $item = $manager->createItem(); |
@@ -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->createItem(); |
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 |