Merge branch 'dev' into buttons

wanderlust-group-project-1 · Apr 28, 2024 · cbf24cc · cbf24cc
2 parents 5255221 + e54b3eb
commit cbf24cc
Show file tree

Hide file tree

Showing 38 changed files with 1,134 additions and 852 deletions.
diff --git a/app/controllers/API/GuideBookings.php b/app/controllers/API/GuideBookings.php
@@ -126,6 +126,23 @@ public function getGuideAllBookings(int $packageId): void{
 
 
     }
+
+    public function getAllMyBookings(): void
+    {
+        $response = new JSONResponse;
+
+        $GuideBookingsModel = new GuideBookingsModel();
+        $bookingDetails = $GuideBookingsModel->getAllMyBookings(UserMiddleware::getUser()['id']);
+        $guideDetails = $GuideBookingsModel->getGuideDetailsByBookingID($bookingDetails[0]->id);
+        $response->success(true)
+                ->data([
+                    'bookingDetails' => $bookingDetails,
+                    'guideDetails' => $guideDetails
+                ])
+                ->message('Booking details fetched successfully')
+                ->statusCode(200)
+                ->send();
+    }
     public function deleteBooking($date): void
     {
         $response = new JSONResponse;

diff --git a/app/controllers/Cart.php b/app/controllers/Cart.php
@@ -28,7 +28,9 @@ public function viewCart(string $a = '', string $b = '', string $c = ''):void {
 
 
 
-
+            // if($data['items']){
+
+
         foreach ($data['items'] as $equipment) {
             $equipment->total = $equipment->e_standard_fee + $equipment->e_fee * (strtotime($data['cart']->end_date) - strtotime($data['cart']->start_date)) / (60 * 60 * 24);
         }
@@ -42,6 +44,7 @@ public function viewCart(string $a = '', string $b = '', string $c = ''):void {
             $data['total'] += $item->total;
         }
 
+    // }
 
 
         $this->view('customer/components/cart', $data); 

diff --git a/app/controllers/GuideProfile.php b/app/controllers/GuideProfile.php
diff --git a/app/controllers/Rent.php b/app/controllers/Rent.php
@@ -64,7 +64,7 @@ public function items(string $a = '', string $b = '', string $c = ''):void {
         $data['cart'] = $cart;
         $data['request'] = $request->getAll();
 
-        $data['equipments'] = $rent->getItems($request->getAll());
+        $data['equipments'] = $rent->getItems($request->getAll(),$data['cart']);
 
 //         show($data['equipments']);
 
@@ -79,7 +79,7 @@ public function items(string $a = '', string $b = '', string $c = ''):void {
         // show($data['equipments']);
 
 
-
+        // show($data['equipments']);
 
         // show($data['equipments']);
 

diff --git a/app/models/GuideBookings.php b/app/models/GuideBookings.php
@@ -90,6 +90,13 @@ public function getCustomerDetailsByBookingID(int $bookingId): mixed {
         return $this->query($q->getQuery(), $q->getData())[0];
     }
 
+    public function getGuideDetailsByBookingID(int $bookingId): mixed {
+        $q = new QueryBuilder();
+        $q->setTable('guides');
+        $q->select('guides.*')->join('guide_booking', 'guides.id', 'guide_booking.guide_id')->where('guide_booking.id', $bookingId);
+        return $this->query($q->getQuery(), $q->getData())[0];
+    }
+
     public function getAllBookings(int $userId): mixed {
 
         $userId = $_SESSION['USER']->id;
@@ -99,6 +106,15 @@ public function getAllBookings(int $userId): mixed {
         return $this->query($q->getQuery(), $q->getData());
     }
 
+    public function getAllMyBookings(int $userId): mixed {
+
+        $userId = $_SESSION['USER']->id;
+        $q = new QueryBuilder();
+        $q->setTable($this->table);
+        $q->select('guide_booking.*')->where('customer_id', $userId);
+        return $this->query($q->getQuery(), $q->getData());
+    }
+
     public function getGuideIdByPackageId(int $packageId): mixed {
         $q = "CALL GetGuideIdByPackageId(:package_id)";
         $params = [

diff --git a/app/models/Package.php b/app/models/Package.php
@@ -6,6 +6,7 @@ class PackageModel
 
     protected string $table = 'package';
     protected array $allowedColumns = [
+        'name',
         'guide_id',
         'price',
         'max_group_size',

diff --git a/app/models/Rent.php b/app/models/Rent.php
@@ -49,15 +49,17 @@ public function validateRent(array $data) {
     }
 
 
-    public function getItems(array $data) {
+    public function getItems(array $data, $cart) {
 
         $q = new QueryBuilder();
 
+        // show($cart);
         $q->setTable('equipment');
         $q->select('equipment.*, rental_services.name As rental_service_name')
             ->join('rental_services', 'equipment.rentalservice_id', 'rental_services.id')
             ->join('rental_settings', 'equipment.rentalservice_id', 'rental_settings.rentalservice_id')
             ->join('locations', 'rental_services.location_id', 'locations.id')
+
             ->where('rental_settings.renting_status', 1)
 
             // if   $data['search']
@@ -76,8 +78,35 @@ public function getItems(array $data) {
 
 
 
-            // show($q->getQuery());
+        $equipments = $this->query($q->getQuery(), $q->getData());
+        // show($equipments);
+        if (is_array($equipments)) {
+            $equipments = array_map(function ($equipment) use ($cart) {
+                $item = new ItemModel;
+                $items =  $item->getAvailableItems([
+                    'equipment_id' => $equipment->id,
+                    'start_date' => $cart->start_date,
+                    'end_date' => $cart->end_date
+                ]);
+                // only return equipment that has available items (item status = available)
+
+                if (count($items) > 0) {
+                    // $equipment->items = $items;
+                    return $equipment;
+                }
+
+
+            }, $equipments);
+        } else {
+            // Handle the case where $equipments is not an array
+            $equipments = [];
+        }
+        // remove null values
+        $equipments = array_filter($equipments);
+
 
+        // show($equipments);
+        return $equipments;
 
            return $this->query($q->getQuery(),$q->getData());
 

diff --git a/app/models/RentComplaint.php b/app/models/RentComplaint.php
@@ -69,8 +69,7 @@ public function cancelComplaint($id){
     }
 
 
-    // public function getComplaints(array $data) 
-    // {
-    //     return $this->where($data);
-    // }
+
+
+
 }
diff --git a/app/models/RentalService.php b/app/models/RentalService.php
@@ -192,8 +192,8 @@ public function getRentalServiceStat(int $id): mixed
         $q->setTable('rental_services');
         //  group by rental service id and count orders
         $q->select('count(distinct(rent.id)) as orders_count , count(distinct(equipment.id)) as equipments_count')
-            ->join('equipment', 'rental_services.id', 'equipment.rentalservice_id')
-            ->join('rent', 'rental_services.id', 'rent.rentalservice_id')
+            ->leftJoin('equipment', 'rental_services.id', 'equipment.rentalservice_id')
+            ->leftJoin('rent', 'rental_services.id', 'rent.rentalservice_id')
             ->where('rental_services.id', $id)
             ->groupBy('rental_services.id');
 

diff --git a/app/views/admin/customer.view.php b/app/views/admin/customer.view.php
@@ -23,6 +23,14 @@
         </ul>
 
 
+        <div class="flex-d-r mt-5 ml-3">
+            <div class="search-container">
+                <input type="text" placeholder="Search.." name="search" class="form-control-lg" id="search">
+                <!-- <button class="btn-text-green border" type="submit"><i class="fa fa-search"></i></button> -->
+            </div>
+        </div>  
+
+
         <div class="table-container">
             <table class="data-table table-custom">
                 <thead>
@@ -120,6 +128,19 @@ function openModal(id) {
         </script>
 
 
+<script>
+    $(document).ready(function() {
+        $("#search").on("keyup", function() {
+            var value = $(this).val().toLowerCase();
+            $(".data-table tbody tr").filter(function() {
+                $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+            });
+        });
+    });
+
+
+</script>
+
 
 
         <?php

diff --git a/app/views/admin/customer/user.view.php b/app/views/admin/customer/user.view.php
@@ -1,6 +1,6 @@
 <div class=" col profile-info m-5">
     <div class="row">
-        <img src="<?php echo ROOT_DIR ?>/assets/images/dp.jpg" alt="Profile Image" class="mw-200px px-4 p-6">
+        <img src="<?php echo OSURL?>images/customer/<?= $customer->image ?>" alt="Profile Image" class="mw-200px px-4 p-6">
         <div>
             <h2 id="profile-name"> <?php echo $customer->name ?> </h2>
             <p id="profile-email"><i class="fas fa-envelope m-2"></i><?php echo $customer->email ?></p>
@@ -9,7 +9,7 @@
             <p id="profile-address"><i class="fa fa-location-arrow m-2"></i><?php echo $customer->address ?></p>
             <!-- <p id="profile-status" class="status <?php echo $customer->status; ?>"><?php echo ucfirst($customer->status); ?></p> -->
             <div class="row">
-                <button type="" class="btn-danger m-2 d-flex justify-content-end p-2 " id="see-more">
+                <button type="" class="btn-text-red border " id="see-more">
                     Remove User
                 </button>
             </div>

diff --git a/app/views/admin/dashboard.view.php b/app/views/admin/dashboard.view.php
@@ -43,7 +43,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/rentalServices">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -75,7 +75,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/guides">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -108,7 +108,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/customers">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -143,7 +143,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/charts">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -175,7 +175,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/complains">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -207,7 +207,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/tips">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -231,7 +231,7 @@
                               <div class="flex-d-c">
                                     <!-- <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/charts">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -330,7 +330,7 @@
                               <div class="flex-d-c">
                                     <div class="flex-d-r justify-content-end">
                                           <a href="<?php echo ROOT_DIR ?>/admin/charts">
-                                                <button type=" submit" class="btn-success" id="see-more">
+                                                <button type=" submit" class="btn-text-green   border " id="see-more">
                                                       See More >>
                                                 </button>
                                           </a>
@@ -433,7 +433,7 @@
 
                                           </div>
                                           <div class="col-lg-4">
-                                                <button class="btn-success" id="income-report">Generate</button>
+                                                <button class="btn-text-green   border " id="income-report">Generate</button>
                                           </div>
 
 
@@ -471,7 +471,7 @@
 
                                           </div>
                                           <div class="col-lg-4">
-                                                <button class="btn-success" id="income-report">Generate</button>
+                                                <button class="btn-text-green   border " id="income-report">Generate</button>
                                           </div>
 
 

diff --git a/app/views/admin/guides.view.php b/app/views/admin/guides.view.php
@@ -21,6 +21,14 @@
         </ul>
 
 
+        <div class="flex-d-r mt-5 ml-3">
+            <div class="search-container">
+                <input type="text" placeholder="Search.." name="search" class="form-control-lg" id="search">
+                <!-- <button class="btn-text-green border" type="submit"><i class="fa fa-search"></i></button> -->
+            </div>
+        </div>  
+
+
         <div class="table-container">
             <table class="data-table table-custom">
                 <thead>
@@ -119,6 +127,20 @@ function openModal(id) {
         </script>
 
 
+<script>
+    $(document).ready(function() {
+        $("#search").on("keyup", function() {
+            var value = $(this).val().toLowerCase();
+            $(".data-table tbody tr").filter(function() {
+                $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+            });
+        });
+    });
+
+
+</script>
+
+
 
 
         <?php