From 01272c76f32ac8bc48bd0fa7913fe7e818a9fa81 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 24 Jul 2017 14:24:40 +0530
Subject: [PATCH] import bug fix

---
 application/controllers/purchaseorder.php |  3 +-
 application/views/editimportpo.php        | 36 ++++++++++++++++++-----
 application/views/importpopdf.php         |  9 ++++--
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index 695eaa06..f2551f8b 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -339,7 +339,8 @@ class purchaseorder extends BaseController
                 
                 $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
               
-                $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
+               // $data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
+                $data['PaymentTerms']=$this->purchaseorder_model->getPaymentTermsDetails();
                 //$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
             	
                 $data['WorkStatus']=$this->purchaseorder_model->getStatus(7);
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 49536298..c2c7a4f2 100644
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -107,6 +107,7 @@ $ExchangeRateCalculatedon='';
 $StatusName='';
 $Import_DispatchDetails='';
 $Import_PlaceofOrgin='';
+$DeliveryOption='';
 
 if(!empty($POMaster))
 {
@@ -139,10 +140,11 @@ if(!empty($POMaster))
         $Import_DispatchDetails=$Req->Import_DispatchDetails;
         $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
         $PaymentTerms=$Req->PaymentTerms;
+        $DeliveryOption=$Req->DeliveryOption;
     }
 }
-//echo $ServiceDescription;
-//echo $StatusName;
+//echo $DeliveryOption;
+//echo $PaymentTerms;
 
 
 if(!empty($RequistionDetails))
@@ -534,7 +536,7 @@ body {
                                    
                                    foreach ($PaymentTerms as $Pay):
                                            if($PaymentTerms==$Pay->PaymentTerms){
-                                            $options1[$Pay->PaymentTerms] =  $Pay->PaymentTerms;
+                                            $options1[$Pay->PaymentTerms] = $Pay->PaymentTerms;
 
                                             }
 
@@ -543,7 +545,7 @@ body {
 
                                         foreach ($PaymentTerms as $Pay):
                                            if($PaymentTerms!=$Pay->PaymentTerms){
-                                            $options1[$Pay->PaymentTerms] =  $Pay->PaymentTerms;
+                                            $options1[$Pay->PaymentTerms] = $Pay->PaymentTerms;
 
                                             }
 
@@ -2464,8 +2466,8 @@ if($PONOStatus == PO_RELEASED)
                                 $totcustomSH   = $totcustomSH + $record->AfterCustomSHCess;
                                 $totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty;
                                 $totgrossduty   = $totgrossduty + $record->Grossdutypayable;
-                                $totavlmodvat    = $totavlmodvat +$record->AvailableModvat;
-                                $totgrossduty=$totgrossduty+$record->Grossdutypayable;
+                               // $totavlmodvat    = $totavlmodvat +$record->AvailableModvat;
+                                //$totgrossduty=$totgrossduty+$record->Grossdutypayable;
                                 $totavlmodvat=$totavlmodvat+$record->AvailableModvat;
                                 $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
                                 $ExchangeRate=$record->ExchangeRate;
@@ -2776,6 +2778,19 @@ var NilType = '<?php echo NILTYPE;?>';
 };
 
 
+var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
+if(delivery==1)
+{
+  document.getElementById("Schedule").checked = true; 
+  $('#Deliverydtdiv').hide();
+  $('#Schedulediv').show(); 
+}
+else
+{
+document.getElementById("Date").checked = true; 
+$('#Deliverydtdiv').show();
+$('#Schedulediv').hide();
+}
 // var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>
 // if (paymentday=="After") 
 // {
@@ -4577,6 +4592,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
    var RMC=$("#EditRMCIncludingCustomers").val();
    var TotalExp=$('#EdittxtBasicValue').val();
 //alert(itemRate);
+//console.log(GrossDuty);
+
 
    var tr= document.getElementById(userid);
    var cellval = tr.cells; 
@@ -4844,6 +4861,9 @@ TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
 
 
 
+
+
+
 function Save(status)
 {
 //alert();
@@ -4937,10 +4957,12 @@ var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
   
        $.each(Detail, function (index, value) 
        {
-           $("#PaymentTerms").append( $('<option></option>').val(value.ConfigValue).html(value.ConfigValue) );
 
+        
+           $("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
 
          
+
        } ); 
 
  
diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php
index f54b793b..58c1cb39 100644
--- a/application/views/importpopdf.php
+++ b/application/views/importpopdf.php
@@ -58,10 +58,11 @@
               $Import_DispatchDetails=$PO->Import_DispatchDetails;
                 // $PaymentDays=$PO->PaymentDays;
                 // $PayableAT=$PO->PayableAT;
+              $DeliverySchedule=$PO->DeliverySchedule;
 	        }
         }
 
-
+//echo $DeliverySchedule;
         if(!empty($Requestername))
 
         {
@@ -230,7 +231,9 @@
 			<td align="right"><?php echo number_format(($record->Rate),2) ; ?></td>
 			<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
 												echo number_format($BasicValue,2) ; ?></td>
-		    <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td>
+		    <!-- <td align="right"><?php echo number_format(($record->TotalOrderValue),2); ?></td> -->
+		    <td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
+												echo number_format($BasicValue,2) ; ?></td>
 			 
 			</tr>
 
@@ -252,7 +255,7 @@
 									$CustomDutyExpensesPerKG = $CustomDutyExpensesPerKG+$record->CustomDutyExpensesPerKG ;
 									$RMCIncludingCustomersPerKG = $RMCIncludingCustomersPerKG+$record->RMCIncludingCustomersPerKG ;
 									$AfterExciseDutySHCess= $AfterExciseDutySHCess+$record->AfterExciseDutySHCess ;
-									$TotalOrderValue = $TotalOrderValue+$record->BasicPriceInMTon;
+									$TotalOrderValue = $TotalOrderValue+$record->ProductPrice;
 								}
 								}