From 02daeb9579482d6267bfdf5d09f51f9eb2e6e83a Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Tue, 28 Jan 2025 17:08:48 +0530 Subject: [PATCH] Jan 23 [UPDT] : Updated 'salon_management' --- salon_management/controllers/salon_management.py | 15 +++++---------- .../static/src/js/website_salon_booking.js | 7 +++++-- .../views/salon_booking_templates.xml | 1 + 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/salon_management/controllers/salon_management.py b/salon_management/controllers/salon_management.py index 6f00afec9..f7a9d2ead 100755 --- a/salon_management/controllers/salon_management.py +++ b/salon_management/controllers/salon_management.py @@ -31,17 +31,12 @@ class SalonBookingWeb(http.Controller): @http.route(route='/page/salon_details', type='json', auth='public', website=True, csrf=False) - def salon_details(self, name, date, salon_time, phone, email, chair, - number): - val = 0 - service_list = [] - while val < (int(number)): - service_list.append(int(val)) - val += 1 + def salon_details(self, name, date, salon_time, phone, email, chair, number, list_service): + service_lists = [service['item'] for service in list_service] dates_time = date + " " + salon_time + ":00" user_tz = request.env.user.tz or 'UTC' if isinstance(user_tz, bool): - user_tz = 'UTC' # Ensure it's a string + user_tz = 'UTC' local_tz = pytz.timezone(user_tz) date_and_time = (local_tz.localize( datetime.strptime(str(dates_time), '%Y-%m-%d %H:%M:%S')). @@ -53,9 +48,9 @@ class SalonBookingWeb(http.Controller): 'email': email, 'chair_id': chair, 'service_ids': [(6, 0, [salon.id for salon in request.env - ['salon.service'].search([('id', 'in', - service_list)])])], + ['salon.service'].search([('id', 'in', service_lists)])])], }) + return json.dumps({'result': True}) @http.route('/page/salon_check_date', type='json', auth="public", diff --git a/salon_management/static/src/js/website_salon_booking.js b/salon_management/static/src/js/website_salon_booking.js index 0731c756f..07ccd8f8e 100755 --- a/salon_management/static/src/js/website_salon_booking.js +++ b/salon_management/static/src/js/website_salon_booking.js @@ -28,7 +28,7 @@ publicWidget.registry.SalonManagement = publicWidget.Widget.extend({ if (name == "" || date == "" || time == "" || phone == "" || email == "" || list_service.length == 0) { alert("All fields are mandatory"); } else { - var colonIndex = time.indexOf(":"); // Find the index of ":" + var colonIndex = time.indexOf(":"); var hours = time.substring(0, colonIndex); var minutes = time.substring(colonIndex + 1) var colon = time[colonIndex]; @@ -37,6 +37,7 @@ publicWidget.registry.SalonManagement = publicWidget.Widget.extend({ } else { var time_left = parseInt(hours); var time_right = parseInt(minutes);; + console.log("number",number) if ((time_left < 25) && (time_right < 60) && (time_left >= 0) && (time_right >= 0)) { jsonrpc('/page/salon_details', { name: name, @@ -45,7 +46,9 @@ publicWidget.registry.SalonManagement = publicWidget.Widget.extend({ phone: phone, email: email, chair: chair, - number: number + number: number, + list_service:list_service + }).then( function(result){ if (JSON.parse(result).result == true){ window.location.href = "/page/salon_management/salon_booking_thank_you"; diff --git a/salon_management/views/salon_booking_templates.xml b/salon_management/views/salon_booking_templates.xml index 232e46229..b6bf51ef1 100755 --- a/salon_management/views/salon_booking_templates.xml +++ b/salon_management/views/salon_booking_templates.xml @@ -57,6 +57,7 @@