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

Merge branch 'main' of bitbucket.org:venbainformationtechnology/recon

Browse Source
This commit is contained in:
suseendhiran17 2023-07-20 17:12:43 +05:30
commit 84eb16ad14
6 changed files with 110 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Tmc.php
View File

@ -81,8 +81,9 @@ class Tmc extends CI_Controller {
public function gen_tmc_recon(){ public function gen_tmc_recon(){
$this->checksess(); $this->checksess();
$fromdate = $this->input->post('fromdate'); $fromdate = $this->input->post('from');
$todate = $this->input->post('todate');
$todate = $this->input->post('to');
// if($gid) // 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.'"'); // $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 // else

25
application/views/corporate/dashboard.php
View File

@ -82,22 +82,25 @@
<div class="row mt-5"> <div class="row mt-5">
<form class="col-md-12" id="formid" autocomplete="off"> <form class="col-md-12" id="formid" autocomplete="off">
<div class="form-row"> <div class="form-row">
<input type="hidden" id="_date_">
<input id="fromdate" value="" type="hidden">
<input id="todate" value="" type="hidden">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="col-lg-3 col-form-label">Date</label> <label> FROM</label>&nbsp;&nbsp;
<!-- <input type="date" id="birthday" name="birthday"> --> <input type="date" id="from" name="from">
&nbsp;&nbsp;&nbsp;&nbsp;
<label> TO</label>&nbsp;&nbsp;
<input type="date" id="to" name="to">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="reportrange" class="pull-right form-control"> <div id="" class="">
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
<span></span> <span></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-0">
<label for="inputPassword4" class="col-form-label"></label> <label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:35px" id="_submit_" type="submit" class="btn btn-primary">Submit</button> <button style="margin-top:0px;font-size: 12px;" type="submit" class="btn btn-primary">Submit</button>
</div> </div>
</div> </div>
</form> </form>
@ -461,8 +464,8 @@ e.preventDefault();
datesArr = []; datesArr = [];
datesArr1 = []; datesArr1 = [];
// console.log($('#reportrange').val(),"data"); // console.log($('#reportrange').val(),"data");
var startDate = new Date($('#fromdate').val()); var startDate = new Date($('#from').val());
var endDate = new Date($('#todate').val()); var endDate = new Date($('#to').val());
while (startDate <= endDate) { while (startDate <= endDate) {
var dateString = startDate.toLocaleDateString('en-GB'); var dateString = startDate.toLocaleDateString('en-GB');

24
application/views/corporate/dashboard_tmc.php
View File

@ -82,21 +82,25 @@
<div class="row mt-5"> <div class="row mt-5">
<form class="col-md-12" id="formid" autocomplete="off"> <form class="col-md-12" id="formid" autocomplete="off">
<div class="form-row"> <div class="form-row">
<input type="hidden" id="_date_">
<input id="fromdate" value="" type="hidden">
<input id="todate" value="" type="hidden">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="col-lg-3 col-form-label">Date</label> <label> FROM</label>&nbsp;&nbsp;
<input type="date" id="from" name="from">
&nbsp;&nbsp;&nbsp;&nbsp;
<label> TO</label>&nbsp;&nbsp;
<input type="date" id="to" name="to">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="reportrange" class="pull-right form-control"> <div id="" class="">
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
<span></span> <span></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-0">
<label for="inputPassword4" class="col-form-label"></label> <label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:35px" id="_submit_" type="submit" class="btn btn-primary">Submit</button> <button style="margin-top:0px;font-size: 12px;" type="submit" class="btn btn-primary">Submit</button>
</div> </div>
</div> </div>
</form> </form>
@ -460,8 +464,8 @@ e.preventDefault();
datesArr = []; datesArr = [];
datesArr1 = []; datesArr1 = [];
// console.log($('#reportrange').val(),"data"); // console.log($('#reportrange').val(),"data");
var startDate = new Date($('#fromdate').val()); var startDate = new Date($('#from').val());
var endDate = new Date($('#todate').val()); var endDate = new Date($('#to').val());
while (startDate <= endDate) { while (startDate <= endDate) {
var dateString = startDate.toLocaleDateString('en-GB'); var dateString = startDate.toLocaleDateString('en-GB');

38
application/views/corporate/tmc_recon.php
View File

@ -111,18 +111,14 @@
<label> TO &nbsp;&nbsp;</label> <label> TO &nbsp;&nbsp;</label>
<input type="date" id="TO" name="to" &nbsp;&nbsp;> <input type="date" id="TO" name="to" &nbsp;&nbsp;>
&nbsp;&nbsp; &nbsp;&nbsp;
<div class="col-lg-12">
<div >
</div>
</div>
</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:0px;font-size: 10px;" 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>
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="form-group col-md-4" style="margin-top:35px;"> <div class="form-group col-md-4">
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple> <select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
<option selected="selected" value="0">SEGMENT</option> <option selected="selected" value="0">SEGMENT</option>
<option selected="selected" value="1">INV DATE </option> <option selected="selected" value="1">INV DATE </option>
@ -197,7 +193,8 @@
<h4 class="modal-title">Associated Inovice Files</h4> <h4 class="modal-title">Associated Inovice Files</h4>
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
</div> </div>
<form id="usrforma" enctype="multipart/form-data"> <form id="usrforma" enctype="multipart/form-data" class="form-horizontal editform" style="padding:10px;">
<div class="modal-body"> <div class="modal-body">
<div id="modalContent"></div> <div id="modalContent"></div>
<div class="form-body"> <div class="form-body">
@ -414,7 +411,7 @@ function() {
success:function(data){ success:function(data){
htmlData = '<div class="col-md-12" id="fielddiv1">'+ htmlData = '<div class="col-md-12" id="fielddiv1">'+
'<div class="row">'+ '<div class="row">'+
'<div class="col-md-4 mb25" id="">'+ '<div class="col-md-6 mb25" id="">'+
'<label>GST Inv Number<span class="required">*</span></label>'+ '<label>GST Inv Number<span class="required">*</span></label>'+
'<input class="col-md-10" required id="gstno_0" type="text" name="in[0][gst_nub]"/> <a href="javascript:void(0)" onclick="getGstAmt(0)"><i class="fa fa-search"></i></a>'+ '<input class="col-md-10" required id="gstno_0" type="text" name="in[0][gst_nub]"/> <a href="javascript:void(0)" onclick="getGstAmt(0)"><i class="fa fa-search"></i></a>'+
'</div>'+ '</div>'+
@ -588,16 +585,16 @@ function() {
netttl += parseInt(pdata[i].ti_amount); netttl += parseInt(pdata[i].ti_amount);
var fname = pdata[i].ti_file_name.split('___'); var fname = pdata[i].ti_file_name.split('___');
htmlData += '<div class="row">'+ htmlData += '<div class="row">'+
'<div class="col-md-3 mb25">'+ '<div class="col-md-6 mb25">'+
'<label>'+pdata[i].ti_gst_nub+'</label>'+ '<label>'+pdata[i].ti_gst_nub+'</label>'+
'</div>'+ '</div>'+
'<div class="col-md-2 mb25">'+ '<div class="col-md-6 mb25">'+
'<span>'+pdata[i].ti_amount+'</span>'+ '<span>'+pdata[i].ti_amount+'</span>'+
'</div>'+ '</div>'+
'<div class="col-md-2 mb25">'+ '<div class="col-md-6 mb25">'+
'<div><a href="<?php echo base_url('corporate/download_airline_invoice/') ?>'+pdata[i].ti_file_name+'" target="_blank"><i class="fa fa-download"></i></a></div>'+ '<div><a href="<?php echo base_url('corporate/download_airline_invoice/') ?>'+pdata[i].ti_file_name+'" target="_blank"><i class="fa fa-download"></i></a></div>'+
'</div>'+ '</div>'+
'<div class="col-md-3 mb25">'; '<div class="col-md-6 mb25">';
if(pdata[i].gd_id == '') if(pdata[i].gd_id == '')
htmlData += '<label>Not Filed</label>'; htmlData += '<label>Not Filed</label>';
else else
@ -608,9 +605,9 @@ function() {
}); });
htmlData += '<div class="row">'+ htmlData += '<div class="row">'+
'<div class="col-md-3 mb25"><b>Total</b>'+ '<div class="col-md-6 mb25"><b>Total</b>'+
'</div>'+ '</div>'+
'<div class="col-md-2 mb25">'+ '<div class="col-md-6 mb25">'+
'<span>'+netttl+'</span>'+ '<span>'+netttl+'</span>'+
'</div>'+ '</div>'+
'</div>'; '</div>';
@ -651,13 +648,14 @@ function() {
// 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"
//// } // // }

26
application/views/tmc/dashboard.php
View File

@ -82,24 +82,23 @@
<div class="row mt-5"> <div class="row mt-5">
<form class="col-md-12" id="formid" autocomplete="off"> <form class="col-md-12" id="formid" autocomplete="off">
<div class="form-row"> <div class="form-row">
<input type="hidden" id="_date_">
<input id="fromdate" value="" type="hidden">
<input id="todate" value="" type="hidden">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>FROM</label> <label>FROM &nbsp;&nbsp;</label>
<input type="date" id="from" name="from"> <input type="date" id="from" name="from" &nbsp; ;&nbsp;&nbsp;>
<label class="col-lg-3 col-form-label">TO</label> &nbsp;&nbsp;
<input type="date" id="to" name="to"> <label >TO</label>&nbsp;&nbsp;
<input type="date" id="to" name="to" &nbsp;&nbsp;>
<div class="col-lg-12"> <div class="col-lg-12">
<div id="reportrange" class="pull-right form-control"> <div id="" >
<span></span> <span></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-0">
<label for="inputPassword4" class="col-form-label"></label> <label for="inputPassword4" class="col-form-label"></label>
<button style="margin-top:35px" id="_submit_" type="submit" class="btn btn-primary">Submit</button> <button style="margin-top:0px;font-size: 12px;" type="submit" class="btn btn-primary">Submit</button>
</div> </div>
</div> </div>
</form> </form>
@ -462,9 +461,10 @@ $('#formid').submit(function(e){
e.preventDefault(); e.preventDefault();
datesArr = []; datesArr = [];
datesArr1 = []; datesArr1 = [];
// console.log($('#reportrange').val(),"data");
var startDate = new Date($('#fromdate').val()); var startDate = new Date($('#from').val());
var endDate = new Date($('#todate').val()); alert($('#from').val());
var endDate = new Date($('#to').val());
while (startDate <= endDate) { while (startDate <= endDate) {
var dateString = startDate.toLocaleDateString('en-GB'); var dateString = startDate.toLocaleDateString('en-GB');

60
application/views/tmc/tmc_recon.php
View File

@ -103,36 +103,42 @@
</select> </select>
</div> </div>
--> -->
<input id="fromdate" value="" type="hidden">
<input id="todate" value="" type="hidden">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="col-lg-3 col-form-label">Date</label> <label >FROM</label>
&nbsp;
<input type="date" id="from" name="from">
&nbsp;&nbsp;&nbsp;&nbsp;
<label >TO</label>
<input type="date" id="to" name="to">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="reportrange" class="pull-right form-control"> <div id="" >
<i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
<span></span> <span></span>
</div> </div>
</div> </div>
</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:35px" type="submit" id="submit_1" class="btn btn-primary">Submit</button> <button style="margin-top:0px;font-size: 10px;" type="submit" class="btn btn-primary">Submit</button>
</div> </div>
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="form-group col-md-4" style="margin-top:35px;"> <div class="form-group col-md-4">
<select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple> <select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
<option value="0">SEGMENT</option> <option selected="selected" value="0">SEGMENT</option>
<option value="1">INV DATE </option> <option selected="selected" value="1">INV DATE </option>
<option value="2">GST INVOICE NO</option> <option selected="selected" value="2">GST INVOICE NO</option>
<option value="3">REF NO</option> <option selected="selected" value="3">REF NO</option>
<option value="4">DOC TYPE</option> <option selected="selected" value="4">DOC TYPE</option>
<option value="5">BILLING ENTITY</option> <option selected="selected"value="5">BILLING ENTITY</option>
<option value="6">PASSENGER NAME</option> <option selected="selected"value="6">PASSENGER NAME</option>
<option value="7">AIRLINE CODE</option> <option selected="selected" value="7">AIRLINE CODE</option>
<option value="8">TICKET NO</option> <option selected="selected"value="8">TICKET NO</option>
<option value="9">SECTOR</option> <option selected="selected"value="9">SECTOR</option>
<option value="10">CABINCLASS</option> <option selected="selected"value="10">CABINCLASS</option>
<option value="11">TOTAL TKT FARE</option> <option selected="selected" value="11">TOTAL TKT FARE</option>
</select> </select>
</div> </div>
@ -526,15 +532,20 @@ function() {
$('#formid').submit(function(e){ $('#formid').submit(function(e){
e.preventDefault(); e.preventDefault();
fromdate_for_deleterow = convert($("#fromdate").val());
todate_for_deleterow = convert($("#todate").val());
console.log($("#from").val());
console.log($('#formid').serialize());
$.ajax({ $.ajax({
url:'<?php echo base_url('corporate/gen_tmc_recon'); ?>', url:'<?php echo base_url('corporate/gen_tmc_recon'); ?>',
type:'POST', type:'POST',
data:{ "fromdate" : convert($("#fromdate").val()) , "todate" : convert($("#todate").val()) }, data:$('#formid').serialize(),
success:function(data){ success:function(data){
oTable.clear(); oTable.clear();
var jsonData = JSON.parse(data); var jsonData = JSON.parse(data);
console.log(jsonData);
var jd = jsonData.data; var jd = jsonData.data;
var htmlData = ''; var htmlData = '';
var i = 0; var i = 0;
@ -548,6 +559,7 @@ function() {
}) })
}) })
function viewfn(tdid,ref){ function viewfn(tdid,ref){
$('#tmc_ref').val(tdid); $('#tmc_ref').val(tdid);
$.ajax({ $.ajax({
@ -724,9 +736,9 @@ function() {
var remaining_column = all_column.filter(function(obj) { return remove_column.indexOf(obj) == -1; }); 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);
}); });