diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index 3ef212b11..a559403e8 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -6,12 +6,13 @@
+
".$error_message."";
- exit;
- }
+if(isset($error_message))
+{
+ echo "
@@ -76,9 +77,9 @@
if($discount > 0)
{
$invoice_columns = $invoice_columns + 1;
- ?>
+ ?>
lang->line('sales_customer_discount'); ?> |
-
lang->line('sales_total'); ?> |
@@ -89,19 +90,19 @@
{
if($item['print_option'] == PRINT_YES)
{
- ?>
-
- |
- |
- |
- |
- |
- 0): ?>
- |
-
- |
-
-
+
+ |
+ |
+ |
+ |
+ |
+ 0): ?>
+ |
+
+ |
+
+
@@ -134,6 +135,51 @@
lang->line('sales_total'); ?> |
|
+
+ $payment)
+ {
+ $only_sale_check |= $payment['payment_type'] == $this->lang->line('sales_check');
+ $splitpayment = explode(':', $payment['payment_type']);
+ $show_giftcard_remainder |= $splitpayment[0] == $this->lang->line('sales_giftcard');
+ ?>
+
+ | |
+ |
+ |
+
+
+
+
+
+ | |
+ |
+ |
+
+
+
+
+
+ | |
+ lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> |
+ |
+
+
diff --git a/public/css/invoice_email.css b/public/css/invoice_email.css
index b013d32d4..02de3aee2 100644
--- a/public/css/invoice_email.css
+++ b/public/css/invoice_email.css
@@ -5,11 +5,11 @@
*/
#menubar, #footer { display: none; }
* { margin: 0; padding: 0; }
-body { font-family: Helvetica; font-size: 13px; }
+body { font-family: DejaVu Sans, Helvetica, Sans-Serif; font-size: 13px; }
#page-wrap { width: 750px; margin: 0 auto; }
-pre { font-family: Helvetica; font-size: 13px; }
+pre { font-family: DejaVu Sans, Helvetica, Sans-Serif; font-size: 13px; }
-#page-wrap { font-family: Helvetica; }
+#page-wrap { font-family: DejaVu Sans, Helvetica, Sans-Serif; }
#page-wrap table { border-collapse: collapse; }
#page-wrap table#items td { padding: 10px; }
#page-wrap #meta table td, #page-wrap table th { border: 1px solid black; padding: 5px; }
@@ -39,7 +39,7 @@ pre { font-family: Helvetica; font-size: 13px; }
#items { width: 100%; border: 1px solid black; }
#items th { background: #eee; }
#items tr.item-row td { border: 0; vertical-align: top; }
-#items td { font-family: DejaVu Sans; }
+#items td { font-family: DejaVu Sans, Helvetica, Sans-Serif; }
#items td.description { width: 300px; }
#items td.item-name { width: 175px; }
#items td.total-line { text-align: right; border-width: 1px 0 1px 1px; border-style: solid; }
@@ -49,7 +49,7 @@ pre { font-family: Helvetica; font-size: 13px; }
#items td.blank { border: 0; }
#terms { text-align: center; margin: 20px 0; }
-#terms h5 { border-bottom: 1px solid black; font: 13px Helvetica, Sans-Serif; padding: 8px 0; margin: 8px 0; line-height: 1.3em; }
+#terms h5 { border-bottom: 1px solid black; font: 13px DejaVu Sans, Helvetica, Sans-Serif; padding: 8px 0; margin: 8px 0; line-height: 1.3em; }
.delete-wpr { position: relative; }
.delete { display: block; color: #000; text-decoration: none; position: absolute; background: #EEEEEE; font-weight: bold; padding: 0px 3px; border: 1px solid; top: -6px; left: -22px; font-family: Verdana; font-size: 12px; }