From 315da27c38c1f17df6e313e497cf191e9eaeb166 Mon Sep 17 00:00:00 2001
From: Hritikkk9 <hritikdhanawade3@gmail.com>
Date: Thu, 11 Jul 2024 17:59:09 +0530
Subject: [PATCH 1/2] subscription faq added

---
 .../Customer_API/SubscriptionController.php   | 12 +++---
 .../subscriptions/list-of-products.blade.php  | 40 ++++---------------
 routes/web.php                                |  4 +-
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
index cd695ac..8167885 100644
--- a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
+++ b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\APIs\Customer_API;
 
 use App\Http\Controllers\Controller;
+use App\Models\Faq;
 use App\Models\IamPrincipal;
 use App\Models\SubscriptionProducts;
 use App\Models\Subscriptions;
@@ -27,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 = 54;
-                $user_id = $token['sub'];
+                $user_id = 13;
+                // $user_id = $token['sub'];
 
                 $dateTime = now();
                 $formattedDateTime = $dateTime->format('Y-m-d H:i:s');
@@ -54,8 +55,9 @@ class SubscriptionController extends Controller
                     return view("Admin.pages.subscriptions.my-subscription", compact('user_id', 'userData', 'isSubscribedUser', 'products'));
                 }
                 $productList = SubscriptionProducts::where('is_active', 1)->first();
+                $faqs = Faq::where('faq_category_id',3)->where('is_active','1')->get(); //getting only subscription faqS
 
-                return view('Admin.pages.subscriptions.list-of-products', compact('productList', 'userData'));
+                return view('Admin.pages.subscriptions.list-of-products', compact('productList', 'userData','faqs'));
             } else {
                 return jsonResponseWithErrorMessageApi(__('auth.user_deleted'), 409);
             }
diff --git a/resources/views/Admin/pages/subscriptions/list-of-products.blade.php b/resources/views/Admin/pages/subscriptions/list-of-products.blade.php
index 69bc3dd..807939c 100644
--- a/resources/views/Admin/pages/subscriptions/list-of-products.blade.php
+++ b/resources/views/Admin/pages/subscriptions/list-of-products.blade.php
@@ -145,40 +145,16 @@
         <h3 class="text-center head my-4">Program/Redemption Rules</h3>
         <div class="container">
             <div data-ui-tablist class="ui-accordion ui-accordion--outlined" data-ui-transition="collapse-fade">
-                <div class="ui-accordion-item">
-                    <button data-ui-tablist-tab class="ui-accordion-header ui-active">How to create new
-                        account?</button>
-                    <div data-ui-tablist-tabpanel>
-                        <div class="ui-accordion-body">
-                            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
-                            labore et
-                            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
-                            laboris nisi ut aliquip ex ea commodo consequat.
+                @foreach ($faqs as $faq)
+                    <div class="ui-accordion-item">
+                        <button data-ui-tablist-tab class="ui-accordion-header">{{ $faq->question }}</button>
+                        <div data-ui-tablist-tabpanel {{ $loop->first ? '' : 'hidden' }}>
+                            <div class="ui-accordion-body">
+                                {{ $faq->answers }}
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="ui-accordion-item">
-                    <button data-ui-tablist-tab class="ui-accordion-header">How to create new account?</button>
-                    <div data-ui-tablist-tabpanel hidden>
-                        <div class="ui-accordion-body">
-                            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
-                            labore et
-                            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
-                            laboris nisi ut aliquip ex ea commodo consequat.
-                        </div>
-                    </div>
-                </div>
-                <div class="ui-accordion-item">
-                    <button data-ui-tablist-tab class="ui-accordion-header">How to create new account?</button>
-                    <div data-ui-tablist-tabpanel hidden>
-                        <div class="ui-accordion-body">
-                            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut
-                            labore et
-                            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
-                            laboris nisi ut aliquip ex ea commodo consequat.
-                        </div>
-                    </div>
-                </div>
+                @endforeach
             </div>
         </div>
     </section>
diff --git a/routes/web.php b/routes/web.php
index 070d540..dcbbd28 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -221,10 +221,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');
-});
+// });
 
 
 

From c104da1a11292c5329f9286526641a23777dcd03 Mon Sep 17 00:00:00 2001
From: Hritikkk9 <hritikdhanawade3@gmail.com>
Date: Thu, 11 Jul 2024 18:00:57 +0530
Subject: [PATCH 2/2] subscription faq added-2

---
 .../APIs/Customer_API/SubscriptionController.php          | 8 ++++----
 routes/web.php                                            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php b/app/Http/Controllers/APIs/Customer_API/SubscriptionController.php
index 8167885..be81089 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 = 13;
-                // $user_id = $token['sub'];
+                // $user_id = 13;
+                $user_id = $token['sub'];
 
                 $dateTime = now();
                 $formattedDateTime = $dateTime->format('Y-m-d H:i:s');
diff --git a/routes/web.php b/routes/web.php
index dcbbd28..070d540 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -221,10 +221,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');
-// });
+});