From d43e57ddda999fd1bc85e4d75fe9bb21520fa701 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Thu, 2 Nov 2023 15:45:34 +0530
Subject: [PATCH] Invoice PDF : ps

---
 app/Controllers/Scheme.php         |  2 +-
 app/Views/business_form.php        |  4 +-
 app/Views/invoice_pdf_template.php | 24 ++++++-----
 app/Views/scheme_form.php          |  9 +---
 app/Views/scheme_list.php          | 68 +++++++++++++++---------------
 5 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/app/Controllers/Scheme.php b/app/Controllers/Scheme.php
index ec40d197..3909c39a 100644
--- a/app/Controllers/Scheme.php
+++ b/app/Controllers/Scheme.php
@@ -133,7 +133,7 @@ class Scheme extends BaseController
         else {
             // It's an update operation
             $isactive = $this->request->getPost('isactive');
-            $data['isactive'] = ($isactive == 'on') ? 1 : 0;
+            $data['isactive'] = ($isactive) ? 1 : 0;
             $data['updated_by'] = $session_uid;
 
             $SchemeModel->update($scheme_id, $data);
diff --git a/app/Views/business_form.php b/app/Views/business_form.php
index 5e0100d0..6ab7e7a6 100644
--- a/app/Views/business_form.php
+++ b/app/Views/business_form.php
@@ -82,9 +82,7 @@
                             </div>
                             <div class="form-group col-md-12">
                                 <label for="bterms" class="col-form-label">Terms & Condition<span class="text-danger">*</span></label>
-                                <textarea class="form-control" id="terms" name="bterms" rows="5" cols="50">
-                                <?php echo ($businesses['terms']);?>
-                            </textarea>
+                                <textarea class="form-control" id="terms" name="bterms" rows="5" cols="50"><?= $businesses['terms'];?></textarea>
                             </div>
                           
                         </div>
diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php
index 4bd1529c..82c88e7c 100644
--- a/app/Views/invoice_pdf_template.php
+++ b/app/Views/invoice_pdf_template.php
@@ -311,17 +311,19 @@ if (count($invoiceDateParts) === 3) {
     </div>
 
     <?php foreach ($data as $value) : ?>
-   
-    <div class="terms">
-    <p>Thank you!</p><br><br>
-    <?php if (!empty($value->notes)): ?>
-    <p>Notes: <?= $value->notes ?></p><br><br>
-<?php endif; ?>
-        <?php foreach ($invoiceTerms as $row) : ?>
-    
-        <p><?= $row->terms ?></p><br><br>
-        <?php endforeach; ?>
-    </div>
+        <div class="terms">
+            <p>Thank you!</p>
+            <?php if(!empty($value->notes)){ ?>
+                   <br><p style="text-align: left !important;"><b>Notes:</b> <?= $value->notes; ?></p>
+            <?php } ?>
+            <?php foreach ($invoiceTerms as $row) : 
+                if (!empty($row->terms)) { ?>
+                    <br><pre style="font-family: 'Times New Roman', Times, sans-serif; font-size: 12px; text-align: left;">
+                        <?= $row->terms ?>
+                    </pre>
+                <?php } 
+            endforeach; ?>
+        </div>
     <?php endforeach; ?>
 </body>
 </html>
diff --git a/app/Views/scheme_form.php b/app/Views/scheme_form.php
index 37bedb0d..dbe4e4a4 100644
--- a/app/Views/scheme_form.php
+++ b/app/Views/scheme_form.php
@@ -51,14 +51,7 @@
 
                         <input type="hidden" id="book_id" name="book_id" placeholder="hidden for scheme id" value="<?= isset($scheme['book_id']) ? $scheme['book_id'] : '' ?>" />
                         <input type="hidden" id="business_id" name="business_id" placeholder="hidden for business id" value="<?= $session_bid ?>" />
-                        <!-- <?php if (!empty($scheme)) {  ?>
-                            <div class="form-group text-right m-b-0 checkbox checkbox-purple">
-                                <input type="checkbox" id="isactive" name="isactive" class="form-control" <?= isset($scheme) && $scheme['isactive'] == 1 ? 'checked' : '' ?>>
-                                <label for="isactive"> Is Active</label>
-                            </div>
-                            <br>
-                        <?php } ?>
-                        <br> -->
+                        <input type="hidden" id="isactive" name="isactive" placeholder="hidden for isactive" value="<?= isset($scheme['isactive']) ? $scheme['isactive'] : '' ?>" />
 
                         <div class="form-group text-right m-b-0">
                             <button class="btn btn-success waves-effect waves-light mr-1" type="submit">
diff --git a/app/Views/scheme_list.php b/app/Views/scheme_list.php
index 1231cd5c..af86d43a 100644
--- a/app/Views/scheme_list.php
+++ b/app/Views/scheme_list.php
@@ -8,22 +8,22 @@
                 <br>
                 <h4 class="header-title mb-3"><?= $page_name; ?></h4>
                 <?php if (session()->getFlashdata('success') || session()->getFlashdata('error')) : ?>
-                <?php if (session()->getFlashdata('success')) : ?>
-                    <div class="alert alert-success alert-dismissible fade show" role="alert">
-                        <?= session('success') ?>
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                <?php endif; ?>
-                <?php if (session()->getFlashdata('error')) : ?>
-                    <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                        <?= session('error') ?>
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                <?php endif; ?>
+                    <?php if (session()->getFlashdata('success')) : ?>
+                        <div class="alert alert-success alert-dismissible fade show" role="alert">
+                            <?= session('success') ?>
+                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                            </button>
+                        </div>
+                    <?php endif; ?>
+                    <?php if (session()->getFlashdata('error')) : ?>
+                        <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                            <?= session('error') ?>
+                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                            </button>
+                        </div>
+                    <?php endif; ?>
                 <?php endif; ?>
                 <div class="table-responsive">
                     <!-- <table id="datatable-buttons" class="table dt-responsive w-100"> -->
@@ -39,18 +39,18 @@
                             </tr>
                         </thead>
                         <?php foreach ($scheme as $row) : ?>
-    <tr>
-        <td hidden><?= $row['book_id'];?></td>
-        <td><?= $row['title']; ?></td>
-        <td><?= $row['price']; ?></td>
-        <td><?= $row['duration']; ?></td>
-        <td hidden><?= $row['category_name']; ?></td>
-        <td>
-            <a href="<?= base_url() . "new_scheme/" . $row['book_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>
-            <!-- <a href="<?= base_url() . "delete_scheme/" . $row['book_id']; ?>" class="delete-button"><i class="ri-delete-bin-line"></i></a> -->
-        </td>
-    </tr>
-<?php endforeach; ?>
+                            <tr>
+                                <td hidden><?= $row['book_id']; ?></td>
+                                <td><?= $row['title']; ?></td>
+                                <td><?= $row['price']; ?></td>
+                                <td><?= $row['duration']; ?></td>
+                                <td hidden><?= $row['category_name']; ?></td>
+                                <td>
+                                    <a href="<?= base_url() . "new_scheme/" . $row['book_id']; ?>" class="edit-button"><i class="ri-pencil-line"></i></a>
+                                    <!-- <a href="<?= base_url() . "delete_scheme/" . $row['book_id']; ?>" class="delete-button"><i class="ri-delete-bin-line"></i></a> -->
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
 
                         </tbody>
                     </table>
@@ -60,10 +60,12 @@
     </div><!-- end col-->
 </div><!-- end row-->
 <script>
-$(document).ready(function() {
-    $('#scroll-horizontal-datatable_scheme').DataTable({
-        "order": [[0, "desc"]] // 4 is the column index of "created_on" in your table
-        // Other DataTables configuration options
+    $(document).ready(function() {
+        $('#scroll-horizontal-datatable_scheme').DataTable({
+            "order": [
+                [0, "desc"]
+            ] // 4 is the column index of "created_on" in your table
+            // Other DataTables configuration options
+        });
     });
-});
 </script>
\ No newline at end of file