diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 4a8986c5..212e4f1b 100755
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -1036,7 +1036,6 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_
// Load view with data
$html = view('invoice_pdf_template', ['data' => $data, 'invoiceItems' => $invoiceItems, 'invoice_type' => $invoice_type,'business' => $business, 'invoiceTerms' => $data, 'status' => $status]);
-
// Return HTML content
echo $html;
}
@@ -1061,10 +1060,9 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_
// Get status data
$status = $data[0]->status;
-
// Load view with data
// $html = view('invoice_print_preview_template', ['data' => $data, 'invoiceItems' => $invoiceItems,'business'=>$business, 'invoice_type' => $invoice_type, 'invoiceTerms' => $data, 'status' => $status]);
- $html = view('invoice_pdf_template', ['data' => $data, 'invoiceItems' => $invoiceItems,'business'=>$business, 'invoice_type' => $invoice_type, 'invoiceTerms' => $data, 'status' => $status]);
+ $html = view('invoice_pdf_template', ['data' => $data, 'invoiceItems' => $invoiceItems, 'invoice_type' => $invoice_type,'business' => $business, 'invoiceTerms' => $data, 'status' => $status]);
// Return HTML content
echo $html;
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index 6b41daf2..b8e3cf20 100755
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -289,18 +289,20 @@ public function getJoinedData($where, $orderby = [])
public function getMembershipListForCustomer($category, $id)
{
- return $this->db->table('subscription as S')
+ $result = $this->db->table('subscription as S')
->join('customers as C', 'C.customer_id = S.customer_id', 'left')
->join('books as BK', 'BK.book_id = S.scheme_id', 'left')
->join('book_categories as BC', 'BC.book_id = S.scheme_id', 'left')
- ->join('category as CM', 'CM.id = BC.category_id', 'left')
- ->select('S.customer_id,BK.short_code,S.membership_id,S.status ,CONCAT_WS(" ", C.first_name, C.last_name) as customer_name, S.sub_id, S.scheme_id, DATE_FORMAT(S.from_subscription, "%d/%m/%Y") AS formatted_from_subscription, DATE_FORMAT(S.to_subscription, "%d/%m/%Y") AS formatted_to_subscription, S.from_subscription, S.to_subscription,S.isactive,S.is_renew, S.created_on, CM.name ,BK.title, BK.book_id')
+ ->join('category as CM', 'CM.id = BC.category_id', 'left')
+ ->join('invoice as I', 'I.invoice_id = S.invoice_id', 'left')
+ ->select('S.customer_id,BK.short_code,S.membership_id,S.status,I.status as invoice_status ,CONCAT_WS(" ", C.first_name, C.last_name) as customer_name, S.sub_id, S.scheme_id, DATE_FORMAT(S.from_subscription, "%d/%m/%Y") AS formatted_from_subscription, DATE_FORMAT(S.to_subscription, "%d/%m/%Y") AS formatted_to_subscription, S.from_subscription, S.to_subscription,S.isactive,S.is_renew, S.created_on, CM.name ,BK.title, BK.book_id,(SELECT is_renew FROM subscription as sub WHERE S.sub_id = sub.is_renew LIMIT 1)as renewed')
->where('LOWER(CM.name)', strtolower($category))
->where('S.customer_id', $id)
->orderBy('S.to_subscription', 'ASC')
->groupBy('S.sub_id')
->get()
->getResultArray();
+ return $result;
}
public function getProductImgs($productId)
diff --git a/app/Models/SubscriptionModel.php b/app/Models/SubscriptionModel.php
index 1cf82fd0..714acaff 100755
--- a/app/Models/SubscriptionModel.php
+++ b/app/Models/SubscriptionModel.php
@@ -253,7 +253,7 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va
$result = $query->getResultArray();
$lastQuery = $this->db->getLastQuery();
$finalQueryString = $lastQuery->getQuery();
- // echo(count($result));die;
+ // dd($result);
return $result;
}
public function getSubscriptionDetailsBySchemeName($selectedScheme, $downloadType){
@@ -265,14 +265,17 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va
$result1 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.to_subscription >=', $currentDate,$selectedScheme);
$result2 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.isactive', 1,$selectedScheme);
$result3 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.from_subscription <=', $currentDate,$selectedScheme);
+ $approvedResult = $this->getQueryforSubscriptionDetailsBySchemeName(1,'i.status','Approved',$selectedScheme);
// Flatten the arrays for comparison
$flattened1 = array_map('serialize', $result1);
$flattened2 = array_map('serialize', $result2);
$flattened3 = array_map('serialize', $result3);
+ $flattened4 = array_map('serialize',$approvedResult);
// Find common elements
$commonElements0 = array_intersect($flattened1, $flattened2);
- $commonElements = array_intersect($commonElements0, $flattened3);
+ $commonElements1 = array_intersect($commonElements0, $flattened3);
+ $commonElements = array_intersect($commonElements1, $flattened4);
// Unserialize to get back the original array format
$result = array_map('unserialize', $commonElements);
@@ -292,17 +295,21 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va
if ($downloadType === 'both') {
$result0 = $this->getQueryforSubscriptionDetailsBySchemeName(0,'','',$selectedScheme);
$result1 = $this->getQueryforSubscriptionDetailsBySchemeName(1,'s.from_subscription <=', $currentDate,$selectedScheme);
+ $approvedResult = $this->getQueryforSubscriptionDetailsBySchemeName(1,'i.status','Approved',$selectedScheme);
+
+
$flattened1 = array_map('serialize', $result0);
$flattened2 = array_map('serialize', $result1);
+ $flattened3 = array_map('serialize', $approvedResult);
- $commonElements = array_intersect($flattened1, $flattened2);
+ $commonElements0 = array_intersect($flattened1, $flattened2);
+ $commonElements = array_intersect($commonElements0, $flattened3);
$result = array_map('unserialize', $commonElements);
-
+ // dd($this->db->getLastQuery());
}
-
$customerDetails = [];
$processedCustomerIDs = [];
$subscriptionIDs = [];
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index f5bf297a..a8a6852c 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -1652,8 +1652,8 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
let messages = "Earlier Membership :
";
for (let i = 0; i < cm.length; i++) {
let text1 = cm[i].is_renew > 1 ? " - Renewed" : "";
- let text2 = cm[i].isactive != 1 ? " - Draft" : "";
- let text3 = cm[i].status == 0 ? ' - Expired ': " - Active";
+ let text2 = cm[i].invoice_status != 'Approved' ? " - Draft" : "";
+ let text3 = cm[i].status == 0 ? ' - Expired ': " - Active";
messages += cm[i].title + "
( From: " + cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription + " )" + text1 + text2 + text3+ "
";
}
@@ -1666,10 +1666,13 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
$('#membership_id').append('');
for(i=0;i' +cm[i].short_code + ' - '+ membership_id+' ' +cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription +'');
- }
+ $('#membership_id').append('');
+
+ }
+ }
}else{
$('#membership_id_div').hide();
}
diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php
index 57ef42a8..98001804 100755
--- a/app/Views/invoice_pdf_template.php
+++ b/app/Views/invoice_pdf_template.php
@@ -3,6 +3,9 @@
+
+
+
@@ -262,7 +291,7 @@
|
- title ?>
+ | title ?>
description != '') { ?>description ?>
|
quantity ?> |
diff --git a/app/Views/subscribers_list.php b/app/Views/subscribers_list.php
index 0ad8bf08..ae37c4c2 100755
--- a/app/Views/subscribers_list.php
+++ b/app/Views/subscribers_list.php
@@ -71,7 +71,6 @@
if ($currentDate > $toDateTime) {
$daysRemaining = -$daysRemaining;
}
- log_message('info',json_encode($row['renewed']));
if ($daysRemaining < 0) {
$class = 'text-danger';
$message = "Expired" . ($row['renewed'] != null ? " " . '(Renewed)' : '');