diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index a9656c6..8f98ea3 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -401,8 +401,10 @@ class Corporate extends CI_Controller { public function gen_tmc_recon(){ $this->checksess(); - $fromdate = $this->input->post('fromdate'); - $todate = $this->input->post('todate'); + $fromdate= $this->input->post('from'); + + $todate = $this->input->post('to'); + // 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.'"'); // else @@ -455,8 +457,8 @@ class Corporate extends CI_Controller { public function gen_gstr2a_recon($gid = null){ $this->checksess(); - $fromdate = $this->input->post('fromdate'); - $todate = $this->input->post('todate'); + $fromdate = $this->input->post('from'); + $todate = $this->input->post('to'); if($gid) $res = $this->db->query('select *,am_code as supplier_code from gstr2a_data where is_active = 1 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_id = "'.$gid.'" and gd.is_active = 1'); // $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 where gd_id = "'.$gid.'"'); @@ -1256,14 +1258,14 @@ class Corporate extends CI_Controller { $data['curYear'] = date('Y',time()); $this->load->view('corporate/gstr2a',$data); } - public function gstlist() + public function airlineinvoice() { $this->load->database('second', TRUE); $res['data']= $this->db2->get('air_invoice_details')->result(); - $this->load->view('corporate/gstlist',$res); + $this->load->view('corporate/airlineinvoice',$res); } diff --git a/application/views/corporate/airlineinvoice.php b/application/views/corporate/airlineinvoice.php new file mode 100644 index 0000000..71fe200 --- /dev/null +++ b/application/views/corporate/airlineinvoice.php @@ -0,0 +1,384 @@ + + + + + AIRLINE INVOICE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+
+ + +
+ + +
+
+
+

AIRLINE INVOICE

+
+
    +
  1. Files
    2. +
  2. AIRLINE INVOICE
    3. +
+
+
+
+
+ + +
+
+
+
+ +
+
+
+ + + +
+ +
+
+ +
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NO + INVOICE IDPAX NAMEPNRTICKET NOVENDORVENDOR GSTRECIPIENTRECIPIENT GSTINVOICE NUMBERINVOICE DATEHSNTAXABLE VALUECGST VALUECGST RATESGST VALUESGST RATEIGST VALUEIGST RATETOTAL INVOICE VALUETOTAL VALUESTATUSTICKET TYPE AIRLINE FILE NAMEEXTRACTION DATEBATCH ID
sno;?>sl; ?>pax_name; ?>pnr; ?>ticket_no; ?>vendor; ?>vendor_gst; ?>recepient; ?>recepient_gst; ?>invoice_no?>invoice_dt; ?>hsn; ?>taxable_value; ?>cgst_value;?>cgst_rate; ?>sgst_value; ?>sgst_rate; ?>igst_value; ?>igst_rate; ?>total_inv_value; ?>total_values; ?>status; ?>ticket_type; ?>airline_file_name; ?>extraction_date; ?>batch_id; ?>
+ +
+
+
+ + +
+ +
+ + +
+ + + + + + - - - +
@@ -481,15 +484,18 @@ function() { $('#formid').submit(function(e){ e.preventDefault(); - console.log($("#fromdate").val()); + + alert( $("#to").val()); + console.log($("#from").val()); console.log($('#formid').serialize()); $.ajax({ url:'', type:'POST', - data:{ "fromdate" : convert($("#fromdate").val()) , "todate" : convert($("#todate").val()) }, + data:$('#formid').serialize(), success:function(data){ oTable.clear(); var jsonData = JSON.parse(data); + console.log(jsonData); var jd = jsonData.data; var htmlData = ''; var i = 0; @@ -684,7 +690,7 @@ function() { ], "columnDefs": [ { - "targets": [ 0, 1, 2, 8, 12, 13, 14, 15, 16, 21, 23, 24 ], + "targets": [0,1,2,,3,22,23,24,25 ], "visible": false }, { @@ -790,15 +796,15 @@ 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","15","16","17","18","19","20","21"]; 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(false); + oTable.columns(remove_column).visible(true); - oTable.columns(remaining_column).visible(true); + oTable.columns(remaining_column).visible(false); }); diff --git a/application/views/corporate/includes/top_nav.php b/application/views/corporate/includes/top_nav.php index b190869..8e02011 100644 --- a/application/views/corporate/includes/top_nav.php +++ b/application/views/corporate/includes/top_nav.php @@ -86,7 +86,7 @@ TMC Dashboard GSTR2A TMC - AIRLINE INVOICE + AIRLINE INVOICE
  • diff --git a/application/views/corporate/tmc_recon.php b/application/views/corporate/tmc_recon.php index 9064bac..989a9dc 100644 --- a/application/views/corporate/tmc_recon.php +++ b/application/views/corporate/tmc_recon.php @@ -103,36 +103,40 @@ --> - - -
    - +
    + + + +    + + +   
    -
    - - +
    +
    - +
    -
    @@ -157,7 +161,7 @@ TOTAL TKT FARE REMARKS ACTION - INVOICE + @@ -525,13 +529,20 @@ function() { $('#formid').submit(function(e){ e.preventDefault(); + + + console.log($("#from").val()); + console.log($('#formid').serialize()); $.ajax({ url:'', type:'POST', - data:{ "fromdate" : convert($("#fromdate").val()) , "todate" : convert($("#todate").val()) }, + data:$('#formid').serialize(), + success:function(data){ + oTable.clear(); var jsonData = JSON.parse(data); + console.log(jsonData); var jd = jsonData.data; var htmlData = ''; var i = 0; @@ -620,20 +631,8 @@ function() { oTable = $("#scroll-horizontal-datatable").DataTable({ lengthChange: !1, - dom: 'Bfrtip', - buttons: [ - { - extend: "csvHtml5", - exportOptions: { - columns: [ 0, 1, 2, 3, 4, 23, 24, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ] - } - } - -// 'copyHtml5', -// 'excelHtml5', -// 'csvHtml5' -// 'pdfHtml5' - ], + + scrollX: !0, language: { paginate: { @@ -715,15 +714,15 @@ 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"]; 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(false); + oTable.columns(remove_column).visible(true); - oTable.columns(remaining_column).visible(true); + oTable.columns(remaining_column).visible(false); }); diff --git a/uploads/1/airline_invoice/1689770393___AIRLINE_INVOICE_(14).csv b/uploads/1/airline_invoice/1689770393___AIRLINE_INVOICE_(14).csv new file mode 100644 index 0000000..6be37b8 --- /dev/null +++ b/uploads/1/airline_invoice/1689770393___AIRLINE_INVOICE_(14).csv @@ -0,0 +1,16 @@ +"S.NO","INVOICE ID","PAX NAME","PNR","TICKET NO","AIRLINE FILE NAME","EXTRACTION DATE","RECIPIENT","RECIPIENT GST","INVOICE NUMBER","INVOICE DATE","HSN","TAXABLE VALUE","CGST VALUE","CGST RATE","SGST VALUE","SGST RATE","IGST VALUE","IGST RATE","TOTAL INVOICE VALUE","TOTAL VALUE","STATUS","TICKET TYPE" +"1","154872","ABHIKANSHIT BHATNAGAR","OZSHQF","---","2023-05-13-06_IJAI230100033828.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","KA/OCT22/110020","2023-01-30","996425","6437.14","0.00","0.00","0.00","0.00","321.86","5 %","6759.00","7460.00","Extraction OK","Tax-Manual" +"2","154873","GARG/ROHIT MR","---","1095270855","2023-05-13-06_272312BP01AAX516.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","KA/OCT22/110019","2023-01-31","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual" +"3","154874","LAKHOTIA/MANISH","---","1095270965","2023-05-13-06_272312BP01AAX516.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","KA/OCT22/107984","2023-01-31","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual" +"4","154875","FERNANDEZ/SHARO","---","1095831017","2023-05-13-06_272312BP02AAF852.pdf","2023-05-15","Aujas Networks Pvt Ltd","29AAGCA7954E1ZF","272312BP02AAF852","2023-02-07","996425","2983.00","0.00","0.00","0.00","0.00","149.00","5.00","3132.00","3510.00","Extraction OK","Tax-Manual" +"5","154876","---","IZ29SB","---","2023-05-13-06_IZ29SB_DESAI.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","291IZ29SB0223001","2023-02-06","996425","6802.00","167.00","2.5%","167.00","2.5%","0.00","0%","7136.00","7655.00","Extraction OK","Tax-Manual" +"6","154877","---","Y5C7HC","---","2023-05-13-06_Y5C7HC_LAKHOTIA.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","291Y5C7HC0123001","2023-01-25","996425","4319.00","106.00","2.5%","106.00","2.5%","0.00","0%","4531.00","5098.00","Extraction OK","Tax-Manual" +"7","154880","---","---","176-6749189919","2023-05-13-06_2022-12-14_29AAGCA7954E1ZF_176-6749189919_Invoice_KAINTK1222005040.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","KAINTK1222005040","2022-12-14","996425","33453.00","745.00","5.00","745.00","5.00","0.00","0%","34943.00","34943.00","Extraction OK","Tax-Manual" +"8","154881","","MSBNTQ","---","2023-05-13-06_TaxInvoiceAD1222301AM41118.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","AD1222301AM41118","2023-01-29","996425","2381.00","0.00","0.00","0.00","0.00","119.00","5.00","2500.00","2500.00","Extraction OK","Tax-Manual" +"9","154882","","DMKNUS","---","2023-05-13-06_TaxInvoiceKA1222301CB05928.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","KA1222301CB05928","2023-01-30","996425","2057.00","51.50","2.50","51.50","2.50","0.00","0.00","2160.00","2809.00","Extraction OK","Tax-Manual" +"10","154883","","MV5BYX","---","2023-05-13-06_TaxInvoiceMH1222301CT40105.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","MH1222301CT40105","2023-01-30","996335","254.00","0.00","0.00","0.00","0.00","46.00","18.00","300.00","300.00","Extraction OK","Tax-Manual" +"11","154884","","QSWWRD","---","2023-05-13-06_TaxInvoiceTS1222302BJ68723_8.pdf","2023-05-15","AUJAS CYBERSECURITY LIMITED","29AAGCA7954E1ZF","TS1222302BJ68723","2023-02-03","996425","2381.00","0.00","0.00","0.00","0.00","119.00","5.00","2500.00","2900.00","Extraction OK","Tax-Manual" +"12","154885","DESAI SUHAS MR","---","228 1186569133","2023-05-13-06_GST_INVOICE.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I270000007697373","2022-12-30","996425","4920.00","0.00","0.0%","0.00","0.0%","246.00","5.0%","5166.00","5859.00","Extraction OK","Tax-Manual" +"13","154886","DESAI SUHAS MR","---","228 1186541205","2023-05-13-06_GST_INVOICE1.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I070000013252928","2022-12-31","996425","9700.00","0.00","0.0%","0.00","0.0%","485.00","5.0%","10185.00","10575.00","Extraction OK","Tax-Manual" +"14","154887","DESAI SUHAS MR","---","228 6749498957","2023-05-13-06_GST_INVOICE2.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I290000002926328","2022-12-30","996425","4500.00","112.00","2.5%","112.00","2.5%","0.00","0.0%","4724.00","5374.00","Extraction OK","Tax-Manual" +"15","154888","DESAI SUHAS MR","---","228 1186541204","2023-05-13-06_GST_INVOICE3.pdf","2023-05-15","AUJASCYBERSECURITYLIMITED","29AAGCA7954E1ZF","I270000007706338","2022-12-31","996425","8700.00","0.00","0.0%","0.00","0.0%","435.00","5.0%","9135.00","9828.00","Extraction OK","Tax-Manual" \ No newline at end of file