+
@@ -84,7 +86,7 @@
?>
0)
+ if($item['discount'] > 0)
{
?>
@@ -97,11 +99,11 @@
-
+
config->item('receipt_show_total_discount') && $discount > 0)
+ if($this->config->item('receipt_show_total_discount') && $discount > 0)
{
- ?>
+ ?>
| lang->line('sales_sub_total'); ?> |
|
@@ -115,9 +117,9 @@
?>
config->item('receipt_show_taxes'))
+ if($this->config->item('receipt_show_taxes'))
{
- ?>
+ ?>
| lang->line('sales_sub_total'); ?> |
|
@@ -139,8 +141,8 @@
-
- config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
+
+ config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
| lang->line('sales_total'); ?> |
|
@@ -154,7 +156,7 @@
$only_sale_check = FALSE;
$show_giftcard_remainder = FALSE;
foreach($payments as $payment_id=>$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');
@@ -171,15 +173,15 @@
|
-
| lang->line('sales_giftcard_balance'); ?> |
|
-
diff --git a/application/views/sales/receipt_email.php b/application/views/sales/receipt_email.php
index 3f08b5e1b..5bd1b5453 100644
--- a/application/views/sales/receipt_email.php
+++ b/application/views/sales/receipt_email.php
@@ -1,17 +1,19 @@
-
+
@@ -40,7 +42,7 @@
lang->line('sales_id').": ".$sale_id; ?>
lang->line('employees_employee').": ".$employee; ?>
-
+
@@ -51,7 +53,7 @@
| lang->line('sales_total'); ?> |
$item)
+ foreach($cart as $line=>$item)
{
?>
@@ -79,7 +81,7 @@
?>
0)
+ if($item['discount'] > 0)
{
?>
@@ -92,11 +94,11 @@
-
+
config->item('receipt_show_total_discount') && $discount > 0)
+ if($this->config->item('receipt_show_total_discount') && $discount > 0)
{
- ?>
+ ?>
| lang->line('sales_sub_total'); ?> |
|
@@ -110,20 +112,20 @@
?>
config->item('receipt_show_taxes'))
+ if($this->config->item('receipt_show_taxes'))
{
- ?>
+ ?>
| lang->line('sales_sub_total'); ?> |
- config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?> |
+ |
$value)
+ foreach($taxes as $tax_group_index=>$sales_tax)
{
?>
- | : |
- |
+ : |
+ |
-
- config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
+
+ config->item('receipt_show_taxes') && !($this->config->item('receipt_show_total_discount') && $discount > 0)); ?>
| lang->line('sales_total'); ?> |
|
@@ -149,7 +151,7 @@
$only_sale_check = FALSE;
$show_giftcard_remainder = FALSE;
foreach($payments as $payment_id=>$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');
@@ -166,22 +168,22 @@
|
-
| lang->line('sales_giftcard_balance'); ?> |
|
-
| lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> |
|
-
+
| |
@@ -192,7 +194,7 @@
-
+

diff --git a/application/views/sales/receipt_short.php b/application/views/sales/receipt_short.php
index e7034c706..ca35ab60c 100644
--- a/application/views/sales/receipt_short.php
+++ b/application/views/sales/receipt_short.php
@@ -1,17 +1,19 @@