Zettai-Backup/recon
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

heama

Browse Source
This commit is contained in:
heama 2023-07-21 19:03:49 +05:30
parent 074732ca24
commit fdbebc7345
4 changed files with 88 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Corporate.php
View File

@ -5113,7 +5113,7 @@ public function upload_tmc(){
$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->select('tmc_data.td_pax as tmc_pax,tmc_data.td_carrier as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt as tmc_tkt,tmc_data.td_tkt_fare as tmc_ticket_fare, gstr2a_data.gd_inv_no as gstr2a_inv ,gstr2a_data.gd_inv_value as gstr2a_value, 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');

3
application/views/corporate/includes/top_nav.php
View File

@ -87,7 +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">
@ -107,6 +107,7 @@
<div class="dropdown-menu" aria-labelledby="topnav-dashboard">
<a href="<?php echo site_url('corporate/gstr2a_recon'); ?>" class="dropdown-item">GSTR2A</a>
<a href="<?php echo site_url('corporate/tmc_recon'); ?>" class="dropdown-item">TMC</a>
<a href="<?php echo site_url('corporate/tmc_gst_inv');?>" class="dropdown-item">DATA RECON</a>
</div>
</li>
<?php if ($this->session->flashdata('corporate_id') != 1) { ?>

104
application/views/corporate/tmc_gst_inv.php
View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>TMC GST INV</title>
<title>DATA RECON</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" />
@ -76,11 +76,11 @@
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">TMC GST INV </h4>
<h4 class="page-title">DATA RECON </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>
<li class="breadcrumb-item"><a href="javascript: void(0);">Reconciliation</a></li>
<li class="breadcrumb-item active">DATA RECON</li>
</ol>
</div>
</div>
@ -126,12 +126,19 @@
<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 selected="selected"value="0">PAX NAME(TMC)</option>
<option selected="selected" value="1">AIRLINE PNR(TMC)</option>
<option selected="selected" value="2">SECTOR(TMC)</option>
<option selected="selected" value="3">TRAVEL DATE(TMC)</option>
<option selected="selected"value="4">TICKET NUMBER(TMC)</option>
<option selected="selected"value="5">TICKET FARE(TMC)</option>
<option selected="selected"value="6">INVOICE NUMBER(GST)</option>
<option selected="selected"value="7">VALUE(GST)</option>
<option selected="selected"value="8">INVOICE NUMBER</option>
<option selected="selected"value="9">PNR NO(INV)</option>
<option selected="selected"value="10">TICKET NO(INV)</option>
<option selected="selected" value="11">TOTAL INVOICE(INV)</option>
<!-- <option value="6">RECIPIENT</option>
<option value="7">RECIPIENT GST</option>
<option value="8">INVOICE NUMBER</option>
@ -162,12 +169,21 @@
<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>PAX NAME(TMC)</th>
<th>AIRLINE(TMC)</th>
<th>SECTOR(TMC)</th>
<th>TRAVEL DATE(TMC)</th>
<th>TICKET NUMBER(TMC)</th>
<th>TICKET FARE(TMC)</th>
<th>INVOICE NUMBER(GST)</th>
<th>VALUE(GST)</th>
<th>INVOICE NUMBER(INV)</th>
<th>PNR NO(INV)</th>
<th>TICKET NO(INV)</th>
<th>TOTAL INVOICE(INV)</th>
<!-- <th>RECIPIENT</th>
<th>RECIPIENT GST</th>
<th>INVOICE NUMBER</th>
@ -197,12 +213,42 @@
<?php foreach ($data as $value){
?>
<tr>
<td><?php echo $value->tmc_tkt; ?></td>
<td><?php echo $value->tmc_pax; ?></td>
<td><?php echo $value->tmc_airline; ?></td>
<td><?php echo $value->tmc_sector; ?></td>
<td><?php echo $value->tmc_date; ?></td>
<td><?php echo $value->tmc_tkt; ?></td>
<td><?php echo $value->tmc_ticket_fare; ?></td>
<td><?php echo $value->gstr2a_inv; ?></td>
<td><?php echo $value-> gstr2a_value; ?></td>
<td><?php echo $value->inv_invoice_no; ?></td>
<td><?php echo $value-> inv_pnr; ?></td>
<td><?php echo $value-> inv_tkt_no; ?></td>
<?php
if ($value->tmc_ticket_fare === $value->gstr2a_value && $value->tmc_ticket_fare === $value->total_values)
{ ?>
<td ><?php echo $value->total_values; ?></td>
<?php }
else
{ ?>
<td style="color:red;"><?php echo $value->total_values; ?></td>
<?php } ?>
<!-- <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->total_values; ?></td> -->
<!-- <td><?php echo $value->recepient; ?></td>
<td><?php echo $value->recepient_gst; ?></td>
<td><?php echo $value->invoice_no?></td>
@ -308,7 +354,7 @@
{
extend: "csvHtml5",
exportOptions: {
columns: [ 0, 1, 2, 3, 4,5]
columns: [ 0, 1, 2, 3, 4,5,6,7,8,9,10,11,12,13,14,15]
}
}
@ -345,6 +391,26 @@
$(".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"];
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>

BIN
uploads/1/gstr2a/GSTR2A-TESTNEW-Jun-2020-1689934395.xlsx Normal file
View File

Binary file not shown.