Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2294bdd
Get Booking data api added (#1)
AtOM18 Oct 17, 2024
e8f7079
bug: fix conditional rendering of booking req
shramanpaul Oct 17, 2024
24f28c9
Dashboard client (#3)
AtOM18 Oct 18, 2024
a916e5e
add: forwardBooking confirmBooking
shramanpaul Oct 22, 2024
a004765
Dashboard client (#4)
AtOM18 Oct 22, 2024
0b36c17
Add items backend functionality (#5)
ompandey0703 Oct 22, 2024
31c0939
add: rooms availibility
shramanpaul Oct 22, 2024
d4570be
Merge branch 'dashboard_client' of https://github.com/shramanpaul/Fus…
shramanpaul Oct 22, 2024
e6c08fc
fix: urls
shramanpaul Oct 23, 2024
fcd40fc
add: Account statement backend (#6)
Vishal-Github-21 Oct 23, 2024
1de81b6
Updated visitor_hostel URLs and views:added partial booking API (#7)
Pheonix7113 Oct 29, 2024
eb85173
fix: partial booking feature
shramanpaul Nov 4, 2024
f80c2da
fix: completed bookings
shramanpaul Nov 5, 2024
74b7f05
fix: account statement
shramanpaul Nov 8, 2024
0c952a4
Merge branch 'dashboard_client' of https://github.com/FusionIIIT/Fusi…
shramanpaul Nov 8, 2024
d6cd5d9
fix: correct income display on account statement
shramanpaul Nov 8, 2024
aff211b
Added CheckIn and CheckOut API, and fixed Completed bookings API (#8)
AtOM18 Mar 10, 2025
d98dade
fix: expired reqs
shramanpaul Mar 14, 2025
f2e3d38
fix: cancelled bookings
shramanpaul Mar 14, 2025
d161e7d
bugs: inventory
shramanpaul Mar 24, 2025
1d72a96
bug: expenditure
shramanpaul Mar 24, 2025
08a60d1
fix: minor bug
shramanpaul Apr 14, 2025
ab62d72
resolve: conflicts
shramanpaul Apr 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion FusionIIIT/applications/visitor_hostel/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
url(r'^record-meal/', views.record_meal, name = 'record_meal'),
url(r'^bill/', views.bill_generation, name = 'bill_generation'),
url(r'^update-booking/', views.update_booking, name = 'update_booking'),
url(r'^check-out-with-inventory/', views.check_out_with_inventory, name = 'check_out_with_inventory'),

url(r'^bill_between_date_range/', views.bill_between_dates, name = 'generate_records'),
url(r'^room-availability/', views.room_availabity, name = 'room_availabity'),
Expand All @@ -31,6 +32,11 @@
url(r'^check-partial-booking/', views.check_partial_booking, name='check_partial_booking'),


url(r'^room_availabity_new/', views.room_availabity_new, name = 'room_availabity_new'),

url(r'^check-partial-booking/', views.check_partial_booking, name='check_partial_booking'),


url(r'^add-to-inventory/', views.add_to_inventory, name = 'add_to_inventory'),
url(r'^update-inventory/', views.update_inventory, name = 'update_inventory'),
url(r'^edit-room-status/', views.edit_room_status, name = 'edit_room_status'),
Expand All @@ -40,11 +46,12 @@
url(r'^user-details/', views.get_user_details, name='get_user_details'), #
url(r'^get-booking-details/(?P<booking_id>\d+)/$', views.get_booking_details, name='get_booking_details'), #
url(r'^forward-booking-new/$', views.forward_booking_new, name='forward_booking_new'),
url(r'^update-booking-new/$', views.update_booking_new, name='update_booking_new'),

url(r'^confirm-booking-new/$', views.confirm_booking_new, name='confirm_booking_new'), #

url(r'^inventory/$', views.get_inventory_items, name='get_inventory_items'),
url(r'^inventory/(?P<pk>\d+)/$', views.get_inventory_item, name='get_inventory_item'),
# url(r'^inventory/(?P<pk>\d+)/$', views.get_inventory_item, name='get_inventory_item'),
url(r'^inventory-bills/$', views.get_inventory_bills, name='get_inventory_bills'),
url(r'^inventory-bills/(?P<pk>\d+)/$', views.get_inventory_bill, name='get_inventory_bill'),

Expand All @@ -57,6 +64,7 @@
url('api/inventory_list/', InventoryListView.as_view(), name='inventory-list'),
# completed bookings
url(r'^completed-bookings/', views.completed_bookings, name='completed_bookings'),
url(r'^expire-pending-bookings/', views.expire_pending_bookings, name='expire_pending_bookings'),

]

Loading