freight in import add,edit

This commit is contained in:
venbatechnologies@gmail.com 2017-09-21 11:05:05 +05:30
parent 4399f49349
commit 39c7617f4a
3 changed files with 80 additions and 6 deletions

View File

@ -1622,6 +1622,7 @@ function addNewImportPurchaseOrder()
//echo "AS";
$MaterialCode = $this->input->post('materialCode'.$i);
$Quantity = $this->input->post('quantity'.$i);
//echo $Quantity;
$Reqnumber = $this->input->post('Reqnumber'.$i);
$itemRate = $this->input->post('itemRate'.$i);
@ -1674,6 +1675,8 @@ function addNewImportPurchaseOrder()
$Freightrate=$this->input->post('FreightRate'.$i);
$Freightamount=$this->input->post('AfterFreightRate'.$i);
//echo $Freightamount;
$specialinstruction=$this->input->post('Addinstruction'.$i);
//echo $specialinstruction;
@ -1936,6 +1939,8 @@ function addNewImportPurchaseOrder()
$FreightRate=$this->input->post('FreightValue'.$i);
$FreightAmount=$this->input->post('AfterFreightValue'.$i);
//echo $FreightAmount;
$specialinstruction=$this->input->post('Addinstruction'.$i);

View File

@ -97,6 +97,7 @@ $totgrossduty=0;
$totavlmodvat=0;
$totgrossexpense=0;
$totordervalue=0;
$totfreight=0;
$ExchangeRate=0;
$totorder=0;
$Cur='';
@ -2901,6 +2902,8 @@ echo form_textarea($data);
<input type="hidden" name="<?php echo 'Addinstruction'.$index ?>" id="<?php echo 'Addinstruction'.$index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
<!-- <input type="hidden" name="<?php echo 'AfterFreightValue'.$index ?>" id="<?php echo 'AfterFreightValue'.$index ?>" value="<?php echo $record->AfterFreightValue; ?>" /> -->
@ -2937,6 +2940,12 @@ echo form_textarea($data);
$ExchangeRate=$record->ExchangeRate;
//echo $totorder;
$totorder=$totorder+$record->TotalOrderValue;
//echo $totorder;
$totfreight=$totfreight+$record->AfterFreightValue;
//echo $totfreight;
// $totorder=$record->TotalOrderValue;
// //$ServiceDescription=$record->ServiceDescription;
// echo $totorder;
@ -2969,6 +2978,8 @@ echo form_textarea($data);
$totgrossduty=number_format($totgrossduty,2);
$totavlmodvat=number_format($totavlmodvat,2);
$totgrossexpense=number_format($totgrossexpense,2);
$totfreight=number_format($totfreight,2);
@ -3093,6 +3104,15 @@ echo form_textarea($data);
echo form_input($data);
?>
</div>
<div class="col-md-4">
<label>Total Freight Value </label> <?php
$data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight',$totfreight),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data);
?>
</div>
@ -5157,6 +5177,7 @@ var TotalLanding=0;
var TotalGrossExpense=0;
var TotalOrder=0;
var TotalOrdervalue=0;
var TotalFreight=0;
//$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2);
//var Aft=$('#AfterLandingCharge').val();
//console.log(Aft);
@ -5184,6 +5205,7 @@ var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossduty
var AvailableModvat=$('#AvailableModvat'+rowid).val()==''?'0.00':$('#AvailableModvat'+rowid).val();
var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#Grossexpensesduetocustomduty'+rowid).val();
var totalexp=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val();
var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val();
//console.log(totalexp);
// console.log(AfterHighseas);
// console.log(AfterCustomduty);
@ -5223,7 +5245,7 @@ TotalGrossDuty = parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable);
TotalAvlmodvat = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat);
TotalGrossExpense = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses);
TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(totalexp);
TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght);
//console.log(TotalLanding);
}
}while (i < rows);
@ -5257,6 +5279,7 @@ $('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2));
$('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2));
$('#txtToatlOrder').val(parseFloat(TotalOrdervalue).toFixed(2));
$('#txttot').val(parseFloat(TotalOrdervalue).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2));
//console.log(r);
//var x=parseFloat($('#txttotalcustomED').val());
//console.log(x);
@ -5541,6 +5564,8 @@ var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
var FreightRateAmount=$('#edittxtAfterFreight').val();
var Nooftrip=$('#editNOOfTrips').val();
//console.log(FreightRateAmount);
var FreightTypename = $('#drpeditFreight').val();
if (FreightTypename != "PER TRIP")
{
@ -5621,7 +5646,7 @@ var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
// var a=$('#FreightType'+userid).val();
// var b=$('#NoOfTrip'+userid).val();
// var c=$('#FreightValue'+userid).val();
// var d=$('#AfterFreightValue'+userid).val();
var d=$('#AfterFreightValue'+userid).val();
// console.log(a);
@ -5654,6 +5679,7 @@ function populateValueMainFormForEditImportTax()
var TotalGrossExpense=0;
var Totalvalue=0;
var TotalOrdervalue=0;
var TotalFreight=0;
var i = 0;
var TotalRMC=0;
do{
@ -5679,6 +5705,8 @@ var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossduty
var AvailableModvat=$('#AvailableModvat'+rowid).val()==''?'0.00':$('#AvailableModvat'+rowid).val();
var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#Grossexpensesduetocustomduty'+rowid).val();
var Totalvalue=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val();
var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val();
//var RMC=$('#RMCIncludingCustomers'+rowid).val()==''?'0.00':$('#RMCIncludingCustomers'+rowid).val();
//console.log(Totalvalue);
@ -5708,7 +5736,7 @@ TotalAvlmodvat = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat);
TotalGrossExpense = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses);
TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Totalvalue);
TotalFreight=parseFloat(TotalFreight)+parseFloat(Frieght);
//TotalRMC=parseFloat(TotalRMC)+parseFloat(RMC);
//console.log(Totalvalue);
@ -5732,6 +5760,8 @@ TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Totalvalue);
$('#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($('#txttotallanding').val());
//console.log(a);
@ -5949,6 +5979,7 @@ function populateValueMainFormForDeleteItem(rowid)
var TotalAvlmodvat=$('#txttotalavlmodvat').val();
var TotalGrossExpense=$('#txttotalgrossexpense').val();
var TotalOrderValue=$('#txtToatlOrder').val();
var TotalFreight=$('#txtTotalFreight').val();
//console.log(TotalCustomED);
@ -5969,6 +6000,7 @@ var Grossexpenses=$('#Grossexpensesduetocustomduty'+rowid).val()==''?'0.00':$('#
//console.log(AfterCustomEDcess);
var totalExp=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val();
var Frieght=$('#AfterFreightValue'+rowid).val()==''?'0.00':$('#AfterFreightValue'+rowid).val();
TotalLanding = parseFloat(TotalLanding) - parseFloat(AfterLandingCharge);
TotalHighseas = parseFloat(TotalHighseas) - parseFloat(AfterHighseas);
@ -5983,6 +6015,7 @@ TotalGrossDuty = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable);
TotalAvlmodvat = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat);
TotalGrossExpense = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses);
TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
TotalFreight=parseFloat(TotalFreight)-parseFloat(Frieght);
$('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
$('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2));
@ -5999,6 +6032,8 @@ TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
$('#txtToatlOrder').val(parseFloat(TotalOrderValue).toFixed(2));
$('#txttot').val(parseFloat(TotalOrderValue).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotalFreight).toFixed(2));

View File

@ -2087,6 +2087,16 @@ echo form_textarea($data);
echo form_input($data);
?>
</div>
<div class="col-md-4">
<label>Total Freight Value </label> <?php
$data = array('name' => 'txtTotalFreight','value' => set_value('txtTotalFreight'),'id'=>'txtTotalFreight', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data);
?>
</div>
@ -4162,6 +4172,8 @@ var Grossdutypayable=$('#Grossdutypayable').val()==''?'0.00':$('#Grossdutypayabl
var AvailableModvat=$('#AvailableModvat').val()==''?'0.00':$('#AvailableModvat').val();
var Grossexpenses=$('#Grossexpenses').val()==''?'0.00':$('#Grossexpenses').val();
var totalexp=$('#TotalExp').val()==''?'0.00':$('#TotalExp').val();
var freight=$('#txtAfterFreight').val()==''?'0.00':$('#txtAfterFreight').val();
var TotalLanding=$('#txttotallanding').val()==''?'0.00':$('#txttotallanding').val();
var TotalHighseas=$('#txttotalhighseas').val()==''?'0.00':$('#txttotalhighseas').val();
var TotalCustom=$('#txttotalcustom').val()==''?'0.00':$('#txttotalcustom').val();
@ -4175,6 +4187,9 @@ var TotalGrossDuty=$('#txttotalgrossduty').val()==''?'0.00':$('#txttotalgrossdut
var TotalAvlmodvat=$('#txttotalavlmodvat').val()==''?'0.00':$('#txttotalavlmodvat').val();
var TotalGrossExpense=$('#txttotalgrossexpense').val()==''?'0.00':$('#txttotalgrossexpense').val();
var TotalOrder=$('#txtToatlOrder').val()==''?'0.00':$('#txtToatlOrder').val();
var TotalFreight=$('#txtTotalFreight').val()==''?'0.00':$('#txtTotalFreight').val();
$('#txttotallanding').val((parseFloat(AfterLandingCharge) + parseFloat(TotalLanding)).toFixed(2) );
$('#txttotalhighseas').val((parseFloat(TotalHighseas) + parseFloat(AfterHighseas)).toFixed(2) );
$('#txttotalcustom').val((parseFloat(TotalCustom) + parseFloat(AfterCustomduty)).toFixed(2) );
@ -4188,6 +4203,9 @@ $('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypa
$('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
$('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
$('#txtTotalFreight').val((parseFloat(TotalFreight) + parseFloat(freight)).toFixed(2) );
//alert(JSON.stringify(totalexp));
//alert(TotalOrder);
@ -4412,6 +4430,7 @@ $('.EditImport').click(function(){
var edititemname = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
//console.log(editQuantity);
var itemRate = $("#EditRate").val();
var BasicValue=$("#EdittxtBasicValue").val();
var BasicPriceinUS=$('#EditimBasicPrice').val();
@ -4489,7 +4508,7 @@ if (FreightTypename != "PER TRIP")
$('#materialCode'+userid).val(editMaterialCode);
$('#materialName'+userid).val(edititemname);
$('#uom'+userid).val(editUOM);
$('#Quantity'+userid).val(EditQuantity);
$('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate);
$('#BasicAmt'+userid).val(BasicValue);
$('#BasicPriceinUS'+userid).val(BasicPriceinUS);
@ -4537,13 +4556,13 @@ if (FreightTypename != "PER TRIP")
$('#Addinstruction'+userid).val(spclins);
// var a=$('#FreightType'+userid).val();
//var a=$('#quantity'+userid).val();
// var b=$('#NoofTrip'+userid).val();
// var c=$('#FreightRate'+userid).val();
// var d=$('#AfterFreightRate'+userid).val();
// console.log(a);
//console.log(a);
// console.log(b);
// console.log(c);
// console.log(d);
@ -4589,6 +4608,8 @@ function populateValueMainFormForEditImportTax()
var TotalOrdervalue=0;
var i = 0;
var TotalRMC=0;
var TotalFrieght=0;
do{
i += 1;
var tr= document.getElementById(i);
@ -4613,6 +4634,9 @@ var AvailableModvat=$('#AvilableModvat'+rowid).val()==''?'0.00':$('#AvilableModv
var Grossexpenses=$('#Grossexpenses'+rowid).val()==''?'0.00':$('#Grossexpenses'+rowid).val();
var RMC=$('#RMCIncludingCustomers'+rowid).val()==''?'0.00':$('#RMCIncludingCustomers'+rowid).val();
var Totalvalue=$('#TotalValue'+rowid).val()==''?'0.00':$('#TotalValue'+rowid).val();
var AfterFreight=$('#AfterFreightRate'+rowid).val()==''?'0.00':$('#AfterFreightRate'+rowid).val();
TotalLanding = parseFloat(TotalLanding) + parseFloat(AfterLandingCharge);
TotalHighseas = parseFloat(TotalHighseas) + parseFloat(AfterHighseas);
TotalCustom = parseFloat(TotalCustom) + parseFloat(AfterCustomduty);
@ -4626,6 +4650,7 @@ TotalGrossDuty = parseFloat(TotalGrossDuty) + parseFloat(Grossdutypayable);
TotalAvlmodvat = parseFloat(TotalAvlmodvat ) + parseFloat(AvailableModvat);
TotalGrossExpense = parseFloat(TotalGrossExpense ) + parseFloat(Grossexpenses);
TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Totalvalue);
TotalFrieght=parseFloat(TotalFrieght)+parseFloat(AfterFreight);
//TotalRMC=parseFloat(TotalRMC)+parseFloat(RMC);
@ -4652,6 +4677,9 @@ TotalOrdervalue=parseFloat(TotalOrdervalue)+parseFloat(Totalvalue);
//$('#txtToatlOrder').val(parseFloat(TotalOrder).toFixed(2));
$('#txtToatlOrder').val(parseFloat(TotalOrdervalue).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotalFrieght).toFixed(2));
//$('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
@ -4714,6 +4742,7 @@ function populateValueMainFormForDeleteItem(rowid)
var TotalAvlmodvat=$('#txttotalavlmodvat').val();
var TotalGrossExpense=$('#txttotalgrossexpense').val();
var TotalOrderValue=$('#txtToatlOrder').val();
var TotalFrieght=$('#txtTotalFreight').val();
//console.log(TotalLanding);
var AfterLandingCharge= $('#AfterLandingChargee'+rowid).val() == '' ? '0.00' : $('#AfterLandingChargee'+rowid).val();
//console.log(AfterLandingCharge);
@ -4730,6 +4759,8 @@ var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossduty
var AvailableModvat=$('#AvilableModvat'+rowid).val()==''?'0.00':$('#AvilableModvat'+rowid).val();
var Grossexpenses=$('#Grossexpenses'+rowid).val()==''?'0.00':$('#Grossexpenses'+rowid).val();
var totalExp=$('#TotalExp'+rowid).val()==''?'0.00':$('#TotalExp'+rowid).val();
var AfterFreight=$('#AfterFreightRate'+rowid).val()==''?'0.00':$('#AfterFreightRate'+rowid).val();
TotalLanding = parseFloat(TotalLanding) - parseFloat(AfterLandingCharge);
//console.log(TotalLanding);
TotalHighseas = parseFloat(TotalHighseas) - parseFloat(AfterHighseas);
@ -4744,6 +4775,7 @@ TotalGrossDuty = parseFloat(TotalGrossDuty) - parseFloat(Grossdutypayable);
TotalAvlmodvat = parseFloat(TotalAvlmodvat ) - parseFloat(AvailableModvat);
TotalGrossExpense = parseFloat(TotalGrossExpense ) - parseFloat(Grossexpenses);
TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
TotalFrieght=parseFloat(TotalFrieght)-parseFloat(AfterFreight);
$('#txttotallanding').val(parseFloat(TotalLanding).toFixed(2));
$('#txttotalhighseas').val(parseFloat(TotalHighseas).toFixed(2));
@ -4758,6 +4790,8 @@ TotalOrderValue=parseFloat(TotalOrderValue)-parseFloat(totalExp);
$('#txttotalavlmodvat').val(parseFloat(TotalAvlmodvat).toFixed(2));
$('#txttotalgrossexpense').val(parseFloat(TotalGrossExpense).toFixed(2));
$('#txtToatlOrder').val(parseFloat(TotalOrderValue).toFixed(2));
$('#txtTotalFreight').val(parseFloat(TotalFrieght).toFixed(2));
}