From 8cd03cd0d4775fe2aaf50e2b679723688180dc81 Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Tue, 10 Oct 2023 15:39:24 +0530
Subject: [PATCH 1/2] business

---
 app/Views/invoice_form.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 09518e48..5b4aa5e6 100644
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -260,8 +260,9 @@
                         </div>
                         <div class="form-row">
                             <div class="form-group text-left col-md-12 ">
-                                <label for="terms">Notes</label>
-                                <textarea class="form-control" id="terms" name="notes" value="<?= isset($invoice_details['notes']) ? $invoice_details['notes'] : '' ?>">
+                                <label for="notes">Notes</label>
+                                <textarea class="form-control" id="terms" name="notes" >
+                                <?php echo ($invoice_details['notes']);?>
                             </textarea>
                             </div>
                         </div>

From d80a8d9c043885e5a1a41b262a718fee42effd89 Mon Sep 17 00:00:00 2001
From: heama <bitbucket@venbainfotech.com>
Date: Tue, 10 Oct 2023 15:53:06 +0530
Subject: [PATCH 2/2] customer

---
 app/Models/CustomerModel.php | 4 ++--
 app/Views/customer_form.php  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/CustomerModel.php b/app/Models/CustomerModel.php
index 1c10c68e..e3c07561 100644
--- a/app/Models/CustomerModel.php
+++ b/app/Models/CustomerModel.php
@@ -102,11 +102,11 @@ public function getSubscriberDataByCustomerId($customerId)
 {
     // Assuming 'subscription' is the table name where subscriber data is stored.
     $builder = $this->db->table('subscription');
-    $builder->join('schemes', 'schemes.scheme_id = subscription.scheme_id');
+    $builder->join('books', 'books.book_id = subscription.scheme_id');
 
     
     // Define the columns you want to select from the subscription table.
-    $builder->select('sub_id, to_subscription, from_subscription,schemes.scheme_name');
+    $builder->select('subscription.*,books.title');
     
     // Add a where condition to filter results based on customer ID.
     $builder->where('customer_id', $customerId);
diff --git a/app/Views/customer_form.php b/app/Views/customer_form.php
index fef4fb65..96589866 100644
--- a/app/Views/customer_form.php
+++ b/app/Views/customer_form.php
@@ -321,14 +321,14 @@
                                 <thead>
                                     <tr>
                                         <th>Subscription Name</th>
-                                        <th>Duration</th>
-                                        <th>Amount</th>
+                                        <th>From Subscription</th>
+                                        <th>To Subscription</th>
                                     </tr>
                                 </thead>
                                 <tbody>
                                     <?php foreach ($subscriptionData as $subscription): ?>
                                         <tr>
-                                            <td><?= $subscription->scheme_name ?></td>
+                                            <td><?= $subscription->title ?></td>
                                             <td><?= $subscription->from_subscription ?></td>
                                             <td><?= $subscription->to_subscription ?></td>
                                         </tr>