From 3bd4a726e16caf97a35fa323e2b97da3c7e70874 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 2 Aug 2017 14:14:01 +0530
Subject: [PATCH] store requisition

---
 application/models/storerequistion_model.php |  3 ++-
 application/views/editstorerequisition.php   | 12 +++++++++++-
 application/views/issueStoreRequistion.php   | 20 +++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/application/models/storerequistion_model.php b/application/models/storerequistion_model.php
index fcfc42fe..37ab3d01 100755
--- a/application/models/storerequistion_model.php
+++ b/application/models/storerequistion_model.php
@@ -389,10 +389,11 @@ $this->db->select('StoreReqNo,Sr.CostCenterCode,Cc.CostCenterName
     function getRequistItemList($StoreReqNo)
     {
         
-            $subQuery = ' select  Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.QuantityIssued,Str.Remarks,Str.StoreComments,Mat.MaterialName,Mat.UOM,Ss.StatusName
+           $subQuery = ' select  Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.QuantityIssued,Str.Remarks,Str.StoreComments,Mat.MaterialName,Mat.UOM,Ss.StatusName,St.Status,St.Quantity 
         from T_Store_Requestion_Details Str
         join T_MaterialMaster Mat  on Mat.MaterialCode = Str.MaterialCode 
         join T_Status Ss on Ss.StatusCode = Str.Status
+        join T_Store_Stockdetails St on St.MaterialCode=Str.MaterialCode
         where Str.StoreReqNo =?';
 
 
diff --git a/application/views/editstorerequisition.php b/application/views/editstorerequisition.php
index f2e8f199..b23f2462 100755
--- a/application/views/editstorerequisition.php
+++ b/application/views/editstorerequisition.php
@@ -397,7 +397,12 @@ $(function() {
   <a class="btn btn-primary"  href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
   <a class="btn btn-primary Save"  ID="submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Update</span></a> 
    
-	<?php } ?>
+	<?php } 
+elseif ($StatusCode==STORE_APPROVAL) 
+{?>
+
+ <a class="btn btn-primary Save"  ID="submit" onclick="Redirect()" >&nbsp;&nbsp;<span class="bold">OK</span></a> 
+ <?php }?>
 	
    
 			</div>
@@ -795,6 +800,11 @@ function validateBeforeAdd()
 }
 
 
+function Redirect()
+{
+    window.location =	"storerequisition";
+}
+
 
 
 function Save(status)
diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php
index eeb3cc3a..624a81d9 100755
--- a/application/views/issueStoreRequistion.php
+++ b/application/views/issueStoreRequistion.php
@@ -59,6 +59,11 @@ $(function() {
 	.dataTables_wrapper {
     padding-bottom: 0px ! important;
 }
+
+
+span.highlight {
+    background-color: yellow;
+}
 </style>
 <div class="content-wrapper" style="min-height: 500px ! important;">
   <!-- Content Header (Page header) -->
@@ -67,6 +72,7 @@ $(function() {
        <center>Siddharth Industries - Store Requisition - <?php echo $StoreReqNo; ?></center>
         
       </h1>
+
     </section>
     <section class="content">
     <div class="row" style="padding:2% 5%">
@@ -133,7 +139,7 @@ $(function() {
  <div class="  container-fluid">
   <div class="box-header">
                  <CENTER><h3 class="box-title"> </h3></CENTER>
-                   
+              <span class="highlight">Available Stock Shown In Red Are Out Of Stock</span>            
                 </div>
 			 <table id="Items" class="table table-bordered table-hover editableTable"  style="background-color:#fff;font-size:12px;"> 
                 <thead style="background-color: #CFCFCF;">
@@ -142,6 +148,7 @@ $(function() {
                     <th>Description</th>
                     <th>UOM</th>
                     <th>Requested Quantity</th>
+                    <th>Available Stock</th>
 					<th>Requester Remarks</th>
 					<th>Issued Quantity</th>                    
                     <th>Comments</th>
@@ -168,6 +175,17 @@ $(function() {
 					<td align="left"><?php echo $record->UOM  ?></td>
   
 					<td align="right"><?php echo $record->QuantityRequired ?></td>
+					<?php if($record->Status==0)
+					      {?>
+                    <td align="right" style="color: red"><?php echo $record->Quantity?></td>
+					      	<?
+					      	}?>
+					<?php if($record->Status==1)  
+					        {?>    	
+                    <td align="right"><?php echo $record->Quantity?></td>
+                            <?
+                            }?>
+					
 					 <td align="left"><?php echo $record->Remarks  ?></td> 
 					<td align="left"> <input type="text" onchange="SaveIssueQuantity(<?php echo $index ?>,<?php echo  $record->QuantityRequired ?>)" id="<?php echo 'issuedQuantity'.$index ?>"  name="<?php echo 'issuedQuantity'.$index ?>"  class="form required"  onkeypress="return isNumberKey(event);"value="<?php echo $record->QuantityIssued; ?>"> 
 						   </td>