Skip to content
This repository has been archived by the owner on Dec 26, 2024. It is now read-only.

[Client] A.5 Booking Management #47

Merged
merged 6 commits into from
Oct 30, 2023
Merged

[Client] A.5 Booking Management #47

merged 6 commits into from
Oct 30, 2023

Conversation

Cassianky
Copy link
Owner

@Cassianky Cassianky commented Oct 29, 2023

#20

Please view issue for updates on issue. Issue is not yet completed. Please do not merge

@Cassianky Cassianky requested a review from ayangler October 29, 2023 13:44
@Cassianky Cassianky self-assigned this Oct 29, 2023
@Cassianky Cassianky changed the base branch from main to develop October 29, 2023 14:05
@Cassianky Cassianky merged commit 2e842de into develop Oct 30, 2023
Cassianky added a commit that referenced this pull request Oct 30, 2023
* Changes from previous repo since SR2 (#5)

* Updated client and vendor admin approval axios url to call correct api.

* Added delete and mark as read function to admin notification. (#122)

* add month and week bookings view to vendor

* add view pending bookings page

* css fix and tidy

* add accept/reject booking function

* add vendor input rejection reason

* abstract booking modal, define proptypes, view booking details

* view booking detail for table view

* [Client] Bug Fixes for Release 2 (#22)

* Fixed most value for money pricing

* Fixed meaning error message for minimum pax. User cannot select below min pax or above max pax at all

* Fixed sort, refresh of shop page twice upon navigation, themes map error

* Fixed activities refresh twice upon navigation

* Fixed searchbar bug that suggestions does not show on first render

* [Client] Bug fix for pricing addons/discounts from absolute to percentage (#26)

* Fixed most value for money pricing

* Fixed meaning error message for minimum pax. User cannot select below min pax or above max pax at all

* Fixed sort, refresh of shop page twice upon navigation, themes map error

* Fixed activities refresh twice upon navigation

* Fixed searchbar bug that suggestions does not show on first render

* Fixed pricing addons/discounts from absolute to percentage

* Common chat (#28)

* Implemented chatroom for backend.

* Implemented chat messages for backend.

* Calendar view for client pending and confirmed bookings

* Implemented backend function to update bookings with status 'CONFIRMED' and endDateTime past current date to staus 'PENDING_PAYMENT'. Included a button on admin frontend to trigger and call the function. (#37)

* Admin View Bookings and Update Statuses (#40)

* Created view booking pages for admin

* Booking table for pending confirmation

* All active booking and past booking tables

* Updated Paid dialog

* booking change log

* Booking model and update status controller updates

* Cleanedup unneccessary controller functions

* Shifted invoice download button to pending payment

* Pushing latest code for booking model to be used by eug

* Updated booking details modal + changelog

* Fixed bugs

* Merge w develop

* Removed seconds from the timeslot display

* add themes management to admin app

* update app.js

* Added action remark in action history for update of completed booking function. One line update.

* update view booking and add confirm tab

* vendor handle cancellation

* Partially done with the view bookings

* fix file path error

* show vendor price in view booking, update cart to save vendor price

* hide vendor price in client

* update activitytheme folder name

* View bookings & details for Client

* Resolved duplicate method name error

* [Client] A.5 Booking Management (#47)

* fixed merge conflict

* Fixed pricing bug

---------

Co-authored-by: Chua You Heng Eugene <[email protected]>
Co-authored-by: Pui Yee Tong <[email protected]>
Co-authored-by: Pui Yee Tong <[email protected]>
Co-authored-by: yow-yiying <[email protected]>
Co-authored-by: DESKTOP-PR2QQ8F\CYH_Eugene <[email protected]>
Co-authored-by: angler <[email protected]>
@Cassianky Cassianky linked an issue Nov 17, 2023 that may be closed by this pull request
6 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Client] A.5 Booking Management
1 participant