This commit is contained in:
heama 2023-07-21 15:41:50 +05:30
commit 074732ca24
22 changed files with 388 additions and 9 deletions

View File

@ -5107,4 +5107,22 @@ public function upload_tmc(){
echo json_encode($data);
}
}
public function tmc_gst_inv(){
$this->checksess();
$this->load->database('second', TRUE);
// $res = $this->db->query('SELECT invoice_no as inv_invoice_no , pnr as inv_pnr , ticket_no as inv_tkt_no FROM gst1.air_invoice_details AS t1 JOIN reconciler_test.gstr2a_data AS t2 ON t1.invoice_no = t2.gd_inv_no;');
$this->db->select('tmc_data.td_tkt as tmc_tkt , gstr2a_data.gd_inv_no as gstr2a_inv , invoice_no as inv_invoice_no , pnr as inv_pnr , ticket_no as inv_tkt_no , total_values');
$this->db->from('gst1.air_invoice_details');
$this->db->join('reconciler_test.gstr2a_data', 'air_invoice_details.invoice_no = gstr2a_data.gd_inv_no');
$this->db->join('reconciler_test.tmc_data', 'tmc_data.td_tkt = gstr2a_data.gd_tkt_no');
$query = $this->db->get();
$result['data'] = $query->result();
$this->load->view('corporate/tmc_gst_inv',$result);
}
}

View File

@ -186,7 +186,7 @@
<th>INVOICE FILE</th>
<th>ACTION</th>
<th>REFID</th>
<th>REFID</th>
<th>SEARCH</th>
<th>MANUAL TKT NO</th>
<th>TICKET NO</th>
<th>INVOICE</th>
@ -526,9 +526,10 @@ function() {
async: false,
success: function(data){
var pdata = JSON.parse(data);
var d = pdata;
d.counter++;
oTable.row(tr).data(d);
// var d = pdata;
// d.counter++;
// oTable.row(tr).data(d);
$(".btn-primary").click();
},
error:function(){
alert('Request failed. Kindly try after sometime');
@ -616,7 +617,7 @@ function() {
{
extend: "csvHtml5",
exportOptions: {
columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,22]
}
}
@ -683,7 +684,7 @@ function() {
],
"columnDefs": [
{
"targets": [0,1,2,,3,22 ],
"targets": [0,1,2,,3 ],
"visible": false
},
{

View File

@ -87,6 +87,7 @@
<a href="<?php echo site_url('corporate/gstr2a'); ?>" class="dropdown-item">GSTR2A</a>
<a href="<?php echo site_url('corporate/tmc'); ?>" class="dropdown-item">TMC</a>
<a href="<?php echo site_url('corporate/airlineinvoice');?>" class="dropdown-item">AIRLINE INVOICE</a>
<a href="<?php echo site_url('corporate/tmc_gst_inv');?>" class="dropdown-item">TEST</a>
</div>
</li>
<li class="nav-item dropdown">

View File

@ -530,7 +530,7 @@
});
$("#usrforma").submit(function(e) {
console.log("aaaaaaaa");
// alert('sdd')
$('#loading1').show();
$('#submit1').hide();
e.preventDefault(); // avoid to execute the actual submit of the form.
@ -545,9 +545,11 @@
cache: false,
async: false,
success: function(data) {
console.log(data);
$('#loading1').hide();
$('#submit1').show();
var pdata = JSON.parse(data);
console.log(pdata);
if (pdata.status == 1) {
$('#addclose').trigger('click');
usrforma.reset();

View File

@ -0,0 +1,353 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>TMC GST INV</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
<meta content="Coderthemes" name="author" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon -->
<!-- <link rel="shortcut icon" href="<?php echo base_url(); ?>assets/images/favicon.ico">-->
<link rel='shortcut icon' href=assets/images/tsplogo2.png>
<!-- third party css -->
<link href="<?php echo base_url(); ?>assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<!-- third party css end -->
<!-- Plugins css -->
<link href="<?php echo base_url(); ?>assets/libs/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/clockpicker/bootstrap-clockpicker.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>assets/libs/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" type="text/css">
<!-- App favicon -->
<link rel="shortcut icon" href="<?php echo base_url(); ?>assets/images/favicon.ico">
<!-- App css -->
<link href="<?php echo base_url(); ?>assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
<link href="<?php echo base_url(); ?>assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
<link href="<?php echo base_url(); ?>assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
<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" />
<style>
.mb25{
margin-bottom: 25px;
}
.required{
color: red;
}
#bs-select-1{
max-height: 150px !important;
overflow-y: auto !important;
}
.left{
}
</style>
</head>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
<!-- Begin page -->
<div id="wrapper">
<?php include('includes/top_nav.php'); ?>
<!-- ============================================================== -->
<!-- Start Page Content here -->
<!-- ============================================================== -->
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">TMC GST INV </h4>
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Files</a></li>
<li class="breadcrumb-item active">TMC GST INV</li>
</ol>
</div>
</div>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-body">
<div class="row" style="margin-bottom:20px;">
<form class="col-md-12" id="formid">
<div class="form-row">
<!--
<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>
-->
<input id="fromdate" value="" type="hidden">
<input id="todate" value="" type="hidden">
<div class="form-group col-md-4">
<!-- <label class="col-lg-3 col-form-label">Date</label>
<div class="col-lg-12">
<div id="reportrange" class="pull-right form-control">
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
<span></span>
</div>
</div> -->
</div>
<div class="form-group col-md-2">
<!-- <label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:35px" type="submit" class="btn btn-primary">Submit</button> -->
</div>
<div class="col-md-2"></div>
<div class="form-group col-md-4">
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
<option value="0">TICKET NO (TMC)</option>
<option value="1">INV NO (GST)</option>
<option value="2">INV NO</option>
<option value="3">PNR NO</option>
<option value="4">TICKET NO</option>
<option value="5">TOTAL (INV)</option>
<!-- <option value="6">RECIPIENT</option>
<option value="7">RECIPIENT GST</option>
<option value="8">INVOICE NUMBER</option>
<option value="9">INVOICE DATE</option>
<option value="10">HSN</option>
<option value="11">TAXABLE VALUE</option>
<option value="12">CGST VALUE</option>
<option value="13">CGST RATE (&#8377;)</option>
<option value="14">SGST VALUE (&#8377;)</option>
<option value="15">SGST RATE(&#8377;)</option>
<option value="16">IGST VALUE</option>
<optiom value="17">IGST RATE</OPTION> -->
<!--
<option value="17">TMC INV/CRN NO.-1</option>
<option value="18">TMC INV/CRN NO.-2</option>
<option value="19">TMC INV/CRN NO.-3</option>
<option value="20">TMC INV/CRN NO.-4</option>
-->
</select>
</div>
</div>
</form>
</div>
<table id="scroll-horizontal-datatable" class="table w-100 nowrap">
<thead>
<tr>
<th>TICKET NO (TMC)</th>
<th>INV NO (GST)</th>
<th>INV NO</th>
<th>PNR NO</th>
<th>TICKET NO</th>
<th>TOTAL (INV)</th>
<!-- <th>RECIPIENT</th>
<th>RECIPIENT GST</th>
<th>INVOICE NUMBER</th>
<th>INVOICE DATE</th>
<th>HSN</th>
<th>TAXABLE VALUE</th>
<th>CGST VALUE</th>
<th>CGST RATE</th>
<th>SGST VALUE</th>
<th>SGST RATE</th>
<th>IGST VALUE</TH>
<th>IGST RATE</th>
<th>TOTAL INVOICE VALUE</th>
<th>TOTAL VALUE</th>
<th>STATUS</th>
<th>TICKET TYPE</th>
<th> AIRLINE FILE NAME</th>
<th>EXTRACTION DATE</th>
<th>BATCH ID</th>
<th>INVOICE DATE</th> -->
</tr>
</thead>
<tbody>
<?php foreach ($data as $value){
?>
<tr>
<td><?php echo $value->tmc_tkt; ?></td>
<td><?php echo $value->gstr2a_inv; ?></td>
<td><?php echo $value->inv_invoice_no; ?></td>
<td><?php echo $value->inv_pnr; ?></td>
<td><?php echo $value->inv_tkt_no; ?></td>
<td><?php echo $value->total_values; ?></td>
<!-- <td><?php echo $value->recepient; ?></td>
<td><?php echo $value->recepient_gst; ?></td>
<td><?php echo $value->invoice_no?></td>
<td><?php echo $value->invoice_dt; ?></td>
<td><?php echo $value->hsn; ?></td>
<td><?php echo $value->taxable_value; ?></td>
<td><?php echo $value->cgst_value;?></td>
<td><?php echo $value->cgst_rate; ?></td>
<td><?php echo $value->sgst_value; ?></td>
<td><?php echo $value->sgst_rate; ?></td>
<td><?php echo $value->igst_value; ?></td>
<td><?php echo $value->igst_rate; ?></td>
<td><?php echo $value->total_inv_value; ?></td>
<td><?php echo $value->total_values; ?></td>
<td><?php echo $value->status; ?></td>
<td><?php echo $value->ticket_type; ?></td>
<td><?php echo $value->airline_file_name; ?></td>
<td><?php echo $value->extraction_date; ?></td>
<td><?php echo $value->batch_id; ?></td>
<td><?php echo $value->invdt; ?></td> -->
<?php
}
?>
</tr>
<tbody>
</table>
<!-- </thead>
<tbody>
</tbody>
</table>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
<!-- end row-->
</div> <!-- container -->
</div> <!-- content -->
<?php include('includes/footer.php'); ?>
</div>
<!-- ============================================================== -->
<!-- End Page content -->
<!-- ============================================================== -->
<!-- Vendor js -->
<script src="<?php echo base_url(); ?>assets/js/vendor.min.js"></script>
<!-- third party js -->
<script src="<?php echo base_url(); ?>assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/pdfmake/build/pdfmake.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/pdfmake/build/vfs_fonts.js"></script>
<!-- Plugins js-->
<script src="<?php echo base_url(); ?>assets/libs/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/clockpicker/bootstrap-clockpicker.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/moment/min/moment.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- Init js-->
<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> -->
<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>
<!-- App js -->
<script src="<?php echo base_url(); ?>assets/js/app.min.js"></script>
<script>
$(document).ready(function() {
oTable = $("#scroll-horizontal-datatable").DataTable({
lengthChange: !1,
// dom: 'Bfrtip',
buttons: [
{
extend: "csvHtml5",
exportOptions: {
columns: [ 0, 1, 2, 3, 4,5]
}
}
// 'copyHtml5',
// 'excelHtml5',
// 'csvHtml5'
// 'pdfHtml5'
],
// buttons: [{
// extend: "excelHtml5",
// className: "btn-light"
// }
//// , {
//// extend: "print",
//// className: "btn-light"
//// }, {
//// extend: "pdf",
//// className: "btn-light"
//// }
// ],
scrollX: !0,
language: {
paginate: {
previous: "<i class='mdi mdi-chevron-left'>",
next: "<i class='mdi mdi-chevron-right'>"
}
}
});
oTable.buttons().container().appendTo("#scroll-horizontal-datatable_wrapper .col-md-6:eq(0)"), $("#alternative-page-datatable").DataTable({
pagingType: "full_numbers",
drawCallback: function () {
$(".dataTables_paginate > .pagination").addClass("pagination-rounded")
}
});
});
</script>
</body>
</html>

View File

@ -98,7 +98,7 @@
</div>
<div class="form-group col-md-0">
<label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:0px;font-size: 12px;" type="submit" class="btn btn-primary">Submit</button>
<button style="margin-top:0px;font-size: 10px;" type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
@ -464,6 +464,10 @@ datesArr1 = [];
var startDate = new Date($('#from').val());
// alert($('#from').val());
var endDate = new Date($('#to').val());
while (startDate <= endDate) {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.