vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' of bitbucket.org:venbainformationtechnology/vb_book into uat

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-10-10 18:14:25 +05:30
commit 34a4525d80
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/CustomerModel.php
View File

@ -102,11 +102,11 @@ public function getSubscriberDataByCustomerId($customerId)
{ {
// Assuming 'subscription' is the table name where subscriber data is stored. // Assuming 'subscription' is the table name where subscriber data is stored.
$builder = $this->db->table('subscription'); $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. // 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. // Add a where condition to filter results based on customer ID.
$builder->where('customer_id', $customerId); $builder->where('customer_id', $customerId);

6
app/Views/customer_form.php
View File

@ -321,14 +321,14 @@
<thead> <thead>
<tr> <tr>
<th>Subscription Name</th> <th>Subscription Name</th>
<th>Duration</th> <th>From Subscription</th>
<th>Amount</th> <th>To Subscription</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($subscriptionData as $subscription): ?> <?php foreach ($subscriptionData as $subscription): ?>
<tr> <tr>
<td><?= $subscription->scheme_name ?></td> <td><?= $subscription->title ?></td>
<td><?= $subscription->from_subscription ?></td> <td><?= $subscription->from_subscription ?></td>
<td><?= $subscription->to_subscription ?></td> <td><?= $subscription->to_subscription ?></td>
</tr> </tr>

5
app/Views/invoice_form.php
View File

@ -260,8 +260,9 @@
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group text-left col-md-12 "> <div class="form-group text-left col-md-12 ">
<label for="terms">Notes</label> <label for="notes">Notes</label>
<textarea class="form-control" id="terms" name="notes" value="<?= isset($invoice_details['notes']) ? $invoice_details['notes'] : '' ?>"> <textarea class="form-control" id="terms" name="notes" >
<?php echo ($invoice_details['notes']);?>
</textarea> </textarea>
</div> </div>
</div> </div>