From 492e4d2bb6d249027af79bc27136845944edc917 Mon Sep 17 00:00:00 2001
From: Suvodip <suvodip@l1>
Date: Wed, 26 Mar 2025 12:01:32 +0530
Subject: [PATCH] s11

---
 customers/.hta_slug/edit-invoice.php   |   6 +-
 customers/.hta_slug/print-invoice.php  |  10 +--
 my-account/.hta_slug/print-invoice.php | 110 +++++++++++++++++--------
 3 files changed, 83 insertions(+), 43 deletions(-)

diff --git a/customers/.hta_slug/edit-invoice.php b/customers/.hta_slug/edit-invoice.php
index fdd729d..302deb8 100644
--- a/customers/.hta_slug/edit-invoice.php
+++ b/customers/.hta_slug/edit-invoice.php
@@ -251,10 +251,10 @@
             </table>
         </div>
         <div class="d-flex justify-content-end align-items-center">
-            <div>
+            <div class="mt-2">
                 <button class="btn btn-secondary">Discard</button>
-                <button type="submit" class="btn btn-primary">Save</button>
-                <a href="/customers/print-invoice/?customerId=<?= $_GET['customerId'] . '&invoiceId='. $_GET['invoiceId']; ?>" id="printBtn" class="btn btn-primary visually-">Print Invoice</a>
+                <button type="submit" class="btn text-white" style="background-color: #374151;">Save</button>
+                <a href="/customers/print-invoice/?customerId=<?= $_GET['customerId'] . '&invoiceId='. $_GET['invoiceId']; ?>" id="printBtn" class="btn text-white visually-" style="background-color: #374151;">Print Invoice</a>
             </div>
         </div>
         
diff --git a/customers/.hta_slug/print-invoice.php b/customers/.hta_slug/print-invoice.php
index 4d0d5e8..65921dc 100644
--- a/customers/.hta_slug/print-invoice.php
+++ b/customers/.hta_slug/print-invoice.php
@@ -107,11 +107,11 @@ if ($invoiceInfo['tenure'] > 1) {
             <table class="table table-striped " style="font-size: 14px;">
                 <thead class="">
                     <tr>
-                        <th>Payment Amount</th>
-                        <th>Payment Date</th>
-                        <th>Payment Source</th>
-                        <th>Transaction ID</th>
-                        <th>Remarks</th>
+                        <th>Amount</th>
+                        <th>Date</th>
+                        <th>Source</th>
+                        <th>Transaction&nbsp;ID</th>
+                        <th class="text-center">Remarks</th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/my-account/.hta_slug/print-invoice.php b/my-account/.hta_slug/print-invoice.php
index 9556c89..65921dc 100644
--- a/my-account/.hta_slug/print-invoice.php
+++ b/my-account/.hta_slug/print-invoice.php
@@ -22,22 +22,33 @@ if ($invoiceInfo['tenure'] > 1) {
 
 <div class="container my-5">
     <div class="invoice-box" id="invoice-box">
-        <h2 class="text-center fw-bold" style="color: #374151;">Invoice</h2><hr>
-        <div class="d-flex justify-content-between">
-            <div class="w-100">
-                <h6>Invoice ID: <?= $invoiceInfo['invoiceId'] ?></h6>
-                <h6>Customer: <?= $invoiceInfo['customerName'] ?></h6>
-                <p style="width: 70%;"><strong>Address:</strong> <?= $invoiceInfo['address'] ?></p>
-            </div>
-            <div class="w-100 d-flex flex-column align-items-end">
-                <h6>Invoice Date: <?= $invoiceInfo['invoiceDate'] ?></h6>
-                <h6>Payment Mode: <?= $invoiceInfo['paymentMode'] ?></h6>
-                <p><strong>Agent:</strong> <?= $invoiceInfo['salesAgent'] ?></p>
+        <div class="d-flex justify-content-between" >
+            <img src="/assets/logo_dark.png" alt="" style="width: 150px; height: fit-content;" />
+            <div>
+                <h3 class="text-center fw-bold" style="color: #374151;">Invoice</h3>
+                <p style="margin-top: -10px;"><strong># <?= $invoiceInfo['invoiceId'] ?></strong></p>
             </div>
         </div>
-
-        <table class="table table-bordered mt-3">
-            <thead class="table-dark">
+        <div class="d-flex justify-content-between gap-2">
+            <div>
+                <p style="font-size: 14px;"><strong>Bill To:</strong></p>
+                <p style="margin-top: -10px; font-size: 13px;">
+                    <span><strong><?= $invoiceInfo['customerName'] ?></strong></span><br>
+                    <span style=""><?=  $invoiceInfo['address'] ?></span>
+                </p>
+                <p style="margin-top: -15px; font-size: 14px;">Invoice Date: <?= $invoiceInfo['invoiceDate'] ?></p>
+            </div>
+            <div>
+                <p style="font-size: 14px;"><strong>CLASSBOXES TECHNOLOGY</strong></p>
+                <p style="margin-top: -15px; font-size: 13px; text-align: right;">
+                    <span>371 Hoes Lane, Suite #200</span><br>
+                    <span>Piscataway New Jersey</span><br>
+                    <span>US 08854</span>
+                </p>
+            </div>
+        </div>
+        <table class="table table-bordered mt-3" style="font-size: 14px;">
+            <thead class="text-white" style="background-color: #374151;">
                 <tr>
                     <th>Item</th>
                     <th>Description</th>
@@ -60,12 +71,11 @@ if ($invoiceInfo['tenure'] > 1) {
                 </tr>
             </tbody>
         </table>
-        <!-- https://center.rgyci.org/printresult_admin_pdf.php?role=admin&reg=WB180Y2021R11308&sem=1
-        https://center.rgyci.org/printresult_admin.php?sid=&reg=WB180Y2021R11308&sem=1 -->
+
         <!-- EMI Table (if tenure > 1) -->
         <?php if ($invoiceInfo['tenure'] > 1): ?>
-        <h4 class="mt-4" style="color: #374151;">EMI Payment Plan</h4>
-        <table class="table table-striped">
+        <h6 class="mt-4" style="color: #374151;">EMI Payment Plan</h6>
+        <table class="table table-striped" style="font-size: 14px;">
             <thead>
                 <tr>
                     <th>EMI No.</th>
@@ -77,7 +87,7 @@ if ($invoiceInfo['tenure'] > 1) {
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($emiPlans as $emi): ?>
+                <?php foreach ($emiPlans as $emi): if($emi['emiAmount'] !== null) {?>
                 <tr>
                     <td><?= $emi['emiNumber'] ?></td>
                     <td><?= $emi['emiDate'] ?></td>
@@ -88,14 +98,43 @@ if ($invoiceInfo['tenure'] > 1) {
                         <?= ($emi['payStatus'] == 1) ? '<span class="badge bg-success">Paid</span>' : '<span class="badge bg-danger">Pending</span>' ?>
                     </td>
                 </tr>
-                <?php endforeach; ?>
+                <?php } endforeach; ?>
             </tbody>
         </table>
         <?php endif; ?>
-
+        <?php if(!is_null($emiPlans[0]['adPaymentAmount']) && $emiPlans[0]['adPaymentAmount'] > 0) { ?>
+            <h6 class="mt-4" style="color: #374151;">Additional Payment Details:</h6>
+            <table class="table table-striped " style="font-size: 14px;">
+                <thead class="">
+                    <tr>
+                        <th>Amount</th>
+                        <th>Date</th>
+                        <th>Source</th>
+                        <th>Transaction&nbsp;ID</th>
+                        <th class="text-center">Remarks</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php 
+                    foreach ($emiPlans as $emiAdditional) { 
+                        if (!is_null($emiAdditional['adPaymentAmount']) && $emiAdditional['adPaymentAmount'] > 0) { 
+                    ?>
+                        <tr>
+                            <td><?= number_format($emiAdditional['adPaymentAmount'], 2) ?></td>
+                            <td><?= !empty($emiAdditional['adPaymentDate']) ? $emiAdditional['adPaymentDate'] : '-' ?></td>
+                            <td><?= !empty($emiAdditional['adPaymentSource']) ? $emiAdditional['adPaymentSource'] : '-' ?></td>
+                            <td><?= !empty($emiAdditional['adPaymentTran']) ? $emiAdditional['adPaymentTran'] : '-' ?></td>
+                            <td><?= !empty($emiAdditional['adPaymentRemarks']) ? $emiAdditional['adPaymentRemarks'] : '-' ?></td>
+                        </tr>
+                    <?php 
+                        }
+                    } 
+                    ?>
+                </tbody>
+            </table>
+        <?php } ?>
         <p class="text-muted mt-3"><strong>Admin Note:</strong> <?= $invoiceInfo['adminNote'] ?></p>
-
-        <!-- Print Button -->
+        <p style="font-size: 12px;"><strong>Invoice Generate Date: </strong><span id="invoiceGenDate"></span></p>
         <div class="d-flex gap-1">
             <button onclick="downloadPDF()" class="btn text-white btn-print w-100" style="background-color: #374151;">Download Invoice</button>
             <button onclick="window.print()" class="btn text-white btn-print w-100" style="background-color: #374151;">Print Invoice</button>
@@ -104,18 +143,19 @@ if ($invoiceInfo['tenure'] > 1) {
 </div>
 <script src="/assets/js/html2pdf.bundle.min.js"></script>
 <script>
-    function downloadPDF() {
-        const invoice = document.getElementById("invoice-box");
-        html2pdf(invoice, {
-            margin: 10,
-            filename: 'invoice.pdf',
-            image: { type: 'jpeg', quality: 0.98 },
-            html2canvas: { scale: 2 },
-            jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' }
-        });
-    }
-</script>
+    document.getElementById('invoiceGenDate').textContent = new Date().toLocaleDateString('en-GB');
 
+    function downloadPDF() {
+            const invoice = document.getElementById("invoice-box");
+            html2pdf(invoice, {
+                margin: 10,
+                filename: 'invoice.pdf',
+                image: { type: 'jpeg', quality: 0.98 },
+                html2canvas: { scale: 2 },
+                jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' }
+            });
+        }
+</script>
 <style>
     body {
         background-color: #f8f9fa;
@@ -124,7 +164,7 @@ if ($invoiceInfo['tenure'] > 1) {
         max-width: 800px;
         margin: auto;
         padding: 30px;
-        border: 1px solid #ddd;
+        /* border: 1px solid #ddd; */
         background: #fff;
         border-radius: 10px;
     }