SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui issues

Browse Source
This commit is contained in:
gayathri1990 2017-11-01 16:59:17 +05:30
parent b2c6d399b6
commit eae6291000
5 changed files with 112 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
application/views/alterpurchaseorder.php
View File

@ -387,7 +387,7 @@ var SelectedMaterialList = {
$('#txtPackaging').removeAttr( 'readonly','true' );
}
}
change();
//change();
});
$('#EditPackagingType').change(function() {
$('#txtEditPackaging').val('');
@ -406,14 +406,15 @@ var SelectedMaterialList = {
$('#txtEditPackaging').attr('readonly', 'true');
$('#txtEditPackaging').val('0.00');
change();
$('#txtEditAfterPackaging').val('0.00');
Editchange();
}
else
{
$('#txtEditPackaging').removeAttr( 'readonly','true' );
}
}
change();
//change();
});
$('#txtExciseDuty').change(function() {
@ -441,18 +442,13 @@ var SelectedMaterialList = {
}
});
$('#drpEditFreight').change(function() {
$('#txtEditFreight').val('');
$('#drpEditFreight').change(function() {
$('#txtEditFreight').val('');
$('#txtEditAfterFreight').val('');
var FreightType =$("#drpEditFreight").val();
// selValue = $("#drpFreight").val() ;
if(FreightType == PercentageType)
{
var freightCalculation = '';
$('#freightmodel').modal('show');
// $('#txtEditAfterFreight').removeAttr( 'readonly','true' );
}
else if (FreightType == "PER TRIP")
if (FreightType == "PER TRIP")
{
$('#EditTripsValue').show();
@ -461,7 +457,29 @@ var SelectedMaterialList = {
$('#EditTripsValue').hide();
}
calculateFreight(1);
if(FreightType == PercentageType)
{
var freightCalculation = '';
$('#freightmodel').modal('show');
$('#txtEditFreight').removeAttr( 'readonly','true');
}
else if (selValue == NilType)
{
$('#txtEditFreight').attr('readonly', 'true');
$('#txtEditFreight').val('0.00');
$('#txtEditAfterFreight').val('0.00');
Editchange();
}
else
{
$('#txtEditFreight').removeAttr( 'readonly','true' );
// $('#txtEditAfterFreight').val('');
}
// selValue = $("#drpEditFreight").val() ;
});
//add //
$('#drpFreight').change(function() {
@ -1769,11 +1787,21 @@ function SetExciseCalculationCancel()
var Tot = txtQuantity * txtUnitPrice
$('#txtEditRevenueBasicValue').val(Tot);
if($("#EditDiscountType").val()!=0){
calculateDiscount(isEdit);
calculateDiscount(isEdit);
}
var discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
if ($("#EditPackagingType").val()!=0) {
calculatePackaging(1);
}
if ($("#drpEditFreight").val()!=0) {
calculateFreight(1);
}
var discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
var basic = $('#txtEditRevenueBasicValue').val() == '' ? '0.00' : $('#txtEditRevenueBasicValue').val();
var basicValue1 = parseFloat(basic-discount);
//alert(basicValue1);
var packaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
//alert(packaging);
var freight =$('#txtEditAfterFreight').val() == '' ? '0.00' : $('#txtEditAfterFreight').val();
@ -1781,7 +1809,8 @@ function SetExciseCalculationCancel()
var packfreight = parseFloat(packaging)+parseFloat(freight);
var basicValue = parseFloat(basicValue1+packfreight);
//alert(basicValue);
if($("#RevenueEditCgst").val()!=''){
if($("#RevenueEditCgst").val()!=''){
$('#RevenueEditAfterCgst').val(calculateCgstTax(basicValue,$('#RevenueEditCgst').val()));
}
@ -1802,14 +1831,6 @@ function SetExciseCalculationCancel()
else{
$('#RevenueEditAfterIgst').val(0.00);
}
if ($("#EditPackagingType").val()!=0) {
calculatePackaging(isEdit);
}
if ($("#drpEditFreight").val()!=0) {
calculateFreight(isEdit);
}
calculateEditTotalValue();
@ -1852,6 +1873,12 @@ Editchange();
if ($("#PackagingType").val()!=0) {
calculatePackaging(isEdit);
}
if($("#drpFreight").val()!=0){
calculateFreight(isEdit);
}
var discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
var basic = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
@ -1882,21 +1909,7 @@ Editchange();
else{
$('#RevenueAfterIgst').val(0.00);
}
if($("#drpFreight").val()!=0){
calculateFreight(isEdit);
}
calculateTotalValue($('#isEdit').val());
calculateTotalValue($('#isEdit').val());
}
@ -3335,7 +3348,7 @@ function populateValueMainFormForDeleteItem(rowid)
<label>CGST in %</label>
<div class="form-group">
<?php
$data = array('name' => 'RevenueEditCgst','value' => set_value('RevenueEditCgst',0),'id'=>'RevenueEditCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();RevenueChangeEditSgst();');
$data = array('name' => 'RevenueEditCgst','value' => set_value('RevenueEditCgst',0),'id'=>'RevenueEditCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();');
echo form_input($data);
?>
</div>
@ -3378,7 +3391,7 @@ function populateValueMainFormForDeleteItem(rowid)
<label>Packaging Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditPackaging','value' => set_value('txtEditPackaging'),'id'=>'txtEditPackaging', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculatePackaging(1);Editchange();','style'=>'text-align:right;');
$data = array('name' => 'txtEditPackaging','value' => set_value('txtEditPackaging'),'id'=>'txtEditPackaging', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;');
echo form_input($data);
?>
</div>
@ -3469,7 +3482,7 @@ function populateValueMainFormForDeleteItem(rowid)
<label>Freight Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'calculateFreight(1);Editchange();','style'=>'text-align:right;');
$data = array('name' => 'txtEditFreight','value' => set_value('txtEditFreight'),'id'=>'txtEditFreight', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange();','style'=>'text-align:right;');
echo form_input($data);
?>
</div>
@ -6201,10 +6214,10 @@ function populateValueMainFormForDeleteItem(rowid)
{
var basicValue = parseFloat(varBasicValue);
//alert(basicValue);
// alert(basicValue);
var Cgst = parseFloat(Cgst);
//alert(Cgst);
// alert(Cgst);
var ServiceTaxValue = 0.0;
ServiceTaxValue = <?php echo SERVICETAX_CGST; ?>;

32
application/views/capitalpurchaseorder.php
View File

@ -990,9 +990,9 @@ function vaildateBeforeOpenModal()
<div class="col-md-12" id="CAPdiv" style="border:1px solid #000;padding:5px;">
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!--<div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -1014,7 +1014,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -1023,7 +1023,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discounted Amt <?php echo "($INR)"?></label>
<div class="form-group">
<?php
@ -1033,7 +1033,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:0;">
<div class="col-md-3">
<label>Freight Type </label>
<div>
@ -1075,7 +1075,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<div class="col-md-3" style="padding-left: 15px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="form-group">
<?php
@ -1092,12 +1092,12 @@ function vaildateBeforeOpenModal()
</div>
<div class="col-md-12">
<div class="col-md-6" align="right">
<div class="col-md-4" align="right">
CGST In %
</div>
<div class="col-md-3">
<div class="col-md-2">
<div class="form-group">
<?php
@ -1727,9 +1727,9 @@ function vaildateBeforeOpenModal()
</div>
<div class="col-md-12">
<div class="col-md-12" style="border:1px solid #000;padding:5px;" id="EDITCAPdiv">
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!--<div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -1751,7 +1751,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -1760,7 +1760,7 @@ function vaildateBeforeOpenModal()
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discounted Amt <?php echo "($INR)"?> </label>
<div class="form-group">
<?php
@ -1771,7 +1771,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" >
<div class="col-md-3">
<label>Freight Type </label>
<div>
@ -1813,7 +1813,7 @@ function vaildateBeforeOpenModal()
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<div class="col-md-3" style="padding-left: -2px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="form-group">
<?php

24
application/views/editCapitalAmendPO.php
View File

@ -1414,7 +1414,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label id="EditTotalAmount">Basic value in INR</label>
<label id="EditTotalAmount">Basic value in <?php echo "($INR)"?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditCPTotalAmount','value' => set_value('EditCPTotalAmount'),'id'=>'EditCPTotalAmount', 'class' => 'form-control num' ,'readonly' => 'true');
@ -1428,9 +1428,9 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" id="EDITCAPdiv" style="padding:0px;">
<div class="col-md-12" id="" style="padding:0px;"><!--EDITCAPdiv -->
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!--<div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -1452,7 +1452,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -1461,7 +1461,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discounted Amt <?php echo "($INR)"?> </label>
<div class="form-group">
<?php
@ -1472,7 +1472,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:0px">
<div class="col-md-3">
<label>Freight Type </label>
<div>
@ -1514,8 +1514,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="col-md-3" style="padding-left: -2px;">
<label>Freight Amt <?php echo "($INR)"?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtAfterFreightlocedit','value' => set_value('txtAfterFreightlocedit'),'id'=>'txtAfterFreightlocedit', 'class' => 'form-control num' ,'readonly' => 'true');
@ -1619,7 +1619,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="col-md-12" id="EDITCAPdiv3" style="padding:0px;"><!--EDITCAPdiv3 -->
<div class="col-md-5 col-md-offset-4" align="right">
<label>Other Allowances In INR</label>
<label>Other Allowances <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
@ -1636,7 +1636,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="col-md-12" id="EDITCAPdiv4" style="padding:0px;display:block;"><!--EDITCAPdiv4 -->
<div class="col-md-5 col-md-offset-4" align="right">
<label>Total Order Value In INR</label>
<label>Total Order Value <?php echo "($INR)"?></label>
</div>
<div class="col-md-3">
@ -2076,7 +2076,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="col-md-12">
<div class="col-md-3">
<label>IGST In INR</label>
<label>IGST <?php echo "($INR)"?></label>
<?php
$data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst' ,number_format($TotalIGST, 2, '.', '')),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data);

50
application/views/editCapitalPo.php
View File

@ -1466,9 +1466,9 @@ $("#PaymentMethod").select2();
<div class="col-md-12" style="padding:2%">
<div class="col-md-12" id="ADDCAPdiv" style="padding:0px;">
<div class="col-md-12" style="border:1px solid #000;">
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!--<div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -1490,7 +1490,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -1499,7 +1499,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2" style="padding:0px">
<div class="col-md-3" style="padding:0px">
<label>Discounted Amt <?php echo "($INR)"?></label>
<div class="form-group">
<?php
@ -1510,10 +1510,10 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:2px" >
<div class="col-md-3">
<label>Freight Type </label>
<div>
<div class="form-group">
<?php
$options = array("0"=>'Select Freight Type');
//print_r( $options);
@ -1533,6 +1533,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-3" id="TripsValueloc" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
@ -1552,8 +1553,8 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="col-md-3" style="padding-left: -2px;">
<label>Freight Amt <?php echo $INR;?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtAfterFreightloc','value' => set_value('txtAfterFreightloc'),'id'=>'txtAfterFreightloc', 'class' => 'form-control num' ,'readonly' => 'true');
@ -1563,6 +1564,7 @@ $("#PaymentMethod").select2();
</div>
</div>
@ -2208,9 +2210,9 @@ $("#PaymentMethod").select2();
<div class="col-md-12">
<div class="col-md-12" style="border:1px solid #000;padding:0px;">
<div class="col-md-12" id="EDITCAPdiv">
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!-- <div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -2232,7 +2234,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -2241,7 +2243,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2" style="padding:0px;">
<div class="col-md-3" style="padding:0px;">
<label>Discounted Amt <?php echo "($INR)"?> </label>
<div class="form-group">
<?php
@ -2253,7 +2255,7 @@ $("#PaymentMethod").select2();
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" style="padding:0px">
<div class="col-md-3">
<label>Freight Type </label>
<div>
@ -2295,7 +2297,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<div class="col-md-3" style="padding: 1px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="form-group">
<?php
@ -2947,9 +2949,9 @@ $("#PaymentMethod").select2();
</div>
<div class="col-md-12" style="padding: 0px;border:0px;">
<div class="col-md-12" id="VIEWCAPdiv" style="padding: 0px;">
<div class="col-md-12"> <div class="col-md-4">
</div>
<div class="col-md-4">
<div class="col-md-12"> <!-- <div class="col-md-4">
</div>-->
<div class="col-md-3">
<label>Discount Type </label>
<div>
<?php
@ -2961,7 +2963,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2">
<div class="col-md-3">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -2970,7 +2972,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-2" style="padding:0px;">
<div class="col-md-3" >
<label>Discounted Amt <?php echo "($INR)"?> </label>
<div class="form-group">
<?php
@ -2983,7 +2985,7 @@ $("#PaymentMethod").select2();
<div class="col-md-12" style="padding:0px;">
<div class="col-md-12" >
<div class="col-md-3">
<label>Freight Type </label>
<div>
@ -3015,7 +3017,7 @@ $("#PaymentMethod").select2();
?>
</div>
</div>
<div class="col-md-3">
<div class="col-md-3" style=padding:15px">
<label>Freight Rate </label>
<div class="form-group">
<?php
@ -3025,7 +3027,7 @@ $("#PaymentMethod").select2();
</div>
</div>
<div class="col-md-3" style="padding-left: 0px;">
<div class="col-md-3" style=padding-left: -2px;">
<label>Freight Amt In <?php echo $INR;?></label>
<div class="form-group">
<?php

2
application/views/editRevenuepurchaseorder.php
View File

@ -3707,7 +3707,7 @@ function calculateEditTaxValue()
</div>
<div class="col-md-12" >
<div class="col-md-4">
<div class="col-md-2">
<label>Freight Type </label>
<div>
<?php