diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 95c21b1c..6ba3a077 100755
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -1195,14 +1195,8 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_
$data['selected_data'] = $this->request->getVar('date');
$this->logger->info("Itemwise Report ");
}
- $this->logger->info("'Membership Renewals Report'");
- if (empty($data['selected_data'])){
- //dd($data['selected_data']);
- $data['page_name'] = 'Membership Renewals Report (30 days)';
- }else{
- list($fromDate, $toDate) = explode(" - ", $data['selected_data']);
- $data['page_name'] = 'Membership Renewals Report -
(From '.$fromDate.' To '.$toDate.')';
- }
+
+ $data['page_name'] = 'Membership Renewals Report (30 days)';
$this->render_page('report_expired_customers', $data);
}
diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php
index 1421329d..b26477db 100644
--- a/app/Controllers/Payment.php
+++ b/app/Controllers/Payment.php
@@ -204,6 +204,7 @@ public function payment_success() {
'billing_address'=> $address['address_1'],
'billing_address_id' => isset($address['customer_address_id']) ? $address['customer_address_id'] : '',
'payment_method' => $payment_method,
+ 'business_id' =>2 //ask vel
];
$model->save($data);
$update_invoice_numbering = [
@@ -260,7 +261,10 @@ public function payment_success() {
'is_renew' => 1,
'business_id'=>2,
'status' =>1,
- 'membership_id' =>$membership_id
+ 'membership_id' =>$membership_id,
+ 'isactive' =>1,
+ 'business_id' =>2 //ask vel
+
];
$db->table('subscription')->insert($subscriptionData);
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index 70e3deb3..0219114d 100755
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -147,7 +147,7 @@ public function getJoinedData($where, $orderby = [])
// Print the last executed query
- // echo $this->db->getLastQuery();die;
+ //echo $this->db->getLastQuery();die;
return $resultArray;
}
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 8a744bb9..58082393 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -1559,7 +1559,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
return b.is_renew - a.is_renew;
});
if (cm.length > 0) {
- text1 = cm[0].is_renew == 1 ? " - Renewal" : "";
+ text1 = cm[0].is_renew == 1 ? " - Renewed" : "";
text2 = cm[0].isactive == 0 ? " - Expried" : "";
$(".subscribedetails").show(); // Change this line to use the class selector
let message = "Earlier Membership : " + cm[0].title + " ( From: " + cm[0].formatted_from_subscription + " To: " + cm[0].formatted_to_subscription + " )" + text1 + text2;
diff --git a/app/Views/itemwise_report_with_payment_method.php b/app/Views/itemwise_report_with_payment_method.php
index c7099b3d..2a5d0544 100644
--- a/app/Views/itemwise_report_with_payment_method.php
+++ b/app/Views/itemwise_report_with_payment_method.php
@@ -1,12 +1,15 @@
-