@@ -271,8 +271,7 @@ |
||
| 271 | 271 | { |
| 272 | 272 | $propItem = $propItems[$entry['customer.property.id']]; |
| 273 | 273 | unset( $propItems[$entry['customer.property.id']] ); |
| 274 | - } |
|
| 275 | - else |
|
| 274 | + } else |
|
| 276 | 275 | { |
| 277 | 276 | $propItem = $manager->create(); |
| 278 | 277 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -45,7 +45,8 @@ discard block |
||
| 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 : ?> |
|
| 48 | + <?php else { |
|
| 49 | + : ?> |
|
| 49 | 50 | <?= $enc->html( $this->translate( 'admin', 'New' ) ) ?> |
| 50 | 51 | <?php endif ?> |
| 51 | 52 | </span> |
@@ -324,6 +325,7 @@ discard block |
||
| 324 | 325 | \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, |
| 325 | 326 | \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MS, |
| 326 | 327 | ); |
| 328 | +} |
|
| 327 | 329 | |
| 328 | 330 | echo preg_replace( "/\n+/m", "<br/>", trim( $enc->html( sprintf( |
| 329 | 331 | /// Address format with company (%1$s), salutation (%2$s), title (%3$s), first name (%4$s), last name (%5$s), |
@@ -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> |