diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php index c0634e2c0..003a8518c 100755 --- a/application/views/sales/invoice.php +++ b/application/views/sales/invoice.php @@ -1,7 +1,7 @@ load->view("partial/header"); ?> ".$error_message.""; exit; @@ -68,7 +68,7 @@ $(document).ready(function() ?>
 
Appconfig->get('receipt_show_company_name')) + if($this->Appconfig->get('receipt_show_company_name')) { ?>
config->item('company'); ?>
@@ -219,9 +219,9 @@ $(document).ready(function() $(window).on("load", function() { // install firefox addon in order to use this plugin - if (window.jsPrintSetup) + if(window.jsPrintSetup) { - Appconfig->get('print_header')) + Appconfig->get('print_header')) { ?> // set page header @@ -231,7 +231,7 @@ $(window).on("load", function() Appconfig->get('print_footer')) + if(!$this->Appconfig->get('print_footer')) { ?> // set empty page footer diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php index e0150cb23..1e21e09fc 100644 --- a/application/views/sales/invoice_email.php +++ b/application/views/sales/invoice_email.php @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ ".$error_message.""; exit; @@ -19,10 +19,10 @@ if (isset($error_message)) - 0) + 0) { ?> -
lang->line('common_date'); ?>
lang->line('sales_amount_due'); ?>
@@ -62,16 +62,15 @@ if (isset($error_message)) - - - - - - - - - - + + + + + + + + $item) { ?> @@ -89,26 +88,31 @@ if (isset($error_message)) - - - - - - - $value) { ?> - - - - - - - - - - - + + + + + + + $sales_tax) + { + ?> + + + + + + + + + + +
lang->line('sales_item_number'); ?>lang->line('sales_item_name'); ?>lang->line('sales_quantity'); ?>lang->line('sales_price'); ?>lang->line('sales_discount'); ?>lang->line('sales_total'); ?>
lang->line('sales_item_number'); ?>lang->line('sales_item_name'); ?>lang->line('sales_quantity'); ?>lang->line('sales_price'); ?>lang->line('sales_discount'); ?>lang->line('sales_total'); ?>
lang->line('sales_sub_total'); ?>
lang->line('sales_total'); ?>
lang->line('sales_sub_total'); ?>
lang->line('sales_total'); ?>
- +
diff --git a/application/views/sales/receipt_default.php b/application/views/sales/receipt_default.php index 40e0b9a7b..ea9d13d1f 100644 --- a/application/views/sales/receipt_default.php +++ b/application/views/sales/receipt_default.php @@ -1,17 +1,19 @@
config->item('company_logo') != '') - { + if($this->config->item('company_logo') != '') + { ?> -
company_logo
+
+ company_logo +
config->item('receipt_show_company_name')) - { + if($this->config->item('receipt_show_company_name')) + { ?>
config->item('company'); ?>
- +
lang->line('sales_id').": ".$sale_id; ?>
-
lang->line('sales_invoice_number').": ".$invoice_number; ?>
- lang->line('sales_invoice_number').": ".$invoice_number; ?>
+ @@ -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 @@
config->item('company_logo') != '') - { + if($this->config->item('company_logo') != '') + { ?> -
company_logo
+
+ company_logo +
config->item('receipt_show_company_name')) - { + if($this->config->item('receipt_show_company_name')) + { ?>
config->item('company'); ?>
- +
@@ -40,7 +42,7 @@
lang->line('sales_id').": ".$sale_id; ?>
lang->line('employees_employee').": ".$employee; ?>
- +
@@ -51,7 +53,7 @@ $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) { - ?> + ?> @@ -110,20 +112,20 @@ ?> config->item('receipt_show_taxes')) + if($this->config->item('receipt_show_taxes')) { - ?> + ?> - + $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)); ?> @@ -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 @@ - - - + @@ -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 @@
config->item('company_logo') != '') - { + if($this->config->item('company_logo') != '') + { ?> -
company_logo
+
+ company_logo +
config->item('receipt_show_company_name')) - { + if($this->config->item('receipt_show_company_name')) + { ?>
config->item('company'); ?>
- +
lang->line('sales_id').": ".$sale_id; ?>
lang->line('sales_invoice_number').": ".$invoice_number; ?>
- @@ -55,7 +57,7 @@
$item) + foreach($cart as $line=>$item) { ?> @@ -85,7 +87,7 @@ ?> 0) + if($item['discount'] > 0) { ?> @@ -98,11 +100,11 @@ - + config->item('receipt_show_total_discount') && $discount > 0) + if($this->config->item('receipt_show_total_discount') && $discount > 0) { - ?> + ?> @@ -116,12 +118,12 @@ ?> config->item('receipt_show_taxes')) + if($this->config->item('receipt_show_taxes')) { - ?> + ?> - + $sales_tax) @@ -140,8 +142,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)); ?> @@ -152,7 +154,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'); @@ -165,15 +167,15 @@ } ?> - -
lang->line('sales_total'); ?>
lang->line('sales_sub_total'); ?>
lang->line('sales_sub_total'); ?>config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?>
::
lang->line('sales_total'); ?>  
lang->line('sales_giftcard_balance'); ?>
lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?>
 
lang->line('sales_total'); ?>
lang->line('sales_sub_total'); ?>
lang->line('sales_sub_total'); ?>config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?>
lang->line('sales_total'); ?>
lang->line('sales_giftcard_balance'); ?>