diff --git a/client/html/templates/email/voucher/html-body-standard.mjml b/client/html/templates/email/voucher/html-body-standard.mjml index c57e4df94..9e110ff9d 100644 --- a/client/html/templates/email/voucher/html-body-standard.mjml +++ b/client/html/templates/email/voucher/html-body-standard.mjml @@ -2,7 +2,7 @@ /** * @license LGPLv3, http://opensource.org/licenses/LGPL-3.0 - * @copyright Aimeos (aimeos.org), 2018 + * @copyright Aimeos (aimeos.org), 2018-2021 */ $enc = $this->encoder(); @@ -38,19 +38,26 @@ $priceFormat = $pricefmt !== 'price:default' ? $pricefmt : $this->translate( 'cl - html( $this->translate( 'client', 'Your voucher' ) . ': ' . $this->extVoucherCode, $enc::TRUST ) ); ?> + extVoucherCode ) ) : ?> + html( $this->translate( 'client', 'Your vouchers: ' ) ) ); ?>
+ extVoucherCode as $code ) : ?> + -
+ + + html( $this->translate( 'client', 'Your voucher' ) . ': ' . $this->extVoucherCode, $enc::TRUST ) ); ?> + translate( 'currency', $this->extOrderProductItem->getPrice()->getCurrencyId() ); ?> number( $this->extOrderProductItem->getPrice()->getValue() + $this->extOrderProductItem->getPrice()->getRebate(), $this->extOrderProductItem->getPrice()->getPrecision() ), $priceCurrency ); ?> - html( sprintf( $this->translate( 'client', 'The value of your voucher is %1$s' ), $value ), $enc::TRUST ) ); ?> + html( sprintf( $this->translate( 'client', 'The value of your voucher is %1$s', 'The value of your vouchers are %1$s', count( (array) $this->extVoucherCode ) ), $value ), $enc::TRUST ) ); ?> - html( $this->translate( 'client', 'You can use your voucher any time in our online shop' ), $enc::TRUST ) ); ?> + html( $this->translate( 'client', 'You can use your vouchers at any time in our online shop' ), $enc::TRUST ) ); ?> diff --git a/client/html/templates/email/voucher/html-body-standard.php b/client/html/templates/email/voucher/html-body-standard.php index bf5e60ccd..79e830109 100644 --- a/client/html/templates/email/voucher/html-body-standard.php +++ b/client/html/templates/email/voucher/html-body-standard.php @@ -6,8 +6,7 @@ */ $enc = $this->encoder(); -$voucher = $this->extVoucherCode; -$price = $this->extOrderProductItem->getPrice(); + $pricefmt = $this->translate( 'client/code', 'price:default' ); /// Price format with price value (%1$s) and currency (%2$s) @@ -42,6 +41,6 @@ }
+ }
block()->stop(); ?> block()->get( 'email/voucher/html' ); ?> diff --git a/client/html/templates/email/voucher/text-body-standard.php b/client/html/templates/email/voucher/text-body-standard.php index 21bf20d56..76f88c7a9 100644 --- a/client/html/templates/email/voucher/text-body-standard.php +++ b/client/html/templates/email/voucher/text-body-standard.php @@ -18,13 +18,20 @@ get( 'emailIntro' ) ) ); ?> +extVoucherCode ) ) : ?> +translate( 'client', 'Your vouchers: ' ) ) ); ?> +extVoucherCode as $code ) : ?> +- + + translate( 'client', 'Your voucher: ' ) . $this->extVoucherCode ) ); ?> + extOrderProductItem->getPrice(); $priceCurrency = $this->translate( 'currency', $price->getCurrencyId() ); ?> number( $price->getValue() + $price->getRebate(), $price->getPrecision() ), $priceCurrency ); ?> -translate( 'client', 'The value of your voucher is %1$s' ), $value ) ) ); ?> +translate( 'client', 'The value of your voucher is %1$s', 'The value of your vouchers are %1$s', count( (array) $this->extVoucherCode ) ), $value ) ) ); ?> -translate( 'client', 'You can use your voucher any time in our online shop' ) ) ); ?> +translate( 'client', 'You can use your vouchers at any time in our online shop' ) ) ); ?> block()->stop(); ?> block()->get( 'email/voucher/text' );