susee
This commit is contained in:
commit
f5fe7fe182
@ -401,8 +401,10 @@ class Corporate extends CI_Controller {
|
||||
|
||||
public function gen_tmc_recon(){
|
||||
$this->checksess();
|
||||
$fromdate = $this->input->post('fromdate');
|
||||
$todate = $this->input->post('todate');
|
||||
$fromdate= $this->input->post('from');
|
||||
|
||||
$todate = $this->input->post('to');
|
||||
|
||||
// if($gid)
|
||||
// $res = $this->db->query('select *,am_code as supplier_code from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv,sum(td_net) td_net_ref from tmc_data where td_show_status = 1 group by td_tkt) td on gd.gd_id=td.td_gstr2a_match_id left join airline_master am on am.am_name=gd.gd_supplier_type where gd_id = "'.$gid.'"');
|
||||
// else
|
||||
@ -455,8 +457,8 @@ class Corporate extends CI_Controller {
|
||||
|
||||
public function gen_gstr2a_recon($gid = null){
|
||||
$this->checksess();
|
||||
$fromdate = $this->input->post('fromdate');
|
||||
$todate = $this->input->post('todate');
|
||||
$fromdate = $this->input->post('from');
|
||||
$todate = $this->input->post('to');
|
||||
if($gid)
|
||||
$res = $this->db->query('select *,am_code as supplier_code from gstr2a_data where is_active = 1 gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv,sum(td_net) td_net_ref from tmc_data where td_show_status = 1 group by td_tkt) td on gd.gd_id=td.td_gstr2a_match_id left join airline_master am on am.am_name=gd.gd_supplier_type left join airline_invoice ai on gd.gd_id=ai.ti_gdid or gd.gd_inv_no=ai.ti_gst_nub where gd_id = "'.$gid.'" and gd.is_active = 1');
|
||||
// $res = $this->db->query('select *,am_code as supplier_code from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv,sum(td_net) td_net_ref from tmc_data where td_show_status = 1 group by td_tkt) td on gd.gd_id=td.td_gstr2a_match_id left join airline_master am on am.am_name=gd.gd_supplier_type left join airline_invoice ai on gd.gd_id=ai.ti_gdid where gd_id = "'.$gid.'"');
|
||||
@ -1256,14 +1258,14 @@ class Corporate extends CI_Controller {
|
||||
$data['curYear'] = date('Y',time());
|
||||
$this->load->view('corporate/gstr2a',$data);
|
||||
}
|
||||
public function gstlist()
|
||||
public function airlineinvoice()
|
||||
{
|
||||
|
||||
$this->load->database('second', TRUE);
|
||||
|
||||
$res['data']= $this->db2->get('air_invoice_details')->result();
|
||||
|
||||
$this->load->view('corporate/gstlist',$res);
|
||||
$this->load->view('corporate/airlineinvoice',$res);
|
||||
}
|
||||
|
||||
|
||||
|
||||
384
application/views/corporate/airlineinvoice.php
Normal file
384
application/views/corporate/airlineinvoice.php
Normal file
@ -0,0 +1,384 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>AIRLINE INVOICE</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">AIRLINE INVOICE </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">AIRLINE INVOICE</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" 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 (₹)</option>
|
||||
<option selected="selected" value="15">SGST VALUE (₹)</option>
|
||||
<option selected="selected" value="16">SGST RATE(₹)</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>
|
||||
|
||||
<!--
|
||||
|
||||
-->
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<table id="scroll-horizontal-datatable" class="table w-100 nowrap">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>S.NO
|
||||
<th>INVOICE ID</th>
|
||||
<th>PAX NAME</th>
|
||||
<th>PNR</th>
|
||||
<th>TICKET NO</th>
|
||||
<th>VENDOR</th>
|
||||
<th>VENDOR GST</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>
|
||||
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
|
||||
<?php foreach ($data as $value){
|
||||
?>
|
||||
<tr>
|
||||
<td><?php echo $value->sno;?></td>
|
||||
<td><?php echo $value->sl; ?></td>
|
||||
<td><?php echo $value->pax_name; ?></td>
|
||||
<td><?php echo $value->pnr; ?></td>
|
||||
<td><?php echo $value->ticket_no; ?></td>
|
||||
<td><?php echo $value->vendor; ?></td>
|
||||
<td><?php echo $value->vendor_gst; ?></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>
|
||||
|
||||
<?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>
|
||||
|
||||
|
||||
|
||||
<button id="view_modal_btn" style="display:none" type="button" data-toggle='modal' data-target="#view_modal"><i class="fa fa-upload"></i> View modal</button>
|
||||
|
||||
<div id="view_modal" class="modal fade" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
|
||||
|
||||
|
||||
<!-- ============================================================== -->
|
||||
<!-- 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, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,19,20,21,22]
|
||||
}
|
||||
}
|
||||
|
||||
// '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")
|
||||
}
|
||||
});
|
||||
|
||||
$('#column_name').selectpicker();
|
||||
|
||||
|
||||
$('#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 conceptName = $('#column_name').find(":selected").val();
|
||||
|
||||
var remove_column = $('#column_name').val();
|
||||
|
||||
var remaining_column = all_column.filter(function(obj) { return remove_column.indexOf(obj) == -1; });
|
||||
|
||||
oTable.columns(remove_column).visible(true);
|
||||
|
||||
oTable.columns(remaining_column).visible(false);
|
||||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -108,47 +108,55 @@
|
||||
</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>
|
||||
|
||||
<label> FROM </label>
|
||||
<input type="date" id="from" name="from" >
|
||||
|
||||
<label> TO </label>
|
||||
<input type="date" id="TO" name="to" >
|
||||
|
||||
<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>
|
||||
<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>
|
||||
<button style="margin-top:0px" type="submit" class="btn btn-primary">Submit</button>
|
||||
</div>
|
||||
<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 value="0">CORPORATE NAME</option>
|
||||
<option value="1">CORPORATE GSTIN</option>
|
||||
<option value="2">TRADE/LEGAL NAME OF THE SUPPLIER</option>
|
||||
<option value="3">SUPPLIER TYPE</option>
|
||||
<option value="4">INVOICE NUMBER</option>
|
||||
<option value="5">MANUAL TICKET NO.</option>
|
||||
<option value="6">TICKET NO.</option>
|
||||
<option value="7">DOCUMENT TYPE</option>
|
||||
<option value="8">INVOICE DATE</option>
|
||||
<option value="9">INVOICE AMT (₹)</option>
|
||||
<option value="10">TICKET AMT</option>
|
||||
<option value="11">VARIANCE</option>
|
||||
<option value="12">RATE (%)</option>
|
||||
<option value="13">TAXABLE AMT (₹)</option>
|
||||
<option value="14">CENTRAL TAX (₹)</option>
|
||||
<option value="15">STATE/UT TAX (₹)</option>
|
||||
<option value="16">GSTR2A REMARKS</option>
|
||||
<option value="16">INVOICE REMARKS</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>
|
||||
<option value="0">CORPORATE NAME</option>
|
||||
<option value="1">CORPORATE GSTIN</option>
|
||||
<option value="2">TRADE/LEGAL NAME OF THE SUPPLIER</option>
|
||||
<option value="3">SUPPLIER TYPE</option>
|
||||
<option selected="selected" value="4">INVOICE NUMBER</option>
|
||||
<option selected="selected" value="5">MANUAL TICKET NO.</option>
|
||||
<option selected="selected" value="6">TICKET NO.</option>
|
||||
<option selected="selected" value="7">DOCUMENT TYPE</option>
|
||||
<option selected="selected" value="8">INVOICE DATE</option>
|
||||
<option selected="selected" value="9">INVOICE AMT (₹)</option>
|
||||
<option selected="selected" value="10">TICKET AMT</option>
|
||||
<option selected="selected"value="11">VARIANCE</option>
|
||||
<option selected="selected" value="12">RATE (%)</option>
|
||||
<option selected="selected" value="13">TAXABLE AMT (₹)</option>
|
||||
<option selected="selected"value="14">CENTRAL TAX (₹)</option>
|
||||
<option selected="selected" value="15">STATE/UT TAX (₹)</option>
|
||||
<option selected="selected" value="17">GSTR2A REMARKS</option>
|
||||
<option selected="selected"value="18">INVOICE REMARKS</option>
|
||||
|
||||
<option selected="selected"value="19">INVOICE FILE </option>
|
||||
<option selected="selected"value="20">ACTION</option>
|
||||
<option selected="selected"value="21">REFID</option>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</select>
|
||||
</div>
|
||||
@ -186,14 +194,11 @@
|
||||
<th>REFID</th>
|
||||
<th>MANUAL TKT NO</th>
|
||||
<th>TICKET NO</th>
|
||||
<th>INVOICE</th>
|
||||
<th></th>
|
||||
|
||||
|
||||
<!--
|
||||
<th>TMC INV/CRN NO.-1</th>
|
||||
<th>TMC INV/CRN NO.-2</th>
|
||||
<th>TMC INV/CRN NO.-3</th>
|
||||
<th>TMC INV/CRN NO.-4</th>
|
||||
|
||||
-->
|
||||
</tr>
|
||||
</thead>
|
||||
@ -210,9 +215,7 @@
|
||||
</div> <!-- container -->
|
||||
|
||||
</div> <!-- content -->
|
||||
<input type="hidden" id="refval" />
|
||||
<input type="hidden" id="refval_gst_tkt" />
|
||||
<input type="hidden" id="refval_gettkts" />
|
||||
|
||||
<?php include('includes/footer.php'); ?>
|
||||
</div>
|
||||
|
||||
@ -481,15 +484,18 @@ function() {
|
||||
|
||||
$('#formid').submit(function(e){
|
||||
e.preventDefault();
|
||||
console.log($("#fromdate").val());
|
||||
|
||||
alert( $("#to").val());
|
||||
console.log($("#from").val());
|
||||
console.log($('#formid').serialize());
|
||||
$.ajax({
|
||||
url:'<?php echo base_url('corporate/gen_gstr2a_recon'); ?>',
|
||||
type:'POST',
|
||||
data:{ "fromdate" : convert($("#fromdate").val()) , "todate" : convert($("#todate").val()) },
|
||||
data:$('#formid').serialize(),
|
||||
success:function(data){
|
||||
oTable.clear();
|
||||
var jsonData = JSON.parse(data);
|
||||
console.log(jsonData);
|
||||
var jd = jsonData.data;
|
||||
var htmlData = '';
|
||||
var i = 0;
|
||||
@ -684,7 +690,7 @@ function() {
|
||||
],
|
||||
"columnDefs": [
|
||||
{
|
||||
"targets": [ 0, 1, 2, 8, 12, 13, 14, 15, 16, 21, 23, 24 ],
|
||||
"targets": [0,1,2,,3,22,23,24,25 ],
|
||||
"visible": false
|
||||
},
|
||||
{
|
||||
@ -790,15 +796,15 @@ function() {
|
||||
|
||||
$('#column_name').change(function(){
|
||||
|
||||
var all_column = ["0", "1", "2", "3", "4", "5", "6"];
|
||||
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"];
|
||||
|
||||
var remove_column = $('#column_name').val();
|
||||
|
||||
var remaining_column = all_column.filter(function(obj) { return remove_column.indexOf(obj) == -1; });
|
||||
|
||||
oTable.columns(remove_column).visible(false);
|
||||
oTable.columns(remove_column).visible(true);
|
||||
|
||||
oTable.columns(remaining_column).visible(true);
|
||||
oTable.columns(remaining_column).visible(false);
|
||||
|
||||
});
|
||||
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
<a href="<?php echo site_url('corporate/tmc_dashboard'); ?>" class="dropdown-item">TMC Dashboard</a>
|
||||
<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/gstlist');?>" class="dropdown-item">AIRLINE INVOICE</a>
|
||||
<a href="<?php echo site_url('corporate/airlineinvoice');?>" class="dropdown-item">AIRLINE INVOICE</a>
|
||||
</div>
|
||||
</li>
|
||||
<li class="nav-item dropdown">
|
||||
|
||||
@ -103,36 +103,40 @@
|
||||
</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="form-group col-md-4">
|
||||
|
||||
<label> FROM </label>
|
||||
<input type="date" id="from" name="from" >
|
||||
|
||||
<label> TO </label>
|
||||
<input type="date" id="TO" name="to" >
|
||||
|
||||
<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>
|
||||
<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>
|
||||
<button style="margin-top:0px" type="submit" class="btn btn-primary">Submit</button>
|
||||
</div>
|
||||
<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 value="0">SEGMENT</option>
|
||||
<option value="1">INV DATE </option>
|
||||
<option value="2">GST INVOICE NO</option>
|
||||
<option value="3">REF NO</option>
|
||||
<option value="4">DOC TYPE</option>
|
||||
<option value="5">BILLING ENTITY</option>
|
||||
<option value="6">PASSENGER NAME</option>
|
||||
<option value="7">AIRLINE CODE</option>
|
||||
<option value="8">TICKET NO</option>
|
||||
<option value="9">SECTOR</option>
|
||||
<option value="10">CABINCLASS</option>
|
||||
<option value="11">TOTAL TKT FARE</option>
|
||||
<option selected="selected" value="0">SEGMENT</option>
|
||||
<option selected="selected" value="1">INV DATE </option>
|
||||
<option selected="selected" value="2">GST INVOICE NO</option>
|
||||
<option selected="selected" value="3">REF NO</option>
|
||||
<option selected="selected" value="4">DOC TYPE</option>
|
||||
<option selected="selected"value="5">BILLING ENTITY</option>
|
||||
<option selected="selected" value="6">PASSENGER NAME</option>
|
||||
<option selected="selected"value="7">AIRLINE CODE</option>
|
||||
<option selected="selected"value="8">TICKET NO</option>
|
||||
<option selected="selected"value="9">SECTOR</option>
|
||||
<option selected="selected"value="10">CABINCLASS</option>
|
||||
<option selected="selected"value="11">TOTAL TKT FARE</option>
|
||||
<option selected="selected"value="12">REMARKS</option>
|
||||
<option selected="selected"value="13">ACTION</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@ -157,7 +161,7 @@
|
||||
<th>TOTAL TKT FARE</th>
|
||||
<th>REMARKS</th>
|
||||
<th>ACTION</th>
|
||||
<th>INVOICE</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -525,13 +529,20 @@ function() {
|
||||
|
||||
$('#formid').submit(function(e){
|
||||
e.preventDefault();
|
||||
|
||||
|
||||
console.log($("#from").val());
|
||||
console.log($('#formid').serialize());
|
||||
$.ajax({
|
||||
url:'<?php echo base_url('corporate/gen_tmc_recon'); ?>',
|
||||
type:'POST',
|
||||
data:{ "fromdate" : convert($("#fromdate").val()) , "todate" : convert($("#todate").val()) },
|
||||
data:$('#formid').serialize(),
|
||||
|
||||
success:function(data){
|
||||
|
||||
oTable.clear();
|
||||
var jsonData = JSON.parse(data);
|
||||
console.log(jsonData);
|
||||
var jd = jsonData.data;
|
||||
var htmlData = '';
|
||||
var i = 0;
|
||||
@ -620,20 +631,8 @@ function() {
|
||||
oTable = $("#scroll-horizontal-datatable").DataTable({
|
||||
lengthChange: !1,
|
||||
|
||||
dom: 'Bfrtip',
|
||||
buttons: [
|
||||
{
|
||||
extend: "csvHtml5",
|
||||
exportOptions: {
|
||||
columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ]
|
||||
}
|
||||
}
|
||||
|
||||
// 'copyHtml5',
|
||||
// 'excelHtml5',
|
||||
// 'csvHtml5'
|
||||
// 'pdfHtml5'
|
||||
],
|
||||
|
||||
|
||||
scrollX: !0,
|
||||
language: {
|
||||
paginate: {
|
||||
@ -715,15 +714,15 @@ function() {
|
||||
|
||||
$('#column_name').change(function(){
|
||||
|
||||
var all_column = ["0", "1", "2", "3", "4", "5", "6"];
|
||||
var all_column = ["0", "1", "2", "3", "4", "5", "6","7","8","9","10","11","12","13"];
|
||||
|
||||
var remove_column = $('#column_name').val();
|
||||
|
||||
var remaining_column = all_column.filter(function(obj) { return remove_column.indexOf(obj) == -1; });
|
||||
|
||||
oTable.columns(remove_column).visible(false);
|
||||
oTable.columns(remove_column).visible(true);
|
||||
|
||||
oTable.columns(remaining_column).visible(true);
|
||||
oTable.columns(remaining_column).visible(false);
|
||||
|
||||
});
|
||||
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
"S.NO","INVOICE ID","PAX NAME","PNR","TICKET NO","AIRLINE FILE NAME","EXTRACTION DATE","RECIPIENT","RECIPIENT GST","INVOICE NUMBER","INVOICE DATE","HSN","TAXABLE VALUE","CGST VALUE","CGST RATE","SGST VALUE","SGST RATE","IGST VALUE","IGST RATE","TOTAL INVOICE VALUE","TOTAL VALUE","STATUS","TICKET TYPE"
|
||||
"1","154872","ABHIKANSHIT BHATNAGAR","OZSHQF","---","2023-05-13-06_IJAI230100033828.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","KA/OCT22/110020","2023-01-30","996425","6437.14","0.00","0.00","0.00","0.00","321.86","5 %","6759.00","7460.00","Extraction OK","Tax-Manual"
|
||||
"2","154873","GARG/ROHIT MR","---","1095270855","2023-05-13-06_272312BP01AAX516.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","KA/OCT22/110019","2023-01-31","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual"
|
||||
"3","154874","LAKHOTIA/MANISH","---","1095270965","2023-05-13-06_272312BP01AAX516.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","KA/OCT22/107984","2023-01-31","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual"
|
||||
"4","154875","FERNANDEZ/SHARO","---","1095831017","2023-05-13-06_272312BP02AAF852.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","272312BP02AAF852","2023-02-07","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual"
|
||||
"5","154876","---","IZ29SB","---","2023-05-13-06_IZ29SB_DESAI.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","291IZ29SB0223001","2023-02-06","996425","6802.00","167.00","2.5%","167.00","2.5%","0.00","0%","7136.00","7655.00","Extraction OK","Tax-Manual"
|
||||
"6","154877","---","Y5C7HC","---","2023-05-13-06_Y5C7HC_LAKHOTIA.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","291Y5C7HC0123001","2023-01-25","996425","4319.00","106.00","2.5%","106.00","2.5%","0.00","0%","4531.00","5098.00","Extraction OK","Tax-Manual"
|
||||
"7","154880","---","---","176-6749189919","2023-05-13-06_2022-12-14_29AAGCA7954E1ZF_176-6749189919_Invoice_KAINTK1222005040.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","KAINTK1222005040","2022-12-14","996425","33453.00","745.00","5.00","745.00","5.00","0.00","0%","34943.00","34943.00","Extraction OK","Tax-Manual"
|
||||
"8","154881","","MSBNTQ","---","2023-05-13-06_TaxInvoiceAD1222301AM41118.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","AD1222301AM41118","2023-01-29","996425","2381.00","0.00","0.00","0.00","0.00","119.00","5.00","2500.00","2500.00","Extraction OK","Tax-Manual"
|
||||
"9","154882","","DMKNUS","---","2023-05-13-06_TaxInvoiceKA1222301CB05928.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","KA1222301CB05928","2023-01-30","996425","2057.00","51.50","2.50","51.50","2.50","0.00","0.00","2160.00","2809.00","Extraction OK","Tax-Manual"
|
||||
"10","154883","","MV5BYX","---","2023-05-13-06_TaxInvoiceMH1222301CT40105.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","MH1222301CT40105","2023-01-30","996335","254.00","0.00","0.00","0.00","0.00","46.00","18.00","300.00","300.00","Extraction OK","Tax-Manual"
|
||||
"11","154884","","QSWWRD","---","2023-05-13-06_TaxInvoiceTS1222302BJ68723_8.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","TS1222302BJ68723","2023-02-03","996425","2381.00","0.00","0.00","0.00","0.00","119.00","5.00","2500.00","2900.00","Extraction OK","Tax-Manual"
|
||||
"12","154885","DESAI SUHAS MR","---","228 1186569133","2023-05-13-06_GST_INVOICE.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I270000007697373","2022-12-30","996425","4920.00","0.00","0.0%","0.00","0.0%","246.00","5.0%","5166.00","5859.00","Extraction OK","Tax-Manual"
|
||||
"13","154886","DESAI SUHAS MR","---","228 1186541205","2023-05-13-06_GST_INVOICE1.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I070000013252928","2022-12-31","996425","9700.00","0.00","0.0%","0.00","0.0%","485.00","5.0%","10185.00","10575.00","Extraction OK","Tax-Manual"
|
||||
"14","154887","DESAI SUHAS MR","---","228 6749498957","2023-05-13-06_GST_INVOICE2.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I290000002926328","2022-12-30","996425","4500.00","112.00","2.5%","112.00","2.5%","0.00","0.0%","4724.00","5374.00","Extraction OK","Tax-Manual"
|
||||
"15","154888","DESAI SUHAS MR","---","228 1186541204","2023-05-13-06_GST_INVOICE3.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I270000007706338","2022-12-31","996425","8700.00","0.00","0.0%","0.00","0.0%","435.00","5.0%","9135.00","9828.00","Extraction OK","Tax-Manual"
|
||||
|
Loading…
Reference in New Issue
Block a user