From ff85bbb04251fff148e55db30406541359d6a360 Mon Sep 17 00:00:00 2001
From: Srinivas-Saravanan <srinivas.saravanan@venbainfotech.com>
Date: Tue, 12 Nov 2024 16:36:47 +0530
Subject: [PATCH] FEAT_SUBSCRIPTION ID ADDED

---
 app/Controllers/Invoice.php       | 11 ++++++-----
 app/Controllers/Notifications.php |  2 +-
 app/Controllers/Payment.php       |  8 +++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php
index 8610be81..711fe001 100755
--- a/app/Controllers/Invoice.php
+++ b/app/Controllers/Invoice.php
@@ -519,10 +519,11 @@ public function create_or_update_subscription($invoice_id, $msg_flag_name = null
         $product_id = $item['product'];
         $from_sub_date = $item['from_subscription'];
         $to_sub_date = $item['to_subscription'];
-        $result = $subModel->selectMax('membership_id')->first();
-        $max_membership_id = $result ? $result['membership_id'] : null;
-
-
+        $membership_id =random_int(100000, 999999);
+        $result = $subModel->where('membership_id',$membership_id)->findAll();
+        if (count($result)>0){
+            $membership_id = random_int(100000,999999);
+        }
         // Prepare subscription data
         $subscription_data = [
             'customer_id' => $customer_id,
@@ -533,7 +534,7 @@ public function create_or_update_subscription($invoice_id, $msg_flag_name = null
             'business_id' => get_business_id(),
             'created_by' => get_logged_user_id(),
             'is_renew' => $renewal,
-            'membership_id'=>$max_membership_id +1
+            'membership_id'=>$membership_id
         ];
 
         // Insert the subscription data
diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php
index 3a73aa1b..dc599ccf 100755
--- a/app/Controllers/Notifications.php
+++ b/app/Controllers/Notifications.php
@@ -641,7 +641,7 @@ class Notifications extends BaseController
                     $emailContent = str_replace("{EXPIRY_DATE}", $expiryon, $emailContent);
                 }
                 if (isset($membership_id)) {
-                    $emailContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' .'MEM'. $membership_id, $emailContent);
+                    $emailContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' . $membership_id, $emailContent);
                 }
                 
 
diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php
index 3451e61f..6bc19765 100644
--- a/app/Controllers/Payment.php
+++ b/app/Controllers/Payment.php
@@ -23,11 +23,10 @@ class Payment extends BaseController
         $model = new CustomerModel();
         $model2 = new SubscriptionModel();
         
-        if ($membership_id != null){;
-            $membership_id2 = substr($membership_id, 3);
-            $customer_id = $model2->select('customer_id')->where('membership_id',$membership_id2)->first();
+        if ($membership_id != null){
+            $customer_id = $model2->select('customer_id')->where('membership_id',$membership_id)->first();
             $customer_details = $model->get_customer_details_by_customer_id($customer_id);
-            $scheme = $model2->get_subscription_details_by_membership_id($membership_id2);
+            $scheme = $model2->get_subscription_details_by_membership_id($membership_id);
             //var_dump($customer_details);die();
             $response = [
                 'customer_details' => $customer_details,
@@ -46,7 +45,6 @@ class Payment extends BaseController
             else {
                 //echo "inside else";die();
                 $membership_id = $this->request->getPost('membership_id');
-                $membership_id = substr($membership_id, 3);
                 $scheme = $model2->get_subscription_details_by_membership_id($membership_id);
                 $customer_id = $model2->select('customer_id')->where('membership_id',$membership_id)->first();
                 $customer_details = $model->get_customer_details_by_customer_id($customer_id);