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

application/controllers/Admin.php

@@ -53,7 +53,9 @@ class Admin extends CI_Controller {
     
     public function add_corpdetail(){
         $this->checksess();
-        $data = $this->input->post('usr');
+        $data = $this->input->post();
+      
+        $data = $data['usr'];
         $con['c_code'] = $data['c_code'];
         $echk = $this->admin->get_corp($con);
         if($echk->num_rows()>0){
@@ -66,10 +68,20 @@ class Admin extends CI_Controller {
                 echo 3; exit;
             }
             else{
+                // unset($data['payment']);
                 $data['c_createdby'] = $this->session->userdata['recon_sess_i']['u_id'];
                 $data['c_createdon'] = date('Y-m-d H:i:s',time());
-                $this->db->insert('corporates',$data);
+                // echo json_encode($data);
-                echo 1; exit;
+                try {
+                    $this->db->insert('corporates',$data);
+                    echo 1; exit;
+
+                } catch (Exception $e) {
+                   
+                    log_message('error', 'Exception occurred: ' . $e->getMessage());
+                    show_error('An error occurred. Please try again later.');
+                }
+                
             }
         }
     }

application/controllers/Corporate.php

@@ -24,13 +24,13 @@ 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'];
+        $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(){
@@ -417,6 +417,9 @@ 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{
@@ -467,6 +470,22 @@ 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){
@@ -1884,6 +1903,7 @@ class Corporate extends CI_Controller {
         force_download('Payment_Advice_Sample.xlsx', $pth);
     }
     
+    
     public function p_tmc_sample_download(){
         $this->checksess();
         $this->load->helper('download');

application/views/admin/corporates.php

@@ -337,12 +337,15 @@
             $("#usrforma").submit(function(e) {
                 e.preventDefault(); // avoid to execute the actual submit of the form.
                 var form = $(this);
+                console.log(form.serialize());
                 $.ajax({
+                    
                        type: "POST",
                        url: '<?php echo base_url('admin/add_corpdetail'); ?>',
                        data: form.serialize(), // serializes the form's elements.
                        success: function(data)
                        {
+                    //    console.log(JSON.parse(data));
                            if(data == 1){
                                $('#addclose').trigger('click');
                                usrforma.reset();
@@ -359,7 +362,8 @@
                                alert('Request failed. Kindly try after sometime');
                            }
                        },
-                       error:function(){
+                       error:function(err){
+                        console.log(err);
                            alert('Request failed. Kindly try after sometime');
                        }
                      });

application/views/corporate/gstr2a_recon.php

@@ -188,7 +188,7 @@
                                                     <th>REFID</th>
                                                     <th>SEARCH</th>
                                                     <th>MANUAL TKT NO</th>
-                                                    <th>TICKET NO</th>
+                                                    <!-- <th>TICKET NO</th> -->
                                                     <th>INVOICE</th>
 
 
@@ -737,6 +737,16 @@ function() {
 //                                    return '<input type="text" class="form-control" data-refid="'+full['gd_id']+'" value="'+data+'"  onblur="onblurrfn('+full['gd_id']+',this.value)" />';
 //                                } 
 //                              },
+{
+                                "targets": 18,
+                                "width": 300,
+                                "render": function ( data, type, full, meta ) {
+                                    if(full['inv'] == " ")
+                                        return 'Invoice Missing';
+                                    else
+                                        return 'Invoice Received';
+                                } 
+                              },
                         {
                                 "targets": 19,
                                 "width": 300,
@@ -757,16 +767,15 @@ function() {
                         {
                                 "targets": 22,
                                 "render": function ( data, type, full, meta ) {
-                                    return '<button class="form-control buttons tktdelredraw td_'+data+'" id="td_'+data+'">Search</button>' +
+                                    return '<a onclick="deletegst2rarecon('+data+')" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>'
-                                    '&nbsp;<a onclick="deletegst2rarecon('+data+')" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>'
                                 } 
                               },
                               {
-                                "targets": 25,
+                                "targets": 24,
                                 // "width": 300,
                                 "render": function ( data, type, full, meta ) {
                                     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['gd_inv_no']+'</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>';
                                 } 
                               }
                     ]

application/views/corporate/tmc.php

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lan="en">
+<html lang="en">
 
 <head>
     <meta charset="utf-8" />
@@ -530,7 +530,7 @@
             });
 
             $("#usrforma").submit(function(e) {
-                // alert('sdd')
+                console.log("aaaaaaaa");
                 $('#loading1').show();
                 $('#submit1').hide();
                 e.preventDefault(); // avoid to execute the actual submit of the form.
@@ -545,11 +545,9 @@
                     cache: false,
                     async: false,
                     success: function(data) {
-                        console.log(data);
                         $('#loading1').hide();
                         $('#submit1').show();
                         var pdata = JSON.parse(data);
-                        console.log(pdata);
                         if (pdata.status == 1) {
                             $('#addclose').trigger('click');
                             usrforma.reset();

application/views/corporate/tmc_gst_inv.php

@@ -228,7 +228,7 @@
 
                         <td><?php echo $value-> inv_tkt_no; ?></td>
                         <?php
-                     if ($value->tmc_ticket_fare === $value->gstr2a_value && $value->tmc_ticket_fare === $value->total_values)
+                     if ($value->tmc_ticket_fare == $value->gstr2a_value && $value->tmc_ticket_fare == $value->total_values)
                      { ?>
                          <td ><?php  echo $value->total_values; ?></td>
                     <?php }

application/views/tmc/tmc_recon.php

@@ -714,12 +714,24 @@ function() {
                                     return data;
                                 } 
                               },
+                              {
+                                "targets": 12,
+                                "width": 300,
+                                "render": function ( data, type, full, meta ) {
+                                    console.log(full['inv']);
+                                    if (full['inv'] != " ") {
+                                        return 'Invoice Received';
+                                    }
+                                    else{
+                                        return 'Invoice Not Received';
+                                    }
+                                } 
+                              },
                             {
                                 "targets": 13,
                                 "width": 300,
                                 "render": function ( data, type, full, meta ) {
-                                    return `<button type="text" class="form-control" data-refid="${data}" value="${data}"  onclick="viewfn(${data},1)" >View</button>
+                                    return `<a id="${data}" onclick="deletetmcrecon(${data})" style="font-size:16px;text-align:center;"><i class="fa fa-trash" title="Delete"></i></a>`;
-                                    &nbsp;<a id="${data}" onclick="deletetmcrecon(${data})" style="font-size:16px;"><i class="fa fa-trash" title="Delete"></i></a>`;
                                 } 
                               },
                               {