Merge pull request #264 from wanderlust-group-project-1/admin-fix

Admin fix
wanderlust-group-project-1 · Apr 30, 2024 · c6240b2 · c6240b2
2 parents 1279afb + cab7ebc
commit c6240b2
Show file tree

Hide file tree

Showing 15 changed files with 7,006 additions and 38 deletions.
diff --git a/app/controllers/FindGuide.php b/app/controllers/FindGuide.php
@@ -3,6 +3,7 @@
 class FindGuide{
     use Controller;
     public function index(string $a = '', string $b = '', string $c = ''): void {
+        AuthorizationMiddleware::authorize(['customer']);
         $this->view('customer/findGuide');
     }
 

diff --git a/app/controllers/GuideAvailability.php b/app/controllers/GuideAvailability.php
@@ -3,6 +3,7 @@
 class GuideAvailability{
     use Controller;
     public function index(string $a = '', string $b = '', string $c = ''): void {
+        AuthorizationMiddleware::authorize(['guide']);
         $this->view('guide/guideAvailability');
     }
 

diff --git a/app/controllers/GuideBookings.php b/app/controllers/GuideBookings.php
@@ -3,6 +3,7 @@
 class GuideBookings{
     use Controller;
     public function index(string $a = '', string $b = '', string $c = ''): void {
+        AuthorizationMiddleware::authorize(['guide']);
         $this->view('guide/guidebooking');
     }
 }
diff --git a/app/controllers/Guideprofile.php b/app/controllers/Guideprofile.php
@@ -6,6 +6,7 @@ class Guideprofile {
     public function index(string $a = '', string $b = '', string $c = ''): void {
         $user = $_SESSION['USER'];
 
+        AuthorizationMiddleware::authorize(['guide']);
         if ($user->role == 'guide') {
             $guideProfileModel = new GuideProfileModel();
             $guideProfile = $guideProfileModel->getGuideProfileByUserId($user->id); // Assuming you have a method to fetch guide profile by user ID

diff --git a/app/controllers/Guidestatistics.php b/app/controllers/Guidestatistics.php
@@ -4,6 +4,7 @@ class Guidestatistics {
     use Controller;
 
     public function index(string $a = '', string $b = '', string $c = ''): void {
+        AuthorizationMiddleware::authorize(['guide']);
         $this->view('guide/guideStatistics');
     }
 

diff --git a/app/controllers/MyBookings.php b/app/controllers/MyBookings.php
@@ -3,6 +3,7 @@
 class MyBookings{
     use Controller;
     public function index(string $a = '', string $b = '', string $c = ''): void {
+        AuthorizationMiddleware::authorize(['customer']);
         $this->view('customer/myBookings');
     }
 }
diff --git a/app/controllers/MyOrders.php b/app/controllers/MyOrders.php
@@ -4,21 +4,25 @@ class MyOrders {
     use Controller;
 
 
-    public function index(string $a = '', string $b = '', string $c = ''):void {
-
-
+    public function index(string $a = '', string $b = '', string $c = ''): void {
 
         AuthorizationMiddleware::authorize(['customer']);
-
+    
         $tips = new TipsModel();
         $data['tips'] = $tips->findAll();
-
-        // randomly select 1 tip
-        $data['tip'] = $data['tips'][array_rand($data['tips'])];
-        // show($data['tip']);
+
+        if (empty($data['tips'])) {
+            // Handle the case where no tips are found
+            $data['tip'] = '';
+        } else {
+            // Randomly select 1 tip if the array is not empty
+            $data['tip'] = $data['tips'][array_rand($data['tips'])];
+        }
 
+        // Load the view with the data
         $this->view('customer/orders', $data);
     }
+
 
     public function list(string $a = '', string $b = '', string $c = ''):void {
         AuthorizationMiddleware::authorize(['customer']);

diff --git a/app/views/customer/checkout.view.php b/app/views/customer/checkout.view.php
@@ -17,7 +17,7 @@
 
 <div class="container flex-d flex-md-c justify-content-center  mt-9 ml-8 p-6">
     <div class="customer-bg-image">
-        <img src="<?php echo ROOT_DIR?>/assets/images/customerbg.jpg" alt="customer-bg-image" class="customer-bg-image">
+        <img src="<?php echo ROOT_DIR ?>/assets/images/customerbg.jpg" alt="customer-bg-image" class="customer-bg-image">
     </div>
     <div class=" col-lg-8 col-md-12 flex-d-c gap-2 ">
 
@@ -81,23 +81,23 @@
                         <!-- select pay fully or patial  -->
 
 
-<table class="payment-table">
-
+                        <table class="payment-table">
 
-                        <!-- <h4> Total: Rs. <?php echo $total; ?> </h4>
+
+                            <!-- <h4> Total: Rs. <?php echo $total; ?> </h4>
                         <h4> Booking Fee: Rs. <?php echo $total * 0.2 ?> </h4> -->
-                     
-                        <tr>
-                            <td> Total: </td>
-                            <td> Rs. <?php echo $total; ?> </td>
-                        </tr>
-                        <tr>
-                            <td> Booking Fee: </td>
-                            <td> Rs. <?php echo $total * 0.2 ?> </td>
-                        </tr>
-                      
-
-</table>
+
+                            <tr>
+                                <td> Total: </td>
+                                <td> Rs. <?php echo $total; ?> </td>
+                            </tr>
+                            <tr>
+                                <td> Booking Fee: </td>
+                                <td> Rs. <?php echo $total * 0.2 ?> </td>
+                            </tr>
+
+
+                        </table>
 
                     </div>
                     <div class="row gap-2 ">
@@ -116,6 +116,8 @@
 
     </div>
 
+</div>
+
     <script>
         $(document).ready(function() {
             // Event listener for the button click
@@ -219,11 +221,11 @@ function paymentGateWay(data) {
                         alertmsg("Payment dismissed", "error");
 
                         setTimeout(() => {
-                                    window.location.href = "<?php echo ROOT_DIR ?>/myOrders";
+                            window.location.href = "<?php echo ROOT_DIR ?>/myOrders";
 
-                                    hideLoader();
+                            hideLoader();
 
-                                }, 1000);
+                        }, 1000);
 
                     };
 
@@ -233,11 +235,11 @@ function paymentGateWay(data) {
                         console.log("Error:" + error);
                         alertmsg("Error occured", "error");
                         setTimeout(() => {
-                                    window.location.href = "<?php echo ROOT_DIR ?>/myOrders";
+                            window.location.href = "<?php echo ROOT_DIR ?>/myOrders";
 
-                                    hideLoader();
+                            hideLoader();
 
-                                }, 1000);
+                        }, 1000);
                     };
 
                     // Put the payment variables here

diff --git a/app/views/customer/components/complaintlist.view.php b/app/views/customer/components/complaintlist.view.php
@@ -43,8 +43,8 @@
                     <button class="btn btn-primary" id="mark-as-returned">Mark as Returned</button>
                 <?php }
                 elseif ($complaint->status == 'pending') { ?>
-                    <button class="btn-text-orange" id="accept-complaint"><i class="fa fa-check" aria-hidden="true"></i> Accept</button>
-                    <button class="btn-text-red" id="cancel-complaint"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>  
+                    <!-- <button class="btn-text-orange" id="accept-complaint"><i class="fa fa-check" aria-hidden="true"></i> Accept</button>
+                    <button class="btn-text-red" id="cancel-complaint"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>   -->
                 <?php }
                 ?>
 

diff --git a/app/views/customer/orders.view.php b/app/views/customer/orders.view.php
@@ -14,10 +14,19 @@
 
     <div class="card card-normal-glass mw-600px align-self-center bg-transparent">
        <!-- Tip -->
-       <div class="tips">
-        <h3><i class="fa fa-lightbulb-on"></i>  <?php echo $tip->title; ?> </h3>
-        <p>  <?php echo $tip->description; ?> </p>
-       </div>
+       <?php if (isset($tip) && !empty($tip)): ?>
+    <div class="tips">
+        <h3><i class="fa fa-lightbulb-on"></i> <?php echo htmlspecialchars($tip->title); ?></h3>
+        <p><?php echo htmlspecialchars($tip->description); ?></p>
+    </div>
+<?php else: ?>
+    <div class="tips">
+        <h3><i class="fa fa-lightbulb-on"></i> No Tips Available</h3>
+        <p>Check back later for more tips!</p>
+    </div>
+<?php endif; ?>
+
+
 
     </div>
         <div class="card card-normal-glass ">

diff --git a/app/views/rental/components/orderlist.view.php b/app/views/rental/components/orderlist.view.php
@@ -133,8 +133,8 @@
                     <button class="btn-text-orange" id="mark-as-returned"><i class="fa fa-check" aria-hidden="true"></i>Mark as Returned</button>
                 <?php }
                 elseif ($order->status == 'pending') { ?>
-                    <button class="btn-text-orange" id="accept-request"><i class="fa fa-check" aria-hidden="true"></i> Accept</button>
-                    <button class="btn-text-red" id="cancel-request"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>  
+                    <button class="btn-text-orange" id="accept-request"><i class="fa fa-check" aria-hidden="true"></i> Mark As Viewed</button>
+                    <!-- <button class="btn-text-red" id="cancel-request"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>   -->
                 <?php }
                 ?>