From 76242628f17c7671de08927cdc723316c68b29e0 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Tue, 26 Mar 2024 12:47:18 +0530
Subject: [PATCH] invoice DataTable Order : ps

---
 app/Models/InvoiceModel.php        |  1 +
 app/Views/invoice_list.php         | 18 ++++++--------
 app/Views/offline_invoice_list.php | 39 +++++++++---------------------
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index aff339d5..dd6a8e4b 100644
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -373,6 +373,7 @@ public function get_general_invoice_data($f_date = null, $t_date = null)
     $result = $query->join('customers', 'customers.customer_id = invoice.customer_id', 'left')
         ->join('invoiceitems', 'invoiceitems.invoice_id = invoice.invoice_id', 'left')
         ->join('books', 'books.book_id = invoiceitems.product', 'left')
+        ->orderBy("invoice.invoice_date", "DESC")
         ->groupBy('invoice.invoice_id') // Assuming invoice_id is the primary key of the invoice table
         ->get()
         ->getResult();
diff --git a/app/Views/invoice_list.php b/app/Views/invoice_list.php
index 3cb4859c..cb4b2158 100644
--- a/app/Views/invoice_list.php
+++ b/app/Views/invoice_list.php
@@ -54,6 +54,7 @@
                     <table id="scroll-horizontal-datatable_wrapper" class="table w-100 nowrap">
                         <thead class="thead-light">
                             <tr>
+                                <th hidden></th>
                                 <th>Order Number</th>
                                 <th>Invoice Date</th>
                                 <th>Customer Name</th>
@@ -68,18 +69,13 @@
                                     $invoice_date = date('d/m/Y', strtotime($row['invoice_date']));
                             ?>
                                     <tr>
-                                        <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['invoice_number']; ?></td>
-                                        <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $invoice_date; ?></td>
-                                        <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['customer_name']; ?></td>
-                                        <td class="preview-pdf" id="status-column" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['status']; ?></td>
-                                        <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= "₹ " . $row['total_amount']; ?></td>
+                                        <td hidden><?= $row['invoice_date']; ?></td>
+                                        <td class="preview-pdf" data-order="<?= $row['invoice_number']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['invoice_number']; ?></td>
+                                        <td class="preview-pdf" data-order="<?= strtotime($row['invoice_date']); ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $invoice_date; ?></td>
+                                        <td class="preview-pdf" data-order="<?= $row['customer_name']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['customer_name']; ?></td>
+                                        <td class="preview-pdf" data-order="<?= $row['status']; ?>;" id="status-column"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['status']; ?></td>
+                                        <td class="preview-pdf" data-order="<?= $row['total_amount']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= "₹ " . $row['total_amount']; ?></td>
                                         <td>
-                                            <?php if ($row['invoice_type'] == 2) : ?>
-                                                <a href="<?= base_url() . "new_subscription_invoice/" . $row['invoice_id']; ?>" class="edit-button" title="Edit the Invoice"><i class="ri-pencil-line" title="Edit the Subscription"></i></a>&nbsp;
-                                            <?php elseif ($row['invoice_type'] == 1) : ?>
-                                               
-                                            <?php endif; ?>
-
                                             <a href="<?= base_url("generate_invoice_pdf/{$row['invoice_id']}") ?>" class="download-pdf-button" title="Download the Invoice"><i class="ri-file-download-line"></i></a>&nbsp;
                                             <a href="<?= base_url("print_address/{$row['invoice_id']}") ?>" class="print-address-button" title="Print Address"><i class="ri-printer-line"></i></a>
                                         </td>
diff --git a/app/Views/offline_invoice_list.php b/app/Views/offline_invoice_list.php
index b212648f..f41cd8eb 100644
--- a/app/Views/offline_invoice_list.php
+++ b/app/Views/offline_invoice_list.php
@@ -1,5 +1,4 @@
 <style>
-    <style>
     /* CSS for modal content */
     #pdfPreviewModal .modal-dialog {
         max-width: 210mm; /* A5 width */
@@ -102,36 +101,22 @@
                             </thead>
                             <tbody>
                             <?php foreach ($invoice as $row) : 
-    if ($row['invoice_type'] == 1) : // Check if it's a subscription invoice 
-        $invoice_date = date('d/m/Y', strtotime($row['invoice_date']));
-?>
-    <?php if (empty($row['order_number'])) : // Check if order_number is empty ?>
-        <tr>
-            <td hidden><?= $row['invoice_id']; ?></td>
-            <td class="preview-pdf" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['invoice_number']; ?></td>
-            <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $invoice_date; ?></td>
-            <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['customer_name']; ?></td>
-            <td class="preview-pdf" id="status-column" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['status']; ?></td>
-            <td class="preview-pdf"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= "₹ ".$row['total_amount']; ?></td>
-            <!-- Add a class to each td -->
-<!-- <td class="preview-pdf" data-invoice-id="<?= $row['invoice_id']; ?>">Preview</td> -->
-
-          
-     
+                                    if ($row['invoice_type'] == 1) : // Check if it's a subscription invoice 
+                                        $invoice_date = date('d/m/Y', strtotime($row['invoice_date']));
+                                        if (empty($row['order_number'])) : // Check if order_number is empty ?>
+                                        <tr>
+                                            <td hidden><?= $row['invoice_date']; ?></td>
+                                            <td class="preview-pdf" data-order="<?= $row['invoice_number']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['invoice_number']; ?></td>
+                                            <td class="preview-pdf" data-order="<?= strtotime($row['invoice_date']); ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $invoice_date; ?></td>
+                                            <td class="preview-pdf" data-order="<?= $row['customer_name']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['customer_name']; ?></td>
+                                            <td class="preview-pdf" data-order="<?= $row['status']; ?>;" id="status-column"  data-invoice-id="<?= $row['invoice_id']; ?>"><?= $row['status']; ?></td>
+                                            <td class="preview-pdf" data-order="<?= $row['total_amount']; ?>" data-invoice-id="<?= $row['invoice_id']; ?>"><?= "₹ " . $row['total_amount']; ?></td>
                                             <td>
-                                                <!-- <a href="<?= base_url() . "approve_invoice/" . $row['invoice_id']; ?>" class="approve-button" title="Approve the Invoice"><i class="ri-checkbox-circle-fill"></i></a>&nbsp; -->
-                                                <?php if ($row['invoice_type'] == 2) : ?>
-                                                    <a href="<?= base_url() . "new_subscription_invoice/" . $row['invoice_id']; ?>" class="edit-button" title="Edit the Invoice"><i class="ri-pencil-line" title="Edit the Subscription"></i></a>&nbsp;
-                                                <?php elseif ($row['invoice_type'] == 1) : ?>
-                                                    <a href="<?= base_url() . "new_book_invoice/" . $row['invoice_id']; ?>" class="edit-button" title="Edit the Invoice"><i class="ri-pencil-line" title="Edit the Invoice"></i></a>&nbsp;
-                                                <?php endif; ?>
-
                                                 <a href="<?= base_url("generate_invoice_pdf/{$row['invoice_id']}") ?>" class="download-pdf-button" title="Download the Invoice"><i class="ri-file-download-line"></i></a>&nbsp;
                                                 <a href="<?= base_url("print_address/{$row['invoice_id']}") ?>" class="print-address-button" title="Print Address"><i class="ri-printer-line"></i></a>
                                             </td>
-                                    </tr>
-                                    <?php endif; ?>
-                                <?php endif; endforeach; ?>
+                                        </tr>
+                                    <?php endif; endif; endforeach; ?>
                             </tbody>
                         </table>
                     </div>