@@ -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->create(); |
@@ -278,8 +278,7 @@ |
||
| 278 | 278 | { |
| 279 | 279 | $propItem = $propItems[$entry['media.property.id']]; |
| 280 | 280 | unset( $propItems[$entry['media.property.id']] ); |
| 281 | - } |
|
| 282 | - else |
|
| 281 | + } else |
|
| 283 | 282 | { |
| 284 | 283 | $propItem = $propManager->create(); |
| 285 | 284 | } |
@@ -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 | } |
@@ -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> |
@@ -21,8 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | |
| 24 | -$pgroup = function( array $params, $group ) |
|
| 25 | -{ |
|
| 24 | +$pgroup = function( array $params, $group ) { |
|
| 26 | 25 | if( $group != null ) { |
| 27 | 26 | return [$group => ['page' => $params]]; |
| 28 | 27 | } |
@@ -55,8 +54,7 @@ discard block |
||
| 55 | 54 | } else { |
| 56 | 55 | $key = 'admin/jqadm/url/create'; |
| 57 | 56 | } |
| 58 | -} |
|
| 59 | -else |
|
| 57 | +} else |
|
| 60 | 58 | { |
| 61 | 59 | $key = 'admin/jqadm/url/search'; |
| 62 | 60 | } |
@@ -54,8 +54,7 @@ |
||
| 54 | 54 | } else { |
| 55 | 55 | $cfgkey = 'admin/jqadm/url/create'; |
| 56 | 56 | } |
| 57 | -} |
|
| 58 | -else |
|
| 57 | +} else |
|
| 59 | 58 | { |
| 60 | 59 | $cfgkey = 'admin/jqadm/url/search'; |
| 61 | 60 | } |
@@ -86,7 +86,8 @@ discard block |
||
| 86 | 86 | <?php if( $logos = $this->get( 'itemData/locale.site.logo' ) ) : ?> |
| 87 | 87 | <img class="item-preview" |
| 88 | 88 | src="<?= $enc->attr( $this->content( end( $logos ) ) ) ?>"> |
| 89 | - <?php else : ?> |
|
| 89 | + <?php else { |
|
| 90 | + : ?> |
|
| 90 | 91 | <p class="item-preview"> |
| 91 | 92 | <?= $enc->html( $this->translate( 'admin', 'Upload shop logo' ) ) ?> |
| 92 | 93 | </p> |
@@ -100,7 +101,9 @@ discard block |
||
| 100 | 101 | <div class="box"> |
| 101 | 102 | |
| 102 | 103 | <div class="form-group media-preview"> |
| 103 | - <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); ?>" |
|
| 104 | + <input class="fileupload" type="file" tabindex="<?= $this->get( 'tabindex', 1 ); |
|
| 105 | +} |
|
| 106 | +?>" |
|
| 104 | 107 | name="media[icon]"> |
| 105 | 108 | <?php if( $icon = $this->get( 'itemData/locale.site.icon' ) ) : ?> |
| 106 | 109 | <img class="item-preview" |
@@ -29,7 +29,8 @@ discard block |
||
| 29 | 29 | <span class="navbar-label"> |
| 30 | 30 | <?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
| 31 | 31 | <?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ) ?> |
| 32 | - <?php else : ?> |
|
| 32 | + <?php else { |
|
| 33 | + : ?> |
|
| 33 | 34 | <?= $enc->html( $this->translate( 'admin', 'New' ) ) ?> |
| 34 | 35 | <?php endif ?> |
| 35 | 36 | </span> |
@@ -188,6 +189,7 @@ discard block |
||
| 188 | 189 | <?php |
| 189 | 190 | /// Price format with price value (%1$s) and currency (%2$s) |
| 190 | 191 | $priceFormat = $this->translate( 'client/code', '%1$s %2$s' ); |
| 192 | +} |
|
| 191 | 193 | $currency = $this->translate( 'currency', $order->getPrice()->getCurrencyId() ); |
| 192 | 194 | ?> |
| 193 | 195 | |
@@ -517,8 +517,7 @@ discard block |
||
| 517 | 517 | { |
| 518 | 518 | $attrItem = $attrItems[$array['order.service.attribute.id']]; |
| 519 | 519 | unset( $attrItems[$array['order.service.attribute.id']] ); |
| 520 | - } |
|
| 521 | - else |
|
| 520 | + } else |
|
| 522 | 521 | { |
| 523 | 522 | $attrItem = $attrManager->create(); |
| 524 | 523 | } |
@@ -553,9 +552,13 @@ discard block |
||
| 553 | 552 | { |
| 554 | 553 | $manager = \Aimeos\MShop::create( $this->context(), 'customer' ); |
| 555 | 554 | |
| 556 | - try { |
|
| 555 | + try |
|
| 556 | + { |
|
| 557 | 557 | $data += $manager->get( $item->getCustomerId() )->toArray(); |
| 558 | - } catch( \Exception $e ) {}; |
|
| 558 | + } |
|
| 559 | + catch( \Exception $e ) |
|
| 560 | + { |
|
| 561 | +}; |
|
| 559 | 562 | } |
| 560 | 563 | |
| 561 | 564 | |