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-08-17 12:46:50 +05:30
parent 2015c4d9c0
commit 7988a04e03
9 changed files with 174 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
application/controllers/Corporate.php
View File

@ -19,28 +19,26 @@ class Corporate extends CI_Controller {
* @see https://codeigniter.com/user_guide/general/urls.html * @see https://codeigniter.com/user_guide/general/urls.html
*/ */
function __construct() function __construct()
{ {
parent::__construct(); parent::__construct();
$this->load->model('Corporate_model','corp'); $this->load->model('Corporate_model','corp');
$this->db2 = $this->load->database('second', TRUE); $this->db2 = $this->load->database('second', TRUE);
// $c_id = $this->session->userdata['recon_sess_i']['u_corporateid']; // $c_id = $this->session->userdata['recon_sess_i']['u_corporateid'];
// $this->db->select('payment'); // $this->db->select('payment');
// $this->db->from('corporates'); // $this->db->from('corporates');
// $this->db->where('c_id', intval($c_id)); // $this->db->where('c_id', intval($c_id));
// $query = $this->db->get(); // $query = $this->db->get();
// $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment); // $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment);
//force_ssl(); //force_ssl();
} }
public function index(){ public function index(){
redirect('corporate/dashboard'); redirect('corporate/dashboard');
} }
public function dashboard(){ public function dashboard(){
$this->checksess(); $this->checksess();
$this->load->view('corporate/dashboard'); $this->load->view('corporate/dashboard');
} }
@ -419,6 +417,9 @@ class Corporate extends CI_Controller {
$this->load->database('second', TRUE); $this->load->database('second', TRUE);
$res_2 = $this->db2->where('pnr' , $value->td_tkt)->or_where('ticket_no' , $value->td_tkt)->get('air_invoice_details')->result(); $res_2 = $this->db2->where('pnr' , $value->td_tkt)->or_where('ticket_no' , $value->td_tkt)->get('air_invoice_details')->result();
if(isset($res_2[0])){ if(isset($res_2[0])){
// $uptData['inv_received'] = 1;
// $this->db->where('td_id', $value->td_id);
// $data = $this->db->update('tmc_data',$uptData);
$value->inv = $res_2[0]->invoice_no; $value->inv = $res_2[0]->invoice_no;
} }
else{ else{
@ -469,6 +470,25 @@ class Corporate extends CI_Controller {
else else
$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 or gd.gd_inv_no=ai.ti_gst_nub where gd.is_active = 1 and gd_inv_date between "'.$fromdate.'" and "'.$todate.'" order by gd_id desc'); $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 or gd.gd_inv_no=ai.ti_gst_nub where gd.is_active = 1 and gd_inv_date between "'.$fromdate.'" and "'.$todate.'" order by gd_id desc');
// $res = $this->db->query('select * from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv from tmc_data group by td_tkt) td on gd.gd_tkt_no=td.td_tkt where gd_inv_date between "'.$fromdate.'" and "'.$todate.'"'); // $res = $this->db->query('select * from gstr2a_data gd left join (select *,group_concat(td_gst_inv) g_td_gst_inv from tmc_data group by td_tkt) td on gd.gd_tkt_no=td.td_tkt where gd_inv_date between "'.$fromdate.'" and "'.$todate.'"');
foreach ($res->result() as $key => $value) {
// print_r($value);die();
if ($value) {
$this->load->database('second', TRUE);
$res_2 = $this->db2->where('invoice_no' , $value->gd_inv_no)->get('air_invoice_details')->result();
if(isset($res_2[0])){
// $uptData['inv_received'] = 1;
// $this->db->where('td_id', $value->td_id);
// $data = $this->db->update('tmc_data',$uptData);
$value->inv = $res_2[0]->invoice_no;
$value->tkt=$res_2[0]->ticket_no;
$value->amt=$res_2[0]->total_values;
$value->tpnr=$res_2[0]->pnr;
}
else{
$value->inv = " ";
}
}
}
$fres['data'] = array(); $fres['data'] = array();
$res2 = new stdClass(); $res2 = new stdClass();
if($gid){ if($gid){
@ -1886,6 +1906,7 @@ class Corporate extends CI_Controller {
force_download('Payment_Advice_Sample.xlsx', $pth); force_download('Payment_Advice_Sample.xlsx', $pth);
} }
public function p_tmc_sample_download(){ public function p_tmc_sample_download(){
$this->checksess(); $this->checksess();
$this->load->helper('download'); $this->load->helper('download');
@ -5113,14 +5134,13 @@ public function upload_tmc(){
public function tmc_gst_inv(){ public function tmc_gst_inv(){
$this->checksess(); $this->checksess();
$this->load->database('second', TRUE); $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_pax as tmc_pax,tmc_data.td_airline_pnr as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt_fare as tmc_ticket_fare , gstr2a_data.gd_inv_value as gstr2a_value , tmc_data.td_tkt_fare as tmc_ticket_fare , REPLACE(tmc_data.td_tkt," ","") as tmc_tkt , REPLACE(tmc_data.td_pnr," ","") as tmc_pnr , REPLACE(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_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->from('gst1.air_invoice_details');
$this->db->join('reconciler_test.tmc_data', 'replace(tmc_data.td_tkt," ","") = replace(air_invoice_details.ticket_no," ","") or replace(tmc_data.td_pnr," ","") = replace(air_invoice_details.pnr," ","")');
$this->db->join('reconciler_test.gstr2a_data', 'air_invoice_details.invoice_no = gstr2a_data.gd_inv_no'); $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(); $query = $this->db->get();
$result['data'] = $query->result(); $result['data'] = $query->result();
$this->load->view('corporate/tmc_gst_inv',$result); $this->load->view('corporate/tmc_gst_inv',$result);
} }
@ -5128,3 +5148,5 @@ public function upload_tmc(){
} }

5
application/views/admin/includes/top_nav.php
View File

@ -3,6 +3,11 @@
<div class="container-fluid"> <div class="container-fluid">
<ul class="list-unstyled topnav-menu float-right mb-0"> <ul class="list-unstyled topnav-menu float-right mb-0">
<li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li>
<li class="dropdown notification-list topbar-dropdown"> <li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">

33
application/views/corporate/gstr2a_recon.php
View File

@ -717,9 +717,12 @@
"width": "12%", "width": "12%",
"render": function ( data, type, full, meta ) { "render": function ( data, type, full, meta ) {
if(full['inv'] != " "){ if(full['inv'] != " "){
return ''+full['tkt']+''; // return ''full['tkt'] != " " ? full['tkt']:full['tpnr']''
// return ''+full['tkt']+''
return full['tkt'] != "---" ? full['tkt'] : full['tpnr']
}else }else
return '<input type="text" class="form-control search" style="display:inline" id="thisval_'+full['gd_id']+'" value="'+data+'" /><a style="margin-left:5px;margin-right:5px;" class="edit_btn" href="javascript:void(0)" onclick="onblurfn('+full['gd_id']+')"><i class="fa fa-search"></i></a>'; return '<input type="text" class="form-control search" style="display:inline" id="thisval_'+full['gd_id']+'" value="'+data+'" /><a style="margin-left:5px;margin-right:5px;" class="edit_btn" href="javascript:void(0)" onclick="onblurfn('+full['gd_id']+')"><i class="fa fa-search"></i></a>';
} }
}, },
@ -760,7 +763,7 @@
if(full['inv'] != " "){ if(full['inv'] != " "){
return 'Invoice Received'; return 'Invoice Received';
// return('.search').hide(); // return('.search').hide();
} else if (full['ti_recieved'] === "0") { } else if (full['ti_recieved'] ==="0") {
return 'Invoice Received (Manual)'; return 'Invoice Received (Manual)';
} }
else{ else{
@ -776,7 +779,7 @@
"width": 300, "width": 300,
"render": function ( data, type, full, meta ) { "render": function ( data, type, full, meta ) {
if(full['inv'] != " "){ if(full['inv'] != " "){
return '<button type="text" style="border:none;" class="form-control" id="'+full['gd_id']+'" data-refid="'+full['gd_inv_no']+'" value="'+full['gd_inv_no']+'" onclick="viewinvfn('+full['gd_id']+')" ><i class="fa fa-eye"></i></button>'; return '<button type="text" style="border:none;" class="form-control" id="'+full['gd_id']+'" data-refid="'+full['gd_inv_no']+'" value="'+full['gd_inv_no']+'" onclick="viewinvfn('+full['gd_id']+')"><i class="fa fa-eye"></i></button>';
} else if(data == ''){ } else if(data == ''){
return '<form><input class="filecls" type="file" name="gd_gst_inv" /><input type="hidden" value="'+full['gd_id']+'" name="gdid" /></form>'; return '<form><input class="filecls" type="file" name="gd_gst_inv" /><input type="hidden" value="'+full['gd_id']+'" name="gdid" /></form>';
} }
@ -804,17 +807,17 @@
return '<a onclick="deletegst2rarecon('+data+')" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>' return '<a onclick="deletegst2rarecon('+data+')" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>'
} }
}, },
{ // {
"targets": 22, // "targets": 22,
"width": 300, // "width": 300,
"render": function ( data, type, full, meta ) { // "render": function ( data, type, full, meta ) {
console.log(full['gd_id']); // console.log(full['gd_id']);
return '<button type="text" style="border:none;" class="form-control" id="'+full['gd_id']+'" data-refid="'+full['gd_inv_no']+'" value="'+full['gd_inv_no']+'" onclick="viewinvfn('+full['gd_id']+')" >'+full['inv']+'</button>'; // return '<button type="text" style="border:none;" class="form-control" id="'+full['gd_id']+'" data-refid="'+full['gd_inv_no']+'" value="'+full['gd_inv_no']+'" onclick="viewinvfn('+full['gd_id']+')" >'+full['inv']+'</button>';
} // }
}, // },
] ]
}); });
@ -890,7 +893,7 @@
// } // }
} }
} }
function viewinvfn(inv_no){ function viewinvfn(inv_no){
$.ajax({ $.ajax({
url:'<?php echo base_url('corporate/get_inv_gst1/') ?>', url:'<?php echo base_url('corporate/get_inv_gst1/') ?>',
data:{inv_no:$('#'+inv_no+'').val()}, data:{inv_no:$('#'+inv_no+'').val()},
@ -899,9 +902,10 @@
var Pdata = JSON.parse(data); var Pdata = JSON.parse(data);
console.log(Pdata); console.log(Pdata);
var modal_data = ''; var modal_data = '';
modal_data= '<div class="row"><div class="col-md-4 col-lg-4"><b>Invoive Date</b><div style="float:right;">:</div></div><div class="col-md-8 col-lg-8">'+Pdata[0]['invdt']+'</div></div>'; modal_data= '<div class="row"><div class="col-md-4 col-lg-4"><b>Invoive Date</b><div style="float:right;">:</div></div><div class="col-md-8 col-lg-8">'+Pdata[0]['invoice_dt']+'</div></div>';
delete Pdata[0].sl; delete Pdata[0].sl;
delete Pdata[0].invoice_dt; delete Pdata[0].invoice_dt;
delete Pdata[0].sno;
delete Pdata[0].invdt; delete Pdata[0].invdt;
delete Pdata[0].batch_id; delete Pdata[0].batch_id;
Object.keys(Pdata[0]).forEach((element,index) => { Object.keys(Pdata[0]).forEach((element,index) => {
@ -911,7 +915,6 @@
$('#scrollableModalTitle').html(Pdata[0].invoice_no) $('#scrollableModalTitle').html(Pdata[0].invoice_no)
$('#inv_getdata').html(modal_data); $('#inv_getdata').html(modal_data);
$('#scrollable-modal').modal('show'); $('#scrollable-modal').modal('show');
}, },
error:function(){ error:function(){

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

@ -7,8 +7,7 @@
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#"> <a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i> <i class="fe-maximize noti-icon"></i>
</a> </a>
</li> </li> <li class="dropdown notification-list topbar-dropdown">
<li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<img src="<?php echo base_url(); ?>assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle"> <img src="<?php echo base_url(); ?>assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle">
<span class="pro-user-name ml-1"> <span class="pro-user-name ml-1">

8
application/views/corporate/recon.code-workspace Normal file
View File

@ -0,0 +1,8 @@
{
"folders": [
{
"path": "../../.."
}
],
"settings": {}
}

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

@ -122,7 +122,7 @@
<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>
<option selected="selected" value="2">GST INVOICE NO</option> <option selected="selected" value="2">TMC INVOICE NO</option>
<!-- <option selected="selected" value="3">REF NO</option> --> <!-- <option selected="selected" value="3">REF NO</option> -->
<option selected="selected" value="4">DOC TYPE</option> <option selected="selected" value="4">DOC TYPE</option>
<option selected="selected"value="5">BILLING ENTITY</option> <option selected="selected"value="5">BILLING ENTITY</option>

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

@ -82,23 +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">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>FROM &nbsp;&nbsp;</label> <label> FROM</label>&nbsp;&nbsp;
<input type="date" id="from" name="from" &nbsp; ;&nbsp;&nbsp;> <input type="date" id="from" name="from" value="2020-01-01">
&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<label >TO</label>&nbsp;&nbsp; <label> TO</label>&nbsp;&nbsp;
<input type="date" id="to" name="to" &nbsp;&nbsp;> <input type="date" id="to" name="to"value="2023-01-01">
<div class="col-lg-12"> <div class="col-lg-12">
<div id="" > <div id="" class="">
<span></span> <span></span>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-0"> <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: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> </div>
</form> </form>
@ -461,13 +463,8 @@ $('#formid').submit(function(e){
e.preventDefault(); e.preventDefault();
datesArr = []; datesArr = [];
datesArr1 = []; datesArr1 = [];
// console.log($('#reportrange').val(),"data");
var startDate = new Date($('#from').val()); var startDate = new Date($('#from').val());
// alert($('#from').val());
var endDate = new Date($('#to').val()); var endDate = new Date($('#to').val());
while (startDate <= endDate) { while (startDate <= endDate) {

5
application/views/tmc/includes/top_nav.php
View File

@ -3,6 +3,11 @@
<div class="container-fluid"> <div class="container-fluid">
<ul class="list-unstyled topnav-menu float-right mb-0"> <ul class="list-unstyled topnav-menu float-right mb-0">
<li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li>
<li class="dropdown notification-list topbar-dropdown"> <li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"> <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">

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

@ -45,6 +45,7 @@
#bs-select-1{ #bs-select-1{
max-height: 150px !important; max-height: 150px !important;
overflow-y: auto !important; overflow-y: auto !important;
} }
</style> </style>
@ -83,8 +84,7 @@
</div> </div>
<!-- end page title --> <!-- end page title -->
<div class="row">
<div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@ -103,42 +103,38 @@
</select> </select>
</div> </div>
--> -->
<div class="form-group col-md-4">
<div class="form-group col-md-4">
<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"> <label> FROM &nbsp;&nbsp;</label>
<input type="date" id="from" name="from" value="2020-01-01" >
<div class="col-lg-12"> &nbsp;&nbsp;
<div id="" > <label> TO &nbsp;&nbsp;</label>
<input type="date" id="TO" name="to" value="2023-01-01" &nbsp;&nbsp;>
<span></span> &nbsp;&nbsp;
</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"> <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>
<option selected="selected" value="2">GST INVOICE NO</option> <option selected="selected" value="2">TMC INVOICE NO</option>
<option selected="selected" value="3">REF NO</option> <!-- <option selected="selected" value="3">REF NO</option> -->
<option selected="selected" value="4">DOC TYPE</option> <option selected="selected" value="4">DOC TYPE</option>
<option selected="selected"value="5">BILLING ENTITY</option> <option selected="selected"value="5">BILLING ENTITY</option>
<option selected="selected"value="6">PASSENGER NAME</option> <option selected="selected" value="6">PASSENGER NAME</option>
<option selected="selected" value="7">AIRLINE CODE</option> <option selected="selected"value="7">AIRLINE CODE</option>
<option selected="selected"value="8">TICKET NO</option> <option selected="selected"value="8">TICKET NO</option>
<option selected="selected"value="9">SECTOR</option> <option selected="selected"value="9">SECTOR</option>
<option selected="selected"value="10">CABINCLASS</option> <option selected="selected"value="10">CABINCLASS</option>
<option selected="selected" value="11">TOTAL TKT FARE</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> </select>
</div> </div>
@ -151,7 +147,7 @@
<tr> <tr>
<th>SEGMENT</th> <th>SEGMENT</th>
<th>INV DATE</th> <th>INV DATE</th>
<th>GST INVOICE NO</th> <th>TMC INVOICE NO</th>
<th>REF NO</th> <th>REF NO</th>
<th>DOC TYPE</th> <th>DOC TYPE</th>
<th>BILLING ENTITY</th> <th>BILLING ENTITY</th>
@ -161,19 +157,19 @@
<th>SECTOR</th> <th>SECTOR</th>
<th>CABINCLASS</th> <th>CABINCLASS</th>
<th>TOTAL TKT FARE</th> <th>TOTAL TKT FARE</th>
<th>NET FARE</th>
<th>REMARKS</th> <th>REMARKS</th>
<th>ACTION</th> <th>ACTION</th>
<th>INVOICE</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> <!-- end col-->
</div>
<!-- end row--> <!-- end row-->
</div> <!-- container --> </div> <!-- container -->
@ -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">
@ -254,6 +251,8 @@
</div> </div>
<input type="hidden" id="counter" name="counter" value="1" /> <input type="hidden" id="counter" name="counter" value="1" />
<input type="hidden" id="inv_1"/>
<!-- ============================================================== --> <!-- ============================================================== -->
<!-- End Page content --> <!-- End Page content -->
<!-- ============================================================== --> <!-- ============================================================== -->
@ -276,13 +275,13 @@
<script src="<?php echo base_url(); ?>assets/libs/pdfmake/build/pdfmake.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> <script src="<?php echo base_url(); ?>assets/libs/pdfmake/build/vfs_fonts.js"></script>
<!-- Plugins js--> <!-- 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/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/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/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/moment/min/moment.min.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/bootstrap-daterangepicker/daterangepicker.js"></script> <script src="<?php echo base_url(); ?>assets/libs/bootstrap-daterangepicker/daterangepicker.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> -->
@ -293,7 +292,6 @@
<!-- App js --> <!-- App js -->
<script src="<?php echo base_url(); ?>assets/js/app.min.js"></script> <script src="<?php echo base_url(); ?>assets/js/app.min.js"></script>
<script> <script>
//******************************************************** ***************************/ //******************************************************** ***************************/
// ************************** Date Picker********************************************* // ************************** Date Picker*********************************************
@ -398,8 +396,6 @@ function() {
</script> </script>
<script> <script>
var fromdate_for_deleterow = convert($("#fromdate").val());
var todate_for_deleterow = convert($("#todate").val());
$('#usrforma').on('submit',function(e){ $('#usrforma').on('submit',function(e){
e.preventDefault(); e.preventDefault();
@ -415,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>'+
@ -530,7 +526,7 @@ function() {
return [date.getFullYear(), mnth, day].join("-"); return [date.getFullYear(), mnth, day].join("-");
} }
$('#formid').submit(function(e){ $('#formid').submit(function(e){
e.preventDefault(); e.preventDefault();
@ -559,7 +555,6 @@ function() {
}) })
}) })
function viewfn(tdid,ref){ function viewfn(tdid,ref){
$('#tmc_ref').val(tdid); $('#tmc_ref').val(tdid);
$.ajax({ $.ajax({
@ -590,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
@ -610,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>';
@ -639,7 +634,7 @@ function() {
{ {
extend: "csvHtml5", extend: "csvHtml5",
exportOptions: { exportOptions: {
columns: [ 0, 1, 2, 3, 4, 5,6,7,8,9,10,11,12,13,14] columns: [ 0, 1, 2, 3, 4, 5,6,7,8,9,10,11,12,13]
} }
} }
@ -687,13 +682,14 @@ function() {
{ data : "td_sector"}, { data : "td_sector"},
{ data : "td_cabin_class"}, { data : "td_cabin_class"},
{ data : "td_tkt_fare"}, { data : "td_tkt_fare"},
{ data : "td_net"},
{ data : "d_remarks"}, { data : "d_remarks"},
{ data : "td_id"}, { data : "td_id"}
{ data : "td_net"}
], ],
"columnDefs": [ "columnDefs": [
{ {
"targets": [ ], "targets":3,
"visible": false "visible": false
}, },
{ {
@ -715,33 +711,37 @@ function() {
} }
}, },
{ {
"targets": 12, "targets": 13,
"width": 300, "width": 300,
"render": function ( data, type, full, meta ) { "render": function ( data, type, full, meta ) {
console.log(full['inv']); console.log(full['inv']);
if (full['inv'] != " ") { if (full['inv'] != " ") {
return 'Invoice Received'; return 'Invoice Received';
} else if (full['ti_recieved'] === "0") {
return 'Invoice Received (Manual)';
} }
else{ else{
return 'Invoice Not Received'; return 'Invoice Not Received';
} }
} }
}, },
{ {
"targets": 13,
"width": 300,
"render": function ( data, type, full, meta ) {
return `<a id="${data}" onclick="deletetmcrecon(${data})" style="font-size:16px;text-align:center;"><i class="fa fa-trash" title="Delete"></i></a>`;
}
},
{
"targets": 14, "targets": 14,
"width": 300, "width": 300,
"render": function ( data, type, full, meta ) { "render": function ( data, type, full, meta ) {
console.log(full['inv']);
return '<button type="text" style="border:none;" class="form-control" id="'+full['td_id']+'" data-refid="'+full['td_tkt']+'" value="'+full['td_tkt']+'" onclick="viewinvfn(this.value)" >'+full['inv']+'</button>'; if (full['inv'] != " ") {
return '<button type="text" style="border:none;" class="form-control" id="'+full['td_id']+'" data-refid="'+full['td_tkt']+'" value="'+full['td_tkt']+'" onclick="viewinvfn(this.value)" >'+full['inv']+'</button>';
}
else{
return `<button type="text" class="form-control" data-refid="${data}" value="${data}" onclick="viewfn(${data},1)" >View</button>
&nbsp;<a id="${data}" onclick="deletetmcrecon(${data})" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>`;
} }
}, }
},
] ]
}); });
@ -757,7 +757,7 @@ function() {
$('#column_name').change(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"];
var remove_column = $('#column_name').val(); var remove_column = $('#column_name').val();
@ -810,9 +810,20 @@ function() {
} }
}) })
}; };
$(document).ready(function() {
return $.ajax({
url:'<?php echo base_url('corporate/get_inv_no') ?>',
// data:{tk_no:'tk_no'},
type:'POST',
success:function(data){
Pdata = JSON.stringify(data);
$('#inv_1').val(Pdata);
// console.log(JSON.parse($('#inv_1').val()),'3');
}
})
});
function deletetmcrecon(data)
function deletetmcrecon(data)
{ {
@ -846,9 +857,10 @@ function() {
} }
} }
</script> </script>
<!-- Long Content Scroll Modal --> <!-- Long Content Scroll Modal -->
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" <div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog"
aria-labelledby="scrollableModalTitle" aria-hidden="true"> aria-labelledby="scrollableModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable" role="document"> <div class="modal-dialog modal-dialog-scrollable" role="document">
<div class="modal-content"> <div class="modal-content">
@ -867,6 +879,12 @@ function() {
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
</body> </body>
</html> </html>