RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revenue purchase order bugs fixed

Browse Source
This commit is contained in:
vadivel J 2024-09-26 15:19:04 +05:30
parent e7bb513f03
commit 0d0a4a37df
2 changed files with 445 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Views/editimportpo.php
View File

@ -1168,8 +1168,8 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-3" align="left"> <div class="form-group col-md-3" align="left">
<label>Select File</label> <label>Select Purchase Order File</label>
<input type="file" class="form-control" name="POFile" id="POFile"> <input type="file" class="" name="POFile" id="POFile">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label> <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
<?php } ?> <?php } ?>

238
app/Views/purchaseorder.php
View File

@ -657,10 +657,10 @@ if (!empty($INRSYMBOL)) {
if (FreightType == "PER TRIP") { if (FreightType == "PER TRIP") {
$('#TripsValue').show(); $('#TripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else { } else {
$('#TripsValue').hide(); $('#TripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
} }
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") { if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
selValue = $("#drpFreight").val(); selValue = $("#drpFreight").val();
@ -704,10 +704,10 @@ if (!empty($INRSYMBOL)) {
if (FreightType == "PER TRIP") { if (FreightType == "PER TRIP") {
$('#EditTripsValue').show(); $('#EditTripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else { } else {
$('#EditTripsValue').hide(); $('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
} }
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") { if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
selValue = $("#drpEditFreight").val(); selValue = $("#drpEditFreight").val();
@ -2224,10 +2224,23 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value=""> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
</div> </div>
</div> </div>
<label>Select Purchase Order File</label>
<div class="form-row">
<div class="form-group col-md-12">
<input type="file" name="POFile" id="POFile"><br>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<input type="file" name="POFile" id="POFile"><br>
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -2403,10 +2416,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<!-- Model for revenue po --> <!-- Model for revenue po -->
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" <div align="center">
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content" align="left" style="width:1060px;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4> <h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal"
@ -2462,8 +2476,9 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2475,7 +2490,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<?php <?php
@ -2484,7 +2499,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<?php <?php
@ -2493,14 +2508,22 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Qty<span class="text-danger">*</span></label> <label>Qty<span class="text-danger">*</span></label>
<?php <?php
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-1">
</div>
<div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label> <label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
<!-- <label>Rate</label> --> <!-- <label>Rate</label> -->
<?php <?php
@ -2508,12 +2531,12 @@ if (!empty($INRSYMBOL)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control'); $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label><?php echo "Basic Amt ($INRSYM)"; ?></label> <label><?php echo "Basic Amt ($INRSYM)"; ?></label>
<!-- <label>Basic Amount</label> --> <!-- <label>Basic Amount</label> -->
<?php <?php
@ -2523,9 +2546,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4">
<div class="form-group col-md-3">
<label>Discount Type </label> <label>Discount Type </label>
<div> <div>
<?php <?php
@ -2546,7 +2571,8 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Discount Rate </label> <label>Discount Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2555,18 +2581,20 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Discounted Amt <?php echo "($INRSYM)" ?></label> <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-row" style="text-align:left;">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label>Packaging Type </label> <label>Packaging Type </label>
<div> <div>
<?php <?php
@ -2587,14 +2615,14 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Rate </label> <label>Packaging Rate </label>
<?php <?php
$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();'); $data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Amt <?php echo "($INRSYM)" ?></label> <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true');
@ -2604,8 +2632,9 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-4">
<div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
@ -2617,21 +2646,16 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "'); echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-2" id="TripsValue" style="display:none;">
<label>NO Of Trips</label> <div class="form-group col-md-3">
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<?php <?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();'); $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
@ -2641,18 +2665,31 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row">
<div class="from-group col-md-9"></div>
<div class="form-group col-md-3" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<!-- cgst --> <!-- cgst -->
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>CGST In %</label> <label>CGST In %</label>
<?php <?php
$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();'); $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>CGST Amt <?php echo "($INRSYM)" ?></label> <label>CGST Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
@ -2663,15 +2700,15 @@ if (!empty($INRSYMBOL)) {
<!-- sgst --> <!-- sgst -->
<div class="form-row" id="SGSTAddModel"> <div class="form-row" id="SGSTAddModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST In %</label> <label>SGST In %</label>
<?php <?php
$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();'); $data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST Amt <?php echo "($INRSYM)" ?></label> <label>SGST Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
@ -2680,15 +2717,15 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row" id="IGSTAddModel" style="display:none;"> <div class="form-row" id="IGSTAddModel" style="display:none;">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST In %</label> <label>IGST In %</label>
<?php <?php
$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();'); $data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label> <label>IGST Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
@ -2698,8 +2735,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
<?php <?php
$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);'); $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
@ -2709,8 +2746,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4 "> <div class="form-group col-md-3 ">
<label><?php echo "Total Order Amt ($INRSYM)"; ?></label> <label><?php echo "Total Order Amt ($INRSYM)"; ?></label>
<?php <?php
$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
@ -2740,12 +2777,15 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
</div>
<!-- Edit Model for revenue po --> <!-- Edit Model for revenue po -->
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" <div align="center">
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width">
<div class="modal-content"> <div class="modal-content" align="left" style="width:1060px;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4> <h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal"
@ -2795,7 +2835,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2807,7 +2847,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2816,7 +2856,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2825,7 +2865,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2834,7 +2874,13 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2">
</div>
<div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3">
<label><?php echo "Rate ($INRSYM)" ?><span class="text-danger">*</span></label> <label><?php echo "Rate ($INRSYM)" ?><span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2843,12 +2889,12 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -2857,12 +2903,11 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-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 </label> <label>Discount Type </label>
<div> <div>
<?php <?php
@ -2883,7 +2928,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Discount Rate </label> <label>Discount Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2892,7 +2937,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -2902,9 +2947,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-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 </label> <label>Packaging Type </label>
<div> <div>
<?php <?php
@ -2925,7 +2971,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Packaging Rate </label> <label>Packaging Rate </label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2934,7 +2980,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -2944,9 +2990,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-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 </label> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
@ -2958,31 +3005,37 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "'); echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;"> <div class="form-group col-md-3">
<label>NO Of Trips</label>
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<?php <?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => '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); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Freight Amt <?php echo "($INRSYM)" ?></label> <label>Freight Amt <?php echo "($INRSYM)" ?></label>
<?php <?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="col-md-9"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label>
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6"></div>
<div class="form-group col-md-3">
<label>CGST In %</label> <label>CGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2991,7 +3044,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -3005,8 +3058,8 @@ if (!empty($INRSYMBOL)) {
<div class="form-row" id="SGSTEditModel"> <div class="form-row" id="SGSTEditModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>SGST In %</label> <label>SGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3015,7 +3068,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -3026,10 +3079,11 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row" style="text-align:left;"> <div class="form-row" style="text-align:left;">
<div id="IGSTEditModel" style="display:none;"> <div id="IGSTEditModel" style="display:none;">
<div class="col-md-8"></div> <div class="col-md-6"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>IGST In %</label> <label>IGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3038,7 +3092,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group 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
@ -3051,8 +3105,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label> <label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3064,9 +3118,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
<label><?php echo "Total Order Amt ($INRSYM)"; ?></label> <label><?php echo "Total Order Amt ($INRSYM)"; ?></label>
<?php <?php
@ -3076,6 +3131,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label><?php echo "Reveneue Description"; ?></label> <label><?php echo "Reveneue Description"; ?></label>
@ -3087,7 +3143,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer" style="border:none;> <div class="modal-footer" style="border:none;">
<a class=" btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class=" btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a> <a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div> </div>
@ -3095,6 +3151,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
</div>