diff --git a/application/controllers/Admin.php b/application/controllers/Admin.php index 48562ab..59585cb 100644 --- a/application/controllers/Admin.php +++ b/application/controllers/Admin.php @@ -43,6 +43,11 @@ class Admin extends CI_Controller { $this->checksess(); $this->load->view('admin/corporates'); } + + public function airline(){ + $this->checksess(); + $this->load->view('admin/airline_gstin'); + } @@ -68,6 +73,18 @@ class Admin extends CI_Controller { } } } + + + public function add_airline_gstin(){ + $this->checksess(); + $data = $this->input->post(); + if ($this->input->post()) { + $this->db->insert('airline_gstin',$data); + echo 1; + } else { + echo 0; + } + } public function upd_corpdetail(){ $this->checksess(); @@ -97,6 +114,21 @@ class Admin extends CI_Controller { } } } + + + public function upd_airline_detail(){ + $this->checksess(); + $a_id = $this->input->post('a_id'); + $data = $this->input->post(); + if($a_id){ + $this->db->where('a_id',$a_id); + $this->db->update('airline_gstin',$data); + echo 1; exit; + } + else{ + echo 0; exit; + } + } public function get_corpdetail(){ $this->checksess(); @@ -111,6 +143,21 @@ class Admin extends CI_Controller { } echo json_encode($fary); } + + + public function get_airline_gstno_data(){ + $this->checksess(); + $a_id = $this->input->post('a_id'); + $data = $this->admin->get_airline(null,$a_id,1); + + if($data->num_rows()>0){ + foreach($data->result() as $dat){ + $fdata[] = $dat; + } + $fary['data'] = $fdata; + } + echo json_encode($fary); + } public function get_usrdetail(){ $this->checksess(); @@ -133,6 +180,14 @@ class Admin extends CI_Controller { } echo json_encode($fary); } + + public function get_airline_data(){ + $res = $this->admin->get_airline()->result(); + foreach($res as $r){ + $fary['data'][] = $r; + } + echo json_encode($fary); + } public function generateHash($plainText, $salt = null) { diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 6df30a7..db55f89 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -23,8 +23,24 @@ class Corporate extends CI_Controller { { parent::__construct(); $this->load->model('Corporate_model','corp'); + + // $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'); + } + + public function dashboard(){ + $this->checksess(); + $this->load->view('corporate/dashboard'); + } public function get_alike_tkts($gid = null){ $this->checksess(); @@ -367,14 +383,26 @@ class Corporate extends CI_Controller { $fres['data'] = array(); $res2 = new stdClass(); foreach($res->result() as $res1){ - if($res1->ti_tdid == '') + if($res1->ti_tdid == ''){ $res1->d_remarks = 'Invoice not received'; + $data['inv_received'] = 0; + $this->db->where('td_id', $res1->ti_tdid); + $this->db->update('tmc_data', $data); + } else{ $payremarks = ($res1->s_amt * 100) / $res1->td_tkt_fare; - if($payremarks > 70) + if($payremarks > 70){ + $data['inv_received'] = 1; + $this->db->where('td_id', $res1->ti_tdid); + $this->db->update('tmc_data', $data); $res1->d_remarks = 'Invoice Received'; - else + } + else{ + $data['inv_received'] = 2; + $this->db->where('td_id', $res1->ti_tdid); + $this->db->update('tmc_data', $data); $res1->d_remarks = 'Parital Invoice Received'; + } } $res1->tkt_like = $res1->td_tkt; $res1->td_inv_date = date('d-m-Y',strtotime($res1->td_inv_date)); @@ -424,18 +452,37 @@ class Corporate extends CI_Controller { $variance = $res1->gd_inv_value - $res1->td_tkt_fare; $res2->variance = $variance; - if($res1->ti_file_name == '') - $res2->gd_file_status = 'Invoice Missing'; - else + if($res1->ti_file_name == ''){ + $data['inv_status'] = 0; + $this->db->where('gd_id', $res1->ti_tdid); + $this->db->update('gstr2a_data', $data); + $res2->gd_file_status = 'Invoice Missing'; + } + else{ + $data['inv_status'] = 4; + $this->db->where('gd_id', $res1->ti_tdid); + $this->db->update('gstr2a_data', $data); $res2->gd_file_status = ''; + } - if($variance == 0) + if($variance == 0){ + $data['inv_status'] = 1; + $this->db->where('gd_id', $res1->ti_tdid); + $this->db->update('gstr2a_data', $data); $res2->gd_remarks = 'Transaction Matched'; - else if($variance > 0) + } + else if($variance > 0){ + $data['inv_status'] = 2; + $this->db->where('gd_id', $res1->ti_tdid); + $this->db->update('gstr2a_data', $data); $res2->gd_remarks = 'TMC Amount Short'; - else + } + else{ + $data['inv_status'] = 3; + $this->db->where('gd_id', $res1->ti_tdid); + $this->db->update('gstr2a_data', $data); $res2->gd_remarks = 'Airline Amount Short'; - + } $res2->gd_remarks_inv = $res1->gd_remarks_inv; $res2->gd_rate_perc = $res1->gd_rate_perc; $res2->gd_taxable_value = $res1->gd_taxable_value; @@ -515,10 +562,6 @@ class Corporate extends CI_Controller { } } - public function index(){ - redirect('corporate/gstr2a'); - } - public function upd_gst_tkt_no(){ $data['gd_tkt_no'] = $this->input->post('gd_tkt_no'); $con['gd_id'] = $this->input->post('refid'); @@ -4649,4 +4692,34 @@ class Corporate extends CI_Controller { } echo json_encode($fary); } + + + public function gen_gst_datewise_data(){ + $this->checksess(); + $date = $this->input->post('date'); + $arr = array(); + $arr1 = array(); + $arr2 = array(); + $arr3 = array(); + $arr4 = array(); + + foreach ($date as $key => $value) { + if ($key < count($date) - 1) { + $inc = $key + 1; + $total = $this->corp->total_count($date[$key] , $date[$inc]); + $inv_missing_count = $this->corp->inv_missing_count($date[$key] , $date[$inc]); // 0 + $trans_matching_count = $this->corp->trans_matching_count($date[$key] , $date[$inc]); // 1 + $tmc_amount_short_count = $this->corp->tmc_amount_short_count($date[$key] , $date[$inc]); // 2 + $airline_amount_short_count = $this->corp->airline_amount_short_count($date[$key] , $date[$inc]); // 3 + + array_push($arr , $total);array_push($arr1 , $inv_missing_count); + array_push($arr2 , $trans_matching_count);array_push($arr3 , $tmc_amount_short_count); + array_push($arr4 , $airline_amount_short_count); + } + } + // array_push($tmc_amount_short_count_c , array_sum($arr3));array_push($airline_amount_short_count_c , array_sum($arr4)); + $data = array('total' => $arr , 'inv_missing_count' => $arr1 , 'trans_matching_count' => $arr2 , 'tmc_amount_short_count' => $arr3 , 'airline_amount_short_count' => $arr4 ); + + echo json_encode($data); + } } \ No newline at end of file diff --git a/application/controllers/Tmc.php b/application/controllers/Tmc.php index a86706c..c7c4421 100644 --- a/application/controllers/Tmc.php +++ b/application/controllers/Tmc.php @@ -24,10 +24,24 @@ class Tmc extends CI_Controller { parent::__construct(); $this->load->model('Tmc_model','tmc'); //force_ssl(); + $total = $this->tmc->get_tmc_inv_count(); + $received = $this->tmc->get_tmc_inv_received_count(); + $not_received = $this->tmc->get_tmc_inv_not_received_count(); + $par_received = $this->tmc->get_tmc_inv_par_received_count(); + + $this->session->set_flashdata('total', $total); + $this->session->set_flashdata('received', $received); + $this->session->set_flashdata('not_received', $not_received); + $this->session->set_flashdata('par_received', $par_received); } public function index(){ - redirect('tmc/tmc'); + redirect('tmc/dashboard'); + } + + public function dashboard(){ + $this->checksess(); + $this->load->view('tmc/dashboard'); } public function checksess(){ @@ -92,8 +106,14 @@ class Tmc extends CI_Controller { echo json_encode($fres); } + + + + + + + public function upload_tmc(){ - print_r("aaaaa"); $this->checksess(); $monthAllAryLabel = array('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'); @@ -335,9 +355,17 @@ class Tmc extends CI_Controller { $insdata['f_status'] = 'Initiated'; $insdata['f_uploadedby'] = $this->session->userdata['recon_sess_i']['u_id']; $insdata['f_uploadedat'] = date('Y-m-d H:i:s',time()); - $this->db->insert('files',$insdata); - $td_tfid = $this->db->insert_id(); - $rdata['insref'] = $td_tfid; + if (!$this->input->post('condition_check')) { + $this->db->insert('files',$insdata); + $td_tfid = $this->db->insert_id(); + $rdata['insref'] = $td_tfid; + } + else{ + // $this->db->insert('files',$insdata); + // $td_tfid = $this->db->insert_id(); + $td_tfid = $this->input->post('td_tfid'); + $rdata['insref'] = $this->input->post('td_tfid'); + } for($c=0;$cinput->post('condition_check')) { + echo json_encode($rdata); exit; + // } + // else{ + // $message = "Invalid Records"; + // echo ""; + // echo ''; + // } } else{ - + $reccnt = $highestRow; $inscnt = 0; @@ -390,9 +427,45 @@ class Tmc extends CI_Controller { $rdata['status'] = 1; $rdata['added_records'] = $inscnt; - echo json_encode($rdata); + // if (!$this->input->post('condition_check')) { + echo json_encode($rdata); + // } + // else{ + // $message = "Data Uploaded"; + // echo ""; + // echo ''; + // } } } } - -} \ No newline at end of file + + public function gen_tmc_datewise_data(){ + $this->checksess(); + $date = $this->input->post('date'); + $arr = array(); + $arr1 = array(); + $arr2 = array(); + $arr3 = array(); + + $c = array(); + $c1 = array(); + foreach ($date as $key => $value) { + if ($key < count($date) - 1) { + $inc = $key + 1; + $total = $this->tmc->total_count($date[$key] , $date[$inc]); + $received = $this->tmc->get_inv_rec_1($date[$key] , $date[$inc]); + $par_received = $this->tmc->get_inv_rec_2($date[$key] , $date[$inc]); + $not_received = $this->tmc->not_received_count($date[$key] , $date[$inc]); + array_push($arr , $received);array_push($arr1 , $par_received); + array_push($arr2 , $total);array_push($arr3 , $not_received); + } + } + array_push($c , array_sum($arr));array_push($c1 , array_sum($arr3)); + $data = array('received' => $arr , 'par_received' => $arr1 , 'total' => $arr2 , 'not_received' => $arr3 , 'c' => $c , 'c1' => $c1); + + echo json_encode($data); + } +} + diff --git a/application/models/Admin_model.php b/application/models/Admin_model.php index 4d33f53..59ab351 100644 --- a/application/models/Admin_model.php +++ b/application/models/Admin_model.php @@ -19,4 +19,12 @@ class Admin_model extends CI_Model { $con['c_isactive'] = 1; return $this->db->get_where('corporates',$con); } + + function get_airline($con=null,$a_id = null,$is_active = null){ + if($a_id) + $con['a_id'] = $a_id; + if($is_active) + $con['is_active'] = 1; + return $this->db->get_where('airline_gstin',$con); + } } \ No newline at end of file diff --git a/application/models/Corporate_model.php b/application/models/Corporate_model.php index f131299..c5e20fa 100644 --- a/application/models/Corporate_model.php +++ b/application/models/Corporate_model.php @@ -124,4 +124,61 @@ class Corporate_model extends CI_Model { $con['f_id'] = $fid; return $this->db->get_where('files',$con)->row('f_file'); } + + //dashboard + public function total_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('gstr2a_data'); + $this->db->where('gd_inv_date >=', $from_date); + $this->db->where('gd_inv_date <=', $to_date); + $query = $this->db->count_all_results(); + return $query; + } + + //Inv missing + public function inv_missing_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('gstr2a_data'); + $this->db->where('gd_inv_date >=', $from_date); + $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('inv_status', 0); + $query = $this->db->count_all_results(); + return $query; + } + + //Transaction Matched + public function trans_matching_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('gstr2a_data'); + $this->db->where('gd_inv_date >=', $from_date); + $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('inv_status', 1); + $query = $this->db->count_all_results(); + return $query; + } + //TMC Amount Short + public function tmc_amount_short_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('gstr2a_data'); + $this->db->where('gd_inv_date >=', $from_date); + $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('inv_status', 2); + $query = $this->db->count_all_results(); + return $query; + } + //Airline Amount Short + public function airline_amount_short_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('gstr2a_data'); + $this->db->where('gd_inv_date >=', $from_date); + $this->db->where('gd_inv_date <=', $to_date); + $this->db->where('inv_status', 3); + $query = $this->db->count_all_results(); + return $query; + } } \ No newline at end of file diff --git a/application/models/Tmc_model.php b/application/models/Tmc_model.php index 0d70aba..fb5c6e0 100644 --- a/application/models/Tmc_model.php +++ b/application/models/Tmc_model.php @@ -19,4 +19,109 @@ class Tmc_model extends CI_Model { $con['c_isactive'] = 1; return $this->db->get_where('corporates',$con); } + + function get_by_tmc($id) + { + $this->db->select(); + $this->db->from('files'); + $this->db->where('f_id', $id); + $query = $this->db->get(); + $query = $query->result(); + return $query; + } + + public function get_tmc_count() + { + $this->db->select('SUM(td_tkt) as total_ticket , SUM(A.current_cost) as total_current_cost , categories.name as category_name '); + $this->db->group_by('A.category'); + $this->db->from('asset A'); + $this->db->where('A.business_id', $business_id); + $this->db->order_by('A.id','ASC'); + $this->db->where('A.is_active', 1); + $query = $this->db->count_all_results(); + return $query; + } + + //Tptal Inv received count + public function get_tmc_inv_count() + { + $this->db->select('inv_received'); + $this->db->from('tmc_data'); + $query = $this->db->count_all_results(); + return $query; + } + + //Inv received count + public function get_tmc_inv_received_count() + { + $this->db->select('inv_received'); + $this->db->from('tmc_data'); + $this->db->where('inv_received', 1); + $query = $this->db->count_all_results(); + return $query; + } + + //Inv not count + public function get_tmc_inv_not_received_count() + { + $this->db->select('inv_received'); + $this->db->from('tmc_data'); + $this->db->where('inv_received', 0); + $query = $this->db->count_all_results(); + return $query; + } + + //Inv par received count + public function get_tmc_inv_par_received_count() + { + $this->db->select('inv_received'); + $this->db->from('tmc_data'); + $this->db->where('inv_received', 2); + $query = $this->db->count_all_results(); + return $query; + } + + public function get_inv_rec_1($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('tmc_data'); + $this->db->where('td_inv_date >=', $from_date); + $this->db->where('td_inv_date <=', $to_date); + $this->db->where('inv_received', 1); + $query = $this->db->count_all_results(); + return $query; + } + + public function get_inv_rec_2($from_date , $to_date) // + { + $this->db->select('*'); + $this->db->from('tmc_data'); + $this->db->where('td_inv_date >=', $from_date); + $this->db->where('td_inv_date <=', $to_date); + $this->db->where('inv_received', 2); + $query = $this->db->count_all_results(); + return $query; + } + + public function total_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('tmc_data'); + $this->db->where('td_inv_date >=', $from_date); + $this->db->where('td_inv_date <=', $to_date); + $query = $this->db->count_all_results(); + return $query; + } + + + public function not_received_count($from_date , $to_date) + { + $this->db->select('*'); + $this->db->from('tmc_data'); + $this->db->where('td_inv_date >=', $from_date); + $this->db->where('td_inv_date <=', $to_date); + $this->db->where('inv_received', 0); + $query = $this->db->count_all_results(); + return $query; + } } \ No newline at end of file diff --git a/application/views/admin/airline_gstin.php b/application/views/admin/airline_gstin.php new file mode 100644 index 0000000..136ed40 --- /dev/null +++ b/application/views/admin/airline_gstin.php @@ -0,0 +1,402 @@ + + + + + Airline GSTIN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+
+ + +
+ + +
+
+
+

Airline GSTIN

+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + +
NameCodeNumeric CodeGST NOAction
+ +
+
+
+
+ + +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/admin/corporates.php b/application/views/admin/corporates.php index a16d53c..75c59d8 100644 --- a/application/views/admin/corporates.php +++ b/application/views/admin/corporates.php @@ -160,12 +160,25 @@

    
+ +
+
+      + + +
@@ -233,6 +246,20 @@   Deactive + +
+
+      + + +
+ @@ -363,6 +390,13 @@ } } + else if(k == 'payment') + { + if((v == '1') || (v == '2') || (v == '3')){ + $('#'+v).prop('checked', true); + } + + } }); }, diff --git a/application/views/admin/includes/top_nav.php b/application/views/admin/includes/top_nav.php index c96c179..5e09cb8 100644 --- a/application/views/admin/includes/top_nav.php +++ b/application/views/admin/includes/top_nav.php @@ -85,6 +85,7 @@
Corporates Users + Airline GSTIN
diff --git a/application/views/corporate/dashboard.php b/application/views/corporate/dashboard.php new file mode 100644 index 0000000..ac58713 --- /dev/null +++ b/application/views/corporate/dashboard.php @@ -0,0 +1,765 @@ + + + + + Corporate Dashboard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + +
+ + +
+
+
+

Welcome !

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

0

+

Total Count

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

0

+

Invoice Missing

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

0

+

Transaction Matched

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

0

+

TMC Amount Short

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

Share Of Invoices Received

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

Invoice Receipt Trend

+ +
+
+
+
+
+
+
+
+
+ + + + + +
+ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/corporate/gstno.php b/application/views/corporate/gstno.php index 2eeac9b..bc4f355 100644 --- a/application/views/corporate/gstno.php +++ b/application/views/corporate/gstno.php @@ -150,7 +150,7 @@
- +

diff --git a/application/views/corporate/gstr2a_recon.php b/application/views/corporate/gstr2a_recon.php index 23b5016..74355b8 100644 --- a/application/views/corporate/gstr2a_recon.php +++ b/application/views/corporate/gstr2a_recon.php @@ -18,6 +18,15 @@ + + + + + + + + + @@ -96,14 +105,17 @@
--> -
- - -
-
- - + + +
+ +
+
+ + +
+
@@ -280,6 +292,16 @@ + + + + + + + + + + @@ -289,6 +311,110 @@ + + + + + + + + + + + @@ -267,6 +285,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/views/tmc/includes/top_nav.php b/application/views/tmc/includes/top_nav.php index ef30525..b967ad0 100644 --- a/application/views/tmc/includes/top_nav.php +++ b/application/views/tmc/includes/top_nav.php @@ -82,6 +82,7 @@ Files
+ Dashboard TMC
diff --git a/application/views/tmc/tmc.php b/application/views/tmc/tmc.php index da75f25..1a9c332 100644 --- a/application/views/tmc/tmc.php +++ b/application/views/tmc/tmc.php @@ -228,6 +228,47 @@
+ +
+ + + + @@ -485,7 +530,7 @@ }); $("#usrforma").submit(function(e) { - + console.log("aaaaaaaa"); $('#loading1').show(); $('#submit1').hide(); e.preventDefault(); // avoid to execute the actual submit of the form. @@ -500,10 +545,83 @@ cache: false, async: false, success: function(data) { - $('#loading1').hide(); $('#submit1').show(); - + var pdata = JSON.parse(data); + if (pdata.status == 1) { + $('#addclose').trigger('click'); + usrforma.reset(); + alert('File uploaded successfully.'); +// alert('File uploaded successfully. Records insertred - ' + pdata.added_records); + // getcorplisting(); + location.reload(); + } else if (pdata.status == 31) { + alert('File already uploaded for this criteria.'); + } else if (pdata.status == 13) { + alert('Error. Column mismatch.'); + } else if (pdata.status == 0) { + $('#fileref').val(pdata.insref); + var content = 'Total Records - '+pdata.ttlrows+'
Invalid Records - '+pdata.invalidrows; + if(pdata.duprecords != 0) + content += '
Duplicate Records - '+pdata.duprecords; +// var content = 'Error in
'; +// var row = 1; +// $.each(pdata.error, function(k, v){ +// $.each(v, function(kk, vv) { +// var l = 0; +// if (kk == 'column') { +// if (l == 0) { +// content += 'Row ' + row + ' - '; +// l = l + 1; +// } +// for (var i = 0; i < vv.length; i++) { +// content += vv[i] + ','; +// } +// content += '
'; +// row = row + 1; +// } +// }) +// }) + $('#addclose').trigger('click'); + $('#responsecontent').html(content+'
*Note : If you proceed only valid records will be uploaded.'); + $('#responsemref').trigger('click'); + + // console.log(content); + // var content='Error in \n'; + // $.each(pdata.error,function(k,v){ + // var sary = v.split('-'); + // content += 'Row '+sary[0]+' - Column - '+sary[1]+'\n'; + // }) + // content += 'Kindly correct the data and upload'; + // alert(content); + } else { + alert('Request failed. Kindly try after sometime'); + } + }, + error: function() { + alert('Request failed. Kindly try after sometime'); + } + }); + }); + + + $("#usrformb").submit(function(e) { + $('#loading1').show(); + $('#submit1').hide(); + e.preventDefault(); // avoid to execute the actual submit of the form. + // var form = $(this); + var formData = new FormData($("#usrformb")[0]); + $.ajax({ + type: "POST", + url: '', + data: formData, + processData: false, + contentType: false, + cache: false, + async: false, + success: function(data) { + $('#loading1').hide(); + $('#submit1').show(); var pdata = JSON.parse(data); if (pdata.status == 1) { $('#addclose').trigger('click'); @@ -607,7 +725,8 @@ "render": function(data, type, full, meta) { // return '    '; - return ''; + return ` +   `; } } @@ -658,6 +777,8 @@ if(data.length > 2){ oTable.clear(); var jsonData = JSON.parse(data); + // console.log(jsonData.data[0].f_id); + // console.log(jsonData); var jd = jsonData.data; var htmlData = ''; var i = 0; @@ -680,6 +801,16 @@ $('#download_modal').modal('show'); } + function uploadfn(data1,data2,data3,data4) + { + console.log(data1); + $("#upload_id").val(data1); + $("#f_month").val(data2); + $("#f_year").val(data3); + $("#f_agent").val("dummy"); + $('#upload_modal').modal('show'); + } + diff --git a/application/views/tmc/tmc_recon.php b/application/views/tmc/tmc_recon.php index 1c09991..a6c3b99 100644 --- a/application/views/tmc/tmc_recon.php +++ b/application/views/tmc/tmc_recon.php @@ -18,6 +18,13 @@ + + + + + + + @@ -96,14 +103,17 @@ --> -
- - -
-
- - + + +
+ +
+
+ + +
+
@@ -258,6 +268,14 @@ + + + + + + + + @@ -267,6 +285,110 @@ + + +