diff --git a/application/config/database.php b/application/config/database.php index d6e1301..6aab8d6 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -94,3 +94,26 @@ $db['default'] = array( 'failover' => array(), 'save_queries' => TRUE ); + + +$db['second'] = array( + 'dsn' => '', + 'hostname' => 'localhost', + 'username' => 'root', + 'password' => '', + 'database' => 'gst1', + 'dbdriver' => 'mysqli', + 'dbprefix' => '', + 'pconnect' => FALSE, + 'db_debug' => (ENVIRONMENT !== 'production'), + 'cache_on' => FALSE, + 'cachedir' => '', + 'char_set' => 'utf8', + 'dbcollat' => 'utf8_general_ci', + 'swap_pre' => '', + 'encrypt' => FALSE, + 'compress' => FALSE, + 'stricton' => FALSE, + 'failover' => array(), + 'save_queries' => TRUE +); \ No newline at end of file diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index a317d4c..d9dd049 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -23,7 +23,7 @@ class Corporate extends CI_Controller { { parent::__construct(); $this->load->model('Corporate_model','corp'); - + $this->db2 = $this->load->database('second', TRUE); // $c_id = $this->session->userdata['recon_sess_i']['u_corporateid']; // $this->db->select('payment'); // $this->db->from('corporates'); @@ -42,9 +42,23 @@ class Corporate extends CI_Controller { $this->load->view('corporate/dashboard'); } + public function get_inv_gst1(){ + $this->checksess(); + $this->load->database('second', TRUE); + $res = $this->db2->where('invoice_no' , $this->input->post('inv_no'))->get('air_invoice_details')->result(); + echo json_encode($res); + } + + public function get_tic_gst1(){ + $this->checksess(); + $this->load->database('second', TRUE); + $res = $this->db2->where('pnr' , $this->input->post('inv_no'))->or_where('ticket_no' , $this->input->post('inv_no'))->get('air_invoice_details')->result(); + echo json_encode($res); + } + public function tmc_dashboard(){ $this->checksess(); - $this->load->view('corporate/tmc'); + $this->load->view('corporate/dashboard_tmc'); } public function get_alike_tkts($gid = null){ diff --git a/application/views/corporate/dashboard_tmc.php b/application/views/corporate/dashboard_tmc.php new file mode 100644 index 0000000..38f97ac --- /dev/null +++ b/application/views/corporate/dashboard_tmc.php @@ -0,0 +1,763 @@ + + + + + TMC Dashboard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + +
+ + +
+
+
+

Welcome !

+
+
+
+ + +
+
+
+ + + +
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+

0

+

Total Tickets

+
+
+
+
+
+ +
+
+
+
+
+ +
+
+

0

+

Invoice Received

+
+
+
+
+
+ +
+
+
+
+
+ +
+
+

0

+

Invoice Pending

+
+
+
+
+
+ +
+
+
+
+
+ +
+
+

0

+

Mismatch

+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+

Share Of Invoices Received

+ + +
+
+
+
+
+
+ +
+
+
+ +
+
+
+ +

Invoice Receipt Trend

+ +
+
+
+
+
+
+
+
+
+ + + + + +
+ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/corporate/gstr2a_recon.php b/application/views/corporate/gstr2a_recon.php index 9aca9c8..cf6487d 100644 --- a/application/views/corporate/gstr2a_recon.php +++ b/application/views/corporate/gstr2a_recon.php @@ -48,6 +48,9 @@ max-height: 150px !important; overflow-y: auto !important; } + .left{ + + } @@ -178,10 +181,13 @@ INVOICE REMARKS INVOICE FILE Action - refid - refid + REFID + REFID MANUAL TKT NO TICKET NO + INVOICE + + + + \ No newline at end of file diff --git a/application/views/corporate/tmc_recon.php b/application/views/corporate/tmc_recon.php index f5da554..dddc0f9 100644 --- a/application/views/corporate/tmc_recon.php +++ b/application/views/corporate/tmc_recon.php @@ -156,7 +156,8 @@ CABINCLASS TOTAL TKT FARE REMARKS - Action + ACTION + INVOICE @@ -687,7 +688,15 @@ function() { return `  `; } - } + }, + { + "targets": 14, + "width": 300, + "render": function ( data, type, full, meta ) { + console.log(full['td_tkt']); + return ''; + } + }, ] }); @@ -715,6 +724,46 @@ function() { }); + function capitalize(s) + { + str1 = s.replace(/\_/g," "); + str1 = str1[0].toUpperCase() + str1.slice(1); + str1 = str1.replace(/\Pnr/g,"PNR "); + str1 = str1.replace(/\Hsn/g,"HSN "); + str1 = str1.replace(/\Cgst/g,"CGST "); + str1 = str1.replace(/\Igst/g,"IGST "); + str1 = str1.replace(/\Sgst/g,"SGST "); + + return str1; + } + + function viewinvfn(){ + $.ajax({ + url:'', + data:{inv_no:$('#inv_no').val()}, + type:'POST', + success:function(data){ + var Pdata = JSON.parse(data); + var modal_data = ''; + modal_data= '
Invoive Date
:
'+Pdata[0]['invdt']+'
'; + delete Pdata[0].sl; + delete Pdata[0].invoice_dt; + delete Pdata[0].invdt; + delete Pdata[0].batch_id; + Object.keys(Pdata[0]).forEach((element) => { + console.log(element); + modal_data+= '
'+capitalize(element)+'
:
'+Pdata[0][element]+'
' + }); + $('#scrollableModalTitle').html(Pdata[0].invoice_no); + $('#inv_getdata').html(modal_data); + $('#scrollable-modal').modal('show'); + }, + error:function(){ + + } + }) + }; + function deletetmcrecon(data) { @@ -750,6 +799,27 @@ function() { } + + \ No newline at end of file diff --git a/application/views/tmc/tmc_recon.php b/application/views/tmc/tmc_recon.php index 975a832..f758154 100644 --- a/application/views/tmc/tmc_recon.php +++ b/application/views/tmc/tmc_recon.php @@ -156,7 +156,8 @@ CABINCLASS TOTAL TKT FARE REMARKS - Action + ACTION + INVOICE @@ -692,7 +693,15 @@ function() { return `  `; } - } + }, + { + "targets": 14, + "width": 300, + "render": function ( data, type, full, meta ) { + console.log(full['td_tkt']); + return ''; + } + }, ] }); @@ -720,6 +729,46 @@ function() { }); + function capitalize(s) + { + str1 = s.replace(/\_/g," "); + str1 = str1[0].toUpperCase() + str1.slice(1); + str1 = str1.replace(/\Pnr/g,"PNR "); + str1 = str1.replace(/\Hsn/g,"HSN "); + str1 = str1.replace(/\Cgst/g,"CGST "); + str1 = str1.replace(/\Igst/g,"IGST "); + str1 = str1.replace(/\Sgst/g,"SGST "); + + return str1; + } + + function viewinvfn(){ + $.ajax({ + url:'', + data:{inv_no:$('#inv_no').val()}, + type:'POST', + success:function(data){ + var Pdata = JSON.parse(data); + var modal_data = ''; + modal_data= '
Invoive Date
:
'+Pdata[0]['invdt']+'
'; + delete Pdata[0].sl; + delete Pdata[0].invoice_dt; + delete Pdata[0].invdt; + delete Pdata[0].batch_id; + Object.keys(Pdata[0]).forEach((element) => { + console.log(element); + modal_data+= '
'+capitalize(element)+'
:
'+Pdata[0][element]+'
' + }); + $('#scrollableModalTitle').html(Pdata[0].invoice_no); + $('#inv_getdata').html(modal_data); + $('#scrollable-modal').modal('show'); + }, + error:function(){ + + } + }) + }; + function deletetmcrecon(data) { @@ -756,6 +805,26 @@ function() { } - + + \ No newline at end of file