nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:comments

Browse Source
This commit is contained in:
0Pranav
2019-11-01 09:36:45 +05:30
parent 4701bc8bfc
commit 957c9f5ff0
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/www/book-appointment/index.py
View File

@@ -31,14 +31,12 @@ def get_timezones():
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def get_appointment_slots(date, timezone): def get_appointment_slots(date, timezone):
import pytz import pytz
guest_timezone = pytz.timezone(timezone) # Convert query to local timezones
local_timezone = pytz.timezone(frappe.utils.get_time_zone())
format_string = '%Y-%m-%d %H:%M:%S' format_string = '%Y-%m-%d %H:%M:%S'
query_start_time = datetime.datetime.strptime( query_start_time = datetime.datetime.strptime(
date + ' 00:00:00', format_string) date + ' 00:00:00', format_string)
query_end_time = datetime.datetime.strptime( query_end_time = datetime.datetime.strptime(
date + ' 23:59:59', format_string) date + ' 23:59:59', format_string)
query_start_time = convert_to_system_timzone(timezone,query_start_time) query_start_time = convert_to_system_timzone(timezone,query_start_time)
query_end_time = convert_to_system_timzone(timezone,query_end_time) query_end_time = convert_to_system_timzone(timezone,query_end_time)
now = convert_to_guest_timezone(timezone,datetime.datetime.now()) now = convert_to_guest_timezone(timezone,datetime.datetime.now())
@@ -49,12 +47,10 @@ def get_appointment_slots(date, timezone):
timeslots = get_available_slots_between( timeslots = get_available_slots_between(
query_start_time, query_end_time, settings) query_start_time, query_end_time, settings)
# Filter timeslots based on date # Filter and convert timeslots
converted_timeslots = [] converted_timeslots = []
for timeslot in timeslots: for timeslot in timeslots:
print("Unconverted Timeslot:{0}".format(timeslot))
timeslot = convert_to_guest_timezone(timezone,timeslot) timeslot = convert_to_guest_timezone(timezone,timeslot)
print("Converted Timeslot:{0}".format(timeslot))
# Check if holiday # Check if holiday
if _is_holiday(timeslot.date(), holiday_list): if _is_holiday(timeslot.date(), holiday_list):
converted_timeslots.append( converted_timeslots.append(
@@ -72,7 +68,6 @@ def get_appointment_slots(date, timezone):
converted_timeslots = filter_timeslots(date_required, converted_timeslots) converted_timeslots = filter_timeslots(date_required, converted_timeslots)
return converted_timeslots return converted_timeslots
def get_available_slots_between(query_start_time, query_end_time, settings): def get_available_slots_between(query_start_time, query_end_time, settings):
records = _get_records(query_start_time, query_end_time, settings) records = _get_records(query_start_time, query_end_time, settings)
timeslots = [] timeslots = []