diff --git a/service_charges_pos/models/res_config_settings.py b/service_charges_pos/models/res_config_settings.py index a00bc0040..e24a7ac53 100644 --- a/service_charges_pos/models/res_config_settings.py +++ b/service_charges_pos/models/res_config_settings.py @@ -61,7 +61,9 @@ class ResConfigSettings(models.TransientModel): def onchange_enable_service_charge(self): """When the service charge is enabled set service product and amount by default in globally""" + service_charges =self.env['pos.config'].search([]) if self.enable_service_charge: + service_charges.is_service_charges = True if not self.global_product_id: self.global_product_id = self.env[ 'product.product'].search([ diff --git a/service_charges_pos/static/src/js/service_charge_button.js b/service_charges_pos/static/src/js/service_charge_button.js index e985bdfde..9b2bdbdcc 100644 --- a/service_charges_pos/static/src/js/service_charge_button.js +++ b/service_charges_pos/static/src/js/service_charge_button.js @@ -90,9 +90,9 @@ export class ServiceChargeButton extends Component { ProductScreen.addControlButton({ component: ServiceChargeButton, condition: function () { - let res_config_settings = this.pos.res_config_settings[this.pos.res_config_settings.length -1] + let res_config_settings = this.pos.config.is_service_charges if (res_config_settings) { - return res_config_settings.enable_service_charge + return this.pos.config.is_service_charges } else { return false } diff --git a/service_charges_pos/views/pos_config_views.xml b/service_charges_pos/views/pos_config_views.xml index ffde1fedf..b24248331 100644 --- a/service_charges_pos/views/pos_config_views.xml +++ b/service_charges_pos/views/pos_config_views.xml @@ -9,7 +9,7 @@ - +