|
@@ -355,7 +355,8 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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> |
Please login to merge, or discard this patch.