FEAT_UI_CHANGES_IN_REPORTS

This commit is contained in:
Srinivas-Saravanan 2025-04-02 15:39:08 +05:30
parent 9486dd1e7d
commit 660647bcf5
5 changed files with 6820 additions and 6239 deletions

File diff suppressed because it is too large Load Diff

View File

@ -25,6 +25,15 @@
<link href="<?php echo base_url(); ?>assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet"><!-- icons --> <link href="<?php echo base_url(); ?>assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet"><!-- icons -->
<link href="<?php echo base_url(); ?>assets/css/icons.min.css" rel="stylesheet" type="text/css"> <link href="<?php echo base_url(); ?>assets/css/icons.min.css" rel="stylesheet" type="text/css">
<style> <style>
.dataTable tbody td {
padding-right: 10px;
}
.mb-3, .my-3 {
margin-top: -53px;
margin-bottom: -27px !important;
}
.mb25{ .mb25{
margin-bottom: 25px; margin-bottom: 25px;
} }
@ -39,18 +48,29 @@
} }
th::before {
margin-top: -13px !important;
top: 6px !important;
}
th::after{
/* display: inline-block; */
/* text-align: center; */
top: 0px !important;
}
/* .form-group { /* .form-group {
font-size: 11px; font-size: 11px;
padding: 5px; padding: 5px;
} */ } */
.body { .body {
font-size: 10px; font-size: 12px;
} }
.table { .table {
font-size: 9px; font-size: 12px;
border-spacing:0px; border-spacing:10px;
} }
@ -67,9 +87,9 @@
.table tbody{ .table tbody{
position: relative; position: relative;
overflow: auto; overflow: auto;
max-height: 350px; max-height: 700px;
width: 100%; width: 100%;
font-weight: bold; /* font-weight: bold; */
} }
.table thead th{ .table thead th{
@ -95,26 +115,7 @@
padding: 0.10rem; padding: 0.10rem;
} }
#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:15px;
margin-left:-236px;
}
#scroll-horizontal-datatable_filter{
margin-left:-246px;
margin-right: 880px;
margin-top: -67px;
}
#scroll-horizontal-datatable_wrapper .buttons-csv{
height: 36px;
padding: 6px 20px;
line-height: 17px;
margin-left: 42px;
margin-top: -46px;
}
div.dataTables_wrapper div.dataTables_paginate ul.pagination { div.dataTables_wrapper div.dataTables_paginate ul.pagination {
margin: 23px 0; margin: 23px 0;
} }
@ -211,23 +212,23 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
<option selected="selected"value="6">VENDOR GST</option> <option selected="selected"value="6">VENDOR GST</option>
<option selected="selected" value="7">RECIPIENT</option> <option selected="selected" value="7">RECIPIENT</option>
<option selected="selected"value="8">RECIPIENT GST</option> <option value="8">RECIPIENT GST</option>
<option selected="selected"value="9">INVOICE NUMBER</option> <option selected="selected"value="9">INVOICE NUMBER</option>
<option selected="selected"value="10">INVOICE DATE</option> <option selected="selected"value="10">INVOICE DATE</option>
<option selected="selected"value="11">HSN</option> <option value="11">HSN</option>
<option selected="selected"value="12">TAXABLE VALUE</option> <option selected="selected"value="12">TAXABLE VALUE</option>
<option selected="selected"value="13">CGST VALUE</option> <option value="13">CGST VALUE</option>
<option selected="selected"value="14">CGST RATE</option> <option value="14">CGST RATE</option>
<option selected="selected"value="15">SGST VALUE</option> <option value="15">SGST VALUE</option>
<option selected="selected"value="17">SGST RATE</option> <option value="16">SGST RATE</option>
<option selected="selected"value="18">IGST VALUE</option> <option value="17">IGST VALUE</option>
<option selected="selected"value="19">IGST RATE</option> <option value="18">IGST RATE</option>
<option selected="selected"value="20">TOTAL INVOICE VALUE</option> <option selected="selected"value="19">TOTAL INVOICE VALUE</option>
<option selected="selected"value="21">TOTAL VALUE</option> <option selected="selected"value="20">TOTAL VALUE</option>
<option selected="selected"value="22">STATUS</option> <option selected="selected"value="21">STATUS</option>
<option selected="selected"value="23">TICKET TYPE</option> <option selected="selected"value="22">TICKET TYPE</option>
<option selected="selected"value="24">AIRLINE FILE NAME</option> <option selected="selected"value="23">AIRLINE FILE NAME</option>
<option selected="selected"value="25">EXTRACTION DATE</option> <option selected="selected"value="24">EXTRACTION DATE</option>
<!-- <option selected="selected"value="26">BATCH ID</option> --> <!-- <option selected="selected"value="26">BATCH ID</option> -->
<!-- <option selected="selected" value="0">Icon for Select Option</option> --> <!-- <option selected="selected" value="0">Icon for Select Option</option> -->
</select> </select>
@ -246,39 +247,39 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
</form> </form>
</div> </div>
<table id="scroll-horizontal-datatable" class="table w-100 nowrap"> <table id="scroll-horizontal-datatable" class="table table-striped nowrap w-100">
<thead> <thead>
<button id="toggle-column-modal-button" class="btn btn-link" data-toggle="modal" data-target="#columnModal" style=" <!-- <button id="toggle-column-modal-button" class="btn btn-link" data-toggle="modal" data-target="#columnModal" style="
margin-top: -43px; margin-top: -43px;
margin-right: 1228px; margin-right: 1228px;
"> <i class="fa fa-eye"></i> </button> "> <i class="fa fa-eye"></i> </button> -->
<tr> <tr>
<th hidden>S.NO</th> <th hidden>S.NO</th>
<th hidden>INVOICE ID</th> <th hidden>INVOICE ID</th>
<th>PAX NAME</th> <th>PAX NAME</th>
<th>PNR</th> <th>PNR</th>
<th>TICKET NO</th> <th>TKT</th>
<th>VENDOR</th> <th hidden>VENDOR</th>
<th>VENDOR GST</th> <th hidden>VENDOR GST</th>
<th>RECIPIENT</th> <th>REC</th>
<th>RECIPIENT GST</th> <th >REC GST</th>
<th>INVOICE NUMBER</th> <th>INV NUMBER</th>
<th>INVOICE DATE</th> <th>INV DATE</th>
<th>HSN</th> <th >HSN</th>
<th>TAXABLE VALUE</th> <th>TAX VAL</th>
<th>CGST VALUE</th> <th >CGST VAL</th>
<th>CGST RATE</th> <th >CGST RATE</th>
<th>SGST VALUE</th> <th >SGST VAL</th>
<th>SGST RATE</th> <th >SGST RATE</th>
<th>IGST VALUE</th> <th >IGST VAL</th>
<th>IGST RATE</th> <th >IGST RATE</th>
<th>TOTAL INVOICE VALUE</th> <th>TOT INV VAL</th>
<th>TOTAL VALUE</th> <th>TOT VAL</th>
<th>STATUS</th> <th>STATUS</th>
<th>TICKET TYPE</th> <th>TKT TYPE</th>
<th>AIRLINE FILE NAME</th> <th>AIRLINE FILE NAME</th>
<th>EXTRACTION DATE</th> <th>EXTR DATE</th>
<th>BATCH ID</th> <th>BATCH ID</th>
</tr> </tr>
</thead> </thead>
@ -291,26 +292,27 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
<td><?php echo $value->pax_name; ?></td> <td><?php echo $value->pax_name; ?></td>
<td><?php echo $value->pnr; ?></td> <td><?php echo $value->pnr; ?></td>
<td><?php echo $value->ticket_no; ?></td> <td><?php echo $value->ticket_no; ?></td>
<td><?php echo $value->vendor; ?></td> <td hidden><?php echo $value->vendor; ?></td>
<td><?php echo $value->vendor_gst; ?></td> <td hidden><?php echo $value->vendor_gst; ?></td>
<td><?php echo $value->recepient; ?></td> <td><?php echo $value->recepient; ?></td>
<td><?php echo $value->recepient_gst; ?></td> <td><?php echo $value->recepient_gst; ?></td>
<td><?php echo $value->invoice_no?></td> <td><?php echo $value->invoice_no?></td>
<td><?php echo $value->invoice_dt; ?></td> <td><?php echo $value->invoice_dt; ?></td>
<td><?php echo $value->hsn; ?></td> <td><?php echo $value->hsn; ?></td>
<td><?php echo $value->taxable_value; ?></td> <td style="text-align: right;"><?php echo (int) $value->taxable_value; ?></td>
<td><?php echo $value->cgst_value;?></td> <td style="text-align: right;"><?php echo (int) $value->cgst_value;?></td>
<td><?php echo $value->cgst_rate; ?></td> <td style="text-align: right;"><?php echo (int) $value->cgst_rate; ?></td>
<td><?php echo $value->sgst_value; ?></td> <!-- <td hidden>kkk</td> -->
<td><?php echo $value->sgst_rate; ?></td> <td style="text-align: right;"><?php echo (int) $value->sgst_value; ?></td>
<td><?php echo $value->igst_value; ?></td> <td style="text-align: right;"><?php echo (int) $value->sgst_rate; ?></td>
<td><?php echo $value->igst_rate; ?></td> <td style="text-align: right;"><?php echo (int) $value->igst_value; ?></td>
<td><?php echo $value->total_inv_value; ?></td> <td style="text-align: right;"><?php echo (int) $value->igst_rate; ?></td>
<td><?php echo $value->total_values; ?></td> <td style="text-align: right;"><?php echo (int) $value->total_inv_value; ?></td>
<td style="text-align: right;"><?php echo (int) $value->total_values; ?></td>
<td><?php echo $value->status; ?></td> <td><?php echo $value->status; ?></td>
<td><?php echo $value->ticket_type; ?></td> <td><?php echo $value->ticket_type; ?></td>
<td><?php echo $value->airline_file_name; ?></td> <td><?php echo $value->airline_file_name; ?></td>
<td><?php echo $value->extraction_date; ?></td> <td><?php echo date('d-m-Y', strtotime($value->extraction_date)); ?></td>
<td><?php echo $value->batch_id; ?></td><?php <td><?php echo $value->batch_id; ?></td><?php
} }
?> ?>
@ -388,15 +390,25 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
$(document).ready(function() { $(document).ready(function() {
oTable = $("#scroll-horizontal-datatable").DataTable({ oTable = $("#scroll-horizontal-datatable").DataTable({
lengthChange: !1, lengthChange: true,
"paging": true,
"lengthMenu": [10, 25, 50, 100],
"pageLength": 50,
dom: 'Bfrtip', // dom: 'Bflrtip',
"dom": '<"row mb-3"<"col-md-4 d-flex justify-content-start align-items-center"l><"col-md-4 d-flex justify-content-end align-items-center"f><"col-md-4 d-flex justify-content-end align-self-start"B>>rtip',
buttons: [ buttons: [
{ {
extend: "csvHtml5", extend: "csvHtml5",
exportOptions: { 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]
} }
},
{
text: "Columns",
action: function (e, dt, node, config) {
$('#columnModal').modal('show');
}
} }
// 'copyHtml5', // 'copyHtml5',
@ -418,8 +430,13 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
//// } //// }
// ], // ],
scrollX: !0, scrollX: !0,
"paging": true, // "paging": false,
"pageLength": 50, // "pageLength": 50,
"columnDefs": [{
"targets": [11,8,13,14,15,16,17,18],
"visible": false
}],
language: { language: {
paginate: { paginate: {
previous: "<i class='mdi mdi-chevron-left'>", previous: "<i class='mdi mdi-chevron-left'>",

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>TMC GST INV</title> <title>TMC GST INV</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -8,7 +9,7 @@
<meta content="Coderthemes" name="author" /> <meta content="Coderthemes" name="author" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon --> <!-- App favicon -->
<!-- <link rel="shortcut icon" href="<?php echo base_url(); ?>assets/images/favicon.ico">--> <!-- <link rel="shortcut icon" href="<?php echo base_url(); ?>assets/images/favicon.ico">-->
<link rel='shortcut icon' href=assets/images/tsplogo2.png> <link rel='shortcut icon' href=assets/images/tsplogo2.png>
<!-- third party css --> <!-- third party css -->
@ -38,96 +39,135 @@
<link href="<?php echo base_url(); ?>assets/css/icons.min.css" rel="stylesheet" type="text/css" /> <link href="<?php echo base_url(); ?>assets/css/icons.min.css" rel="stylesheet" type="text/css" />
<style> <style>
.mb25{
.dataTable tbody td {
padding-right: 10px;
}
th::before {
margin-top: -16px !important;
top: 6px !important;
margin-right: 4px !important;
}
th::after {
/* display: inline-block; */
/* text-align: center; */
top: -2px !important;
margin-right: 4px !important;
}
.mb25 {
margin-bottom: 25px; margin-bottom: 25px;
} }
.required{
.required {
color: red; color: red;
} }
#bs-select-1{
#bs-select-1 {
max-height: 150px !important; max-height: 150px !important;
overflow-y: auto !important; overflow-y: auto !important;
} }
.left{
} .left {}
.table tr, table td {
padding: 5px; /* Adjust the padding as needed to decrease the cell height */ .table tr,
table td {
padding: 5px;
/* Adjust the padding as needed to decrease the cell height */
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: 30px; */
width: 100%; width: 100%;
} }
.table thead th{
vertical-align: middle;
}
.dataTables_scrollBody
{
max-height: 390px; .table thead th {
vertical-align: middle;
}
.dataTables_scrollBody {
/* max-height: 100px; */
width: 1129px; width: 1129px;
} }
.footer
{ .footer {
padding-top: 19px; padding-top: 19px;
padding-right: 17px; padding-right: 17px;
padding-bottom: 2px; padding-bottom: 2px;
padding-left: 17px; padding-left: 17px;
}
.highlight-gst-inv {
background-color: #FFFFFF; /* Light grey for GST Invoice Number */
} }
.highlight-gst-inv {
background-color: #FFFFFF;
/* Light grey for GST Invoice Number */
}
.highlight-gst-inv_fare { .highlight-gst-inv_fare {
background-color: #FFFFFF; /* Light grey for GST Invoice Number */ background-color: #FFFFFF;
/* Light grey for GST Invoice Number */
} }
.highlight-tmc-tkt { .highlight-tmc-tkt {
background-color: #f0f0f0; /* Lighter grey for TMC Ticket Number */ background-color: #f0f0f0;
/* Lighter grey for TMC Ticket Number */
} }
.highlight-tmc-pax { .highlight-tmc-pax {
background-color:#f0f0f0; /* Lighter grey for TMC Ticket Number */ background-color: #f0f0f0;
/* Lighter grey for TMC Ticket Number */
} }
.highlight-tmc-tkt_fare { .highlight-tmc-tkt_fare {
background-color: #f0f0f0; /* Lighter grey for TMC Ticket Number */ background-color: #f0f0f0;
/* Lighter grey for TMC Ticket Number */
} }
.highlight-airline-inv { .highlight-airline-inv {
background-color: #f0f0f0; /* Light grey for Airline Invoice Number */ background-color: #f0f0f0;
/* Light grey for Airline Invoice Number */
} }
.highlight-airline-tkt { .highlight-airline-tkt {
background-color: #f0f0f0; /* Light sandal for Airline Ticket Number */ background-color: #f0f0f0;
/* Light sandal for Airline Ticket Number */
} }
.highlight-airline-tkt_fare { .highlight-airline-tkt_fare {
background-color: #f0f0f0; /* Light sandal for Airline Ticket Number */ background-color: #f0f0f0;
/* Light sandal for Airline Ticket Number */
} }
/* ...your existing styles */ /* ...your existing styles */
.fare-mismatch td { .fare-mismatch td {
color:red; /* Ensures text is readable on dark red background */ color: red;
/* Ensures text is readable on dark red background */
} }
<style> <style>.mb25 {
.mb25{
margin-bottom: 25px; margin-bottom: 25px;
} }
.required{
.required {
color: red; color: red;
} }
#bs-select-1{
#bs-select-1 {
max-height: 150px !important; max-height: 150px !important;
overflow-y: auto !important; overflow-y: auto !important;
} }
.left{
} .left {}
/* .form-group { /* .form-group {
@ -135,82 +175,65 @@
padding: 5px; padding: 5px;
} */ } */
.body { .body {
font-size: 10px; font-size: 12px;
} }
.table { .table {
font-size: 9px; font-size: 12px;
border-spacing:0px; border-spacing: 0px;
} }
label { label {
display: inline-block; display: inline-block;
margin-bottom: 2.5rem; margin-bottom: 2.5rem;
} }
.table tr, table td {
.table tr,
table td {
padding: 5px; 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: 50px; */
width: 100%; width: 100%;
font-weight: bold; /* font-weight: bold; */
} }
.table thead th{
.table thead th {
vertical-align: middle; vertical-align: middle;
} }
.dataTables_scrollBody
{
max-height: 390px;
width: 1129px;
}
.form-group { .form-group {}
} .table td,
.table td, .table th { .table th {
padding: 0.10rem; padding: 0.10rem;
} }
.dt-buttons,.btn-group .flex-wrap
{
margin-top:-185px;
} .dt-buttons .flex-wrap {
#scroll-horizontal-datatable_filter label{ margin-top: -185px;
margin-top:15px;
margin-left:-236px;
}
#scroll-horizontal-datatable_filter {
margin-left: -280px;
margin-top: -122px;
}
#scroll-horizontal-datatable_filter label{
z-index: 99;
position: relative;
margin-right: 872px;
margin-top: 25px;
}
.dataTables_scroll{
margin-top:-27px;
}
/* Style the container for the table with a fixed header */
/* Style the container for the table with a fixed header */
}
.mb-3,
.my-3 {
margin-top: -53px;
margin-bottom: -27px !important;
}
</style> </style>
</head> </head>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'> <body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
<!-- Begin page --> <!-- Begin page -->
<div id="wrapper"> <div id="wrapper">
@ -247,50 +270,20 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row" style="margin-bottom:20px;"> <div style="margin-bottom: 2.5rem" class="row">
<form method="post" action="<?php echo base_url('corporate/tmc_gst_inv'); ?>"> <form class="col-md-12" method="post" action="<?php echo base_url('corporate/tmc_gst_inv'); ?>">
<h4 style="
margin-top: -18px;
">TMC GST INV</h4><br>
<div class="form-row" style="
margin-left: 782px;">
<!--
<div class="form-group col-md-2">
<label for="inputEmail4" class="col-form-label">GST No</label>
<select name="gst_no" class="form-control">
<?php
// foreach($gstno_list->result() as $gstno_i){
// echo '<option>'.$gstno_i->gn_gstno.'</option>';
// }
?>
</select> <div class="form-row">
<div class="form-group col-md-6" ><h4 class="page-title">TMC RECON</h4><br></div>
<div class="form-group col-md-6 d-flex justify-content-end align-items-center">
<div class="col-md-5"></div>
<div class="col-md-5 d-flex justify-content-end">
<input class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" />
</div> </div>
--> <div class="col-md-2 d-flex justify-content-end">
<button type="submit" class="btn btn-primary">Submit</button>
<div class="form-group col-md-5" style="margin-top:-34px;">
<label for="from_date">From</label>
<!-- <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'] : ''; ?>"> -->
<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;">
<label for="to_date">To</label>
<!-- <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'] : ''; ?>"> -->
<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 class="form-group col-md-2">
<label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:-43px;font-size:12px;z-index: 99;
position: relative;" type="submit" class="btn btn-primary">Submit</button><br>
</div> </div>
@ -310,19 +303,19 @@
</form> </form>
</div> </div>
<table id="scroll-horizontal-datatable" class="table w-100 nowrap"> <table id="scroll-horizontal-datatable" class="table table-striped nowrap w-100">
<thead> <thead>
<tr> <tr>
<th>TMC Pax Name</th> <th>TMC PAX NAME</th>
<th>TMC Tkt number</th> <th>TMC TKT NUMBER</th>
<th>TMC Tkt Fare</th> <th>TMC TKT FARE</th>
<th>GST Inv Number</th> <th>GST INV NUMBER</th>
<th>GST Inv Value</th> <th>GST INV VALUE</th>
<th>Airline Inv Number</th> <th>AIRLINE INV NUMBER</th>
<th>Airline Tkt Number</th> <th>AIRLINE TKT NUMBER</th>
<th>Airline Tkt Fare</th> <th>AIRLINE TKT FARE</th>
<!-- <th>RECIPIENT</th> <!-- <th>RECIPIENT</th>
<th>RECIPIENT GST</th> <th>RECIPIENT GST</th>
<th>INVOICE NUMBER</th> <th>INVOICE NUMBER</th>
@ -352,17 +345,17 @@
// Check if any fare value is empty // Check if any fare value is empty
$anyFareEmpty = empty($row->tmc_tkt_fare) || empty($row->gst_fare) || empty($row->airline_fare); $anyFareEmpty = empty($row->tmc_tkt_fare) || empty($row->gst_fare) || empty($row->airline_fare);
?> ?>
<tr <?php if (!$anyFareEmpty && ($row->tmc_tkt_fare != $row->gst_fare || $row->tmc_tkt_fare != $row->airline_fare || $row->gst_fare != $row->airline_fare)) echo 'class="fare-mismatch"'; ?> > <tr <?php if (!$anyFareEmpty && ($row->tmc_tkt_fare != $row->gst_fare || $row->tmc_tkt_fare != $row->airline_fare || $row->gst_fare != $row->airline_fare)) echo 'class="fare-mismatch"'; ?>>
<td class="highlight-tmc-pax"><?php echo $row->tmc_pax; ?></td> <td class="highlight-tmc-pax"><?php echo $row->tmc_pax; ?></td>
<td class="highlight-tmc-tkt"><?php echo $row->tmc_ticket_no; ?></td> <td class="highlight-tmc-tkt"><?php echo $row->tmc_ticket_no; ?></td>
<td class="highlight-tmc-tkt_fare"><?php echo $row->tmc_tkt_fare; ?></td> <td style="text-align: right;" class="highlight-tmc-tkt_fare"><?php echo (int) $row->tmc_tkt_fare; ?></td>
<td class="highlight-gst-inv"><?php echo $row->gst_invoice_no; ?></td> <td class="highlight-gst-inv"><?php echo $row->gst_invoice_no; ?></td>
<td class="highlight-gst-inv_fare"><?php echo $row->gst_fare; ?></td> <td style="text-align: right;" class="highlight-gst-inv_fare"><?php echo (int) $row->gst_fare; ?></td>
<td class="highlight-airline-inv"><?php echo $row->airline_inv_no; ?></td> <td class="highlight-airline-inv"><?php echo $row->airline_inv_no; ?></td>
<td class="highlight-airline-tkt"><?php echo $row->airline_ticket_no; ?></td> <td class="highlight-airline-tkt"><?php echo $row->airline_ticket_no; ?></td>
<td class="highlight-airline-tkt_fare"><?php echo $row->airline_fare; ?></td> <td style="text-align: right;" class="highlight-airline-tkt_fare"><?php echo (int) $row->airline_fare; ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<!-- <tr> <!-- <tr>
<td><?php echo $value->tmc_pax; ?></td> <td><?php echo $value->tmc_pax; ?></td>
@ -379,11 +372,11 @@
<!-- <td><?php echo $value->recepient; ?></td> <!-- <td><?php echo $value->recepient; ?></td>
<td><?php echo $value->recepient_gst; ?></td> <td><?php echo $value->recepient_gst; ?></td>
<td><?php echo $value->invoice_no?></td> <td><?php echo $value->invoice_no ?></td>
<td><?php echo $value->invoice_dt; ?></td> <td><?php echo $value->invoice_dt; ?></td>
<td><?php echo $value->hsn; ?></td> <td><?php echo $value->hsn; ?></td>
<td><?php echo $value->taxable_value; ?></td> <td><?php echo $value->taxable_value; ?></td>
<td><?php echo $value->cgst_value;?></td> <td><?php echo $value->cgst_value; ?></td>
<td><?php echo $value->cgst_rate; ?></td> <td><?php echo $value->cgst_rate; ?></td>
<td><?php echo $value->sgst_value; ?></td> <td><?php echo $value->sgst_value; ?></td>
<td><?php echo $value->sgst_rate; ?></td> <td><?php echo $value->sgst_rate; ?></td>
@ -404,7 +397,7 @@
</tr> </tr>
<tbody> <tbody>
</table> </table>
<!-- </thead> <!-- </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
@ -462,7 +455,7 @@
<script src="<?php echo base_url(); ?>assets/js/pages/form-pickers.init.js"></script> <script src="<?php echo base_url(); ?>assets/js/pages/form-pickers.init.js"></script>
<!-- <script src="<?php echo base_url(); ?>assets/js/pages/datatables.init.js"></script> --> <!-- <script src="<?php echo base_url(); ?>assets/js/pages/datatables.init.js"></script> -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">
<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>
@ -475,38 +468,39 @@
$(document).ready(function() { $(document).ready(function() {
oTable = $("#scroll-horizontal-datatable").DataTable({ oTable = $("#scroll-horizontal-datatable").DataTable({
lengthChange: !1, lengthChange: true,
"paging": true, "paging": true,
"lengthMenu": [10, 25, 50, 100],
"pageLength": 50, "pageLength": 50,
// dom: 'Bfrtip', // dom: 'Bflrtip',
buttons: [ "dom": '<"row mb-3"<"col-md-4 d-flex justify-content-start align-items-center"l><"col-md-4 d-flex justify-content-end align-items-center"f><"col-md-4 d-flex justify-content-end align-self-start"B>>rtip',
{ buttons: [{
extend: "csvHtml5", extend: "csvHtml5",
exportOptions: { exportOptions: {
columns: [ 0, 1, 2, 3, 4,5,6,7] columns: [0, 1, 2, 3, 4, 5, 6, 7]
} }
} }
// 'copyHtml5', // 'copyHtml5',
// 'excelHtml5', // 'excelHtml5',
// 'csvHtml5' // 'csvHtml5'
// 'pdfHtml5' // 'pdfHtml5'
], ],
// buttons: [{ // buttons: [{
// extend: "excelHtml5", // extend: "excelHtml5",
// className: "btn-light" // className: "btn-light"
// } // }
//// , { //// , {
//// extend: "print", //// extend: "print",
//// className: "btn-light" //// className: "btn-light"
//// }, { //// }, {
//// extend: "pdf", //// extend: "pdf",
//// className: "btn-light" //// className: "btn-light"
//// } //// }
// ], // ],
scrollX: !0, // scrollX: !0,
language: { language: {
paginate: { paginate: {
previous: "<i class='mdi mdi-chevron-left'>", previous: "<i class='mdi mdi-chevron-left'>",
@ -517,13 +511,91 @@ scrollX: !0,
oTable.buttons().container().appendTo("#scroll-horizontal-datatable_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")
} }
}); });
}); });
</script>
<script>
$(document).ready(function() {
var $select_data = '<?php echo $selected_data; ?>';
// Set default start date to 01/01/2020
var defaultStart = moment('01/01/2020', 'DD/MM/YYYY'); // ← Fixed start date
var defaultEnd = moment(); // Today
// Use submitted dates if available
if ($select_data && $select_data.indexOf(' - ') > -1) {
var parts = $select_data.split(' - ');
defaultStart = moment(parts[0], 'DD/MM/YYYY');
defaultEnd = moment(parts[1], 'DD/MM/YYYY');
}
// Initialize datepicker
$('input.input-daterange-datepicker').daterangepicker({
locale: {
format: 'DD/MM/YYYY',
cancelLabel: 'Clear'
},
startDate: defaultStart,
endDate: defaultEnd,
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}).on('apply.daterangepicker', function(ev, picker) {
$(this).val(
picker.startDate.format('DD/MM/YYYY') + ' - ' +
picker.endDate.format('DD/MM/YYYY')
);
});
});
$(document).ready(function() {
// Reset form on initial load if it's not a deliberate submission
if (window.history.replaceState) {
window.history.replaceState(null, null, window.location.pathname);
}
var $select_data = '<?php echo $selected_data; ?>';
var defaultStart = moment('01/01/2020', 'DD/MM/YYYY');
var defaultEnd = moment();
if ($select_data && $select_data.indexOf(' - ') > -1) {
var parts = $select_data.split(' - ');
defaultStart = moment(parts[0], 'DD/MM/YYYY');
defaultEnd = moment(parts[1], 'DD/MM/YYYY');
}
$('input.input-daterange-datepicker').daterangepicker({
locale: { format: 'DD/MM/YYYY', cancelLabel: 'Clear' },
startDate: defaultStart,
endDate: defaultEnd,
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}).on('apply.daterangepicker', function(ev, picker) {
$(this).val(
picker.startDate.format('DD/MM/YYYY') + ' - ' +
picker.endDate.format('DD/MM/YYYY')
);
});
});
</script> </script>
</body> </body>
</html> </html>

File diff suppressed because it is too large Load Diff