From 0e14d5390fcb3154bd677bb7ad24872ee1221159 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 22 Apr 2018 09:12:01 +0100 Subject: [PATCH] Minor fixes --- application/controllers/Item_kits.php | 5 +- application/libraries/Sale_lib.php | 2 +- application/views/sales/invoice.php | 15 ++-- application/views/sales/quote.php | 86 ++++++++++---------- application/views/sales/quote_email.php | 10 +-- application/views/sales/receipt_default.php | 34 ++++---- application/views/sales/receipt_email.php | 30 +++---- application/views/sales/work_order.php | 71 ++++++++-------- application/views/sales/work_order_email.php | 7 +- 9 files changed, 133 insertions(+), 127 deletions(-) diff --git a/application/controllers/Item_kits.php b/application/controllers/Item_kits.php index 4094c38fa..bf7e8ecd7 100644 --- a/application/controllers/Item_kits.php +++ b/application/controllers/Item_kits.php @@ -29,7 +29,8 @@ class Item_kits extends Secure_Controller $item_kit->total_cost_price += $item_info->cost_price * $item_kit_item['quantity']; - if($item_kit->price_option == PRICE_OPTION_ALL || ($item_kit->price_option == PRICE_OPTION_KIT_STOCK && $item_info->stock_type == HAS_STOCK )) { + if($item_kit->price_option == PRICE_OPTION_ALL || ($item_kit->price_option == PRICE_OPTION_KIT_STOCK && $item_info->stock_type == HAS_STOCK )) + { $item_kit->total_unit_price += $item_info->unit_price * $item_kit_item['quantity']; } } @@ -58,8 +59,6 @@ class Item_kits extends Secure_Controller $sort = $this->input->get('sort'); $order = $this->input->get('order'); - error_log('>>>search started'); - $item_kits = $this->Item_kit->search($search, $limit, $offset, $sort, $order); $total_rows = $this->Item_kit->get_found_rows($search); diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index d342002e2..61ca5d259 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -802,7 +802,7 @@ class Sale_lib } else { - if ($print_option != NULL) + if($print_option != NULL) { $print_option_selected = $print_option; } diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php index 579a6c6cc..51ef0670a 100755 --- a/application/views/sales/invoice.php +++ b/application/views/sales/invoice.php @@ -108,8 +108,8 @@ $(document).ready(function() lang->line('sales_quantity'); ?> lang->line('sales_price'); ?> lang->line('sales_discount'); ?> - 0): ?> - lang->line('sales_customer_discount');?> + 0): ?> + lang->line('sales_customer_discount');?> lang->line('sales_total'); ?> @@ -119,7 +119,7 @@ $(document).ready(function() { if($item['print_option'] == PRINT_YES) { - ?> + ?> @@ -130,7 +130,7 @@ $(document).ready(function() - 0): ?> + 0): ?> @@ -140,8 +140,9 @@ $(document).ready(function() + if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description'])) + { + ?> @@ -149,7 +150,7 @@ $(document).ready(function() -
 
Appconfig->get('receipt_show_company_name')) + if($this->Appconfig->get('receipt_show_company_name')) { ?>
config->item('company'); ?>
@@ -108,8 +108,8 @@ if (isset($error_message)) lang->line('sales_quantity'); ?> lang->line('sales_price'); ?> lang->line('sales_discount'); ?> - 0): ?> - lang->line('sales_customer_discount');?> + 0): ?> + lang->line('sales_customer_discount');?> lang->line('sales_total'); ?> @@ -117,42 +117,42 @@ if (isset($error_message)) $item) { - if($item['print_option'] == PRINT_YES) - { - ?> - - - - - - - - 0): ?> - - - - - - - - + ?> - - -
+ + + + + + + 0): ?> + + + + - + + + + + +
+ + + @@ -218,22 +218,24 @@ if (isset($error_message)) // install firefox addon in order to use this plugin if (window.jsPrintSetup) { - Appconfig->get('print_header')) + Appconfig->get('print_header')) { ?> - // set page header - jsPrintSetup.setOption('headerStrLeft', ''); - jsPrintSetup.setOption('headerStrCenter', ''); - jsPrintSetup.setOption('headerStrRight', ''); + // set page header + jsPrintSetup.setOption('headerStrLeft', ''); + jsPrintSetup.setOption('headerStrCenter', ''); + jsPrintSetup.setOption('headerStrRight', ''); Appconfig->get('print_footer')) + + if(!$this->Appconfig->get('print_footer')) { ?> - // set empty page footer - jsPrintSetup.setOption('footerStrLeft', ''); - jsPrintSetup.setOption('footerStrCenter', ''); - jsPrintSetup.setOption('footerStrRight', ''); + // set empty page footer + jsPrintSetup.setOption('footerStrLeft', ''); + jsPrintSetup.setOption('footerStrCenter', ''); + jsPrintSetup.setOption('footerStrRight', ''); diff --git a/application/views/sales/quote_email.php b/application/views/sales/quote_email.php index 8ca6a5190..578922d59 100644 --- a/application/views/sales/quote_email.php +++ b/application/views/sales/quote_email.php @@ -72,8 +72,8 @@ lang->line('sales_quantity'); ?> lang->line('sales_price'); ?> lang->line('sales_discount'); ?> - 0): ?> - lang->line('sales_customer_discount');?> + 0): ?> + lang->line('sales_customer_discount');?> lang->line('sales_total'); ?> @@ -83,19 +83,19 @@ { if($item['print_option'] == PRINT_YES) { - ?> + ?> - 0): ?> + 0): ?> - diff --git a/application/views/sales/receipt_default.php b/application/views/sales/receipt_default.php index 9c1bd2848..f2cbc2407 100644 --- a/application/views/sales/receipt_default.php +++ b/application/views/sales/receipt_default.php @@ -67,7 +67,7 @@ { if($item['print_option'] == PRINT_YES) { - ?> + ?> @@ -76,29 +76,31 @@ config->item('receipt_show_description')) { - ?> - - config->item('receipt_show_description')) + { ?> + config->item('receipt_show_serialnumber')) { - ?> + } + + if($this->config->item('receipt_show_serialnumber')) + { + ?> - 0) { - ?> + if($item['discount'] > 0) + { + ?> lang->line("sales_discount_included") ?> - - - lang->line('sales_giftcard_balance'); ?> - - + + lang->line('sales_giftcard_balance'); ?> + + diff --git a/application/views/sales/receipt_email.php b/application/views/sales/receipt_email.php index 2115c0e51..a8e0c04b1 100644 --- a/application/views/sales/receipt_email.php +++ b/application/views/sales/receipt_email.php @@ -62,7 +62,7 @@ { if($item['print_option'] == PRINT_YES) { - ?> + ?> @@ -71,32 +71,34 @@ config->item('receipt_show_description')) { - ?> - - config->item('receipt_show_description')) + { ?> + config->item('receipt_show_serialnumber')) { - ?> + } + + if($this->config->item('receipt_show_serialnumber')) + { + ?> - 0) { - ?> + if($item['discount'] > 0) + { + ?> - lang->line("sales_discount_included") ?> + lang->line("sales_discount_included") ?> - config->item('receipt_show_total_discount') && $discount > 0) { ?> diff --git a/application/views/sales/work_order.php b/application/views/sales/work_order.php index 9ead64341..47d5de5a4 100644 --- a/application/views/sales/work_order.php +++ b/application/views/sales/work_order.php @@ -1,7 +1,7 @@ load->view("partial/header"); ?> ".$error_message.""; exit; @@ -50,9 +50,9 @@ if (isset($error_message)) + ?> - @@ -61,18 +61,18 @@ if (isset($error_message)) Appconfig->get('company_logo') != '') { - ?> + ?> company_logo -
 
Appconfig->get('receipt_show_company_name')) + if($this->Appconfig->get('receipt_show_company_name')) { - ?> + ?>
config->item('company'); ?>
- @@ -90,13 +90,16 @@ if (isset($error_message)) + if($print_price_info) + { + ?> lang->line('sales_amount_due'); ?> - + @@ -118,27 +121,22 @@ if (isset($error_message)) - - - - - - + + + + - + ?> - -
- +
- Appconfig->get('print_header')) + Appconfig->get('print_header')) { ?> - // set page header - jsPrintSetup.setOption('headerStrLeft', ''); - jsPrintSetup.setOption('headerStrCenter', ''); - jsPrintSetup.setOption('headerStrRight', ''); + // set page header + jsPrintSetup.setOption('headerStrLeft', ''); + jsPrintSetup.setOption('headerStrCenter', ''); + jsPrintSetup.setOption('headerStrRight', ''); Appconfig->get('print_footer')) + + if(!$this->Appconfig->get('print_footer')) { ?> - // set empty page footer - jsPrintSetup.setOption('footerStrLeft', ''); - jsPrintSetup.setOption('footerStrCenter', ''); - jsPrintSetup.setOption('footerStrRight', ''); + // set empty page footer + jsPrintSetup.setOption('footerStrLeft', ''); + jsPrintSetup.setOption('footerStrCenter', ''); + jsPrintSetup.setOption('footerStrRight', ''); diff --git a/application/views/sales/work_order_email.php b/application/views/sales/work_order_email.php index 7eb069a11..29aac70b9 100644 --- a/application/views/sales/work_order_email.php +++ b/application/views/sales/work_order_email.php @@ -22,7 +22,8 @@ @@ -89,7 +90,7 @@ -