Merge branch 'uat' of bitbucket.org:venbainformationtechnology/vb_book into uat
This commit is contained in:
commit
34a4525d80
@ -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);
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user