From 7758205025a8c02533e3ff65c22b88da5d2390e7 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 12 Oct 2017 10:49:35 +0530
Subject: [PATCH] import

---
 application/config/constants.php   |  2 +-
 application/views/editimportpo.php | 33 +++++++++++++++++++++---------
 application/views/importpo.php     |  2 +-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/application/config/constants.php b/application/config/constants.php
index 466eccd1..a9ec86d1 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -261,7 +261,7 @@ define('RMC_CAL1',                                          'txtpurchaserate+txt
 define('CALCULATE_TOTAL1',                                  '(txtrmc*quantity)+basicprice');
 
 define('IGST',                                      '(tot*igstpercentage)/100');
-define('SUBTOTAL',                                  '(assessble+custom+customsh+customed)');
+define('SUBTOTAL',                                  '((assessble)+(custom)+(customsh)+(customed))');
 
 define('ASSESSBLE',                                  '(result+txtbasicprice)');
 define('DUTYIMPACT',                                  '(totduty-igst)');
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index e0236cfd..3ca5427f 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -3694,6 +3694,7 @@ $('#RMCIncludingCustomers').val('');
     //var result=(txtlanding*txtbasicprice/100);
     var result= <?php echo LOADING_CHARGE;?>;
     var assessble=parseFloat(result)+parseFloat(txtbasicprice);
+
     
     var assessble=<?php echo ASSESSBLE;?>;
     //$('#AfterLandingCharge').val(parseFloat(Math.round(result)));
@@ -3733,20 +3734,27 @@ $('#RMCIncludingCustomers').val('');
     //alert();
     var txtlanding=0;
     var txtbasicprice=0;
-
+    var asss=0;
     txtlanding=$('#EditLandingCharge').val() == '' ? '0.00' : $('#EditLandingCharge').val()
     //txtlanding=parseFloat($('#EditLandingCharge').val());
     //txtbasicprice=parseFloat($('#EditAfterBasicPriceTax').val());
 
   txtbasicprice=$('#EditAfterBasicPriceTax').val() == '' ? '0.00' : $('#EditAfterBasicPriceTax').val()
-    //var result=(txtlanding*txtbasicprice/100);
+  //  console.log(txtbasicprice);
     var result= <?php echo LOADING_CHARGE;?>;
+//console.log(result);
 
-    var Assessable= <?php echo ASSESSBLE;?>;
+ asss=result;
+//console.log(asss);
+
+
+   // var Assessable= <?php echo ASSESSBLE;?>;
+var Assessable=parseFloat(txtbasicprice)+parseFloat(asss);
+//console.log(Assessable);
     //alert(Assessable);
 
     $('#EditAfterLandingCharge').val(result.toFixed(2));
-   $('#EditAfterAssessable').val(Assessable.toFixed(2));
+  $('#EditAfterAssessable').val(Assessable);
    EditCalculateCustomduty();
     //alert();
  }
@@ -4085,13 +4093,18 @@ txtshpercentage=$('#EditCustomSHcess').val() == '' ? '0.00' : $('#EditCustomSHce
 
   // var assessble=parseFloat($('#EditAfterAssessable').val());
 
-  custom=$('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val()
-  customsh=$('#EditAfterCustomSHcess').val() == '' ? '0.00' : $('#EditAfterCustomSHcess').val()
-  customed=$('#EditAfterCustomEDcess').val() == '' ? '0.00' : $('#EditAfterCustomEDcess').val()
-  assessble=$('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val()
-
+  var custom=parseFloat($('#EditAfterCustomduty').val() == '' ? '0.00' : $('#EditAfterCustomduty').val());
+  var customsh=parseFloat($('#EditAfterCustomSHcess').val() == '' ? '0.00' : $('#EditAfterCustomSHcess').val());
+  var customed=parseFloat($('#EditAfterCustomEDcess').val() == '' ? '0.00' : $('#EditAfterCustomEDcess').val());
+  var assessble=parseFloat($('#EditAfterAssessable').val() == '' ? '0.00' : $('#EditAfterAssessable').val());
+  
+  // console.log(custom);
+  // console.log(customsh);
+  // console.log(customed);
+  // console.log(assessble);
 
   var tot=<?php echo SUBTOTAL;?>;
+  console.log(tot);
   //var igstpercentage=parseFloat($('#EditIgst').val());
 var igstpercentage=$('#EditIgst').val() == '' ? '0.00' : $('#EditIgst').val()
   var afterigst=<?php echo IGST;?>;
@@ -5001,7 +5014,7 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
         //console.log(x);AfterCustomEDcess
         $('#EditAfterCustomEDcess').val($("#AfterCustomEdCess1"+userid).val());
         var aa=parseFloat($('#EditAfterCustomEDcess').val());
-        console.log(aa);
+       // console.log(aa);
         $('#EditCustomSHcess').val($("#CustomSHCess"+userid).val());
         $('#EditAfterCustomSHcess').val($("#AfterCustomSHCess"+userid).val());
        
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 3f4ab755..f981a5ad 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -4110,7 +4110,7 @@ if (FreightTypename != "PER TRIP")
           $('#Dutyimpact'+userid).val(Dutyimpact);
           $('#AfterAssessable'+userid).val(assessble);
           $('#Nett'+userid).val(Nett);
-          $('#CustomDutyExpenses'+userid).val(assessble);
+          $('#CustomDutyExpenses'+userid).val(CustomDutyExpense);
           $('#Subtotal'+userid).val(Subtotal);
           
           $('#TotalExp'+userid).val(TotalExp);