From 7799b4d8ef8aad4f8dd0242c354b08e4d695bf33 Mon Sep 17 00:00:00 2001 From: braisab Date: Tue, 29 Nov 2022 12:23:16 +0100 Subject: [PATCH] [IMP]pms_api_rest: added overpayment color to configurate in property --- pms/models/pms_property.py | 79 ------------------- pms/views/pms_property_views.xml | 67 ---------------- pms_api_rest/datamodels/pms_property.py | 1 + pms_api_rest/models/pms_property.py | 6 ++ pms_api_rest/services/pms_property_service.py | 1 + pms_api_rest/views/pms_property_views.xml | 5 ++ 6 files changed, 13 insertions(+), 146 deletions(-) diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py index fa27c99be..1b0c055cb 100644 --- a/pms/models/pms_property.py +++ b/pms/models/pms_property.py @@ -238,85 +238,6 @@ class PmsProperty(models.Model): default=get_default_logo(), ) - color_option_config = fields.Selection( - string="Color Option Configuration", - help="Configuration of the color code for the planning.", - selection=[("simple", "Simple"), ("advanced", "Advanced")], - default="simple", - ) - - simple_out_color = fields.Char( - string="Reservations Outside", - help="Color for done reservations in the planning.", - default="rgba(94,208,236)", - ) - - simple_in_color = fields.Char( - string="Reservations Inside", - help="Color for onboard and departure_delayed reservations in the planning.", - default="rgba(0,146,183)", - ) - - simple_future_color = fields.Char( - string="Future Reservations", - help="Color for confirm, arrival_delayed and draft reservations in the planning.", - default="rgba(1,182,227)", - ) - - pre_reservation_color = fields.Char( - string="Pre-Reservation", - help="Color for draft reservations in the planning.", - default="rgba(162,70,128)", - ) - - confirmed_reservation_color = fields.Char( - string="Confirmed Reservation", - default="rgba(1,182,227)", - help="Color for confirm reservations in the planning.", - ) - - paid_reservation_color = fields.Char( - string="Paid Reservation", - help="Color for done paid reservations in the planning.", - default="rgba(126,126,126)", - ) - - on_board_reservation_color = fields.Char( - string="Checkin", - help="Color for onboard not paid reservations in the planning.", - default="rgba(255,64,64)", - ) - - paid_checkin_reservation_color = fields.Char( - string="Paid Checkin", - help="Color for onboard paid reservations in the planning.", - default="rgba(130,191,7)", - ) - - out_reservation_color = fields.Char( - string="Checkout", - help="Color for done not paid reservations in the planning.", - default="rgba(88,77,118)", - ) - - staff_reservation_color = fields.Char( - string="Staff", - help="Color for staff reservations in the planning.", - default="rgba(192,134,134)", - ) - - to_assign_reservation_color = fields.Char( - string="OTA Reservation To Assign", - help="Color for to_assign reservations in the planning.", - default="rgba(237,114,46,)", - ) - - pending_payment_reservation_color = fields.Char( - string="Payment Pending", - help="Color for pending payment reservations in the planning.", - default="rgba(162,70,137)", - ) - @api.depends_context( "checkin", "checkout", diff --git a/pms/views/pms_property_views.xml b/pms/views/pms_property_views.xml index d6dcefd0d..b70761089 100644 --- a/pms/views/pms_property_views.xml +++ b/pms/views/pms_property_views.xml @@ -85,73 +85,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/pms_api_rest/datamodels/pms_property.py b/pms_api_rest/datamodels/pms_property.py index 0e2a7c6bf..97e280ef7 100644 --- a/pms_api_rest/datamodels/pms_property.py +++ b/pms_api_rest/datamodels/pms_property.py @@ -23,6 +23,7 @@ class PmsPropertyInfo(Datamodel): outReservationColor = fields.String(required=False, allow_none=True) staffReservationColor = fields.String(required=False, allow_none=True) toAssignReservationColor = fields.String(required=False, allow_none=True) + overPaymentColor = fields.String(required=False, allow_none=True) pendingPaymentReservationColor = fields.String(required=False, allow_none=True) simpleOutColor = fields.String(required=False, allow_none=True) simpleInColor = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/models/pms_property.py b/pms_api_rest/models/pms_property.py index 80ea18de5..cda087937 100644 --- a/pms_api_rest/models/pms_property.py +++ b/pms_api_rest/models/pms_property.py @@ -82,3 +82,9 @@ class PmsProperty(models.Model): help="Color for pending payment reservations in the planning.", default="rgba(162,70,137)", ) + + overpayment_reservation_color = fields.Char( + string="Overpayment", + help="Color for pending payment reservations in the planning.", + default="rgba(4, 95, 118)", + ) diff --git a/pms_api_rest/services/pms_property_service.py b/pms_api_rest/services/pms_property_service.py index 6818860fa..51322e4f0 100644 --- a/pms_api_rest/services/pms_property_service.py +++ b/pms_api_rest/services/pms_property_service.py @@ -43,6 +43,7 @@ class PmsPropertyService(Component): staffReservationColor=prop.staff_reservation_color, toAssignReservationColor=prop.to_assign_reservation_color, pendingPaymentReservationColor=prop.pending_payment_reservation_color, + overPaymentColor=prop.overpayment_reservation_color, simpleOutColor=prop.simple_out_color, simpleInColor=prop.simple_in_color, simpleFutureColor=prop.simple_future_color, diff --git a/pms_api_rest/views/pms_property_views.xml b/pms_api_rest/views/pms_property_views.xml index cc3afd76e..5c86deee6 100644 --- a/pms_api_rest/views/pms_property_views.xml +++ b/pms_api_rest/views/pms_property_views.xml @@ -70,6 +70,11 @@ widget="color" attrs="{'invisible': [('color_option_config', '!=', 'advanced')]}" /> +