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

FIX_Subscription membership Issues : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-07-29 04:49:45 +00:00
parent 35ee49eb96
commit c4f86a1534
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/InvoiceModel.php
View File

@ -157,14 +157,14 @@ public function getJoinedData($where, $orderby = [])
$result = $this->db->table('subscription as S') $result = $this->db->table('subscription as S')
->select('S.sub_id, S.scheme_id, S.customer_id, S.business_id,S.invoice_id,S.mode,S.from_subscription, S.to_subscription, S.is_renew, S.isactive') ->select('S.sub_id, S.scheme_id, S.customer_id, S.business_id,S.invoice_id,S.mode,S.from_subscription, S.to_subscription, S.is_renew, S.isactive')
->where("S.isactive",1) ->where("S.isactive",1)
->where("S.to_subscription <= ",$now) ->where("S.to_subscription < ",$now)
->get() ->get()
->getResultArray(); ->getResultArray();
// echo "<pre>";print_r($result);echo "</pre>"; // echo "<pre>";print_r($result);echo "</pre>";die;
$returnMessages = [];$i = 0 ;$j = 0; $returnMessages = [];$i = 0 ;$j = 0;
if (!empty($result)) { if (!empty($result)) {
foreach ($result as $row) { foreach ($result as $row) {
$this->db->table('invoiceitems')->where(['invoice_id' => $row['invoice_id']])->update(['from_subscription' => NULL,'to_subscription' => NULL]);//first child // $this->db->table('invoiceitems')->where(['invoice_id' => $row['invoice_id']])->update(['from_subscription' => NULL,'to_subscription' => NULL]);//first child
$this->db->table('subscription')->where(['sub_id' => $row['sub_id']])->update(['isactive' => 0]);//second child $this->db->table('subscription')->where(['sub_id' => $row['sub_id']])->update(['isactive' => 0]);//second child
$affectedRows = $this->db->affectedRows(); $affectedRows = $this->db->affectedRows();
if ($affectedRows) { if ($affectedRows) {

4
app/Models/SubscriptionModel.php
View File

@ -313,11 +313,11 @@ public function getSubscriptionDetailsBySchemeName($selectedScheme, $downloadTyp
if ($downloadType === 'active') { if ($downloadType === 'active') {
$builder->where('s.isactive', 1); $builder->where('s.isactive', 1);
// $builder->where('s.to_subscription >=', $currentDate); $builder->where('s.to_subscription >=', $currentDate);
} elseif ($downloadType === 'expired') { } elseif ($downloadType === 'expired') {
$builder->where('s.isactive', 0); $builder->where('s.isactive', 0);
// $builder->where('s.to_subscription <', $currentDate); // $builder->where('s.to_subscription <', $currentDate);
} }
$builder->orderBy('s.to_subscription', 'asc'); $builder->orderBy('s.to_subscription', 'asc');

13
app/Views/subscribers_list.php
View File

@ -68,11 +68,16 @@
// Calculate days remaining // Calculate days remaining
$interval = $currentDate->diff($toDateTime); $interval = $currentDate->diff($toDateTime);
$daysRemaining = $interval->days; $daysRemaining = $interval->days;
if ($currentDate > $toDateTime) {
$daysRemaining = -$daysRemaining;
}
if ($daysRemaining <= 0) { if ($daysRemaining < 0) {
$class = 'text-danger'; $class = 'text-danger';
$message = "Expired"; $message = "Expired";
} elseif ($daysRemaining == 0) {
$class = 'text-danger';
$message = "Expires Today";
} elseif ($daysRemaining == 1) { } elseif ($daysRemaining == 1) {
$class = 'text-warning'; $class = 'text-warning';
$message = "Expires Tomorrow"; $message = "Expires Tomorrow";
@ -150,11 +155,11 @@
<label>Select Subscription Type:</label> <label>Select Subscription Type:</label>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" name="download_type" id="activeOption" value="active"> <input class="form-check-input" type="radio" name="download_type" id="activeOption" value="active">
<label class="form-check-label" for="activeOption">Active Customers</label> <label class="form-check-label" for="activeOption">Active Membership Customer</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" name="download_type" id="expiredOption" value="expired"> <input class="form-check-input" type="radio" name="download_type" id="expiredOption" value="expired">
<label class="form-check-label" for="expiredOption">Expired Customers</label> <label class="form-check-label" for="expiredOption">Expired Membership Customer</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" name="download_type" id="bothOption" value="both" checked> <input class="form-check-input" type="radio" name="download_type" id="bothOption" value="both" checked>