Sep 22 [FIX] : Bug Fixed 'salon_management'

salon_management/controllers/main.py

@@ -119,8 +119,7 @@ class SalonBookingWeb(http.Controller):
         date_end = pytz.timezone(request.env.user.tz).localize(
             datetime.combine(date_check, time(23, 59, 59))).astimezone(
             pytz.UTC).replace(tzinfo=None)
-        chair_obj = request.env['salon.chair'].search(
-            [('active_booking_chairs', '=', True)])
+        chair_obj = request.env['salon.chair'].search([])
         order_obj = request.env['salon.order'].search(
             [('chair_id.active_booking_chairs', '=', True),
              ('stage_id', 'in', [1, 2, 3]), ('start_time', '>=', date_start),
@@ -139,7 +138,6 @@ class SalonBookingWeb(http.Controller):
 class SalonOrders(http.Controller):
     @http.route(['/salon/chairs'], type="json", auth="public")
     def elearning_snippet(self, products_per_slide=3):
-        print('controller')
         chairs = []
         salon_chairs = request.env['salon.chair'].sudo().search([])
         number_of_orders = {}
@@ -148,16 +146,12 @@ class SalonOrders(http.Controller):
             number_of_orders.update({i.id: len(request.env['salon.order'].search(
                 [("chair_id", "=", i.id),
                  ("stage_id", "in", [2, 3])]))})
-            # print(i.id)
             chairs.append(
                 {'name': i.name, 'id': i.id, 'orders': number_of_orders[i.id]})
-        print(number_of_orders, 'main')
         values = {
             's_chairs': chairs
         }
-        print(values)
 
         response = http.Response(
             template='salon_management.dashboard_salon_chairs', qcontext=values)
-        print(response.render())
         return response.render()

salon_management/data/data.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-
         <record id="website_menu_salon_booking" model="website.menu">
             <field name="name">Bookings</field>
             <field name="url">/page/salon_management/salon_booking_form</field>

salon_management/models/salon_booking.py

@@ -32,23 +32,26 @@ class SalonBooking(models.Model):
     _name = 'salon.booking'
     _description = 'Salon Booking'
 
-    name = fields.Char(string="Name")
+    name = fields.Char(string="Name", required=True)
     state = fields.Selection(
         string="State", default="draft",
         selection=[('draft', 'Draft'), ('approved', 'Approved'),
                    ('rejected', 'Rejected')])
-    time = fields.Datetime(string="Date")
+    time = fields.Datetime(string="Date", required=True)
     phone = fields.Char(string="Phone")
     email = fields.Char(string="E-Mail")
-    service_ids = fields.Many2many('salon.service', string="Services")
-    chair_id = fields.Many2one('salon.chair', string="Chair")
+    service_ids = fields.Many2many('salon.service',
+                                   string="Services")
+    chair_id = fields.Many2one('salon.chair', string="Chair",
+                               required=True)
     company_id = fields.Many2one(
         'res.company', 'Company',
         default=lambda self: self.env['res.company'].browse(1))
     language_id = fields.Many2one(
         'res.lang', 'Language',
         default=lambda self: self.env['res.lang'].browse(1))
-    filtered_order_ids = fields.Many2many('salon.order', string="Salon Orders",
+    filtered_order_ids = fields.Many2many('salon.order',
+                                          string="Salon Orders",
                                           compute="_compute_filtered_order_ids")
 
     def _compute_filtered_order_ids(self):
@@ -110,7 +113,6 @@ class SalonBooking(models.Model):
                                                                 force_send=True)
         self.state = "rejected"
 
-    @api.model
     def get_booking_count(self):
         salon_bookings = self.env['salon.booking'].search_count(
             [('state', '=', 'approved')])
@@ -128,5 +130,4 @@ class SalonBooking(models.Model):
             'clients': salon_clients,
             'chairs': salon_chairs
         }
-        # print(values)
         return values

salon_management/static/src/js/salon_dashboard.js

@@ -41,14 +41,13 @@ odoo.define('salon_management.SalonDashboard', function (require) {
             rpc.query({
                 model: "salon.booking",
                 method: "get_booking_count",
-                args: [],
+                args: [0],
             })
                 .then(function (result) {
                     $("#bookings_count").append("<span class='stat-digit'>" + result.bookings + "</span>");
                     $("#recent_count").append("<span class='stat-digit'>" + result.sales + "</span>");
                     $("#orders_count").append("<span class='stat-digit'>" + result.orders + "</span>");
                     $("#clients_count").append("<span class='stat-digit'>" + result.clients + "</span>");
-                    // console.log("pass to controller");
                     ajax.jsonRpc("/salon/chairs", "call", {}).then(function (values) {
                         $('#chairs_dashboard_view').append(values);
                     });
@@ -88,7 +87,6 @@ odoo.define('salon_management.SalonDashboard', function (require) {
             ev.stopPropagation();
             ev.preventDefault();
             var active_id = event.target.id
-            console.log(active_id,"acname")
             var options = {
                 on_reverse_breadcrumb: this.on_reverse_breadcrumb,
             };

salon_management/views/salon_booking_templates.xml

@@ -87,6 +87,7 @@
                                 <div class="col-lg-10 s_title pt16 pb16 row">
                                     <div class="col-lg-5 s_title pt16 pb16">
                                         <select id="chair" required="True">
+                                            <t t-esc="chair_details"/>
                                             <t t-foreach="chair_details" t-as="chair">
                                                 <option t-att-value="chair.id" t-esc="chair.name" />
                                             </t>

salon_management/views/salon_booking_views.xml

@@ -7,7 +7,6 @@
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="get_booking_count" string="Test" class="oe_highlight" type="object" />
                     <button name="action_approve_booking" states="draft" string="Approve" class="oe_highlight" type="object" />
                     <button name="action_reject_booking" states="draft" string="Reject" class="oe_highlight" type="object" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,rejected" />