From 7c1337c21f74fcee261b7a3429f56d2d31a7d0ca Mon Sep 17 00:00:00 2001
From: Hritikkk9 <hritikdhanawade3@gmail.com>
Date: Wed, 3 Jul 2024 19:21:01 +0530
Subject: [PATCH] webhook commit

---
 .../APIs/Customer_API/SubscriptionController.php         | 8 ++++----
 .../Admin/pages/subscriptions/my-subscription.blade.php  | 9 +++++----
 routes/web.php                                           | 4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
index 542648e..f10f21e 100644
--- a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
+++ b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
@@ -28,14 +28,14 @@ class SubscriptionController extends Controller
     {
         try {
             // dd($request->header('access-token'));
-            // $token = readHeaderToken();
+            $token = readHeaderToken();
             // dd("acc",$token);
-            $token = true;
+            // $token = true;
 
             // dd($token, Session::get('vendorToken'));
             if ($token) {
-                $user_id = 12;
-                // $user_id = $token['sub'];
+                // $user_id = 12;
+                $user_id = $token['sub'];
 
                 $dateTime = now();
                 $formattedDateTime = $dateTime->format('Y-m-d H:i:s');
diff --git a/resources/views/Admin/pages/subscriptions/my-subscription.blade.php b/resources/views/Admin/pages/subscriptions/my-subscription.blade.php
index 7d770fc..e51e73f 100644
--- a/resources/views/Admin/pages/subscriptions/my-subscription.blade.php
+++ b/resources/views/Admin/pages/subscriptions/my-subscription.blade.php
@@ -27,11 +27,13 @@
         </div>
         <div class="inn-group my-4">
           <label class="comm-head" for="">Subscription Charge</label>
-          <input type="text" class="form-control other-input mt-3" value="$5000">
+          <input type="text" class="form-control other-input mt-3" value="{{$isSubscribedUser->amount}}">
         </div>
         <div class="inn-group my-4">
           <label class="comm-head" for="">Renewal date</label>
-          <input type="text" class="form-control other-input mt-3" value="September 15th, 2024">
+          <input type="text" class="form-control other-input mt-3" value="{{ 
+          
+          \Carbon\Carbon::parse($isSubscribedUser->next_payment_date)->format('j M, Y') }}">
         </div>
       </div>
       <div class="my-5">
@@ -107,8 +109,7 @@
           </button>
         </div>
         <div class="modal-body">
-          <p class="text-center para">If you cancel now, you can still access your subscription until September
-            15th, 2024. After this date, you will no longer be able to redeem cocktails.
+          <p class="text-center para">If you cancel now, you can still access your subscription until {{\Carbon\Carbon::now()->format('M d ,Y')}} After this date, you will no longer be able to redeem cocktails.
           </p>
           <p class="text-center mt-3 para">Are you sure you want to cancel?
           </p>
diff --git a/routes/web.php b/routes/web.php
index aace9cb..3f38421 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -218,10 +218,10 @@ Route::group(['middleware' => ['checkStatus']], function () {
 
 
 //subscription ROutes
-// Route::group(['middleware' => ['customer.jwt.verify']], function () {
+Route::group(['middleware' => ['customer.jwt.verify']], function () {
 
     Route::get('my-subscription-page', [SubscriptionController::class, 'mySubscription'])->name('my-subscription-page');
-// });
+});