Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
aadhavan valli 2024-09-21 13:30:58 +05:30
commit 419726d72f

View File

@ -391,12 +391,15 @@ if (!empty($INRSYMBOL)) {
Editchange(); Editchange();
}); });
$('#PackagingType').change(function () { $('#PackagingType').change(function () {
$('#txtPackaging').val(''); $('#txtPackaging').val('');
$('#txtAfterPackaging').val(''); $('#txtAfterPackaging').val('');
selValue = $("#PackagingType").val(); selValue = $("#PackagingType").val();
if (selValue == PercentageType) { if (selValue == PercentageType) {
var PackagingCalculation = ''; var PackagingCalculation = '';
$('#REVENUE').modal('hide');
$('#packagingcalmodel').modal('show'); $('#packagingcalmodel').modal('show');
$('#txtPackaging').removeAttr('readonly', 'true'); $('#txtPackaging').removeAttr('readonly', 'true');
} else { } else {
@ -412,6 +415,7 @@ if (!empty($INRSYMBOL)) {
} }
//change(); //change();
}); });
$('#EditPackagingType').change(function () { $('#EditPackagingType').change(function () {
$('#txtEditPackaging').val(''); $('#txtEditPackaging').val('');
$('#txtEditAfterPackaging').val(''); $('#txtEditAfterPackaging').val('');
@ -504,6 +508,7 @@ if (!empty($INRSYMBOL)) {
selValue = $("#drpFreight").val(); selValue = $("#drpFreight").val();
if (selValue == PercentageType) { if (selValue == PercentageType) {
var freightCalculation = ''; var freightCalculation = '';
$('#REVENUE').modal('hide');
$('#freightmodel').modal('show'); $('#freightmodel').modal('show');
$('#txtFreight').removeAttr('readonly', 'true'); $('#txtFreight').removeAttr('readonly', 'true');
} else if (selValue == NilType) { } else if (selValue == NilType) {
@ -1542,11 +1547,13 @@ if (!empty($INRSYMBOL)) {
function SetPackagingOption() { function SetPackagingOption() {
PackagingCalculation = $("input:radio[name='optPackaging']:checked").val(); PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
$('#packagingcalmodel').modal('hide'); $('#packagingcalmodel').modal('hide');
showmodel();
} }
function setfreightOption() { function setfreightOption() {
freightCalculation = $("input:radio[name='optfreight']:checked").val(); freightCalculation = $("input:radio[name='optfreight']:checked").val();
$('#freightmodel').modal('hide'); $('#freightmodel').modal('hide');
showmodel();
} }
/* Set the Packaging calculation option for calculating Packaging */ /* Set the Packaging calculation option for calculating Packaging */
function SetExciseCalculation() { function SetExciseCalculation() {
@ -2735,7 +2742,7 @@ if (!empty($INRSYMBOL)) {
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<!-- Model for revenue PO --> <!-- Model for revenue PO -->
<div id="REVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true"> aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
@ -2748,7 +2755,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div align="left" style="padding: 31px;"> <div align="left" style="padding: 31px;">
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label> <label>Item Code<span class="badge mandatory">*</span></label>
<div> <div>
<?php <?php
@ -2758,7 +2765,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2767,7 +2774,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2776,7 +2783,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label> <label>Quantity<span class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2785,7 +2792,12 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> </div>
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span <label><?php echo "Rate ($INRSYM)"; ?><span
class="badge mandatory"></label> class="badge mandatory"></label>
<div class="form-group"> <div class="form-group">
@ -2795,12 +2807,12 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control'); $data = array('name' => 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label><?php echo "Basic Amt ($INRSYM)"; ?></label> <label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2813,11 +2825,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div>
<div class="row"> <div class="row">
<div class="col-md-4"></div> <div class="col-md-3"></div>
<div class="col-md-4"> <div class="col-md-3">
<label>Discount Type <span <label>Discount Type <span
class="badge mandatory"></span></label> class="badge mandatory"></span></label>
<div> <div>
@ -2839,7 +2849,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Discount Rate<span class="badge mandatory"></span> <label>Discount Rate<span class="badge mandatory"></span>
</label> </label>
<div class="form-group"> <div class="form-group">
@ -2849,7 +2859,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Discounted Amt <?php echo "($INRSYM)" ?></label> <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2859,9 +2869,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- cmtl-packaging type -->
<div class="row" style="text-align:left;"> <div class="row" style="text-align:left;">
<div class="col-md-4"></div> <div class="col-md-3"></div>
<div class="col-md-4"> <div class="col-md-3">
<label>Packaging Type <span <label>Packaging Type <span
class="badge mandatory"></span></label> class="badge mandatory"></span></label>
<div> <div>
@ -2883,7 +2895,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Packaging Rate <span <label>Packaging Rate <span
class="badge mandatory"></span></label> class="badge mandatory"></span></label>
<div class="form-group"> <div class="form-group">
@ -2893,7 +2905,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Packaging Amt <?php echo "($INRSYM)" ?></label> <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2903,9 +2915,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- cmtl-freight type -->
<div class="row"> <div class="row">
<div class="col-md-4"></div> <div class="col-md-3"></div>
<div class="col-md-4"> <div class="col-md-3">
<label>Freight Type <span class="badge mandatory"></label> <label>Freight Type <span class="badge mandatory"></label>
<div> <div>
<?php <?php
@ -2926,7 +2940,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2" id="TripsValue" style="display:none;"> <div class="col-md-3" id="TripsValue" style="display:none;">
<label>NO Of Trips<span class="badge mandatory"></label> <label>NO Of Trips<span class="badge mandatory"></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2935,7 +2949,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Freight Rate <span class="badge mandatory"></label> <label>Freight Rate <span class="badge mandatory"></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2944,7 +2958,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2956,8 +2970,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-8"></div> <div class="col-md-6"></div>
<div class="col-md-2"> <div class="col-md-3">
<label>CGST In %</label> <label>CGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2966,7 +2980,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>CGST Amt <?php echo "($INRSYM)" ?></label> <label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2976,9 +2990,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="row" id="SGSTAddModel"> <div class="row" id="SGSTAddModel">
<div class="col-md-8"></div> <div class="col-md-6"></div>
<div class="col-md-2"> <div class="col-md-3">
<label>SGST In %</label> <label>SGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2987,7 +3002,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>SGST Amt <?php echo "($INRSYM)" ?></label> <label>SGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2997,10 +3012,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="row" style="text-align:left;"> <div class="row" style="text-align:left;">
<div id="IGSTAddModel" style="display:none;"> <div id="IGSTAddModel" style="display:none;">
<div class="col-md-8"></div> <div class="col-md-6"></div>
<div class="col-md-2"> <div class="col-md-3">
<label>IGST In %</label> <label>IGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3009,7 +3025,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3022,9 +3038,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-9">
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3036,9 +3052,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-9">
</div> </div>
<div class="col-md-4 "> <div class="col-md-3 ">
<label><?php echo "Total Order Amt ($INRSYM)"; ?></label> <label><?php echo "Total Order Amt ($INRSYM)"; ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3050,6 +3066,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<label><?php echo "Revenue Description"; ?></label> <label><?php echo "Revenue Description"; ?></label>
@ -3061,14 +3078,18 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<br>
<div class="col-12 text-right"> <div class="col-12 text-right">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" <a class="btn btn-secondary waves-effect" data-dismiss="modal"
value="Cancel">Cancel</a> value="Cancel">Cancel</a> &nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> <a class="btn btn-success font AddRevenue" ID="AddRevenue">
&nbsp;&nbsp;<span class="bold">Add Revenue</span></a> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
</div> </div>
</div>
</div> </div>
@ -4602,9 +4623,15 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal"
<button type="button" class="btn btn-secondary waves-effect"
onclick="
$('#packagingcalmodel').modal('hide');
showmodel();"
value="Cancel">Cancel</button> value="Cancel">Cancel</button>
<button type="button" class="btn btn-info waves-effect waves-light" <button type="button" class="btn btn-info waves-effect waves-light"
onclick="SetPackagingOption()">Save</button> onclick="SetPackagingOption()">Save</button>
</div> </div>
</div> </div>
@ -4810,20 +4837,25 @@ if (!empty($INRSYMBOL)) {
<div class="radio"> <div class="radio">
<label><input type="radio" name="optfreight" checked="checked" value='0' <input type="radio" name="optfreight" checked="checked" value='0'
id="optfreight"> Basic Amount</label> id="optfreightBasicAmount"> <label for="optfreightBasicAmount">Basic Amount</label>
</div> </div>
<br> <br>
<div class="radio"> <div class="radio">
<label><input type="radio" name="optfreight" id="optfreight" value='1'> After <input type="radio" name="optfreight" id="optfreightDiscountAmount" value='1'>
Discount Amount</label> <label for="optfreightDiscountAmount"> After Discount Amount</label>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-danger" data-dismiss="modal" <a class="btn btn-danger" data-dismiss="modal"
onclick="
$('#freightmodel').modal('hide');
showmodel()"
value="Cancel">Cancel</a> value="Cancel">Cancel</a>
<a class="btn btn-success" ID="freightOption" onclick="setfreightOption();" <a class="btn btn-success" ID="freightOption"
data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
onclick="setfreightOption();"
><span class="bold">Ok</span></a> ><span class="bold">Ok</span></a>
</div> </div>
</div> </div>
@ -8552,3 +8584,5 @@ if (!empty($INRSYMBOL)) {
} }
}); });
</script> </script>