From 25b627d75902ea759771a4dc07b8845f187318ba Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 24 Jul 2017 10:46:58 +0530
Subject: [PATCH] payment terms

---
 application/controllers/purchaseorder.php  |  1 +
 application/views/capitalpurchaseorder.php | 28 +++++++++-------------
 application/views/importpo.php             |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 8afc7112..695eaa06 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -121,6 +121,7 @@ class purchaseorder extends BaseController
             $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); 
             $data['Suplist'] = $this->purchaseorder_model->getSupplierName(); 
             $data['Payment']=$this->purchaseorder_model->getPaymentTermsDetails();
+           // print_r($data['Payment']);
 			
              $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
             
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 18fbd214..92f95d4e 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -409,14 +409,14 @@ function vaildateBeforeOpenModal()
 						</div>									
 						</div>
 						<div class="col-md-12">
-		  <legend>Payment Details</legend>
+		<legend>Payment Details</legend> 
           <!-- Text input-->
-		    <div class="col-md-3">
+		   <div class="col-md-3">
 			    <span for="payablefrom">Payable Terms</span>
 				  
 
 
-             <?php
+            <?php
                                                        
                 $options1 = array("0"=>'Select Payment method');
                                                         //print_r(  $options);
@@ -425,7 +425,7 @@ function vaildateBeforeOpenModal()
                       {
                        foreach ($payment as $payment):
 
-                        $options1[$rl->ConfigValue] =  $rl->ConfigValue.' '.' - '.' '.$rl->ConfigValue;
+                        $options1[$rl->PaymentTerms] =  $rl->ConfigValue.' '.' - '.' '.$rl->PaymentTerms;
 
                         endforeach;
                       }
@@ -433,8 +433,8 @@ function vaildateBeforeOpenModal()
                     echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"');
 
             ?>
-            </div>
-			
+           </div> 
+            
            
 			 
 	</div>
@@ -2010,15 +2010,13 @@ function vaildateBeforeOpenModal()
            $.each(paymentList, function(idx1, obj1) {
                    
 
-                                    if(obj1.ConfigValue == supPaymentTerms )
+                                    if(obj1.PaymentTerms == supPaymentTerms )
                                     {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj1.ConfigValue).html(obj1.ConfigValue));
+                          $("#PaymentMethod").append( $('<option></option>').val(obj1.PaymentTerms).html(obj1.PaymentTerms));
                                     $("#PayableAT").val(supPaymentAT); 
                               
                                
-                                           
-
-                                    }
+                                       }
 
 
                     });                   
@@ -2026,9 +2024,9 @@ function vaildateBeforeOpenModal()
                     $.each(paymentList, function(idx, obj) {
                    
                                 
-                                    if(obj.ConfigValue != supPaymentTerms )
+                                    if(obj.PaymentTerms != supPaymentTerms )
                                     {
-                          $("#PaymentMethod").append( $('<option></option>').val(obj.ConfigValue).html(obj.ConfigValue));
+                          $("#PaymentMethod").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms));
                               $("#PayableAT").val(supPaymentAT); 
                                 
                                               
@@ -2041,10 +2039,6 @@ function vaildateBeforeOpenModal()
 
 
 
-
-
-
-
                     }
                     else
                     {
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 59ba7d1b..08007ebf 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -3915,7 +3915,7 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
        {
 
         
-           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
+           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );