From 8743ebea834e8ec50c7daa3c79ee3c99e090cb2d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 4 Jul 2017 15:56:27 +0530
Subject: [PATCH] po edit changes

---
 application/controllers/purchaseorder.php     |  2 +-
 application/models/purchaseorder_model.php    | 25 +++++++++++++------
 .../views/EditservicePurchaseorder.php        | 22 ++++++++--------
 .../views/editRevenuepurchaseorder.php        | 20 +++++++--------
 application/views/editimportpo.php            | 25 +++++++++++--------
 application/views/importpo.php                |  2 +-
 application/views/purchaseorder.php           |  2 +-
 application/views/servicePurchaseorder.php    |  2 +-
 8 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index ae1eb55e..416ecfd6 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -115,7 +115,7 @@ class purchaseorder extends BaseController
 			$data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); 
 			$data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
 			$data['Suplist'] = $this->purchaseorder_model->getSupplierName(); 
-			$data['Payment']=$this->purchaseorder_model->getSupplierPayment();
+			$data['Payment']=$this->purchaseorder_model->getSupplierPayment('C009');
 			$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
 			
                 
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index 34f5d776..1e4233b6 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -600,15 +600,26 @@ function GetImportPurchaseOrderDetailsForPDF($PONO = '')
 
 
 
-	function getSupplierPayment($Currency='')
-	{
+	// function getSupplierPayment($Currency='')
+	// {
 
-    $subQuery='select distinct PaymentTerms from T_SupplierDetailsN';
-    $query=$this->db->query($subQuery,array($Currency));
-    //print_r($this->db->last_query());
-    return $query->result();
+ //    $subQuery='select distinct PaymentTerms from T_SupplierDetailsN';
+ //    $query=$this->db->query($subQuery,array($Currency));
+ //    //print_r($this->db->last_query());
+ //    return $query->result();
 
-	}
+	// }
+
+	function getSupplierPayment($Config_ID='')
+    {
+
+  // $subQuery='select distinct PaymentTerms from T_SupplierDetailsN';
+    $subQuery='select ConfigValue from T_ConfigDetails where Config_ID=?';
+   $query=$this->db->query($subQuery,array($Config_ID));
+   //print_r($this->db->last_query());
+   return $query->result();
+
+    }
 
 	function GetWorkStatus($Config_ID='')
     {
diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php
index d0dcb3d1..ea8fae50 100755
--- a/application/views/EditservicePurchaseorder.php
+++ b/application/views/EditservicePurchaseorder.php
@@ -7,7 +7,7 @@ $DeliverOption='';
 		$PODate = '';
         
 		$DeliveryAddress ='';
-		$POStatus	 = 	'';
+		$PONOStatus	 = 	'';
 		$PONO =  	'';
 		$TotalServiceTax = 0;
 		$TotalEducessTax = 0.0;
@@ -47,7 +47,7 @@ if(!empty($POMaster))
 		$Deliverydt =  $Ddt->format('Y-m-d');
         
 		$DeliveryAddress =$Req->DeliveryAddress;
-		$POStatus	 = 	$Req->StatusCode;
+		$PONOStatus	 = 	$Req->StatusCode;
 		$PONO = 	$Req->PONO;	
 		$ServiceDescription = $Req->ServiceDescription;	
 		//$PaymentTerms=$Req->PaymentTerms;
@@ -86,10 +86,10 @@ foreach ($PaymentTerms as $TER)
 
 
 
-foreach ($POSTATUS as $PST ) 
-{
-   $POStatus=$PST->StatusName;
-}
+// foreach ($POSTATUS as $PST ) 
+// {
+//    $POStatus=$PST->StatusName;
+// }
 ?>
 
 <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@@ -1385,7 +1385,7 @@ $(document).ready(function () {
 									 <input type="hidden" name="<?php echo 'ServiceFrequency'.$index ?>" id="<?php echo 'ServiceFrequency'.$index ?>" value="<?php echo $record->ServiceFrequency ; ?>" />
 									<?php 
 											
-											if($POStatus == PO_DRAFT) 
+											if($PONOStatus == PO_DRAFT) 
 											{?>					
 									<td>    <a    data-target='#EDITSERVICE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
 									  <?php
@@ -1488,7 +1488,7 @@ $(document).ready(function () {
 								<input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
 								<input type="hidden" name="txtStatus" id="txtStatus" /> 		   
 								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />  
-								<?php if($POStatus == PO_DRAFT) {?>   
+								<?php if($PONOStatus == PO_DRAFT) {?>   
 								<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
 								<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
 								<input type="reset" class="btn btn-primary" value="Reset">
@@ -1519,8 +1519,8 @@ $(document).ready(function () {
 								 <?php
 									// $options = array("0"=>'Select Status');     
 									// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
-								 $options = array("0"=>$POStatus);     
-                                    echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+								 $options = array("0"=>$PONOStatus);     
+                                    echo form_dropdown('Status', $options,set_value('Status',$PONOStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
 								?>
 							</div><br/>
 						</div>
@@ -2279,7 +2279,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
 
          
diff --git a/application/views/editRevenuepurchaseorder.php b/application/views/editRevenuepurchaseorder.php
index 6fd38435..194bf33b 100755
--- a/application/views/editRevenuepurchaseorder.php
+++ b/application/views/editRevenuepurchaseorder.php
@@ -40,7 +40,7 @@ foreach ($PaymentTerms as $TER)
 		$PODate = '';
         $Deliverydt ='';
 		$DeliveryAddress ='';
-		$POStatus	 = 	'';
+		$PONOStatus	 = 	'';
 		$PONO =  	'';
 		$totBasicAmt  = 0;
 		$totDiscountAmt  = 0.0;
@@ -73,7 +73,7 @@ if(!empty($POMaster))
 		$Deliverydt =  $Ddt->format('Y-m-d');
 		
 		$DeliveryAddress =$Req->DeliveryAddress;
-		$POStatus	 = 	$Req->StatusCode;
+		$PONOStatus	 = 	$Req->StatusCode;
 		$PONO = 	$Req->PONO;	
 		$ServiceDescription = $Req->ServiceDescription;
 		$PayableAT=$Req->PayableAT;
@@ -96,10 +96,10 @@ if(!empty($RequistionDetails))
 }
 
 
-foreach ($POSTATUS as $PST ) 
-{
-   $POStatus=$PST->StatusName;
-}
+// foreach ($POSTATUS as $PST ) 
+// {
+//    $POStatus=$PST->StatusName;
+// }
 
 ?>
 <style>
@@ -2952,7 +2952,7 @@ body {
  <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
                     <?php 
 					        
-							if($POStatus == PO_DRAFT) 
+							if($PONOStatus == PO_DRAFT) 
 							{?>					
 					<td>    <a    data-target='#EDITREVENUE'	data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
                       <?php
@@ -3114,7 +3114,7 @@ body {
     <input type="hidden" name="txtRowCount" id="txtRowCount" />
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
    <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/> 
-	 <?php if($POStatus == PO_DRAFT) {?>   
+	 <?php if($PONOStatus == PO_DRAFT) {?>   
 	<a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
 	<a class="btn btn-primary Save"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
     <input type="reset" class="btn btn-primary" value="Reset">
@@ -3143,7 +3143,7 @@ body {
 							<div class="col-md-4">
 								<span>Status</span>								  
 								 <?php
-									$options = array("0"=>$POStatus);     
+									$options = array("0"=>$PONOStatus);     
 									echo form_dropdown('Status', $options,set_value('Status'),'id="Status"'  ,'required="true"' ,'class="form-control select2')
 								?>
 							</div><br/>
@@ -4013,7 +4013,7 @@ $('#Scheduleby').change(function(){
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
 
          
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index f3592ca1..92a5c3b1 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -62,7 +62,7 @@ $Address = '';
 $PODate = '';
 $Deliverydt ='';
 $DeliveryAddress ='';
-$POStatus='';
+$PONOStatus='';
 $PONO = '';
 $ServiceDescription = '';
 $TotalLanding='';
@@ -99,7 +99,7 @@ if(!empty($POMaster))
         $Deliverydt =  $Ddt->format('Y-m-d');
         
         $DeliveryAddress =$Req->DeliveryAddress;
-        $POStatus    =  $Req->StatusCode;
+        $PONOStatus    =  $Req->StatusCode;
         $PONO =     $Req->PONO; 
         $ServiceDescription = $Req->ServiceDescription; 
         $ExchangeRate=$Req->ExchangeRate;
@@ -127,10 +127,10 @@ if(!empty($RequistionDetails))
 }
 
 
-foreach ($POSTATUS as $PST ) 
-{
-   $POStatus=$PST->StatusName;
-}
+// foreach ($POSTATUS as $PST ) 
+// {
+//    $POStatus=$PST->StatusName;
+// }
 
 //echo "$POStatus";
 ?>
@@ -1709,7 +1709,7 @@ foreach ($POSTATUS as $PST )
 
                    <?php 
                             
-                            if($POStatus == PO_DRAFT) 
+                            if($PONOStatus == PO_DRAFT) 
                             {?>                 
                     <td>    <a    data-target='#editimportpomodel'    data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>"  id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
                       <?php
@@ -1897,7 +1897,7 @@ foreach ($POSTATUS as $PST )
         <input type="hidden" name="txtPONO" id="txtPONO"  value="<?php  echo $PONO; ?>"/>   
 
 
-        <?php if($POStatus == PO_DRAFT) {?> 
+        <?php if($PONOStatus == PO_DRAFT) {?> 
         <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
         <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
     <input type="reset" class="btn btn-primary" value="Reset">
@@ -1926,8 +1926,11 @@ foreach ($POSTATUS as $PST )
                             <div class="col-md-4">
                                 <span>Status</span>                                  
                                  <?php
-                                    $options = array("0"=>$POStatus);     
-                                    echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+                                    // $options = array("0"=>$PONOStatus);     
+                                    // echo form_dropdown('Status', $options,set_value('Status',$POStatus),'id="Status"'  ,'required="true"' ,'class="form-control select2')
+
+                                     $data = array('name' => 'Status','value' => set_value('Status',$PONOStatus),'id'=>'Status',  'class' => 'form-control' ,'readonly' => 'true');
+                                    echo form_input($data);
                                 ?>
                             </div><br/>
                 </div>
@@ -3849,7 +3852,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
 
          
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 52f8923d..12ac1eac 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -3657,7 +3657,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
 
          
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index ff41a60d..5f66bd17 100755
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -3784,7 +3784,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
 
          
diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php
index d5a25312..2bb1528e 100755
--- a/application/views/servicePurchaseorder.php
+++ b/application/views/servicePurchaseorder.php
@@ -2049,7 +2049,7 @@ $('#txtStatus').val(stat);
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );