gstrecon changes
This commit is contained in:
heama
parent
8133802f97
commit
21db1e5e80
@ -3601,6 +3601,18 @@ public function upload_tmc(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
|
||||||
|
|
||||||
|
$objWriter->save('./uploads/' . $this->session->userdata['recon_sess_i']['u_corporateid'] . '/tmc/' . $filename);
|
||||||
|
|
||||||
|
if ($ttlrows == $inserror) {
|
||||||
|
|
||||||
|
|
||||||
|
$rdata['status'] = 31;
|
||||||
|
echo json_encode($rdata);
|
||||||
|
exit; // Exit the function
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$ferror = array_values($ferror);
|
$ferror = array_values($ferror);
|
||||||
$this->log->write_log($ferror);
|
$this->log->write_log($ferror);
|
||||||
|
|||||||
@ -192,7 +192,7 @@ $worksheet->setCellValue($remarksColumn . '1', 'Remarks');
|
|||||||
$headingary[] = strval($cell);
|
$headingary[] = strval($cell);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$ttlrows++;
|
|
||||||
if ($fieldAry != $headingary) {
|
if ($fieldAry != $headingary) {
|
||||||
// print_r($fieldAry);
|
// print_r($fieldAry);
|
||||||
// echo '<br/>';
|
// echo '<br/>';
|
||||||
@ -206,6 +206,7 @@ $worksheet->setCellValue($remarksColumn . '1', 'Remarks');
|
|||||||
|
|
||||||
$chkcell = $worksheet->getCellByColumnAndRow(1, $row);
|
$chkcell = $worksheet->getCellByColumnAndRow(1, $row);
|
||||||
if ($chkcell != '') {
|
if ($chkcell != '') {
|
||||||
|
$ttlrows++;
|
||||||
$keys = '';
|
$keys = '';
|
||||||
$values = '';
|
$values = '';
|
||||||
for ($col = 0; $col < $pcols; $col++) {
|
for ($col = 0; $col < $pcols; $col++) {
|
||||||
|
|||||||
@ -975,19 +975,19 @@
|
|||||||
// },
|
// },
|
||||||
|
|
||||||
{
|
{
|
||||||
"targets": 16,
|
"targets": 16,
|
||||||
"width": 300,
|
"width": 300,
|
||||||
"render": function ( data, type, full, meta ) {
|
"render": function (data, type, full, meta) {
|
||||||
if(full['inv'] != " "){
|
if (full['inv'] != " ") {
|
||||||
return '<button type="text" style="border:none;" class="form-control" id="'+full['gd_id']+'" data-refid="'+full['gd_inv_no']+'" value="'+full['gd_inv_no']+'" onclick="viewinvfn('+full['gd_id']+')"><i class="fa fa-eye"></i></button>';
|
return '<button type="text" style="border:none;" class="form-control" id="' + full['gd_id'] + '" data-refid="' + full['gd_inv_no'] + '" value="' + full['gd_inv_no'] + '" onclick="viewinvfn(' + full['gd_id'] + ')"><i class="fa fa-eye"></i></button>';
|
||||||
} else if(data == ''){
|
} else if (data == '') {
|
||||||
return '<form><input class="filecls" type="file" name="gd_gst_inv" /><input type="hidden" value="'+full['gd_id']+'" name="gdid" /></form>';
|
return '<form><label for="fileUpload"><input id="fileUpload" class="filecls" type="file" name="gd_gst_inv" style="display:none;" onchange="uploadFile(event)"/><i class="fa fa-upload" title="Upload File" style="cursor:pointer;"></i><input type="hidden" value="' + full['gd_id'] + '" name="gdid" /></label></form>';
|
||||||
}
|
} else {
|
||||||
else{
|
return '<a style="display: flex; justify-content: center;" title="Invoice Download" onclick="openModal(\'' + data + '\')"><i class="fa fa-eye"></i></a>';
|
||||||
return '<a style="display: flex; justify-content: center;" title="Invoice Download" onclick="openModal(\''+data+'\')"><i class="fa fa-eye"></i></a>';
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
// {
|
// {
|
||||||
@ -1324,6 +1324,17 @@ window.addEventListener('resize', adjustTableCellWidths);
|
|||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
|
// Set the default value to today
|
||||||
|
var today = new Date();
|
||||||
|
var dd = String(today.getDate()).padStart(2, '0');
|
||||||
|
var mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
|
||||||
|
var yyyy = today.getFullYear();
|
||||||
|
|
||||||
|
var todayFormatted = yyyy + '-' + mm + '-' + dd;
|
||||||
|
|
||||||
|
document.getElementById('TO').value = todayFormatted;
|
||||||
|
</script>
|
||||||
|
<!-- <script>
|
||||||
|
|
||||||
var oTable;
|
var oTable;
|
||||||
|
|
||||||
@ -1360,17 +1371,14 @@ window.addEventListener('resize', adjustTableCellWidths);
|
|||||||
$('#columnModal').modal('hide');
|
$('#columnModal').modal('hide');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
</script> -->
|
||||||
|
|
||||||
ide');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body" id="inv_getdata">
|
<div class="modal-body" id="inv_getdata">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
<!-- <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> -->
|
||||||
<!-- <button type="button" class="btn btn-primary">Save changes</button> -->
|
<!-- <button type="button" class="btn btn-primary">Save changes</button> -->
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /.modal-content -->
|
</div><!-- /.modal-content -->
|
||||||
|
|||||||
@ -734,7 +734,7 @@
|
|||||||
// return '<a target="_blank" href="<?php echo base_url('corporate/tmc_file_download/'); ?>' + data + '" style="font-size:16px;"><i class="fa fa-download" title="Download file"></i></a> <a target="_blank" href="<?php echo base_url('corporate/tmc_valid_download/'); ?>'+data+'" style="font-size:16px;color:green"><i class="fa fa-download" title="Download Valid Records"></i></a>';
|
// return '<a target="_blank" href="<?php echo base_url('corporate/tmc_file_download/'); ?>' + data + '" style="font-size:16px;"><i class="fa fa-download" title="Download file"></i></a> <a target="_blank" href="<?php echo base_url('corporate/tmc_valid_download/'); ?>'+data+'" style="font-size:16px;color:green"><i class="fa fa-download" title="Download Valid Records"></i></a>';
|
||||||
|
|
||||||
return `<a href="javascript:void(0)" onclick="downloadfn(${data})" style="font-size:16px;"><i class="fa fa-download" title="Download file"></i></a>
|
return `<a href="javascript:void(0)" onclick="downloadfn(${data})" style="font-size:16px;"><i class="fa fa-download" title="Download file"></i></a>
|
||||||
<a href="javascript:void(0)" onclick="uploadfn(${full.f_id},${full.f_month},${full.f_year});" style="font-size:16px;"><i class="fa fa-upload" title="Upload file"></i></a>
|
|
||||||
<a id="${data}" onclick="deletetmc(${data})" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>`;
|
<a id="${data}" onclick="deletetmc(${data})" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -270,18 +270,27 @@
|
|||||||
|
|
||||||
<div class="form-group col-md-5" style="margin-top:-34px;">
|
<div class="form-group col-md-5" style="margin-top:-34px;">
|
||||||
<label for="from_date">From</label>
|
<label for="from_date">From</label>
|
||||||
<input type="date" class="form-control" id="from_date" name="from_date" style="
|
<!-- <input type="date" class="form-control" id="from_date" name="from_date" style="
|
||||||
margin-top: -34px; value="<?php echo isset($_POST['from_date']) ? $_POST['from_date'] : ''; ?>">
|
margin-top: -34px;" value="<?php echo isset($_POST['from_date']) ? $_POST['from_date'] : ''; ?>"> -->
|
||||||
|
<input type="date" class="form-control" id="from_date" name="from_date" style="
|
||||||
|
margin-top: -34px;z-index: 99;
|
||||||
|
position: relative;" value="2020-01-01">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-5"style="margin-top:-34px;">
|
<div class="form-group col-md-5"style="margin-top:-34px;">
|
||||||
<label for="to_date">To</label>
|
<label for="to_date">To</label>
|
||||||
|
|
||||||
<input type="date" class="form-control" id="to_date" name="to_date" style="
|
<!-- <input type="date" class="form-control" id="to_date" name="to_date" style="
|
||||||
margin-top: -34px;"value="<?php echo isset($_POST['to_date']) ? $_POST['to_date'] : ''; ?>">
|
margin-top: -34px;"value="<?php echo isset($_POST['to_date']) ? $_POST['to_date'] : ''; ?>"> -->
|
||||||
|
<input type="date" class="form-control" id="to_date" name="to_date" style="
|
||||||
|
margin-top: -34px;z-index: 99;
|
||||||
|
position: relative;" value="<?php echo date('Y-m-d'); ?>">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-2">
|
<div class="form-group col-md-2">
|
||||||
<label for="inputPassword4" class="col-form-label"></label>
|
<label for="inputPassword4" class="col-form-label"></label>
|
||||||
<button style="margin-top:-43px;font-size:12px;" type="submit" class="btn btn-primary">Submit</button><br>
|
<button style="margin-top:-43px;font-size:12px;z-index: 99;
|
||||||
|
position: relative;" type="submit" class="btn btn-primary">Submit</button><br>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -467,6 +476,8 @@
|
|||||||
|
|
||||||
oTable = $("#scroll-horizontal-datatable").DataTable({
|
oTable = $("#scroll-horizontal-datatable").DataTable({
|
||||||
lengthChange: !1,
|
lengthChange: !1,
|
||||||
|
"paging": true,
|
||||||
|
"pageLength": 50,
|
||||||
|
|
||||||
// dom: 'Bfrtip',
|
// dom: 'Bfrtip',
|
||||||
buttons: [
|
buttons: [
|
||||||
|
|||||||
@ -420,7 +420,7 @@
|
|||||||
<div id="airline_invoice_0"></div>
|
<div id="airline_invoice_0"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-1 mb25">
|
<div class="col-md-1 mb25">
|
||||||
<a id="minus1" onclick="removeinputs(1)" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>
|
<a id="minus1" onclick="removeinputs(1)" style="margin-top: 47px;color: red;margin-left: 4px " class="btn btn-default"><i class="fa fa-trash"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -430,15 +430,15 @@
|
|||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2 mb25">
|
<div class="col-md-2 mb25">
|
||||||
<a id="addfields" onclick="addfields()" class="btn btn-primary"><i class="fa fa-plus"></i></a>
|
<a id="addfields" onclick="addfields()" class="btn btn-primary" style="margin-top: 10px;margin-left: 18px;" ><i class="fa fa-plus"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
|
||||||
<button class="btn btn-primary" type="submit" id="formsubmit">Submit
|
<button class="btn btn-primary" type="submit" id="formsubmit" style="margin-top: 10px;margin-right: -32px;">Submit
|
||||||
</button>
|
</button>
|
||||||
<button type="button" id="addclose" class="btn btn-default" data-dismiss="modal">Close</button>
|
<button type="button" id="addclose" class="btn btn-default" style="margin-top: 10px; margin-right: -18px;"data-dismiss="modal">Close</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -629,7 +629,7 @@ function() {
|
|||||||
'<div id="airline_invoice_0"></div>'+
|
'<div id="airline_invoice_0"></div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'<div class="col-md-1 mb25">'+
|
'<div class="col-md-1 mb25">'+
|
||||||
'<a id="minus1" onclick="removeinputs(1)" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
'<a id="minus1" onclick="removeinputs(1)" style="margin-top: 47px;color: red;margin-left: 4px; " class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>';
|
'</div>';
|
||||||
@ -711,7 +711,7 @@ function() {
|
|||||||
'<div id="airline_invoice_'+r+'"></div>'+
|
'<div id="airline_invoice_'+r+'"></div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'<div class="col-md-1 mb25">'+
|
'<div class="col-md-1 mb25">'+
|
||||||
'<a id="minus1" onclick="removeinputs('+c+')" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
'<a id="minus1" onclick="removeinputs('+c+')" style="margin-top: 47px;color: red;margin-left: 4px;" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>';
|
'</div>';
|
||||||
|
|||||||
@ -37,9 +37,9 @@
|
|||||||
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
|
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
|
||||||
|
|
||||||
<!-- Include the StickyTableHeaders plugin -->
|
<!-- Include the StickyTableHeaders plugin -->
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/StickyTableHeaders/0.1.1/jquery.stickytableheaders.min.js"></script>
|
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/StickyTableHeaders/0.1.1/jquery.stickytableheaders.min.js"></script> -->
|
||||||
<style>
|
<style>
|
||||||
.mb25{
|
.mb25{
|
||||||
margin-bottom: 25px;
|
margin-bottom: 25px;
|
||||||
}
|
}
|
||||||
.required{
|
.required{
|
||||||
@ -53,26 +53,37 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* .form-group {
|
/* .form-group {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
padding: 5px; /* Adjust the padding as needed to decrease the spacing */
|
padding: 5px;
|
||||||
|
} */
|
||||||
|
.body {
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.table {
|
.table {
|
||||||
font-size: 12px;
|
font-size: 9px;
|
||||||
border-spacing:0px;
|
border-spacing:0px;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
label {
|
||||||
|
display: inline-block;
|
||||||
|
margin-bottom: 2.5rem;
|
||||||
|
}
|
||||||
.table tr, table td {
|
.table tr, table td {
|
||||||
padding: 5px; /* Adjust the padding as needed to decrease the cell height */
|
padding: 5px;
|
||||||
line-height: 2;
|
/* line-height: 2; */
|
||||||
/* Adjust the line-height as needed for tighter cell spacing */
|
/* Adjust the line-height as needed for tighter cell spacing */
|
||||||
}
|
}
|
||||||
|
|
||||||
.table tbody{
|
.table tbody{
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
max-height: 350px;
|
max-height: 350px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
font-weight: bold;
|
||||||
|
|
||||||
}
|
}
|
||||||
.table thead th{
|
.table thead th{
|
||||||
@ -94,20 +105,52 @@
|
|||||||
.form-group {
|
.form-group {
|
||||||
margin-bottom: -2rem;
|
margin-bottom: -2rem;
|
||||||
}
|
}
|
||||||
.row
|
.table td, .table th {
|
||||||
{
|
padding: 0.10rem;
|
||||||
margin-right:-15px;
|
|
||||||
}
|
|
||||||
div.dataTables_wrapper div.dataTables_info {
|
|
||||||
padding-top: 3.85em;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_desc, table.dataTable thead>tr>th.sorting, table.dataTable thead>tr>td.sorting_asc, table.dataTable thead>tr>td.sorting_desc, table.dataTable thead>tr>td.sorting {
|
|
||||||
padding-right: 70px;
|
|
||||||
}
|
}
|
||||||
/* Style the container for the table with a fixed header */
|
/* Style the container for the table with a fixed header */
|
||||||
/* Style the container for the table with a fixed header */
|
/* Style the container for the table with a fixed header */
|
||||||
|
|
||||||
|
.btn-group>.btn {
|
||||||
|
position: absolute;
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
.btn{
|
||||||
|
margin-left: 60px;
|
||||||
|
margin-top: -94px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dataTables_filter{
|
||||||
|
margin-top:-94px;
|
||||||
|
margin-right: 874px;
|
||||||
|
}
|
||||||
|
.page-title{
|
||||||
|
margin-top:-18px;
|
||||||
|
}
|
||||||
|
#toggle-column-modal-button, #scroll-horizontal-datatable_wrapper .buttons-csv, #scroll-horizontal-datatable_filter label{
|
||||||
|
z-index: 99;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
#scroll-horizontal-datatable_filter label{
|
||||||
|
margin-top:-5px;
|
||||||
|
}
|
||||||
|
#scroll-horizontal-datatable_wrapper .buttons-csv{
|
||||||
|
height: 36px;
|
||||||
|
padding: 6px 20px;
|
||||||
|
line-height: 17px;
|
||||||
|
}
|
||||||
|
.dropdown,.bootstrap-select ,.show-tick .form-control
|
||||||
|
{
|
||||||
|
margin-top:4px;
|
||||||
|
}
|
||||||
|
/* .btn ,.dropdown-toggle,.btn-light
|
||||||
|
{
|
||||||
|
margin-left:8px;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
.dropdown-toggle{
|
||||||
|
margin-left:8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -183,8 +226,9 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
<div class="row" style="margin-bottom:20px;">
|
<div class="row" style="margin-bottom:-6px;">
|
||||||
<form class="col-md-12" id="formid">
|
<form class="col-md-12" id="formid">
|
||||||
|
<h4 class="page-title">TMC RECON</h4><br>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<!--
|
<!--
|
||||||
<div class="form-group col-md-2">
|
<div class="form-group col-md-2">
|
||||||
@ -198,75 +242,86 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
-->
|
-->
|
||||||
<div class="form-group col-md-4">
|
|
||||||
|
<div class="form-group col-md-6" style="margin-top:-4px;margin-left: 777px;">
|
||||||
|
|
||||||
<label> FROM </label>
|
<label> FROM </label>
|
||||||
<input type="date" id="from" name="from" value="2020-01-01" >
|
<input type="date" id="from" name="from" value="2020-01-01">
|
||||||
|
|
||||||
<label> TO </label>
|
<label> TO </label>
|
||||||
<input type="date" id="TO" name="to" value="2023-01-01" >
|
<input type="date" id="TO" name="to" value="2023-01-01" ="">
|
||||||
|
|
||||||
|
<label for="inputPassword4" class="col-form-label"></label>
|
||||||
|
<button style="margin-top:-6px;margin-left: -3px;font-size:10px;" type="submit" class="btn btn-primary">Submit</button><br>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group col-md-2">
|
<div class="form-group col-md-2">
|
||||||
<label for="inputPassword4" class="col-form-label"></label>
|
|
||||||
<button style="margin-top:0px;font-size:10px;" type="submit" class="btn btn-primary">Submit</button><br>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2"></div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="form-group col-md-3" id="hidden-dropdown">
|
<!-- <div class="form-group col-md-3" style="margin-top:-7px;"id="hidden-dropdown"> -->
|
||||||
<div class="page-title-right">
|
|
||||||
<ol class="breadcrumb m-0">
|
|
||||||
<!-- <li class="breadcrumb-item"><a href="javascript: void(0);">Reconciliation</a></li> -->
|
|
||||||
<li class="breadcrumb-item active">TMC</li>
|
|
||||||
</ol>
|
|
||||||
</div>
|
|
||||||
<!-- <select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple><p>GSTR@A</p>
|
|
||||||
<option value="1">CORPORATE NAME</option>
|
|
||||||
<option value="2">CORPORATE GSTIN</option>
|
|
||||||
<option value="3">TRADE/LEGAL NAME OF THE SUPPLIER</option>
|
|
||||||
<option value="4">SUPPLIER TYPE</option>
|
|
||||||
<option selected="selected" value="5">INVOICE NUMBER</option> -->
|
|
||||||
<!-- <option selected="selected" value="5">MANUAL TICKET NO.</option>
|
|
||||||
<option selected="selected" value="6">TICKET NO.</option> -->
|
|
||||||
<!-- <option selected="selected" value="8">DOCUMENT TYPE</option>
|
|
||||||
<option selected="selected" value="9">INVOICE DATE</option>
|
|
||||||
<option selected="selected" value="10">INVOICE AMT (₹)</option>
|
|
||||||
<option selected="selected" value="11">TICKET AMT</option>
|
|
||||||
<option selected="selected"value="12">VARIANCE</option>
|
|
||||||
<option selected="selected" value="13">RATE (%)</option>
|
|
||||||
<option selected="selected" value="14">TAXABLE AMT (₹)</option>
|
|
||||||
<option selected="selected"value="15">CENTRAL TAX (₹)</option>
|
|
||||||
<option selected="selected" value="16">STATE/UT TAX (₹)</option>
|
|
||||||
<option selected="selected" value="18">GSTR2A REMARKS</option>
|
|
||||||
<option selected="selected"value="19">INVOICE REMARKS</option>
|
|
||||||
|
|
||||||
<option selected="selected"value="20">TICKET NUMBER </option>
|
<div class="modal fade" id="columnModal" tabindex="-1" role="dialog" aria-labelledby="columnModalLabel" aria-hidden="true">
|
||||||
<option selected="selected"value="21">TICKET AMT</option>
|
<div class="modal-dialog" role="document">
|
||||||
<option selected="selected"value="22">INVOICE FILE</option>
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title" id="columnModalLabel">Select Column to Display</h5>
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
|
<span aria-hidden="true">×</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body"style="margin-top: 10px;">
|
||||||
|
<label for="selectColumn"style="margin-bottom:3.5rem">Select Column:</label>
|
||||||
|
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
|
||||||
|
<option selected="selected" value="1">TICKET NO</option>
|
||||||
|
<option selected="selected" value="2">DOC TYPE </option>
|
||||||
|
<option selected="selected" value="3">PAX NAME</option>
|
||||||
|
<!-- <option selected="selected" value="3">REF NO</option> -->
|
||||||
|
<option selected="selected" value="5">TOTAL TKT FARE</option>
|
||||||
|
<option selected="selected"value="6">INV NUM</option>
|
||||||
|
<option selected="selected" value="7">INV AMT</option>
|
||||||
|
<option selected="selected"value="8">INV DATE</option>
|
||||||
|
<option selected="selected"value="9">TMC INV NUM</option>
|
||||||
|
<option selected="selected"value="10">BILLING ENTITY</option>
|
||||||
|
<option selected="selected"value="11">CARRIER</option>
|
||||||
|
<option selected="selected"value="12">SECTOR</option>
|
||||||
|
<option selected="selected"value="13">CABIN CLASS</option>
|
||||||
|
<option selected="selected"value="14">NET FARE</option>
|
||||||
|
<option selected="selected"value="15">REMARKS</option>
|
||||||
|
<option selected="selected"value="16">ACTION</option>
|
||||||
|
<!-- <option selected="selected" value="0">Icon for Select Option</option> -->
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer"style="margin-top:39px;">
|
||||||
|
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
||||||
|
<button type="button" class="btn btn-primary" id="applyColumn">Apply Column</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<option selected="selected"value="24">DELETE</option>
|
|
||||||
|
|
||||||
|
|
||||||
</select> -->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="table-container">
|
<div class="table-container">
|
||||||
<table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100">
|
<table id="scroll-horizontal-datatable" class="table w-100 nowrap">
|
||||||
|
<button id="toggle-column-modal-button" class="btn btn-link" data-toggle="modal" data-target="#columnModal" style="
|
||||||
|
margin-top: -106px;
|
||||||
|
margin-left: 10px;;
|
||||||
|
">
|
||||||
|
<i class="fa fa-eye"></i> </button>
|
||||||
<!--
|
<!--
|
||||||
<table id="scroll-horizontal-datatable" class="table w-100 nowrap"> -->
|
<table id="scroll-horizontal-datatable" class="table w-100 nowrap"> -->
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<button id="toggle-column-modal-button" class="btn btn-link" data-toggle="modal" data-target="#columnModal">
|
<!-- <button id="toggle-column-modal-button" class="btn btn-link" data-toggle="modal" data-target="#columnModal">
|
||||||
<i class="fa fa-eye"></i> </button>
|
<i class="fa fa-eye"></i> </button> -->
|
||||||
<th>TICKET NO</th>
|
<th>TICKET NO</th>
|
||||||
<th>DOC TYPE</th>
|
<th>DOC TYPE</th>
|
||||||
<th>PASSENGER NAME</th>
|
<th>PASSENGER NAME</th>
|
||||||
@ -277,7 +332,7 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
<th>INV DATE</th>
|
<th>INV DATE</th>
|
||||||
<th>TMC INVOICE NO</th>
|
<th>TMC INVOICE NO</th>
|
||||||
<th>BILLING ENTITY</th>
|
<th>BILLING ENTITY</th>
|
||||||
<th>BILLING ENTITY</th>
|
<th>CARRIER</th>
|
||||||
<th>SECTOR</th>
|
<th>SECTOR</th>
|
||||||
<th>CABINCLASS</th>
|
<th>CABINCLASS</th>
|
||||||
<th>NET FARE</th>
|
<th>NET FARE</th>
|
||||||
@ -299,23 +354,7 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<label for="selectColumn">Select Column:</label>
|
<label for="selectColumn">Select Column:</label>
|
||||||
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
|
|
||||||
<option selected="selected" value="1">SEGMENT</option>
|
|
||||||
<option selected="selected" value="2">INV DATE </option>
|
|
||||||
<option selected="selected" value="3">TMC INVOICE NO</option>
|
|
||||||
<!-- <option selected="selected" value="3">REF NO</option> -->
|
|
||||||
<option selected="selected" value="5">DOC TYPE</option>
|
|
||||||
<option selected="selected"value="6">BILLING ENTITY</option>
|
|
||||||
<option selected="selected" value="7">PASSENGER NAME</option>
|
|
||||||
<option selected="selected"value="8">AIRLINE CODE</option>
|
|
||||||
<option selected="selected"value="9">TICKET NO</option>
|
|
||||||
<option selected="selected"value="10">SECTOR</option>
|
|
||||||
<option selected="selected"value="11">CABINCLASS</option>
|
|
||||||
<option selected="selected"value="12">TOTAL TKT FARE</option>
|
|
||||||
<option selected="selected"value="13">REMARKS</option>
|
|
||||||
<option selected="selected"value="14">ACTION</option>
|
|
||||||
<option selected="selected" value="0">Icon for Select Option</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
|
||||||
@ -381,7 +420,7 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
<div id="airline_invoice_0"></div>
|
<div id="airline_invoice_0"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-1 mb25">
|
<div class="col-md-1 mb25">
|
||||||
<a id="minus1" onclick="removeinputs(1)" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>
|
<a id="minus1" onclick="removeinputs(1)" style="margin-top: 47px;color: red;margin-left: 4px " class="btn btn-default"><i class="fa fa-trash"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -391,15 +430,15 @@ table.dataTable thead>tr>th.sorting_asc, table.dataTable thead>tr>th.sorting_des
|
|||||||
<div class="col-md-10">
|
<div class="col-md-10">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2 mb25">
|
<div class="col-md-2 mb25">
|
||||||
<a id="addfields" onclick="addfields()" class="btn btn-primary"><i class="fa fa-plus"></i></a>
|
<a id="addfields" onclick="addfields()" class="btn btn-primary" style="margin-top: 10px;margin-left: 18px;" ><i class="fa fa-plus"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
|
||||||
<button class="btn btn-primary" type="submit" id="formsubmit">Submit
|
<button class="btn btn-primary" type="submit" id="formsubmit" style="margin-top: 10px;margin-right: -32px;">Submit
|
||||||
</button>
|
</button>
|
||||||
<button type="button" id="addclose" class="btn btn-default" data-dismiss="modal">Close</button>
|
<button type="button" id="addclose" class="btn btn-default" style="margin-top: 10px; margin-right: -18px;"data-dismiss="modal">Close</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -590,7 +629,7 @@ function() {
|
|||||||
'<div id="airline_invoice_0"></div>'+
|
'<div id="airline_invoice_0"></div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'<div class="col-md-1 mb25">'+
|
'<div class="col-md-1 mb25">'+
|
||||||
'<a id="minus1" onclick="removeinputs(1)" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
'<a id="minus1" onclick="removeinputs(1)" style="margin-top: 47px;color: red;margin-left: 4px; " class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>';
|
'</div>';
|
||||||
@ -672,7 +711,7 @@ function() {
|
|||||||
'<div id="airline_invoice_'+r+'"></div>'+
|
'<div id="airline_invoice_'+r+'"></div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'<div class="col-md-1 mb25">'+
|
'<div class="col-md-1 mb25">'+
|
||||||
'<a id="minus1" onclick="removeinputs('+c+')" style="margin-top:20px;color:red" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
'<a id="minus1" onclick="removeinputs('+c+')" style="margin-top: 47px;color: red;margin-left: 4px;" class="btn btn-default"><i class="fa fa-trash"></i></a>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>'+
|
'</div>'+
|
||||||
'</div>';
|
'</div>';
|
||||||
@ -788,7 +827,9 @@ function() {
|
|||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
|
|
||||||
oTable = $("#datatable-buttons").DataTable({
|
oTable = $("#scroll-horizontal-datatable").DataTable({
|
||||||
|
"paging": true,
|
||||||
|
"pageLength": 50,
|
||||||
|
|
||||||
lengthChange: !1,
|
lengthChange: !1,
|
||||||
dom: 'Bfrtip',
|
dom: 'Bfrtip',
|
||||||
@ -853,7 +894,7 @@ function() {
|
|||||||
],
|
],
|
||||||
"columnDefs": [
|
"columnDefs": [
|
||||||
{
|
{
|
||||||
"targets":11,
|
"targets":[11,0],
|
||||||
"visible": false
|
"visible": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -888,21 +929,21 @@ function() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"targets": 16,
|
||||||
|
"width": 300,
|
||||||
|
"render": function (data, type, full, meta) {
|
||||||
|
console.log(full['inv']);
|
||||||
|
if (full['inv'] !== " ") {
|
||||||
|
return `<div style="display:flex;"><button type="text" style="border:none;" class="form-control" id="${full['td_id']}" data-refid="${full['td_tkt']}" value="${full['td_tkt']}" onclick="viewinvfn(this.value)"><i class="fa fa-eye" style="margin-right:51px;"</i></button></div>`;
|
||||||
|
} else {
|
||||||
|
return `<div style="display:flex;"><button type="text" style="border:none;" class="form-control" data-refid="${data}" value="${data}" onclick="viewfn(${data},1)"><i class="fa fa-eye" style="margin-right: 4px;"></i></button><button type="text" style="border:none;" class="form-control" id="${data}" onclick="viewfn(${data},1)"><i class="fa fa-trash"></i></button></div>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
"targets": 16,
|
|
||||||
"width": 300,
|
|
||||||
"render": function ( data, type, full, meta ) {
|
|
||||||
console.log(full['inv']);
|
|
||||||
if (full['inv'] != " ") {
|
|
||||||
return '<button type="text" style="border:none;" class="form-control" id="'+full['td_id']+'" data-refid="'+full['td_tkt']+'" value="'+full['td_tkt']+'" onclick="viewinvfn(this.value)" >'+full['inv']+'</button>';
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
return `<button type="text" class="form-control" data-refid="${data}" value="${data}" onclick="viewfn(${data},1)" >View</button>
|
|
||||||
<a id="${data}" onclick="deletetmcrecon(${data})" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"targets": 6,
|
"targets": 6,
|
||||||
"width": 300,
|
"width": 300,
|
||||||
@ -946,7 +987,7 @@ function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
oTable.buttons().container().appendTo("#datatable-buttons_wrapper .col-md-6:eq(0)"), $("#alternative-page-datatable").DataTable({
|
oTable.buttons().container().appendTo("#scroll-horizontal-datatable_wrapper .col-md-6:eq(0)"), $("#alternative-page-datatable").DataTable({
|
||||||
pagingType: "full_numbers",
|
pagingType: "full_numbers",
|
||||||
drawCallback: function () {
|
drawCallback: function () {
|
||||||
$(".dataTables_paginate > .pagination").addClass("pagination-rounded")
|
$(".dataTables_paginate > .pagination").addClass("pagination-rounded")
|
||||||
@ -1066,7 +1107,7 @@ function() {
|
|||||||
var oTable;
|
var oTable;
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
// oTable = $("#datatable-buttons").DataTable({
|
// oTable = $("#scroll-horizontal-datatable").DataTable({
|
||||||
// Your DataTable configuration here
|
// Your DataTable configuration here
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -1111,6 +1152,7 @@ document.getElementById('TO').value = todayFormatted;
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Long Content Scroll Modal -->
|
<!-- Long Content Scroll Modal -->
|
||||||
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog"
|
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog"
|
||||||
aria-labelledby="scrollableModalTitle" aria-hidden="true">
|
aria-labelledby="scrollableModalTitle" aria-hidden="true">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user