@@ -355,7 +355,8 @@ discard block |
||
| 355 | 355 | <div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ) ?></span></div> |
| 356 | 356 | </div> |
| 357 | 357 | <?php endforeach ?> |
| 358 | - <?php else : ?> |
|
| 358 | + <?php else { |
|
| 359 | + : ?> |
|
| 359 | 360 | <?= $enc->html( $this->translate( 'admin', 'No voucher' ) ) ?> |
| 360 | 361 | <?php endif ?> |
| 361 | 362 | </div> |
@@ -389,6 +390,7 @@ discard block |
||
| 389 | 390 | /// short order address with company (%1$s), first name (%2$s), last name (%3$s), street (%4$s), house number (%5$s), |
| 390 | 391 | /// zip code (%6$s), city (%7$s),state (%8$s), countryid (%9$s), e-mail (%10$s), telephone (%11$s), VAT ID (%12$s) |
| 391 | 392 | $addrFormat = $this->translate( 'admin', "%1\$s\n%2\$s %3\$s\n%5\$s %4\$s\n%7\$s, %6\$s\n%8\$s, %9\$s\n%10\$s\n%11\$s\n%12\$s" ); |
| 393 | +} |
|
| 392 | 394 | ?> |
| 393 | 395 | <span class="address-text" data-format="<?= $enc->attr( $addrFormat ) ?>"><!-- inserted by order.js --></span> |
| 394 | 396 | <span class="address-edit"></span> |
@@ -48,8 +48,7 @@ |
||
| 48 | 48 | ] ) )->slice( 0, 1 ); |
| 49 | 49 | |
| 50 | 50 | $siteItem = $siteManager->search( $search )->first(); |
| 51 | - } |
|
| 52 | - else |
|
| 51 | + } else |
|
| 53 | 52 | { |
| 54 | 53 | $siteItem = $siteManager->find( $view->param( 'site', 'default' ) ); |
| 55 | 54 | } |
@@ -92,7 +92,8 @@ discard block |
||
| 92 | 92 | <?php if( $logos = $this->get( 'itemData/locale.site.logo' ) ) : ?> |
| 93 | 93 | <img class="item-preview" |
| 94 | 94 | src="<?= $enc->attr( $this->content( end( $logos ) ) ) ?>" /> |
| 95 | - <?php else : ?> |
|
| 95 | + <?php else { |
|
| 96 | + : ?> |
|
| 96 | 97 | <p class="item-preview"> |
| 97 | 98 | <?= $enc->html( $this->translate( 'admin', 'Upload shop logo' ) ) ?> |
| 98 | 99 | </p> |
@@ -106,7 +107,9 @@ discard block |
||
| 106 | 107 | <div class="box"> |
| 107 | 108 | |
| 108 | 109 | <div class="form-group media-preview"> |
| 109 | - <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 110 | + <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); |
|
| 111 | +} |
|
| 112 | +?>" |
|
| 110 | 113 | name="media[icon]" /> |
| 111 | 114 | <?php if( $icon = $this->get( 'itemData/locale.site.icon' ) ) : ?> |
| 112 | 115 | <img class="item-preview" |
@@ -683,8 +683,7 @@ |
||
| 683 | 683 | { |
| 684 | 684 | $view->errors = array_merge( $view->get( 'errors', [] ), [$e->getMessage()] ); |
| 685 | 685 | return $this->log( $e ); |
| 686 | - } |
|
| 687 | - elseif( $e instanceof \Aimeos\MShop\Exception ) |
|
| 686 | + } elseif( $e instanceof \Aimeos\MShop\Exception ) |
|
| 688 | 687 | { |
| 689 | 688 | $view->errors = array_merge( $view->get( 'errors', [] ), [$i18n->dt( 'mshop', $e->getMessage() )] ); |
| 690 | 689 | return $this->log( $e ); |
@@ -44,9 +44,12 @@ |
||
| 44 | 44 | { |
| 45 | 45 | $view = $this->view(); |
| 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 | |
@@ -374,9 +374,12 @@ |
||
| 374 | 374 | { |
| 375 | 375 | $manager = \Aimeos\MShop::create( $this->context(), 'plugin' ); |
| 376 | 376 | |
| 377 | - try { |
|
| 377 | + try |
|
| 378 | + { |
|
| 378 | 379 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
| 379 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 380 | + } |
|
| 381 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 382 | + { |
|
| 380 | 383 | return []; |
| 381 | 384 | } |
| 382 | 385 | } |
@@ -366,9 +366,12 @@ |
||
| 366 | 366 | { |
| 367 | 367 | $manager = \Aimeos\MShop::create( $this->context(), 'catalog' ); |
| 368 | 368 | |
| 369 | - try { |
|
| 369 | + try |
|
| 370 | + { |
|
| 370 | 371 | return $manager->getTree( null, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )->getId(); |
| 371 | - } catch( \Exception $e ) { |
|
| 372 | + } |
|
| 373 | + catch( \Exception $e ) |
|
| 374 | + { |
|
| 372 | 375 | return null; |
| 373 | 376 | } |
| 374 | 377 | } |
@@ -375,9 +375,12 @@ |
||
| 375 | 375 | { |
| 376 | 376 | $manager = \Aimeos\MShop::create( $this->context(), 'service' ); |
| 377 | 377 | |
| 378 | - try { |
|
| 378 | + try |
|
| 379 | + { |
|
| 379 | 380 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
| 380 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 381 | + } |
|
| 382 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 383 | + { |
|
| 381 | 384 | return []; |
| 382 | 385 | } |
| 383 | 386 | } |
@@ -374,9 +374,12 @@ |
||
| 374 | 374 | { |
| 375 | 375 | $manager = \Aimeos\MShop::create( $this->context(), 'rule' ); |
| 376 | 376 | |
| 377 | - try { |
|
| 377 | + try |
|
| 378 | + { |
|
| 378 | 379 | return $manager->getProvider( $item, $item->getType() )->getConfigBE(); |
| 379 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 380 | + } |
|
| 381 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 382 | + { |
|
| 380 | 383 | return []; |
| 381 | 384 | } |
| 382 | 385 | } |