@@ -421,9 +421,12 @@ |
||
421 | 421 | { |
422 | 422 | $manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' ); |
423 | 423 | |
424 | - try { |
|
424 | + try |
|
425 | + { |
|
425 | 426 | return $manager->getTree( null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )->getId(); |
426 | - } catch( \Exception $e ) { |
|
427 | + } |
|
428 | + catch( \Exception $e ) |
|
429 | + { |
|
427 | 430 | return null; |
428 | 431 | } |
429 | 432 | } |
@@ -284,8 +284,7 @@ |
||
284 | 284 | { |
285 | 285 | $addrItem = $addrItems[$entry['supplier.address.id']]; |
286 | 286 | unset( $addrItems[$entry['supplier.address.id']] ); |
287 | - } |
|
288 | - else |
|
287 | + } else |
|
289 | 288 | { |
290 | 289 | $addrItem = $manager->createItem(); |
291 | 290 | } |
@@ -541,8 +541,7 @@ discard block |
||
541 | 541 | { |
542 | 542 | $attrItem = $attrItems[$array['order.base.service.attribute.id']]; |
543 | 543 | unset( $attrItems[$array['order.base.service.attribute.id']] ); |
544 | - } |
|
545 | - else |
|
544 | + } else |
|
546 | 545 | { |
547 | 546 | $attrItem = $attrManager->createItem(); |
548 | 547 | } |
@@ -577,9 +576,13 @@ discard block |
||
577 | 576 | { |
578 | 577 | $manager = \Aimeos\MShop::create( $this->getContext(), 'customer' ); |
579 | 578 | |
580 | - try { |
|
579 | + try |
|
580 | + { |
|
581 | 581 | $data += $manager->getItem( $item->getCustomerId() )->toArray(); |
582 | - } catch( \Exception $e ) {}; |
|
582 | + } |
|
583 | + catch( \Exception $e ) |
|
584 | + { |
|
585 | +}; |
|
583 | 586 | } |
584 | 587 | |
585 | 588 |
@@ -284,8 +284,7 @@ |
||
284 | 284 | { |
285 | 285 | $addrItem = $addrItems[$entry['customer.address.id']]; |
286 | 286 | unset( $addrItems[$entry['customer.address.id']] ); |
287 | - } |
|
288 | - else |
|
287 | + } else |
|
289 | 288 | { |
290 | 289 | $addrItem = $manager->createItem(); |
291 | 290 | } |
@@ -303,8 +303,7 @@ |
||
303 | 303 | { |
304 | 304 | $propItem = $propItems[$entry['customer.property.id']]; |
305 | 305 | unset( $propItems[$entry['customer.property.id']] ); |
306 | - } |
|
307 | - else |
|
306 | + } else |
|
308 | 307 | { |
309 | 308 | $propItem = $manager->createItem(); |
310 | 309 | } |
@@ -407,7 +407,7 @@ |
||
407 | 407 | $data['time'] = $fs->time( $data['attribute.code'] ); |
408 | 408 | $data['size'] = $fs->size( $data['attribute.code'] ); |
409 | 409 | } |
410 | - catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
410 | + catch( \Exception $e ) {; } // Show product even if file isn't available any more |
|
411 | 411 | } |
412 | 412 | |
413 | 413 | return $data; |
@@ -407,7 +407,9 @@ |
||
407 | 407 | $data['time'] = $fs->time( $data['attribute.code'] ); |
408 | 408 | $data['size'] = $fs->size( $data['attribute.code'] ); |
409 | 409 | } |
410 | - catch( \Exception $e ) { ; } // Show product even if file isn't available any more |
|
410 | + catch( \Exception $e ) |
|
411 | + { |
|
412 | +; } // Show product even if file isn't available any more |
|
411 | 413 | } |
412 | 414 | |
413 | 415 | return $data; |
@@ -351,8 +351,7 @@ |
||
351 | 351 | { |
352 | 352 | $list['product.lists.siteid'] = (string) $map[$attrId]->getSiteId(); |
353 | 353 | $list['product.lists.id'] = (string) $map[$attrId]->getId(); |
354 | - } |
|
355 | - else |
|
354 | + } else |
|
356 | 355 | { |
357 | 356 | $list['product.lists.siteid'] = $siteId; |
358 | 357 | $list['product.lists.id'] = ''; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
62 | 62 | </a> |
63 | 63 | </li> |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | <?php foreach( array_values( $this->get( 'itemSubparts', [] ) ) as $idx => $subpart ) : ?> |
59 | 59 | <li class="nav-item <?= $enc->attr( $subpart ); ?>"> |
60 | - <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx+1; ?>"> |
|
60 | + <a class="nav-link" href="#<?= $enc->attr( $subpart ); ?>" data-toggle="tab" role="tab" tabindex="<?= ++$idx + 1; ?>"> |
|
61 | 61 | <?= $enc->html( $this->translate( 'admin', $subpart ) ); ?> |
62 | 62 | </a> |
63 | 63 | </li> |