From ff12311ebb763d27698f2947cbc62a17eb4a4f92 Mon Sep 17 00:00:00 2001 From: Pablo Date: Fri, 21 Dec 2018 18:08:25 +0100 Subject: [PATCH] [WIP] Add staff template --- hotel_calendar/models/bus_hotel_calendar.py | 1 - .../models/inherited_hotel_reservation.py | 1 - hotel_calendar/static/src/css/view.css | 23 +++- .../src/xml/hotel_calendar_templates.xml | 120 ++++++++++++------ 4 files changed, 101 insertions(+), 44 deletions(-) diff --git a/hotel_calendar/models/bus_hotel_calendar.py b/hotel_calendar/models/bus_hotel_calendar.py index b80d92fbd..55d9f9f6b 100644 --- a/hotel_calendar/models/bus_hotel_calendar.py +++ b/hotel_calendar/models/bus_hotel_calendar.py @@ -30,7 +30,6 @@ class BusHotelCalendar(models.TransientModel): ('id', '=', master_reserv), ('splitted', '=', True), ]) - import wdb; wdb.set_trace() return { 'type': 'reservation', 'action': vals['action'], diff --git a/hotel_calendar/models/inherited_hotel_reservation.py b/hotel_calendar/models/inherited_hotel_reservation.py index 1c09f9f1b..5d72cb3a9 100644 --- a/hotel_calendar/models/inherited_hotel_reservation.py +++ b/hotel_calendar/models/inherited_hotel_reservation.py @@ -351,7 +351,6 @@ class HotelReservation(models.Model): @api.multi def generate_bus_values(self, naction, ntype, ntitle=''): self.ensure_one() - import wdb; wdb.set_trace() return { 'action': naction, 'type': ntype, diff --git a/hotel_calendar/static/src/css/view.css b/hotel_calendar/static/src/css/view.css index 57a3dc2ee..98102eb60 100644 --- a/hotel_calendar/static/src/css/view.css +++ b/hotel_calendar/static/src/css/view.css @@ -188,8 +188,8 @@ input#bookings_search { margin-bottom: 0px; } .tooltip .container p { - margin-top: 2px; - margin-bottom: 2px; + margin-top: 3px; + margin-bottom: 0px; } .tooltip header { font-size: 1.3em; @@ -199,11 +199,27 @@ input#bookings_search { padding-top: 3px; padding-bottom: 3px; } +.tooltip .fa-border { + padding: .25em; + border: solid 0.1em #777777; + border-radius: .2em; +} +.tooltip .fa-border > text-primary { + padding: .25em; + border: solid 0.1em #777777; + border-radius: .2em; +} /* Spacing in Bootstrap v4.0 */ .mt-3 { margin-top: 3px; } +.mt-10 { + margin-top: 10px !important; +} +.mt-25 { + margin-top: 25px; +} .mr-5 { margin-right: 5px; } @@ -215,6 +231,9 @@ input#bookings_search { padding-top: 5px; padding-bottom: 5px; } +.pb-10 { + padding-bottom: 10px; +} /* WARNING: The .row-eq-height class uses CSS3's flexbox layout mode, which is not supported in Internet Explorer 9 and below. */ diff --git a/hotel_calendar/static/src/xml/hotel_calendar_templates.xml b/hotel_calendar/static/src/xml/hotel_calendar_templates.xml index 9f3bce0ac..149e8d92a 100644 --- a/hotel_calendar/static/src/xml/hotel_calendar_templates.xml +++ b/hotel_calendar/static/src/xml/hotel_calendar_templates.xml @@ -73,19 +73,66 @@

WuBook: 1544109684

Booking: 4253096846

+ -

Sales Channel Direct

+

Sales Channel Direct

+ + +
+
+ +

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+ +

+

+
+
+ +

+

+
+
+
+
-
- +
+

-
+

@@ -95,17 +142,17 @@
-
+

Folio Pending

-
+

Total Paid

-
+
@@ -114,47 +161,40 @@
-
-
- -

-

-
-
- -

-

-
-
-
-
- -

-
-
- -
-
- -
-
- -
-
- -
-
- -
-
+ +
+ + +
+
+
+ +
+

+

+
+
+ +
+ +

Adults: - Children:

+
+
+ + +
+
+

+