Merge branch 'main' of bitbucket.org:venbainformationtechnology/recon

This commit is contained in:
suseendhiran17 2023-08-02 16:55:50 +05:30
commit 57f06c2ca0

View File

@ -126,32 +126,32 @@
<div class="col-md-2"></div>
<div class="form-group col-md-4" style="margin-top:35px;">
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
<option selected="selected" value="0">S.NO</option>
<option selected="selected" value="1">INVOICE id</option>
<option selected="selected" value="2">PAX NAME</option>
<option selected="selected" value="3">PNR</option>
<option selected="selected" value="4">TICKET NO</option>
<option selected="selected" value="5">VENDOR</option>
<option selected="selected" value="6">VENDOR GST</option>
<option selected="selected" value="7">RECIPIENT</option>
<option selected="selected" value="8">RECIPIENT GST</option>
<option selected="selected" value="9">INVOICE NUMBER</option>
<option selected="selected" value="10">INVOICE DATE</option>
<option selected="selected" value="11">HSN</option>
<option selected="selected" value="12">TAXABLE VALUE</option>
<option selected="selected" value="13">CGST VALUE</option>
<option selected="selected" value="14">CGST RATE (&#8377;)</option>
<option selected="selected" value="15">SGST VALUE (&#8377;)</option>
<option selected="selected" value="16">SGST RATE(&#8377;)</option>
<option selected="selected" value="17">IGST VALUE</option>
<option selected="selected" value="18">IGST RATE</OPTION>
<option selected="selected" value="19">TOTAL INVOICE VALUE</option>
<option selected="selected" value="20">TOTAL VALUE</option>
<option selected="selected" value="21">STATUS</option>
<option selected="selected" value="22">TICKET TYPE</option>
<option selected="selected" value="23"> AIRLINE FILE NAME</option>
<option selected="selected" value="24">EXTRACTION DATE</option>
<option selected="selected" value="25">BATCH ID</option>
<option selected="selected" value="0">S.No</option>
<option selected="selected" value="1">PAX NAME</option>
<option selected="selected" value="2">PNR</option>
<option selected="selected" value="3">TICKET NO</option>
<option selected="selected" value="4">VENDOR</option>
<option selected="selected" value="5">VENDOR GST</option>
<option selected="selected" value="6">RECIPIENT</option>
<option selected="selected" value="7">RECIPIENT GST</option>
<option selected="selected" value="8">INVOICE NUMBER</option>
<option selected="selected" value="9">INVOICE DATE</option>
<option selected="selected" value="10">HSN</option>
<option selected="selected" value="11">TAXABLE VALUE</option>
<option selected="selected" value="12">CGST VALUE</option>
<option selected="selected" value="13">CGST RATE (&#8377;)</option>
<option selected="selected" value="14">SGST VALUE (&#8377;)</option>
<option selected="selected" value="15">SGST RATE(&#8377;)</option>
<option selected="selected" value="16">IGST VALUE</option>
<option selected="selected" value="17">IGST RATE</OPTION>
<option selected="selected" value="18">TOTAL INVOICE VALUE</option>
<option selected="selected" value="19">TOTAL VALUE</option>
<option selected="selected" value="20">STATUS</option>
<option selected="selected" value="21">TICKET TYPE</option>
<option selected="selected" value="22"> AIRLINE FILE NAME</option>
<option selected="selected" value="23">EXTRACTION DATE</option>
<option selected="selected" value="24">BATCH ID</option>
<!--
@ -167,8 +167,8 @@
<thead>
<tr>
<th>S.NO
<th>INVOICE ID</th>
<th>S.no</th>
<th>PAX NAME</th>
<th>PNR</th>
<th>TICKET NO</th>
@ -200,11 +200,11 @@
<tbody>
<?php foreach ($data as $value){
<?php foreach ($data as $key => $value){
?>
<tr>
<td><?php echo $value->sno;?></td>
<td><?php echo $value->sl; ?></td>
<td><?php echo $key+1; ?></td>
<td><?php echo $value->pax_name; ?></td>
<td><?php echo $value->pnr; ?></td>
<td><?php echo $value->ticket_no; ?></td>
@ -318,7 +318,7 @@
{
extend: "csvHtml5",
exportOptions: {
columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,19,20,21,22]
columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,19,20,21,22,23,24]
}
}
@ -363,7 +363,7 @@ $('#column_name').change(function(){
var all_column = ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25"];
var all_column = ["0", "1", "2", "3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24"];
var conceptName = $('#column_name').find(":selected").val();