Receipt totals layout improvement (show top border when no discount or

tax section present)
Remove unexistant script include from invoice_email template
This commit is contained in:
jekkos
2015-04-06 15:38:52 +02:00
parent 04abb716fa
commit 43ecda44e0
2 changed files with 3 additions and 3 deletions

View File

@@ -4,7 +4,6 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/invoice_email.css"/>
<script src="<?php echo base_url();?>js/jquery-1.4.4.min.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
</head>
<body>
<?php

View File

@@ -108,9 +108,10 @@ if (isset($error_message))
<?php endif; ?>
<tr>
</tr>
<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('show_total_discount') && $discount > 0)); ?>
<tr>
<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_total'); ?></td>
<td style='text-align:right'><?php echo to_currency($total); ?></td>
<td colspan="3" style='<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right;'><?php echo $this->lang->line('sales_total'); ?></td>
<td style='<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right'><?php echo to_currency($total); ?></td>
</tr>
<tr><td colspan="4">&nbsp;</td></tr>