diff --git a/application/controllers/Corporate.php b/application/controllers/Corporate.php index 4f38ec3..1df7862 100644 --- a/application/controllers/Corporate.php +++ b/application/controllers/Corporate.php @@ -3601,6 +3601,18 @@ public function upload_tmc(){ } } } + $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); + + $objWriter->save('./uploads/' . $this->session->userdata['recon_sess_i']['u_corporateid'] . '/tmc/' . $filename); + + if ($ttlrows == $inserror) { + + + $rdata['status'] = 31; + echo json_encode($rdata); + exit; // Exit the function + } + $ferror = array_values($ferror); $this->log->write_log($ferror); diff --git a/application/controllers/Tmc.php b/application/controllers/Tmc.php index 9078824..481b719 100644 --- a/application/controllers/Tmc.php +++ b/application/controllers/Tmc.php @@ -192,7 +192,7 @@ $worksheet->setCellValue($remarksColumn . '1', 'Remarks'); $headingary[] = strval($cell); } } else { - $ttlrows++; + if ($fieldAry != $headingary) { // print_r($fieldAry); // echo '
'; @@ -206,6 +206,7 @@ $worksheet->setCellValue($remarksColumn . '1', 'Remarks'); $chkcell = $worksheet->getCellByColumnAndRow(1, $row); if ($chkcell != '') { + $ttlrows++; $keys = ''; $values = ''; for ($col = 0; $col < $pcols; $col++) { diff --git a/application/views/corporate/gstr2a_recon.php b/application/views/corporate/gstr2a_recon.php index ffc679a..678e637 100644 --- a/application/views/corporate/gstr2a_recon.php +++ b/application/views/corporate/gstr2a_recon.php @@ -975,19 +975,19 @@ // }, { - "targets": 16, - "width": 300, - "render": function ( data, type, full, meta ) { - if(full['inv'] != " "){ - return ''; - } else if(data == ''){ - return '
'; - } - else{ - return ''; - } - } - }, + "targets": 16, + "width": 300, + "render": function (data, type, full, meta) { + if (full['inv'] != " ") { + return ''; + } else if (data == '') { + return '
'; + } else { + return ''; + } + } +}, + // { @@ -1324,6 +1324,17 @@ window.addEventListener('resize', adjustTableCellWidths); + -ide'); - } - }); - }); diff --git a/application/views/corporate/tmc.php b/application/views/corporate/tmc.php index d831e77..71ec1d8 100644 --- a/application/views/corporate/tmc.php +++ b/application/views/corporate/tmc.php @@ -734,7 +734,7 @@ // return '    '; return ` -   +     `; } } diff --git a/application/views/corporate/tmc_gst_inv.php b/application/views/corporate/tmc_gst_inv.php index 9502ad8..df9461d 100644 --- a/application/views/corporate/tmc_gst_inv.php +++ b/application/views/corporate/tmc_gst_inv.php @@ -270,18 +270,27 @@
- "> + + +
- + + +
-
+
@@ -467,6 +476,8 @@ oTable = $("#scroll-horizontal-datatable").DataTable({ lengthChange: !1, + "paging": true, + "pageLength": 50, // dom: 'Bfrtip', buttons: [ diff --git a/application/views/corporate/tmc_recon.php b/application/views/corporate/tmc_recon.php index 756e5f1..f8bbc02 100644 --- a/application/views/corporate/tmc_recon.php +++ b/application/views/corporate/tmc_recon.php @@ -420,7 +420,7 @@
- +
@@ -430,15 +430,15 @@
- +
@@ -629,7 +629,7 @@ function() { '
'+ ''+ '
'+ - ''+ + ''+ '
'+ ''+ ''; @@ -711,7 +711,7 @@ function() { '
'+ ''+ '
'+ - ''+ + ''+ '
'+ ''+ ''; diff --git a/application/views/tmc/tmc_recon.php b/application/views/tmc/tmc_recon.php index 6c38b79..e7a9b53 100644 --- a/application/views/tmc/tmc_recon.php +++ b/application/views/tmc/tmc_recon.php @@ -37,9 +37,9 @@ - +