diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index f4cc0d8..06706f5 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -5113,7 +5113,7 @@ public function upload_tmc(){ $this->load->database('second', TRUE); // $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->select('tmc_data.td_pax as tmc_pax,tmc_data.td_carrier as tmc_airline,tmc_data.td_sector as tmc_sector,tmc_data.td_inv_date as tmc_date,tmc_data.td_tkt as tmc_tkt,tmc_data.td_tkt_fare as tmc_ticket_fare, gstr2a_data.gd_inv_no as gstr2a_inv ,gstr2a_data.gd_inv_value as gstr2a_value, 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.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'); diff --git a/application/third_party/PHPExcel/Shared/String.php b/application/third_party/PHPExcel/Shared/String.php index 49d217a..f5efd4d 100644 --- a/application/third_party/PHPExcel/Shared/String.php +++ b/application/third_party/PHPExcel/Shared/String.php @@ -524,7 +524,9 @@ class PHPExcel_Shared_String * @author Rasmus Andersson {@link http://rasmusandersson.se/} * @author vadik56 */ - public static function utf16_decode($str, $bom_be = TRUE) { + public static function utf16_decode($str, $bom_be = TRUE) + + if( strlen($str) < 2 ) return $str; $c0 = ord($str{0}); $c1 = ord($str{1}); @@ -539,7 +541,7 @@ class PHPExcel_Shared_String } return $newstr; } - + } /** * Get character count. First try mbstring, then iconv, finally strlen * diff --git a/application/views/corporate/dashboard.php b/application/views/corporate/dashboard.php index a5aa454..ddc8f1b 100644 --- a/application/views/corporate/dashboard.php +++ b/application/views/corporate/dashboard.php @@ -100,7 +100,7 @@
- +
diff --git a/application/views/corporate/dashboard_tmc.php b/application/views/corporate/dashboard_tmc.php index 00dc6bc..fc1ad07 100644 --- a/application/views/corporate/dashboard_tmc.php +++ b/application/views/corporate/dashboard_tmc.php @@ -100,7 +100,7 @@
- +
diff --git a/application/views/corporate/includes/top_nav.php b/application/views/corporate/includes/top_nav.php index e577bbf..d8a1cdd 100644 --- a/application/views/corporate/includes/top_nav.php +++ b/application/views/corporate/includes/top_nav.php @@ -87,7 +87,7 @@ GSTR2A TMC AIRLINE INVOICE - TEST + session->flashdata('corporate_id') != 1) { ?> diff --git a/application/views/corporate/tmc.php b/application/views/corporate/tmc.php index d6af726..d8fe8cb 100644 --- a/application/views/corporate/tmc.php +++ b/application/views/corporate/tmc.php @@ -1,5 +1,5 @@ - + diff --git a/application/views/corporate/tmc_gst_inv.php b/application/views/corporate/tmc_gst_inv.php index 21f0d82..a660cbf 100644 --- a/application/views/corporate/tmc_gst_inv.php +++ b/application/views/corporate/tmc_gst_inv.php @@ -2,7 +2,7 @@ - TMC GST INV + DATA RECON @@ -76,11 +76,11 @@
-

TMC GST INV

+

DATA RECON

@@ -126,12 +126,19 @@