Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove <span/> from mails #21

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Remove <span/> from mails #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Mail/Paragraphs/Products/Mail.html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<?php foreach ($item->additionalOrderData as $d) { ?>
<td class="<?=$d['class']?>"><?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($d['name']));?>: <?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($d['value']));?></td>
<?php } ?>
<td class="price" colspan="<?=($maxAddOrderData-count($item->additionalOrderData)+1)?>" align="right"><?=Kwf_Util_HtmlSpecialChars::filter($this->money($item->price));?></td>
<td class="price" colspan="<?=($maxAddOrderData-count($item->additionalOrderData)+1)?>" align="right"><?=Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($item->price)));?></td>
</tr>
<?php $c++;
} ?>
Expand All @@ -40,12 +40,12 @@
</td>
<td width="120" align="right">
<?php
if (isset($row['class']) && $row['class']=='valueOfGoods') {
echo '<i>'.Kwf_Util_HtmlSpecialChars::filter($this->money($row['amount'],'')).'</i>';
} else if (isset($row['class']) && $row['class']=='totalAmount') {
echo '<b>'.Kwf_Util_HtmlSpecialChars::filter($this->money($row['amount'],'')).'</b>';
if (isset($row['class']) && $row['class'] == 'valueOfGoods') {
echo '<i>' . Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($row['amount'], ''))) . '</i>';
} else if (isset($row['class']) && $row['class'] == 'totalAmount') {
echo '<b>' . Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($row['amount'], ''))) . '</b>';
} else {
echo Kwf_Util_HtmlSpecialChars::filter($this->money($row['amount'],''));
echo Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($row['amount'], '')));
}
?>
</td>
Expand Down
4 changes: 2 additions & 2 deletions KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Mail/Paragraphs/Products/Mail.txt.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?=$this->data->trlKwf('You ordered the following product', 'You ordered the following products', count($this->items));?>:
<?php foreach ($this->items as $item) { ?>
<?=Kwf_Util_HtmlSpecialChars::filter($item->text);?> <?php foreach($item->additionalOrderData as $d) { ?><?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($d['name']));?>: <?=Kwf_Util_HtmlSpecialChars::filter($d['value']);?> <?php } ?> <?=Kwf_Util_HtmlSpecialChars::filter($this->money($item->price));?>
<?=Kwf_Util_HtmlSpecialChars::filter($item->text);?> <?php foreach($item->additionalOrderData as $d) { ?><?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($d['name']));?>: <?=Kwf_Util_HtmlSpecialChars::filter($d['value']);?> <?php } ?> <?=Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($item->price)));?>

<?php } ?>

<?php foreach ($this->sumRows as $row) { ?>
<?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($row['text']));?> <?=Kwf_Util_HtmlSpecialChars::filter($this->money($row['amount'],''));?>
<?=Kwf_Util_HtmlSpecialChars::filter($this->data->trlStaticExecute($row['text']));?> <?=Kwf_Util_HtmlSpecialChars::filter(strip_tags($this->money($row['amount'],'')));?>

<?php } ?>
2 changes: 1 addition & 1 deletion KwcShop/Kwc/Shop/Cart/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public function getPlaceholders()
{
$ret = array();
$m = new Kwf_View_Helper_Money();
$ret['total'] = $m->money($this->getTotal());
$ret['total'] = strip_tags($m->money($this->getTotal()));
$ret['orderNumber'] = $this->order_number;

$plugins = $this->getModel()->getShopCartPlugins();
Expand Down