From 273d13dde1bdb023a54d6cd23881d07ada96d834 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 24 Aug 2017 10:27:16 +0530
Subject: [PATCH] import fixes

---
 application/views/editimportpo.php |   6 +-
 application/views/importpo.php     | 105 +++++++++++++++++++++++++----
 2 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index c872a713..7a53e67c 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -155,7 +155,7 @@ $SavedSum=$Orderedsum*$ExchangeRate;
 //echo $SavedSum;
 $AvilableBudget=$SavedSum+$AvlAmount;
 //echo $AvilableBudget;
-
+//echo $PaymentTermsCode;
 
 if(!empty($RequistionDetails))
 {
@@ -2770,10 +2770,12 @@ var NilType = '<?php echo NILTYPE;?>';
 
 
 var paymentoption=<?php echo json_encode($PaymentTerms,JSON_PRETTY_PRINT)?>;
-//alert(paymentoption);
+var payvalue=<?php echo json_encode($PaymentTermsCode,JSON_PRETTY_PRINT)?>;
+//alert(payvalue);
 if(paymentoption=='PT08')
 {
    $('#otheroptiondiv').show();
+   $('#Otherpayment').val(payvalue);
 }
 
 var delivery=<?php echo json_encode($DeliveryOption,JSON_PRETTY_PRINT)?>;
diff --git a/application/views/importpo.php b/application/views/importpo.php
index ce0de8b6..98535415 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -2245,13 +2245,53 @@ function EditRatechange()
       var txteditQuantity=parseFloat($('#EditQuantity').val());
       var txteditUnitPrice=parseFloat($('#EditRate').val());
       var editTot=txteditQuantity*txteditUnitPrice
-      $('#EdittxtBasicValue').val(editTot);
-      $('#EditimBasicPrice').val(editTot);
+
+      if(isNaN(editTot))
+   {
+    $('#EdittxtBasicValue').val('');
+   }
+   else{
+   $('#EdittxtBasicValue').val(parseFloat(editTot).toFixed(2));
+   } 
+     
+
+
+     if(isNaN(editTot))
+   {
+    $('#EditimBasicPrice').val('');
+   }
+   else{
+   $('#EditimBasicPrice').val(parseFloat(editTot).toFixed(2));
+   } 
+
+
+      //$('#EdittxtBasicValue').val(editTot);
+      //$('#EditimBasicPrice').val(editTot);
       var exchangerate=parseFloat($('#EditExchangeRt').val());
       var txtINR=editTot*exchangerate;
-      $('#EditINRBasicvalue').val(txtINR);
+
+if(isNaN(txtINR))
+   {
+    $('#EditINRBasicvalue').val('');
+   }
+   else{
+   $('#EditINRBasicvalue').val(parseFloat(txtINR).toFixed(2));
+   } 
+
+
+   if(isNaN(txtINR))
+   {
+    $('#EditAfterBasicPriceTax').val('');
+   }
+   else{
+   $('#EditAfterBasicPriceTax').val(parseFloat(txtINR).toFixed(2));
+   }
+
+
+
+      //$('#EditINRBasicvalue').val(txtINR);
       $('#EditBasicPriceTax').val(txtINR);
-      $('#EditAfterBasicPriceTax').val(txtINR);
+      //$('#EditAfterBasicPriceTax').val(txtINR);
       EditCalculateloadingcharge();
 }
 
@@ -2368,7 +2408,16 @@ $('#TotalExp').val('');
     txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
-    $('#EditAfterLandingCharge').val(result.toFixed(2));
+
+
+    if(isNaN(result))
+   {
+    $('#EditAfterLandingCharge').val('');
+   }
+   else{
+   $('#EditAfterLandingCharge').val(parseFloat(result).toFixed(2));
+   }
+   // $('#EditAfterLandingCharge').val(result.toFixed(2));
     EditCalculateHighseassalescharge();
     //alert();
  }
@@ -3143,17 +3192,44 @@ function EditCalculateCtable()
     txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
     //txtpurchaserate=txtbasicinrprice/txtCtablequantity;
     txtpurchaserate=<?php echo PURCHASE_RATE;?>;
-    $('#Editpurchaserate').val(txtpurchaserate);
+
+    if(isNaN(txtpurchaserate))
+    {
+        $('#Editpurchaserate').val(0);
+    }
+    else
+    {
+    $('#Editpurchaserate').val(txtpurchaserate.toFixed(2));
+    }
+    //$('#Editpurchaserate').val(txtpurchaserate);
     //CustomDutyExpenses
     //RMCIncludingCustomers
     txtgrossexp=parseFloat($('#EditGrossexpenses').val());
     //txtcustomdutyexp=txtgrossexp/txtCtablequantity;
     txtcustomdutyexp=<?php echo CUSTOMDUTY_EXP;?>;
-    $('#EditCustomDutyExpenses').val(txtcustomdutyexp);
+
+    if(isNaN(txtcustomdutyexp))
+    {
+        $('#EditCustomDutyExpenses').val(0);
+    }
+    else
+    {
+    $('#EditCustomDutyExpenses').val(txtcustomdutyexp.toFixed(2));
+    }
+    //$('#EditCustomDutyExpenses').val(txtcustomdutyexp);
     //txtrmc=txtpurchaserate+txtcustomdutyexp;
     txtrmc=<?php echo RMC_CAL;?>;
+
+     if(isNaN(txtrmc))
+    {
+        $('#EditRMCIncludingCustomers').val(0);
+    }
+    else
+    {
+    $('#EditRMCIncludingCustomers').val(txtrmc.toFixed(2));
+    }
     purquantity=parseFloat($('#PurQuantity').val());
-    $('#EditRMCIncludingCustomers').val(txtrmc);
+    //$('#EditRMCIncludingCustomers').val(txtrmc);
     total=<?php echo CALCULATE_TOTAL;?>;
     $('#EditTotalExp').val(basicamt);
 
@@ -3913,18 +3989,23 @@ function Budgetcheck()
   //alert();
   //die();
    var totalorderedamount=parseFloat($('#txtToatlOrder').val());
-   // console.log(totalorderedamount)    var Exchange=parseFloat($('#ExchangeRate').val());
+   // console.log(totalorderedamount)    
+   var Exchange=parseFloat($('#ExchangeRate').val());
    //console.log(Exchange);
    
    var totordring=totalorderedamount*Exchange;
-   var TotalSum=avalbudAmte;    if(totordring>TotalSum)
+   var TotalSum=avalbudAmte;    
+   if(totordring>TotalSum)
    {
        alert('You are Exceeding The Budget');
        return false;
-   }    else
+   }    
+
+   else
    {
       return true;
-   }}
+   }
+ }