diff --git a/easy_my_coop/controllers/main.py b/easy_my_coop/controllers/main.py index f646f40..4036966 100644 --- a/easy_my_coop/controllers/main.py +++ b/easy_my_coop/controllers/main.py @@ -172,6 +172,9 @@ class WebsiteSubscription(http.Controller): 'display_internal_rules': comp.display_internal_rules_approval, 'internal_rules_required': comp.internal_rules_approval_required, 'internal_rules_text': comp.internal_rules_approval_text, + 'display_financial_risk': comp.display_financial_risk_approval, + 'financial_risk_required': comp.financial_risk_approval_required, + 'financial_risk_text': comp.financial_risk_approval_text, }) return values @@ -353,6 +356,9 @@ class WebsiteSubscription(http.Controller): if kwargs.get('internal_rules_approved', 'off') == 'on': values['internal_rules_approved'] = True + if kwargs.get('financial_risk_approved', 'off') == 'on': + values['financial_risk_approved'] = True + lastname = kwargs.get("lastname").upper() firstname = kwargs.get("firstname").title() diff --git a/easy_my_coop/models/company.py b/easy_my_coop/models/company.py index 4663aca..8b87bb4 100644 --- a/easy_my_coop/models/company.py +++ b/easy_my_coop/models/company.py @@ -66,6 +66,17 @@ class ResCompany(models.Model): translate=True, help="Text to display aside the checkbox to approve internal rules." ) + display_financial_risk_approval = fields.Boolean( + help="Choose to display a financial risk checkbox on the" + " cooperator website form." + ) + financial_risk_approval_required = fields.Boolean( + string="Is financial risk approval required?" + ) + financial_risk_approval_text = fields.Html( + translate=True, + help="Text to display aside the checkbox to approve financial risk." + ) @api.onchange('data_policy_approval_required') def onchange_data_policy_approval_required(self): @@ -76,3 +87,8 @@ class ResCompany(models.Model): def onchange_internal_rules_approval_required(self): if self.internal_rules_approval_required: self.display_internal_rules_approval = True + + @api.onchange('financial_risk_approval_required') + def onchange_financial_risk_approval_required(self): + if self.financial_risk_approval_required: + self.display_financial_risk_rules_approval = True diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py index 9f20934..82014a0 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -35,6 +35,8 @@ class subscription_request(models.Model): required_fields.append('data_policy_approved') if company.internal_rules_approval_required: required_fields.append('internal_rules_approved') + if company.financial_risk_approval_required: + required_fields.append('financial_risk_approved') return required_fields @api.model @@ -309,7 +311,11 @@ class subscription_request(models.Model): default=False, ) internal_rules_approved = fields.Boolean( - string='Approved Internal Rules', + string='Internal Rules Approved ', + default=False, + ) + financial_risk_approved = fields.Boolean( + string='Financial Risk Approved', default=False, ) _order = "id desc" @@ -429,7 +435,8 @@ class subscription_request(models.Model): 'country_id': self.country_id.id, 'lang': self.lang, 'data_policy_approved': self.data_policy_approved, - 'internal_rules_approved': self.internal_rules_approved + 'internal_rules_approved': self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved } return partner_vals @@ -445,7 +452,9 @@ class subscription_request(models.Model): 'birthdate_date': self.birthdate, 'customer': self.share_product_id.customer, 'data_policy_approved': self.data_policy_approved, - 'internal_rules_approved': self.internal_rules_approved} + 'internal_rules_approved': self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved + } return partner_vals def create_coop_partner(self): @@ -518,7 +527,9 @@ class subscription_request(models.Model): 'function': self.contact_person_function, 'type': 'representative', 'data_policy_approved': self.data_policy_approved, - 'internal_rules_approved': self.internal_rules_approved} + 'internal_rules_approved': self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved + } contact = partner_obj.create(contact_vals) else: if len(contact) > 1: diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py index 249f0f2..e349cc4 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -144,8 +144,9 @@ class ResPartner(models.Model): string="Subscription request") legal_form = fields.Selection([('', '')], string="Legal form") - data_policy_approved = fields.Boolean(string="Approved Data Policy") - internal_rules_approved = fields.Boolean(string="Approved Internal Rules") + data_policy_approved = fields.Boolean(string="Data Policy Approved ") + internal_rules_approved = fields.Boolean(string="Internal Rules Approved ") + financial_risk_approved = fields.Boolean(string="Financial Risk Approved ") @api.multi @api.depends('subscription_request_ids.state') diff --git a/easy_my_coop/view/res_company_view.xml b/easy_my_coop/view/res_company_view.xml index 4eee70a..248f833 100644 --- a/easy_my_coop/view/res_company_view.xml +++ b/easy_my_coop/view/res_company_view.xml @@ -27,6 +27,9 @@ + + + diff --git a/easy_my_coop/view/res_partner_view.xml b/easy_my_coop/view/res_partner_view.xml index 50bb158..e58a4d9 100644 --- a/easy_my_coop/view/res_partner_view.xml +++ b/easy_my_coop/view/res_partner_view.xml @@ -33,6 +33,7 @@ + diff --git a/easy_my_coop/view/subscription_request_view.xml b/easy_my_coop/view/subscription_request_view.xml index 5fb3402..b7f40b2 100644 --- a/easy_my_coop/view/subscription_request_view.xml +++ b/easy_my_coop/view/subscription_request_view.xml @@ -76,6 +76,7 @@ + diff --git a/easy_my_coop/view/subscription_template.xml b/easy_my_coop/view/subscription_template.xml index a09429a..22218fd 100644 --- a/easy_my_coop/view/subscription_template.xml +++ b/easy_my_coop/view/subscription_template.xml @@ -293,6 +293,21 @@ +
+ +
+
+ +
+
+
+
@@ -624,6 +639,21 @@ +
+ +
+
+ +
+
+
+