Skip to content

Commit dee325a

Browse files
shramanpaulAtOM18ompandey0703Vishal-Github-21Pheonix7113
authored
Visitors Hostel (FusionIIIT#1779)
* Get Booking data api added (#1) * bug: fix conditional rendering of booking req * Dashboard client (#3) * Get Booking data api added * active booking api * add: forwardBooking confirmBooking * Dashboard client (#4) * Get Booking data api added * active booking api * Added cancelled, active, completed booking view functionality * cancellation_request done * reject option works * Add items backend functionality (#5) * add: rooms availibility * fix: urls * add: Account statement backend (#6) * "add: account statements" * resolved MC * Updated visitor_hostel URLs and views:added partial booking API (#7) Co-authored-by: Arun7113 <[email protected]> * fix: partial booking feature * fix: completed bookings * fix: account statement * fix: correct income display on account statement * Added CheckIn and CheckOut API, and fixed Completed bookings API (#8) * Get Booking data api added * active booking api * Added cancelled, active, completed booking view functionality * cancellation_request done * reject option works * checkin and checkout api added, also get_completed booking fixed * fix: expired reqs * fix: cancelled bookings * bugs: inventory * bug: expenditure * fix: minor bug --------- Co-authored-by: Hardik Vardaan <[email protected]> Co-authored-by: ompandey0703 <[email protected]> Co-authored-by: Vishal-Github-21 <[email protected]> Co-authored-by: JATOTHU ARUN <[email protected]> Co-authored-by: Arun7113 <[email protected]>
1 parent ca2caab commit dee325a

File tree

2 files changed

+366
-83
lines changed

2 files changed

+366
-83
lines changed

FusionIIIT/applications/visitor_hostel/urls.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
url(r'^record-meal/', views.record_meal, name = 'record_meal'),
2424
url(r'^bill/', views.bill_generation, name = 'bill_generation'),
2525
url(r'^update-booking/', views.update_booking, name = 'update_booking'),
26+
url(r'^check-out-with-inventory/', views.check_out_with_inventory, name = 'check_out_with_inventory'),
2627

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

3334

35+
url(r'^room_availabity_new/', views.room_availabity_new, name = 'room_availabity_new'),
36+
37+
url(r'^check-partial-booking/', views.check_partial_booking, name='check_partial_booking'),
38+
39+
3440
url(r'^add-to-inventory/', views.add_to_inventory, name = 'add_to_inventory'),
3541
url(r'^update-inventory/', views.update_inventory, name = 'update_inventory'),
3642
url(r'^edit-room-status/', views.edit_room_status, name = 'edit_room_status'),
@@ -40,11 +46,12 @@
4046
url(r'^user-details/', views.get_user_details, name='get_user_details'), #
4147
url(r'^get-booking-details/(?P<booking_id>\d+)/$', views.get_booking_details, name='get_booking_details'), #
4248
url(r'^forward-booking-new/$', views.forward_booking_new, name='forward_booking_new'),
49+
url(r'^update-booking-new/$', views.update_booking_new, name='update_booking_new'),
4350

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

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

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

6169
]
6270

0 commit comments

Comments
 (0)