Skip to content

Commit

Permalink
customer-functionalities
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zaras00
Zaras00 committed Apr 28, 2024
1 parent de9ae3c commit 5255221
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 51 deletions.
2 changes: 1 addition & 1 deletion app/models/RentComplaint.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class RentComplaintModel
{
use Model;

protected string $table = 'rent_complaints';
protected string $table = 'rent_complaint';

protected array $allowedColumns = [
'rent_id',
Expand Down
4 changes: 2 additions & 2 deletions app/views/customer/complaints.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<div 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="cl-lg-12 flex-d-c gap-2 mt-5">
<div class="cl-lg-7 flex-d-c gap-2 mt-9">
<div class="card card-normal-glass">
<!-- <button class="btn-text-green">hi</button> -->
<h2 class="justufy-content-ceneter flex-d"> Complaints </h2>
<h2 class="justufy-content-ceneter flex-d ml-3"> Complaints </h2>

<div class="section-switch flex-d gap-3 flex-wrap">
<button class="btn-selected" id="rentComplaints">My complaints</button>
Expand Down
4 changes: 2 additions & 2 deletions app/views/customer/components/cart.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h2 class="justify-content-center flex-d">Cart</h2>

<div class="row gap-2">
<h3> <?php echo htmlspecialchars($cart->start_date); ?> - <?php echo htmlspecialchars($cart->end_date); ?> </h3>
<h6 class="rent-item-view-price"> <?php echo htmlspecialchars($cart->start_date); ?> - <?php echo htmlspecialchars($cart->end_date); ?> </h6>
</div>
<div class="row gap-2 ">
<!-- scrollable cart items -->
Expand Down Expand Up @@ -36,7 +36,7 @@
<!-- <div class="item-count">
</div> -->
<div class="cart-item-price">
<h4>Rs. <?php echo htmlspecialchars($item->total); ?></h4>
<h4 class="rent-item-view-price py-1">Rs. <?php echo htmlspecialchars($item->total); ?></h4>
<!-- <input class="form-control-lg" type="number" name="count" id="item-count" value="1" min="1" max="48"> -->
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion app/views/customer/components/complaint.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@
<!-- item list -->

<div class="col-lg-12 col-md-12">
<h3>Equipment List</h3>
<div class="row">
<h3>Equipment List</h3>
</div>
<div class="table-container">
<table class="table-custom">
<thead>
Expand Down
5 changes: 3 additions & 2 deletions app/views/customer/components/customercomplaints.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@
[equipment_name] => BBQ Grill
[item_number] => I000539029
[equipment_cost] => 5600.00 -->

<h3>Equipment List</h3>
<div class="row">
<h3>Equipment List</h3>
</div>
<div class="table-container">
<table class="table-custom">
<thead>
Expand Down
17 changes: 9 additions & 8 deletions app/views/customer/components/item.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,32 @@
<div class="col-lg-12 flex-d align-items-center gap-2" >

<img src="<?php echo ROOT_DIR; ?>/uploads/images/rental_services/<?php echo htmlspecialchars($equipment->rentalservice_image); ?>" alt="Image" class="img-fluid mh-50px rounded-7">
<h3 class="rental-name"> <?php echo htmlspecialchars($equipment->rentalservice_name); ?> </h3>
<h4 class="rental-name"> <?php echo htmlspecialchars($equipment->rentalservice_name); ?> </h4>

<!-- <?php show($equipment) ?> -->
</div>
</a>
</div>
<div class="row flex-d mt-5">
<div class="row flex-d mt-5 px-6 mb-6">

<div class="col-lg-6">
<div class="col-lg-6 p-3 rounded-9">
<img src="<?php echo htmlspecialchars(OSURL); ?>images/equipment/<?php echo htmlspecialchars($equipment->image); ?>" alt="Image" class="img-fluid mh-200px rounded-7">

</div>

<div class="col-lg-6">
<h1 class="rental-name"> <?php echo htmlspecialchars($equipment->name); ?> </h1>
<h3 class="rental-name"> <?php echo htmlspecialchars($equipment->name); ?> </h3>
<p class="rental-description"> <?php echo htmlspecialchars($equipment->description); ?> </p>

<!-- set count input -->
<input class="form-control-lg" type="number" name="count" id="item-count" value="1" min="1" max="<?php echo htmlspecialchars($equipment->count); ?>">
<!-- set count input
<input class="form-control-lg" type="number" name="count" id="item-count" value="1" min="1" max="<?php echo htmlspecialchars($equipment->count); ?>"> -->





<h3 id="item-fee" data-fee="<?php echo htmlspecialchars($equipment->total); ?>">Rs. <?php echo htmlspecialchars($equipment->total); ?></h3>
<div class="row">
<h5 id="item-fee" class="rent-item-view-price py-3" data-fee="<?php echo htmlspecialchars($equipment->total); ?>">Rs. <?php echo htmlspecialchars($equipment->total); ?></h5>
</div>

<button id="add-to-cart" class="btn-text-green border">Add to Cart</button>
<!-- <button class="btn btn-primary">Add to Cart</button> -->
Expand Down
17 changes: 14 additions & 3 deletions app/views/customer/orders.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<div 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-12 flex-d-c gap-2 mt-5 ">
<div class="col-lg-8 flex-d-c gap-2 mt-9 ">
<div class="card card-normal-glass ">
<h2 class="justify-content-center flex-d"> Orders </h2>
<h2 class="justify-content-center flex-d ml-3"> Orders </h2>
<div class="section-switch flex-d gap-3 flex-wrap" >
<button class="btn-selected" id="all">All</button>
<button class="btn-selected" id="unpaid">Unpaid</button>
Expand Down Expand Up @@ -468,13 +468,24 @@ function paymentGateWay(data) {
</script>

<!-- Order Item Modal -->
<div class="modal" id="order-item-modal">
<!-- <div class="modal" id="order-item-modal">
<div class="modal-content">
<span class="close">&times;</span>

<div id="order-data"> </div>

</div>
</div> -->

<!-- View modal -->
<div class="modal" id="order-item-modal" class
>
<div class="modal-content">
<span class="close">&times;</span>


<div id="order-data"> </div>
</div>
</div>


Expand Down
6 changes: 3 additions & 3 deletions app/views/customer/rent.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@

<div class=" col-lg-12 flex-d-c gap-2 location-container">

<div class="location-form-element">
<div class="location-form-element mb-3 ml-2">
<input id="pac-input" class="controls " type="text" placeholder="Enter Location" />
</div>
<div id="map-canvas" class="map-canvas"> </div>
<div id="map-canvas" class="map-canvas ml-2"> </div>

<!-- <input type="text" class="form-control" id="latitude" hidden/>
<input type="text" class="form-control" id="longitude" hidden/> -->

<div class="location-button-container">
<div class="location-button-container mb-3 ml-2">
<button id="confirm-location" class="location-button btn-text-green border center" type="button">Confirm Location</button>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/views/home.view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<?php require_once('../app/views/sections/rental-service.php');
?>

<?php require_once('../app/views/sections/blog.php');
?>
<!-- <?php require_once('../app/views/sections/blog.php');
?> -->

<?php require_once('../app/views/sections/tips.php');
?>
<!-- <?php require_once('../app/views/sections/tips.php');
?> -->

<?php require_once('../app/views/sections/complaints.php');
?>
Expand Down
4 changes: 2 additions & 2 deletions app/views/sections/complaints.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
$user = $_SESSION['USER']; ?>

<div class="home_button">
<a href="#" class="btn">Add Complains</a>
<a href="#" class="btn-text-green border">Add Complains</a>
</div>

<?php } else { ?>
<div class="home_button">
<a href="<?= ROOT_DIR ?>/login" class="btn">Add Complain</a>
<a href="<?= ROOT_DIR ?>/login" class="btn-text-green border">Add Complain</a>
</div>
<?php } ?>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/sections/guide.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
$user = $_SESSION['USER']; ?>

<div class="home_button">
<a href="#" class="btn">Book Now</a>
<a href="#" class="btn-text-green border">Book Now</a>
</div>

<?php } else { ?>
<div class="home_button">
<a href="<?= ROOT_DIR ?>/login" class="btn">Book Now</a>
<a href="<?= ROOT_DIR ?>/login" class="btn-text-green border">Book Now</a>
</div>
<?php } ?>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/sections/hero.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
$user = $_SESSION['USER']; ?>

<div class="home_button">
<a href="#" class="btn">Get Started</a>
<a href="#" class="btn-text-green border">Get Started</a>
</div>

<?php } else { ?>
<div class="home_button">
<a href="<?= ROOT_DIR ?>/login" class="btn">Get Started</a>
<a href="<?= ROOT_DIR ?>/login" class="btn-text-green border">Get Started</a>
</div>
<?php } ?>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/sections/rental-service.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
$user = $_SESSION['USER']; ?>

<div class="home_button">
<a href="#" class="btn">Book Now</a>
<a href="#" class="btn-text-green border">Book Now</a>
</div>

<?php } else { ?>
<div class="home_button">
<a href="<?= ROOT_DIR ?>/login" class="btn">Book Now</a>
<a href="<?= ROOT_DIR ?>/login" class="btn-text-green border">Book Now</a>
</div>
<?php } ?>
</div>
Expand Down
34 changes: 17 additions & 17 deletions public/assets/scss/wl/dashboard/_button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 8px 16px;
// font-family: "poppins", sans-serif;

& i {
Expand All @@ -143,15 +143,15 @@

// btn-text-green with border
&.border {
border: 2px solid $color-primary;
border: 1px solid $color-primary;
border-radius: 10px;
min-width: 100px;

&:hover {
border: 2px solid $color-primary;
border: 1px solid $color-primary;
text-decoration: none;
// shadow
box-shadow: 0px 2px 5px 2px rgba(0, 0, 0, 0.2);
box-shadow : 0px 1px 10px 1px rgba(105, 105, 105, 0.5);

}
}
Expand Down Expand Up @@ -182,22 +182,22 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 8px 16px;
// font-family: "poppins", sans-serif;
& i {
margin-right: 5px;
}

&.border {
border: 2px solid $blue;
border: 1px solid $blue;
border-radius: 10px;
min-width: 100px;


&:hover {
border: 2px solid $blue;
border: 1px solid $blue;
text-decoration: none;
box-shadow: 0px 2px 5px 2px rgba(0, 0, 0, 0.2);
box-shadow : 0px 1px 10px 1px rgba(105, 105, 105, 0.5);
}
}

Expand All @@ -215,23 +215,23 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 8px 16px;
// font-family: "poppins", sans-serif;

& i {
margin-right: 5px;
}

&.border {
border: 2px solid $orange;
border: 1px solid $orange;
border-radius: 10px;
min-width: 100px;


&:hover {
border: 2px solid $orange;
border: 1px solid $orange;
text-decoration: none;
box-shadow: 0px 2px 5px 2px rgba(0, 0, 0, 0.2);
box-shadow : 0px 1px 10px 1px rgba(105, 105, 105, 0.5);
}
}

Expand All @@ -249,23 +249,23 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 8px 16px;
// font-family: "poppins", sans-serif;

& i {
margin-right: 5px;
}

&.border {
border: 2px solid $red;
border: 1px solid $red;
border-radius: 10px;
min-width: 100px;


&:hover {
border: 2px solid $red;
border: 1px solid $red;
text-decoration: none;
box-shadow: 0px 2px 5px 2px rgba(0, 0, 0, 0.2);
box-shadow : 0px 1px 10px 1px rgba(105, 105, 105, 0.5);
}
}

Expand Down Expand Up @@ -444,7 +444,7 @@
width: fit-content;
cursor: pointer;
border: none;
padding: 10px;
padding: 8px 16px;
// font-family: "poppins", sans-serif;

&:hover{
Expand Down
9 changes: 9 additions & 0 deletions public/assets/scss/wl/dashboard/_customer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,3 +786,12 @@
}
}

//view item on rent page
.rent-item-view-price{
font-size: 2rem;
font-weight: 600;
color: $gray-text;
// justify-content: center;
// align-items: center;
}

0 comments on commit 5255221

Please sign in to comment.