From 75b0f4a0ef4bffee703791e3631f8a635cfa479d Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Thu, 20 Jul 2023 12:53:01 +0530
Subject: [PATCH] views heama

---
 application/views/corporate/gstr2a_recon.php | 24 +++++---------
 application/views/corporate/tmc_recon.php    | 34 ++++++++++++++++++--
 application/views/tmc/dashboard.php          |  7 ++--
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/application/views/corporate/gstr2a_recon.php b/application/views/corporate/gstr2a_recon.php
index 130a066..bbf1468 100644
--- a/application/views/corporate/gstr2a_recon.php
+++ b/application/views/corporate/gstr2a_recon.php
@@ -154,7 +154,7 @@
                                                              <option  selected="selected"value="21">REFID</option>
                                      
 
-      
+      <option  selected="selected"value="23">INVOICE</option>
 
     
 -->
@@ -194,7 +194,7 @@
                                                     <th>REFID</th>
                                                     <th>MANUAL TKT NO</th>
                                                     <th>TICKET NO</th>
-                                                    <th></th>
+                                                    <th>INVOICE</th>
 
 
 <!--
@@ -485,7 +485,7 @@ function() {
             $('#formid').submit(function(e){
                 e.preventDefault();
                
-                alert( $("#to").val());
+              
                 console.log($("#from").val());
                 console.log($('#formid').serialize());
                 $.ajax({
@@ -530,12 +530,10 @@ function() {
                     cache: false,
                     async: false,
                     success: function(data){
-                        // var pdata = JSON.parse(data);
-                        // var d = pdata;
-                        // d.counter++;
-                        // oTable.row(tr).data("d");
-                        // alert('success')
-                        $('.btn-primary').click()
+                        var pdata = JSON.parse(data);
+                        var d = pdata;
+                        d.counter++;
+                        oTable.row(tr).data(d);
                     },
                     error:function(){
                         alert('Request failed. Kindly try after sometime');
@@ -690,7 +688,7 @@ function() {
                     ],
                     "columnDefs": [ 
                               {
-                                "targets": [0,1,2,,3,22,23,24,25  ],
+                                "targets": [0,1,2,,3,22  ],
                                 "visible": false
                               },
                         {
@@ -747,16 +745,10 @@ function() {
                                 "targets": 19,
                                 "width": 300,
                                 "render": function ( data, type, full, meta ) {
-                                    // alert(data)
-                                    console.log(data);
                                     if(data == '')
-                                    {
                                         return '<form><input class="filecls" type="file" name="gd_gst_inv" /><input type="hidden" value="'+full['gd_id']+'" name="gdid" /></form>';
-                                    }
                                     else
-                                    {
                                         return '<a style="color:green" href="javascript:void(0)" title="Invoice Download" onclick="gstr2ainvdownload(\''+data+'\')"><i class="fa fa-download"></i></a>';
-                                    }
                                 } 
                               },
                         {
diff --git a/application/views/corporate/tmc_recon.php b/application/views/corporate/tmc_recon.php
index 989a9dc..4ee2129 100644
--- a/application/views/corporate/tmc_recon.php
+++ b/application/views/corporate/tmc_recon.php
@@ -121,6 +121,7 @@
                                                        <label for="inputPassword4" class="col-form-label"></label>
                                                         <button style="margin-top:0px" type="submit" class="btn btn-primary">Submit</button>
                                                     </div>
+                                                    <div class="col-md-2"></div>
                                                    <div class="form-group col-md-4" style="margin-top:35px;">
                                                         <select style="overflow-y:scroll" name="column_name" id="column_name" class="form-control selectpicker" multiple>
                                                             <option selected="selected" value="0">SEGMENT</option>
@@ -137,6 +138,7 @@
                                                             <option selected="selected"value="11">TOTAL TKT FARE</option>
                                                             <option selected="selected"value="12">REMARKS</option>
                                                             <option selected="selected"value="13">ACTION</option>
+                                                            <option selected="selected"value="14">INVOICE</option>
                                                         </select>
                                                    </div>
                                                     
@@ -161,7 +163,9 @@
                                                     <th>TOTAL TKT FARE</th>
                                                     <th>REMARKS</th>
                                                     <th>ACTION</th>
-                                                    <th></th>
+                                                    <th>INVOICE</th>
+                                                    
+                                                    
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -630,7 +634,33 @@ function() {
                 
                 oTable = $("#scroll-horizontal-datatable").DataTable({
                     lengthChange: !1,
-                    
+                    dom: 'Bfrtip',
+                    buttons: [
+                        {
+                            extend: "csvHtml5",
+                            exportOptions: {
+                                columns: [ 0, 1, 2, 3, 4, 5,6,7,8,9,10,11,12,13,14]
+                            }
+                        }
+                            
+//                        'copyHtml5',
+//                        'excelHtml5',
+//                        'csvHtml5'
+//                        'pdfHtml5'
+                    ],
+
+//                    buttons: [{
+//                        extend: "excelHtml5",
+//                        className: "btn-light"
+//                    }
+////                              , {
+////                        extend: "print",
+////                        className: "btn-light"
+////                    }, {
+////                        extend: "pdf",
+////                        className: "btn-light"
+////                    }
+
                    
                     
                     scrollX: !0,
diff --git a/application/views/tmc/dashboard.php b/application/views/tmc/dashboard.php
index 38f97ac..2bfe209 100644
--- a/application/views/tmc/dashboard.php
+++ b/application/views/tmc/dashboard.php
@@ -86,10 +86,13 @@
                                             <input id="fromdate"  value="" type="hidden">
                                             <input id="todate"  value="" type="hidden">
                                             <div class="form-group col-md-4">
-                                            <label class="col-lg-3 col-form-label">Date</label>
+                                                <label>FROM</label>
+                                                <input type="date" id="from" name="from">
+                                            <label class="col-lg-3 col-form-label">TO</label>
+                                            <input type="date" id="to" name="to">
                                                     <div class="col-lg-12">
                                                         <div id="reportrange" class="pull-right form-control">
-                                                            <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
+                                                            
                                                             <span></span>
                                                         </div>
                                                     </div>