diff --git a/easy_my_coop/__openerp__.py b/easy_my_coop/__openerp__.py index d9cef39..af28c4c 100644 --- a/easy_my_coop/__openerp__.py +++ b/easy_my_coop/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Easy My Coop", - "version": "1.1", + "version": "9.0.1.2.0", "depends": ["base", "sale", "purchase", diff --git a/easy_my_coop/controllers/main.py b/easy_my_coop/controllers/main.py index df70ec3..4e08da0 100644 --- a/easy_my_coop/controllers/main.py +++ b/easy_my_coop/controllers/main.py @@ -340,6 +340,12 @@ class WebsiteSubscription(http.Controller): values["already_cooperator"] = already_coop values["is_company"] = is_company + if kwargs.get('data_policy_approved', 'off') == 'on': + values['data_policy_approved'] = True + + if kwargs.get('internal_rules_approved', 'off') == 'on': + values['internal_rules_approved'] = True + lastname = kwargs.get("lastname").upper() firstname = kwargs.get("firstname").title() diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py index c11e312..636b1e5 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -16,6 +16,8 @@ _REQUIRED = ['email', 'city', 'iban', 'no_registre', + 'data_policy_approved', + 'internal_rules_approved', 'gender'] # Could be improved including required from model @@ -329,6 +331,16 @@ class subscription_request(models.Model): default="website", readonly=True, states={'draft': [('readonly', False)]}) + data_policy_approved = fields.Boolean( + string='Data Policy Approved', + default=False, + # required=True, + ) + internal_rules_approved = fields.Boolean( + string='Approved Internal Rules', + default=False, + # required=True, + ) _order = "id desc" def get_person_info(self, partner): @@ -437,14 +449,16 @@ class subscription_request(models.Model): 'last_name': self.company_name, 'is_company': self.is_company, 'company_register_number': self.company_register_number, #noqa - 'customer': False, 'cooperator': True, + 'cooperator': True, 'street': self.address, 'zip': self.zip_code, 'city': self.city, 'email': self.company_email, 'out_inv_comm_type': 'bba', 'customer': self.share_product_id.customer, 'out_inv_comm_algorithm': 'random', 'country_id': self.country_id.id, - 'lang': self.lang} + 'lang': self.lang, + 'data_policy_approved': self.data_policy_approved, + 'internal_rules_approved': self.internal_rules_approved} return partner_vals def get_partner_vals(self): @@ -458,7 +472,9 @@ class subscription_request(models.Model): 'out_inv_comm_algorithm': 'random', 'country_id': self.country_id.id, 'lang': self.lang, 'birthdate_date': self.birthdate, - 'customer': self.share_product_id.customer} + 'customer': self.share_product_id.customer, + 'data_policy_approved': self.data_policy_approved, + 'internal_rules_approved': self.internal_rules_approved} return partner_vals def create_coop_partner(self): @@ -530,7 +546,9 @@ class subscription_request(models.Model): 'parent_id': partner.id, 'representative': True, 'function': self.contact_person_function, - 'type': 'representative'} + 'type': 'representative', + 'data_policy_approved': self.data_policy_approved, + 'internal_rules_approved': self.internal_rules_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 d3699a5..20493ed 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -139,6 +139,8 @@ class ResPartner(models.Model): subscription_request_ids = fields.One2many('subscription.request', 'partner_id', string="Subscription request") + data_policy_approved = fields.Boolean(string="Approved Data Policy") + internal_rules_approved = fields.Boolean(string="Approved Internal Rules") @api.multi @api.depends('subscription_request_ids.state') diff --git a/easy_my_coop/view/res_partner_view.xml b/easy_my_coop/view/res_partner_view.xml index e775cdb..2471d04 100644 --- a/easy_my_coop/view/res_partner_view.xml +++ b/easy_my_coop/view/res_partner_view.xml @@ -30,6 +30,10 @@ + + + + diff --git a/easy_my_coop/view/subscription_request_view.xml b/easy_my_coop/view/subscription_request_view.xml index 745596a..6ab0be3 100644 --- a/easy_my_coop/view/subscription_request_view.xml +++ b/easy_my_coop/view/subscription_request_view.xml @@ -79,6 +79,8 @@ + + diff --git a/easy_my_coop/view/subscription_template.xml b/easy_my_coop/view/subscription_template.xml index 4cd4c1f..8e654cd 100644 --- a/easy_my_coop/view/subscription_template.xml +++ b/easy_my_coop/view/subscription_template.xml @@ -70,12 +70,18 @@ -
- -
+
+
+ +
+ +
+
+
@@ -240,6 +246,35 @@
+
+ +
+ +
+
+ +
+
+ + +
+ +
+ +
+
+ +
+
+
@@ -502,20 +537,52 @@
- - - - - -
-

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

+
+
+
+ +
+
+
+
+

@@ -551,4 +618,15 @@ + + + + +