ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts in backport of #60782

Browse Source
This commit is contained in:
Nabin Hait
2026-10-24 10:06:25 +05:30
parent c5cbd356b2
commit 182bb047eb
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/www/book_appointment/index.py
-5
View File
@@ -49,15 +49,10 @@ def get_timezones():
return pytz.all_timezones
<<<<<<< HEAD
@frappe.whitelist(allow_guest=True)
def get_appointment_slots(date, timezone):
=======
# nosemgrep: frappe-semgrep-rules.rules.security.guest-whitelisted-method -- reviewed: public booking page; rate limited, returns free slots only, booking must be enabled
@frappe.whitelist(allow_guest=True)
@rate_limit(limit=SLOT_REQUESTS_PER_MINUTE, seconds=60)
def get_appointment_slots(date: str, timezone: str):
>>>>>>> acf0863 (fix(crm): rate limit appointment slot lookups on the booking page)
# Convert query to local timezones
handle_appointment_booking_disabled()
format_string = "%Y-%m-%d %H:%M:%S"