From b6d8c215757b9e23a2fe59ff7a7586a710e86a90 Mon Sep 17 00:00:00 2001 From: Sarani Date: Mon, 29 Apr 2024 04:34:05 +0530 Subject: [PATCH 1/7] admin resolve complaints --- app/controllers/Admin/Complains.php | 24 +++++++++++--- app/views/admin/complains.view.php | 31 ++++++++++++++----- .../admin/components/complainlist.view.php | 2 +- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/app/controllers/Admin/Complains.php b/app/controllers/Admin/Complains.php index d0b7fa8..f80a91d 100644 --- a/app/controllers/Admin/Complains.php +++ b/app/controllers/Admin/Complains.php @@ -11,15 +11,27 @@ public function index(string $a = '', string $b = '', string $c = ''): void public function listComplains(string $a = '', string $b = '', string $c = ''): void { - $complain = new RentReturnComplaintModel; - $data['complaints'] = $complain->getAdminRentalComplaints($b); + //who complaints + if($a == 'customer'){ + $complaint = new RentComplaintModel; + $data['complaints'] = $complaint->getComplaints (['status' => $b]); + $data['view'] = '-customer'; - $this->view('admin/components/complainlist', $data); - } + $this->view('admin/components/complainlist', $data); + }else if($a == 'rentalservice'){ + $complain = new RentReturnComplaintModel; + $data['complaints'] = $complain->getAdminRentalComplaints($b); + $data['view'] = ''; + + $this->view('admin/components/complainlist', $data); + } + + } + - public function viewComplaint(string $a = '', string $b = '', string $c = ''): void + public function viewRentalComplaint(string $a = '', string $b = '', string $c = ''): void { $rentreturncomplaint = new RentReturnComplaintModel; $complaint = $rentreturncomplaint->getComplaint($a); @@ -47,4 +59,6 @@ public function viewComplaint(string $a = '', string $b = '', string $c = ''): v $this->view('admin/components/complaint', ['complaint' => $complaint, 'order' => $order, 'items' => $items]); } + + } diff --git a/app/views/admin/complains.view.php b/app/views/admin/complains.view.php index 00f910d..db4c00e 100644 --- a/app/views/admin/complains.view.php +++ b/app/views/admin/complains.view.php @@ -36,13 +36,13 @@ -
- + -
+ + -->
- + @@ -149,7 +149,7 @@ function getComplaints(status, user = "customer") { }); - // View Complaint + // View Complaint Rental $(document).on('click', '#view-button', function() { var complaintId = $(this).closest('.complaint').attr('data-id'); @@ -157,7 +157,24 @@ function getComplaints(status, user = "customer") { headers: { 'Authorization': 'Bearer ' + getCookie('jwt_auth_token') }, - url: '/admin/complains/viewComplaint/' + complaintId, + url: '/admin/complains/viewRentalComplaint/' + complaintId, + type: 'GET', + success: function(response) { + $('#complaint-data').html(response); + $('#complaint-view-modal').css('display', 'block'); + } + }); + }); + + // View Complaint Customer + + $(document).on('click', '#view-button-customer', function() { + var complaintId = $(this).closest('.complaint').attr('data-id'); + $.ajax({ + headers: { + 'Authorization': 'Bearer ' + getCookie('jwt_auth_token') + }, + url: '/admin/complains/viewRentComplaint/' + complaintId, type: 'GET', success: function(response) { $('#complaint-data').html(response); diff --git a/app/views/admin/components/complainlist.view.php b/app/views/admin/components/complainlist.view.php index 788df4f..0c80146 100644 --- a/app/views/admin/components/complainlist.view.php +++ b/app/views/admin/components/complainlist.view.php @@ -29,7 +29,7 @@
- + status == 'pending') { ?> From 314c07df548b12a6cbff1ea48744e2e980944c26 Mon Sep 17 00:00:00 2001 From: Sarani Date: Mon, 29 Apr 2024 07:28:01 +0530 Subject: [PATCH 2/7] customer-functionalities --- app/models/Rent.php | 2 +- app/views/customer/complaints.view.php | 21 ++++- .../customer/components/orderlist.view.php | 2 + app/views/customer/orders.view.php | 76 +++++++++---------- 4 files changed, 60 insertions(+), 41 deletions(-) diff --git a/app/models/Rent.php b/app/models/Rent.php index 56b23c5..a171df2 100644 --- a/app/models/Rent.php +++ b/app/models/Rent.php @@ -55,7 +55,7 @@ public function getItems(array $data, $cart) { // show($cart); $q->setTable('equipment'); - $q->select('equipment.*, rental_services.name As rental_service_name') + $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') diff --git a/app/views/customer/complaints.view.php b/app/views/customer/complaints.view.php index 67552f1..575d39a 100644 --- a/app/views/customer/complaints.view.php +++ b/app/views/customer/complaints.view.php @@ -29,9 +29,8 @@
- - -
+

Forgot your password?

diff --git a/app/views/signup.view.php b/app/views/signup.view.php index 7342209..56100f6 100755 --- a/app/views/signup.view.php +++ b/app/views/signup.view.php @@ -205,10 +205,10 @@
-
@@ -222,7 +222,7 @@
- +
@@ -317,10 +317,10 @@
-
@@ -334,7 +334,7 @@
- +
diff --git a/public/assets/scss/wl/dashboard/_footer.scss b/public/assets/scss/wl/dashboard/_footer.scss new file mode 100644 index 0000000..25c73f0 --- /dev/null +++ b/public/assets/scss/wl/dashboard/_footer.scss @@ -0,0 +1,169 @@ +.site-footer +{ + background-color: $color-primary; + padding:45px 0 20px; + font-size:15px; + line-height:24px; + color:#737373; + margin-top: 30px; +} +.site-footer hr +{ +// border-top-color:#385520; + opacity:0.3 +} +.site-footer hr.small +{ + margin-top:20px; +} + +.site-footer h2{ + color: #b2c2a3 !important; +} +.site-footer h6 +{ + color:#fff !important; + font-size:16px; + text-transform:uppercase; + margin-top:5px; + letter-spacing:2px; + font-weight:400; +} +.site-footer a +{ + color:#272727; +} +.site-footer a:hover +{ + color:#ffffff; + text-decoration:none; +} +.footer-links +{ + padding-left:0; + list-style:none +} +.footer-links li +{ + display:block +} +.footer-links a +{ + color:#171717 +} +.footer-links a:active,.footer-links a:focus,.footer-links a:hover +{ + color:#ffffff; + text-decoration:none; +} +.footer-links.inline li +{ + display:inline-block +} +.site-footer .social-icons +{ + text-align:right +} +.site-footer .social-icons a +{ + width:40px; + height:40px; + line-height:40px; + margin-left:6px; + margin-right:0; + border-radius:100%; + background-color:#33353d +} +.copyright-text +{ + margin:0 +} +@media (max-width:991px) +{ + .site-footer [class^=col-] + { + margin-bottom:30px + } +} +@media (max-width:767px) +{ + .site-footer + { + padding-bottom:0 + } + .site-footer .copyright-text,.site-footer .social-icons + { + text-align:center + } +} +.social-icons +{ + padding-left:0; + margin-bottom:0; + list-style:none +} +.social-icons li +{ + display:inline-block; + margin-bottom:4px +} +.social-icons li.title +{ + margin-right:15px; + text-transform:uppercase; + color:#f6f9fd; + font-weight:700; + font-size:13px +} +.social-icons a{ + background-color:#eceeef; + color:#818a91; + font-size:16px; + display:inline-block; + line-height:44px; + width:44px; + height:44px; + text-align:center; + margin-right:8px; + border-radius:100%; + -webkit-transition:all .2s linear; + -o-transition:all .2s linear; + transition:all .2s linear +} +// .social-icons a:active,.social-icons a:focus,.social-icons a:hover +// { +// color:#fff; +// background-color:#29aafe +// } +// .social-icons.size-sm a +// { +// line-height:34px; +// height:34px; +// width:34px; +// font-size:14px +// } +// .social-icons a.facebook:hover +// { +// background-color:#3b5998 +// } +// .social-icons a.twitter:hover +// { +// background-color:#00aced +// } +// .social-icons a.linkedin:hover +// { +// background-color:#007bb6 +// } +// .social-icons a.dribbble:hover +// { +// // background-color:#ea4c89 +// } +@media (max-width:767px) +{ + .social-icons li.title + { + display:block; + margin-right:0; + font-weight:600 + } +} diff --git a/public/assets/scss/wl/dashboard/_login.scss b/public/assets/scss/wl/dashboard/_login.scss index 5ae4f8f..c98395e 100644 --- a/public/assets/scss/wl/dashboard/_login.scss +++ b/public/assets/scss/wl/dashboard/_login.scss @@ -170,8 +170,9 @@ $box-shadow : 2px 0 5px 2px rgba(0, 0, 0, 0.2); a { color: $font-color; - //font-style: italic; + // font-style: italic; text-decoration: none; + font-size: 14px; transition: color 0.3s ease; &:hover { color: $hover-bg; @@ -179,6 +180,10 @@ $box-shadow : 2px 0 5px 2px rgba(0, 0, 0, 0.2); } } + h4 { + font-size: 14px !important; + } + #error-message { color: red; text-align: center; diff --git a/public/assets/scss/wl/dashboard/_signup.scss b/public/assets/scss/wl/dashboard/_signup.scss index fd27908..2c76ae7 100644 --- a/public/assets/scss/wl/dashboard/_signup.scss +++ b/public/assets/scss/wl/dashboard/_signup.scss @@ -144,6 +144,7 @@ $box-shadow : 2px 0 5px 2px rgba(0, 0, 0, 0.2); a { color: $font-color; //font-style: italic; + font-size: 14px; text-decoration: none; transition: color 0.3s ease; &:hover { @@ -152,6 +153,10 @@ $box-shadow : 2px 0 5px 2px rgba(0, 0, 0, 0.2); } } + h4 { + font-size: 14px !important; + } + #error-message { color: red; text-align: center; diff --git a/public/assets/scss/wl/dashboard/index.scss b/public/assets/scss/wl/dashboard/index.scss index 704aa59..a61840b 100644 --- a/public/assets/scss/wl/dashboard/index.scss +++ b/public/assets/scss/wl/dashboard/index.scss @@ -19,6 +19,7 @@ @import "./images"; @import "./cart"; @import "./complaints"; +@import "./footer"; @import "./common/align"; @import "./common/padding"; From 1fea18505050c00fc22963a5f23890275a8249bf Mon Sep 17 00:00:00 2001 From: Sarani Date: Mon, 29 Apr 2024 14:12:39 +0530 Subject: [PATCH 4/7] footer-main --- app/views/customer/OneGuide.view.php | 6 +- app/views/customer/checkout.view.php | 4 + app/views/customer/complaints.view.php | 14 ++- app/views/customer/findGuide.view.php | 10 +- app/views/customer/myBookings.view.php | 8 +- app/views/customer/orders.view.php | 8 +- app/views/customer/profile.view.php | 12 ++- app/views/customer/rent.view.php | 5 +- app/views/home.view.php | 6 +- app/views/layout/footer-main.php | 52 ++++++++++ app/views/layout/footer.php | 51 +--------- public/assets/images/Logo white.png | Bin 0 -> 2119 bytes public/assets/scss/wl/dashboard/_footer.scss | 98 +++++++++++++------ 13 files changed, 182 insertions(+), 92 deletions(-) create mode 100644 app/views/layout/footer-main.php create mode 100644 public/assets/images/Logo white.png diff --git a/app/views/customer/OneGuide.view.php b/app/views/customer/OneGuide.view.php index c8c1e7a..b3e0878 100644 --- a/app/views/customer/OneGuide.view.php +++ b/app/views/customer/OneGuide.view.php @@ -466,5 +466,9 @@ function paymentGateWay(data) { + + \ No newline at end of file diff --git a/app/views/customer/checkout.view.php b/app/views/customer/checkout.view.php index 1222329..87fcd9e 100644 --- a/app/views/customer/checkout.view.php +++ b/app/views/customer/checkout.view.php @@ -279,6 +279,10 @@ function paymentGateWay(data) { + + \ No newline at end of file diff --git a/app/views/customer/complaints.view.php b/app/views/customer/complaints.view.php index 575d39a..239a67e 100644 --- a/app/views/customer/complaints.view.php +++ b/app/views/customer/complaints.view.php @@ -116,10 +116,6 @@ function getComplaints(status) {
- - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/views/customer/findGuide.view.php b/app/views/customer/findGuide.view.php index bc18359..a9aaae4 100644 --- a/app/views/customer/findGuide.view.php +++ b/app/views/customer/findGuide.view.php @@ -73,4 +73,12 @@ } }); }); - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/views/customer/myBookings.view.php b/app/views/customer/myBookings.view.php index c8b080f..809a508 100644 --- a/app/views/customer/myBookings.view.php +++ b/app/views/customer/myBookings.view.php @@ -81,4 +81,10 @@ function bookingHTML(userDetails, bookingDetails) { - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/customer/orders.view.php b/app/views/customer/orders.view.php index 29a7905..d6ab9de 100644 --- a/app/views/customer/orders.view.php +++ b/app/views/customer/orders.view.php @@ -572,4 +572,10 @@ function paymentGateWay(data) { - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/customer/profile.view.php b/app/views/customer/profile.view.php index 6526182..84a5375 100755 --- a/app/views/customer/profile.view.php +++ b/app/views/customer/profile.view.php @@ -1,7 +1,7 @@ @@ -448,4 +448,12 @@ function openModal() { }); }); }); - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/views/customer/rent.view.php b/app/views/customer/rent.view.php index c63e3f2..a60ea6a 100644 --- a/app/views/customer/rent.view.php +++ b/app/views/customer/rent.view.php @@ -635,6 +635,9 @@ function getCartCount() { + \ No newline at end of file diff --git a/app/views/home.view.php b/app/views/home.view.php index b179d39..3faa0c2 100755 --- a/app/views/home.view.php +++ b/app/views/home.view.php @@ -57,7 +57,9 @@ Logout --> + \ No newline at end of file diff --git a/app/views/layout/footer-main.php b/app/views/layout/footer-main.php new file mode 100644 index 0000000..214586a --- /dev/null +++ b/app/views/layout/footer-main.php @@ -0,0 +1,52 @@ + + +
+
+
+
+
  • + +
    • +
    +
    +
    +
    +

    About

    +
    +

    We WANDERLUST , are your one-stop solution for hassle-free camping adventures. + Say goodbye to equipment woes, wasted effort, and unreliable guides. + We connect outdoor enthusiasts with quality gear and trustworthy guides.

    +
    +
    + +
    +
    Quick Links
    + +
    + +
    +
    Contact Us
    +
    +

    +94 112 455 455

    +

    wanderlust@gmail.com

    +
    +
    +
    +
    +
    +
    +
    +
    +

    Copyright © 2024 All Rights Reserved by + Wanderlust +

    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/layout/footer.php b/app/views/layout/footer.php index 7df2a8c..6717057 100755 --- a/app/views/layout/footer.php +++ b/app/views/layout/footer.php @@ -5,52 +5,9 @@ - +
    - -
    -
    -
    -
    -

    About

    -
    -

    We WANDERLUST , are your one-stop solution for hassle-free camping adventures. - Say goodbye to equipment woes, wasted effort, and unreliable guides. - We connect outdoor enthusiasts with quality gear and trustworthy guides.

    -
    -
    - -
    -
    Quick Links
    - -
    - -
    -
    Contact Us
    -
    -

    +94 112 455 455

    -

    wanderlust@gmail.com

    -
    -
    -
    -
    -
    -
    -
    -
    -

    Copyright © 2024 All Rights Reserved by - Wanderlust -

    -
    -
    -
    -
    \ No newline at end of file + + \ No newline at end of file diff --git a/public/assets/images/Logo white.png b/public/assets/images/Logo white.png new file mode 100644 index 0000000000000000000000000000000000000000..85edd683c507ec0436c76b6cb708aacc00f99a7b GIT binary patch literal 2119 zcmV-N2)Or&P)GZD-*>0?S4jEB^)3@Ij^TRQgt> z4gX$KoCWcV3-nt-2BC<=e`sKL!$(KFCZ-`~g_0#&Z}n@LxVX63xt|A-<%Q1+>q@kF z2N^#zN)ca%Dx~a`R;BNq5VnDOpH=#u5Y`VaPQR2km<^tc38V<+pDO)1Qg5r$UTstT zf(7x~mqA8G1iwxdvLKZzdl#xpyQiy9WkzI^+9nnL5xT9~y6_3QGpdC|@HvD&jypHb zZG_G%7rwaiZJ@m5aqoP&IOw-TBk$z84be;=)|Thzk0t&LxMOWFMZ0YCz+<(L0G=0x zx19CO(-NuI()^fq;{6*JzH^&)Tx^Tb0K}T=P`CEt_`xI{H2CS77Zy=4(scT03zw?G^|4^Z`6~>=KLjxW zIvU9k?9X-wHRd*f;d=ZM)mah4f+ar&Ur*1mO5}xJtLTT0=NC#%%LY3h7ZZKV3S~@v z8gI+Apa1xx77vJ}}gf#pk;)ZvUQsi0a7o_0wE7iW@_|Y{(5p`z$2w|N1?Cu+! z4g(#%I!Jzf)~>AAh8v%DX5wwDifGMAj%s}3Qgk!gw3AC+J$Km>;^ET&8{-nK*!oXiE!U@2z zu_P^TX}zTyJc~e|+CYgpj&C_0Gg@ldAD%9h`taXi|Iri}c8oWHF%K9wcBqe~NJ~@@ z=U*-AQM?dzX~SzF%9a@ZQy7~6jgJS$lkok`ezc*gdD z!trj}F!THlZ6p24cEpF1gp%|1`_efyqCdU(HPdFf-+f>_iE4s(A-WpuKK7UvilM@> zr(uJg09QC(C;tJM2n~A-$pAj_T5%3IeeHN8R7}h!_PJDj8dYur%=7b#ewjGj;c9$_ zP;!~(rA8y-d(p1KbS$}zL{- zOFtQlPgmiEnADsqrg|lu037ZdcA}n~U#ZF}9529u=Py65ooYwIzQZ^MJ3bDDY0{g) z^J-LoOI5DdY=`~7*0M$QEMO;WMr4ttYh7q~j6YnR z7COuBGQ}Ut#8bGBxkQ+0_s?;ea32pdFKkMtrJZ?QQ|P|1-x-2*V($s@-jEgoK4U?{ zB(18A;b^dpC~pHVeMW6~j{e&5foa`M@n7^8rUOsBR-6L{t{rjsg2rIKE3F|TgMh=c z-C%n@Q{N#KPFpx_{R^%`@g-#Z^f;<-*88-T`Wub2sBRD50p%@G3*#Grj-ZQ+OUTH; z?x5=b2AN>tjKH|nHv(j2;LsuMEy5Dc3>>~N$wHYC1>Jp1lbtM~ZR+2UJP}*S$VdSF x;aCg(Lk2om{tYh!I#-sEk&%&+k&*FC{0rJqj&F&V@4Wy3002ovPDHLkV1h#P|J?up literal 0 HcmV?d00001 diff --git a/public/assets/scss/wl/dashboard/_footer.scss b/public/assets/scss/wl/dashboard/_footer.scss index 25c73f0..a15778b 100644 --- a/public/assets/scss/wl/dashboard/_footer.scss +++ b/public/assets/scss/wl/dashboard/_footer.scss @@ -5,39 +5,75 @@ font-size:15px; line-height:24px; color:#737373; - margin-top: 30px; -} -.site-footer hr -{ -// border-top-color:#385520; - opacity:0.3 -} -.site-footer hr.small -{ - margin-top:20px; -} + margin-top: 40px; -.site-footer h2{ - color: #b2c2a3 !important; -} -.site-footer h6 -{ - color:#fff !important; - font-size:16px; - text-transform:uppercase; - margin-top:5px; - letter-spacing:2px; - font-weight:400; -} -.site-footer a -{ - color:#272727; -} -.site-footer a:hover -{ - color:#ffffff; - text-decoration:none; + .footer-about{ + display: flex; + justify-content: center; + flex-direction: row; + } + + .footer-logo{ + // margin: auto; + margin-top: 20px; + width: 50%; + height: auto; + margin-left: 10px; + } + + .footer-contact{ + align-items: start !important; + } + + .contact-details{ + display: flex; + // margin-left: 10px; + i{ + // margin-top: 5px; + padding: 5px; + } + } + + hr + { + // border-top-color:#385520; + opacity:0.3; + } + hr.small + { + margin-top:20px; + } + + h2{ + color: #ffffff !important; + opacity: 0.6; + } + h6 + { + color:#fff !important; + font-size:16px; + text-transform:uppercase; + margin-top:5px; + letter-spacing:2px; + font-weight:400; + } + a + { + color:#272727; + } + a:hover + { + color:#ffffff; + text-decoration:none; + } + + .contact-details:hover + { + color:#ffffff; + text-decoration:none; + } } + .footer-links { padding-left:0; From 0d016ffd831a5fe9ff905078609dc1148f028d46 Mon Sep 17 00:00:00 2001 From: Nirmal Savinda Date: Mon, 29 Apr 2024 14:19:01 +0530 Subject: [PATCH 5/7] Update Rent.php --- app/models/Rent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/Rent.php b/app/models/Rent.php index a171df2..91a3765 100644 --- a/app/models/Rent.php +++ b/app/models/Rent.php @@ -55,7 +55,7 @@ public function getItems(array $data, $cart) { // show($cart); $q->setTable('equipment'); - $q->select('equipment.*, rental_services.name As rental_service_name, ') + $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') @@ -172,4 +172,4 @@ public function getUpcomingRentByRentalService($data) { -} \ No newline at end of file +} From b8c3ed0eaf481aec055c718a7209e21ca22349dd Mon Sep 17 00:00:00 2001 From: Nirmal Savinda Date: Mon, 29 Apr 2024 14:29:49 +0530 Subject: [PATCH 6/7] Update signup.view.php --- app/views/signup.view.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/signup.view.php b/app/views/signup.view.php index 56100f6..b351b46 100755 --- a/app/views/signup.view.php +++ b/app/views/signup.view.php @@ -205,7 +205,7 @@
    -