diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php index 31ebe086..9dd3526c 100755 --- a/application/views/editImportAmendPO.php +++ b/application/views/editImportAmendPO.php @@ -102,6 +102,7 @@ $totgrossexpense=0.00; $totordervalue=0.00; $ExchangeRate=0.00; $totorder=0.00; +$totfreight=0.00; //$ExchangeRate $ExchangeRateCalculatedon=''; $StatusName=''; @@ -1792,6 +1793,7 @@ echo form_textarea($data); $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $ExchangeRate=$record->ExchangeRate; $totorder=$totorder+$record->BasicValue; + $totfreight=$totfreight+$record->AfterFreightValue; //alert($totorder); @@ -1815,6 +1817,7 @@ echo form_textarea($data); $totgrossduty=number_format($totgrossduty,2); $totavlmodvat=number_format($totavlmodvat,2); $totgrossexpense=number_format($totgrossexpense,2); + $totfreight=number_format($totfreight,2); } ?> @@ -1935,6 +1938,14 @@ echo form_textarea($data); echo form_input($data); ?> + + +
+ 'txtTotalFreight','value' => set_value('txtTotalFreight',$totfreight),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;'); + echo form_input($data); + ?> +
@@ -3817,6 +3828,7 @@ function populateValueMainFormForEditImportTax() var TotalGrossExpense=0; var Totalvalue=0; var TotalOrdervalue=0; + var TotalFreight=0; var i = 0; @@ -3849,6 +3861,7 @@ var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('# //var Totalvalue=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val(); var Total= $('#ProductPrice'+rowid).val() == '' ? '0.00' : $('#ProductPrice'+rowid).val(); +var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val(); //console.log(rowid); //console.log(Total); //var RMC=$('#RMCIncludingCustomers'+rowid).val()==''?'0.00':$('#RMCIncludingCustomers'+rowid).val(); @@ -3879,7 +3892,7 @@ TotalGrossDuty = parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable); TotalAvlmodvat = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat); TotalGrossExpense = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses); TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Total); - +TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght); //TotalRMC=parseFloat(TotalRMC)+parseFloat(RMC); @@ -3904,6 +3917,8 @@ TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Total); $('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2)); $('#txtToatlOrder').val(parseFloat(TotalOrdervalue).toFixed(2)); $('#txttot').val(parseFloat(TotalOrdervalue).toFixed(2)); + + $('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2)); //var a=parseFloat($('#txttot').val()); //console.log(a); diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 69498603..2bb4cf2b 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -5832,9 +5832,38 @@ $('.UpdateImport').click(function() $('#FreightValue'+userid).val(FreightRate); $('#AfterFreightValue'+userid).val(FreightRateAmount); + populateValueMainFormForupdateImportTax(); + } ); + +function populateValueMainFormForupdateImportTax() +{ + var rows =document.getElementById('ImportTax').rows.length; + var TotalFreight=0; + var i=0; + do + { + + i += 1; + var tr= document.getElementById(i); + if(tr != null) + { + cells = tr.getElementsByTagName('td'); + var rowid = cells[0].innerHTML; + + var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val(); + + TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght); + + } + }while (i < rows); + + $('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2)); +} + + function PageRedirect() { window.location = "poapproval";