From 1b5fe78f333b440296e2be9854e5650cb3f54ac2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 21 Dec 2017 20:12:43 +0530
Subject: [PATCH] attachment in purchase

---
 application/models/dahsboard_model.php       |  6 ++++--
 application/views/Report_purchase_inward.php | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index df67fa36..80c1ac64 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -1270,13 +1270,14 @@ ifnull(sum(pl.Quantity * pl.Rate),0)))
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
-- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total
+- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file
  FROM T_PurchaseOrder_Master pm
 left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO
 left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
 left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
 left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo 
+left join T_PurchaseOrder_BillUpload pb on pb.PONO=pm.PONO
 where pm.Status != 'ST030' and  pm.PONO in (select PONO from T_IGR_Master) ";
 
 if ($cname!= ''){
@@ -1348,13 +1349,14 @@ ifnull(sum(pl.Quantity * pl.Rate),0)))
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterIGST),sum(distinct st.After_IGST)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterFreightValue),sum(distinct st.AfterFreightValue)),0) 
 + ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterPackagingValue),0),0)
-- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total
+- ifnull(if(POType = 'REVENUE',sum(distinct rt.AfterDiscount),sum(distinct st.Afterdiscountval)),0)),2) as total,pb.FilePath as file
  FROM T_PurchaseOrder_Master pm
 left join T_PurchaseOrder_LineItem pl on pl.PONO = pm.PONO
 left join T_MaterialMaster mm on mm.MaterialCode = pl.MaterialCode
 left join T_SupplierDetailsN sd on sd.SupplierID = pm.SupplierID
 left join T_Service_Tax st on st.LineItemNo = pl.LineItemNo 
 left join T_Revenue_Tax rt on rt.LineItemNo = pl.LineItemNo 
+left join T_PurchaseOrder_BillUpload pb on pb.PONO=pm.PONO
 where 
 pm.Status != 'ST030'  ";
 
diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php
index 2154a07a..0640ab91 100755
--- a/application/views/Report_purchase_inward.php
+++ b/application/views/Report_purchase_inward.php
@@ -17,6 +17,8 @@ if(!empty($mms))
 </script>
 <link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
+
+  
       <style> 
           .dataTables_filter input {padding: 4px;}
          .dataTables_filter {
@@ -297,7 +299,18 @@ if(!empty($mms))
 						echo $rel->Package;?></span></td>
 						<td style="text-align:right"><span><?php 
 						$tot_tot= $tot_tot + round($rel->total,2);
-						echo number_format($rel->total,2,'.','');?></span></td>
+						?>
+						<?php 
+						if(!empty($rel->file)){ ?>
+						<a target="_blank" href="<?php echo  base_url().'uploads/BillFiles/'?><?php echo $rel->file ?>" data-toggle="tooltip" data-placement="left" title="Attachment Available for Download/View"><?php echo number_format($rel->total,2,'.','');?></a>	
+						<?php
+						}else
+						{
+							echo number_format($rel->total,2,'.','');
+						}
+						?>
+						
+						</span></td>
 					   
 					   
 					
@@ -539,7 +552,9 @@ $(document).ready(function() {
 	 $('#mySelect').val('');
 	
 }
-
+$(document).ready(function(){
+    $('[data-toggle="tooltip"]').tooltip();   
+});
 	</script>