From ca5ba217c54078484592c81489718c21f7b233e1 Mon Sep 17 00:00:00 2001 From: heama Date: Wed, 16 Aug 2023 17:28:50 +0530 Subject: [PATCH] heama --- application/controllers/Corporate.php | 50 +- .../views/corporate/airlineinvoice.php | 67 +- application/views/corporate/dashboard.php | 4 +- application/views/corporate/dashboard_tmc.php | 4 +- application/views/corporate/gstr2a.php | 8 +- application/views/corporate/gstr2a_recon.php | 2147 +++++++++-------- .../views/corporate/includes/top_nav.php | 8 +- application/views/corporate/tmc.php | 6 +- application/views/corporate/tmc_gst_inv.php | 110 +- application/views/corporate/tmc_recon.php | 61 +- ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...DWWPD9503H135-Nov-2022-1689923132_(1).xlsx | Bin 0 -> 19659 bytes .../1691129628___TMC_Recon_(7).csv | 527 ++++ ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../1691131315___TMC_Recon_(7).csv | 527 ++++ ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../1691139932___TMC_Recon_(7).csv | 527 ++++ .../1691141135___GSTR2A_Sample_(5).xlsx | Bin 0 -> 9582 bytes .../1691141265___travelform_bcakup.php | 787 ++++++ .../1691143916___d_record_(1).xls | Bin 0 -> 5632 bytes .../1691143991___d_record_(1).xls | Bin 0 -> 5632 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../355_1691227481___GSTR2A_Recon_(8).csv | 16 + ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../356_1691735964___airline_Sample_(1).pdf | 0 ...65_1691471421___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...04_1689855140___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...691651611___299_1687760660___dummy_(1).pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...34848___2023-05-13-06_IJAI230100033828.pdf | 0 .../384_1691402033___d_record_(2).xls | Bin 0 -> 5632 bytes ...04_1689855140___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../392_1691400991___AIRLINE_INVOICE_(1).csv | 1 + .../396_1691400889___d_record_(1).xls | Bin 0 -> 5632 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes ...52_1689568333___299_1687760660___dummy.pdf | Bin 0 -> 13264 bytes .../399_1691384489___GSTR2A_Recon_(8).csv | 16 + .../399_1691737729___airline_Sample_(1).pdf | 0 .../401_1691735947___airline_Sample_(1).pdf | 0 40 files changed, 3632 insertions(+), 1234 deletions(-) create mode 100644 uploads/1/airline_invoice/1691126787___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/1691129228___GSTR2A-12DWWPD9503H135-Nov-2022-1689923132_(1).xlsx create mode 100644 uploads/1/airline_invoice/1691129628___TMC_Recon_(7).csv create mode 100644 uploads/1/airline_invoice/1691130549___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/1691131315___TMC_Recon_(7).csv create mode 100644 uploads/1/airline_invoice/1691138898___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/1691139932___TMC_Recon_(7).csv create mode 100644 uploads/1/airline_invoice/1691141135___GSTR2A_Sample_(5).xlsx create mode 100644 uploads/1/airline_invoice/1691141265___travelform_bcakup.php create mode 100644 uploads/1/airline_invoice/1691143916___d_record_(1).xls create mode 100644 uploads/1/airline_invoice/1691143991___d_record_(1).xls create mode 100644 uploads/1/airline_invoice/1691145475___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/355_1691227481___GSTR2A_Recon_(8).csv create mode 100644 uploads/1/airline_invoice/356_1691481742___398_1691389349___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/356_1691735964___airline_Sample_(1).pdf create mode 100644 uploads/1/airline_invoice/365_1691471421___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/366_1691477797___404_1689855140___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/369_1691651611___299_1687760660___dummy_(1).pdf create mode 100644 uploads/1/airline_invoice/370_1691658628___398_1691389349___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/382_1691734848___2023-05-13-06_IJAI230100033828.pdf create mode 100644 uploads/1/airline_invoice/384_1691402033___d_record_(2).xls create mode 100644 uploads/1/airline_invoice/386_1691401831___404_1689855140___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/387_1691401850___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/392_1691400991___AIRLINE_INVOICE_(1).csv create mode 100644 uploads/1/airline_invoice/396_1691400889___d_record_(1).xls create mode 100644 uploads/1/airline_invoice/397_1691400171___398_1691389349___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/398_1691389349___404_1689855121___352_1689568333___299_1687760660___dummy.pdf create mode 100644 uploads/1/airline_invoice/399_1691384489___GSTR2A_Recon_(8).csv create mode 100644 uploads/1/airline_invoice/399_1691737729___airline_Sample_(1).pdf create mode 100644 uploads/1/airline_invoice/401_1691735947___airline_Sample_(1).pdf diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index bff6518..b377c50 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -24,22 +24,25 @@ 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'); - $this->db->where('c_id', intval($c_id)); - $query = $this->db->get(); - $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment); - // force_ssl(); + // $c_id = $this->session->userdata['recon_sess_i']['u_corporateid']; + // $this->db->select('payment'); + // $this->db->from('corporates'); + // $this->db->where('c_id', intval($c_id)); + // $query = $this->db->get(); + // $cor_id = $this->session->set_flashdata('corporate_id', $query->result()[0]->payment); + //force_ssl(); } public function index(){ - redirect('corporate/dashboard'); + alert('hi'); + echo 'Hi';die(); + // redirect('corporate/dashboard'); } public function dashboard(){ $this->checksess(); - $this->load->view('corporate/dashboard'); + echo 'Hi';die(); + // $this->load->view('corporate/dashboard'); } public function get_inv_gst1(){ @@ -417,9 +420,6 @@ class Corporate extends CI_Controller { $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(); 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; } else{ @@ -470,22 +470,6 @@ class Corporate extends CI_Controller { 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 * 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; - } - else{ - $value->inv = " "; - } - } - } $fres['data'] = array(); $res2 = new stdClass(); if($gid){ @@ -1903,7 +1887,6 @@ class Corporate extends CI_Controller { force_download('Payment_Advice_Sample.xlsx', $pth); } - public function p_tmc_sample_download(){ $this->checksess(); $this->load->helper('download'); @@ -5131,13 +5114,14 @@ public function upload_tmc(){ public function tmc_gst_inv(){ $this->checksess(); $this->load->database('second', TRUE); - $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'); + // $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->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.tmc_data', 'tmc_data.td_tkt = gstr2a_data.gd_tkt_no'); $query = $this->db->get(); $result['data'] = $query->result(); - $this->load->view('corporate/tmc_gst_inv',$result); } @@ -5145,5 +5129,3 @@ public function upload_tmc(){ } - - diff --git a/application/views/corporate/airlineinvoice.php b/application/views/corporate/airlineinvoice.php index bf136ce..b8ed494 100644 --- a/application/views/corporate/airlineinvoice.php +++ b/application/views/corporate/airlineinvoice.php @@ -126,32 +126,32 @@
+         - +
diff --git a/application/views/corporate/dashboard_tmc.php b/application/views/corporate/dashboard_tmc.php index fc1ad07..3fb821b 100644 --- a/application/views/corporate/dashboard_tmc.php +++ b/application/views/corporate/dashboard_tmc.php @@ -86,10 +86,10 @@
   - +         - +
diff --git a/application/views/corporate/gstr2a.php b/application/views/corporate/gstr2a.php index 8f60b4b..73c70ff 100644 --- a/application/views/corporate/gstr2a.php +++ b/application/views/corporate/gstr2a.php @@ -147,7 +147,7 @@
-
+
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CORPORATE NAMECORPORATE GSTINTrade/Legal name of the SupplierSUPPLIER TYPEINVOICE NUMBERMANUAL TICKET NO.TICKET NO.DOCUMENT TYPEINVOICE DATEINVOICE AMT (₹)TICKET AMTVARIANCERATE (%)TACABLE AMT (₹)INTEGRATED TAX (₹)CENTRAL TAX (₹)STATE/UT TAX (₹)GSTR2A REMARKSINVOICE REMARKSINVOICE FILEACTIONREFIDSEARCHMANUAL TKT NOINVOICE
- -
-
-
-
- - -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + GSTR2A Recon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+
+ + +
+ + +
+
+
+

GSTR2A

+
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+ + +
+ + + +    + + +    +
+
+ + +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CORPORATE NAMECORPORATE GSTINTrade/Legal name of the SupplierSUPPLIER TYPEINVOICE NUMBERMANUAL TICKET NO.TICKET NO.DOCUMENT TYPEINVOICE DATEINVOICE AMT (₹)TICKET AMTVARIANCERATE (%)TAXABLE AMT (₹)INTEGRATED TAX (₹)CENTRAL TAX (₹)STATE/UT TAX (₹)GSTR2A REMARKSINVOICE REMARKS TICKET NUMBERTICKET AMTINVOICE FILEINVOICEMANUAL TKT NODELETE
+ +
+
+
+
+ + +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/corporate/includes/top_nav.php b/application/views/corporate/includes/top_nav.php index d8a1cdd..68477fe 100644 --- a/application/views/corporate/includes/top_nav.php +++ b/application/views/corporate/includes/top_nav.php @@ -1,9 +1,13 @@ -