From 5e97358e908edc8e592a850716c59cbfe16a4ff1 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Mon, 14 Mar 2016 19:54:46 +0000
Subject: [PATCH] enable jsPrint in receipt, invoice and Takings (sales/manage)
 (#394)

---
 application/helpers/table_helper.php        |  6 +--
 application/views/partial/print_receipt.php | 44 ++++++++++++---------
 application/views/sales/invoice.php         | 10 ++---
 application/views/sales/manage.php          |  4 +-
 application/views/sales/receipt.php         |  4 +-
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php
index 1c84ad3fe..e8917f403 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -77,9 +77,9 @@ function get_sales_manage_sale_data_row($sale, $controller)
 	$table_data_row.='<td width="8%">'.to_currency( $sale['change_due'] ).'</td>';
 	$table_data_row.='<td width="12%">'.$sale['payment_type'].'</td>';
 	$table_data_row.='<td width="8%">'.$sale['invoice_number'].'</td>';
-	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/edit/" . $sale['sale_id'], '<span class="glyphicon glyphicon-edit"></span>', array('class'=>'modal-dlg modal-btn-delete modal-btn-submit', 'title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
-	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/receipt/" . $sale['sale_id'], '<span class="glyphicon glyphicon-print"></span>', array('title'=>$CI->lang->line('sales_show_receipt'))).'</td>';
-	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/invoice/" . $sale['sale_id'], '<span class="glyphicon glyphicon-list-alt"></span>', array('title'=>$CI->lang->line('sales_show_invoice'))).'</td>';
+	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/edit/" . $sale['sale_id'], '<span class="glyphicon glyphicon-edit"></span>', array('class'=>'modal-dlg modal-btn-delete modal-btn-submit print_hide', 'title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
+	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/receipt/" . $sale['sale_id'], '<span class="glyphicon glyphicon-print"></span>', array('class'=>'print_hide', 'title'=>$CI->lang->line('sales_show_receipt'))).'</td>';
+	$table_data_row.='<td width="5%" class="print_hide">'.anchor($controller_name."/invoice/" . $sale['sale_id'], '<span class="glyphicon glyphicon-list-alt"></span>', array('class'=>'print_hide', 'title'=>$CI->lang->line('sales_show_invoice'))).'</td>';
 	$table_data_row.='</tr>';
 
 	return $table_data_row;
diff --git a/application/views/partial/print_receipt.php b/application/views/partial/print_receipt.php
index 0450b4cae..bcfdcaf75 100644
--- a/application/views/partial/print_receipt.php
+++ b/application/views/partial/print_receipt.php
@@ -1,11 +1,8 @@
-<?php if ($print_after_sale)
-{
-?>
 <script type="text/javascript">
-$(window).load(function()
+function printdoc()
 {
 	// receipt layout sanity check
-	if ( $("#receipt_items, #items").length > 0) 
+	if ( $("#receipt_items, #items, #table_holder").length > 0) 
 	{
 		// install firefox addon in order to use this plugin
 		if (window.jsPrintSetup) 
@@ -19,19 +16,19 @@ $(window).load(function()
 			<?php if (!$this->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', '');
 			<?php 
 			}
 			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', '');
 			<?php 
 			} 
 			?>
@@ -50,8 +47,8 @@ $(window).load(function()
 					<?php if (!$this->Appconfig->get('print_silently')) 
 					{
 					?>
-					// Suppress print dialog (for this context only)
-					jsPrintSetup.setOption('printSilent', 1);
+						// Suppress print dialog (for this context only)
+						jsPrintSetup.setOption('printSilent', 1);
 					<?php 
 					}
 					?>
@@ -61,15 +58,24 @@ $(window).load(function()
 					jsPrintSetup.print();
 				}
 			}
-		
 		}
 		else
 		{
 			window.print();
 		}
 	}
-});
-</script>
+}
+
+<?php 
+if($print_after_sale)
+{
+?>
+	$(window).load(function() 
+	{
+	   // executes when complete page is fully loaded, including all frames, objects and images
+	   printdoc();
+	}); 
 <?php
 }
-?>
\ No newline at end of file
+?>
+</script>
\ No newline at end of file
diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 94b82c663..f3a49d7c0 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -8,11 +8,11 @@ if (isset($error_message))
 }
 ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
+<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'invoice_printer')); ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:window.print()"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo $this->lang->line('common_print'); ?></div></a>
-	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("#", $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo $this->lang->line('common_print'); ?></div></a>
+	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
 	<?php echo anchor("sales", $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
 	<?php echo anchor("sales/manage", $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>
 </div>
@@ -25,7 +25,7 @@ if (isset($error_message))
 			if(isset($customer))
 			{
 			?>
-				<textarea id="customer" rows="5" cols="6"><?=$customer_info ?></textarea>
+				<textarea id="customer" rows="5" cols="6"><?php echo $customer_info ?></textarea>
 			<?php
 			}
 			?>
@@ -51,7 +51,7 @@ if (isset($error_message))
 	<div class="clearfix"></div>
 
 	<div id="block2">
-       	<textarea id="company-title" rows="5" cols="20"><?=$company_info?></textarea>
+       	<textarea id="company-title" rows="5" cols="20"><?php echo $company_info ?></textarea>
         <table id="meta">
             <tr>
                 <td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php
index 26e583e90..ded34348b 100755
--- a/application/views/sales/manage.php
+++ b/application/views/sales/manage.php
@@ -197,9 +197,11 @@ function init_table_sorting()
 }
 </script>
 
+<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'manage_printer')); ?>
+
 <div id="title_bar">
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('sales_receipt_number'); ?></div>
-	<a href="javascript:window.print()"><div class="btn btn-info btn-sm pull-right print_hide"><?php echo $this->lang->line('common_print'); ?></div></a>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm pull-right print_hide"><?php echo $this->lang->line('common_print'); ?></div></a>
 </div>
 
 <div id="pagination"><?= $links ?></div>
diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php
index aaea9ad15..16df130c3 100644
--- a/application/views/sales/receipt.php
+++ b/application/views/sales/receipt.php
@@ -8,10 +8,10 @@ if (isset($error_message))
 }
 ?>
 
-<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 'selected_printer'=>'receipt_printer')); ?>
+<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>$print_after_sale, 'selected_printer'=>'receipt_printer')); ?>
 
 <div class="print_hide" id="control_buttons" style="text-align:right">
-	<a href="javascript:window.print()"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo $this->lang->line('common_print'); ?></div></a>
+	<a href="javascript:printdoc();"><div class="btn btn-info btn-sm", id="show_print_button"><?php echo $this->lang->line('common_print'); ?></div></a>
 	<?php /* this line will allow to print and go back to sales automatically.... echo anchor("sales", $this->lang->line('common_print'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_print_button', 'onclick'=>'window.print();')); */ ?>
 	<?php echo anchor("sales", $this->lang->line('sales_register'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_sales_button')); ?>
 	<?php echo anchor("sales/manage", $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>