diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py index 6e39080..6d8f71a 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -58,7 +58,6 @@ class SubscriptionRequest(models.Model): @api.model def create(self, vals): partner_obj = self.env['res.partner'] - mail_template_notif = self.get_mail_template_notif(False) if not vals.get('partner_id'): cooperator = False @@ -81,13 +80,13 @@ class SubscriptionRequest(models.Model): cooperator.write({'cooperator': True}) subscr_request = super(SubscriptionRequest, self).create(vals) + mail_template_notif = subscr_request.get_mail_template_notif(False) mail_template_notif.send_mail(subscr_request.id) return subscr_request @api.model def create_comp_sub_req(self, vals): - confirmation_mail_template = self.get_mail_template_notif(True) vals["name"] = vals['company_name'] if not vals.get('partner_id'): cooperator = self.env['res.partner'].get_cooperator_from_crn(vals.get('company_register_number')) @@ -97,6 +96,7 @@ class SubscriptionRequest(models.Model): vals['already_cooperator'] = True subscr_request = super(SubscriptionRequest, self).create(vals) + confirmation_mail_template = subscr_request.get_mail_template_notif(True) confirmation_mail_template.send_mail(subscr_request.id) return subscr_request @@ -502,7 +502,7 @@ class SubscriptionRequest(models.Model): 'out_inv_comm_algorithm': 'random', 'lang': self.lang, 'birthdate_date': self.birthdate, - 'parent_id': self.partner.id, + 'parent_id': self.partner_id.id, 'representative': True, 'function': self.contact_person_function, 'type': 'representative', @@ -553,11 +553,9 @@ class SubscriptionRequest(models.Model): if domain: partner = partner_obj.search(domain) - if not partner.cooperator: - partner.cooperator = True - if not partner: partner = self.create_coop_partner() + self.partner_id = partner else: partner = partner[0] @@ -588,7 +586,7 @@ class SubscriptionRequest(models.Model): 'representative': True}) invoice = self.create_invoice(partner) - self.write({'partner_id': partner.id, 'state': 'done'}) + self.write({'state': 'done'}) self.set_membership() return invoice diff --git a/easy_my_coop/models/mail_template.py b/easy_my_coop/models/mail_template.py index f346a21..b78c7f7 100644 --- a/easy_my_coop/models/mail_template.py +++ b/easy_my_coop/models/mail_template.py @@ -1,12 +1,7 @@ -from odoo import models, fields - - -class MailTemplate(models.Model): - _inherit = "mail.template" - -# def init(self): -# for template_id in EMAIL_TEMPLATE_IDS: -# mail_template = self.env.ref(template_id) -# mail_template.easy_my_coop = True - - easy_my_coop = fields.Boolean(string="Easy my coop mail template") +from odoo import models, fields + + +class MailTemplate(models.Model): + _inherit = "mail.template" + + easy_my_coop = fields.Boolean(string="Easy my coop mail template") diff --git a/easy_my_coop/views/subscription_request_view.xml b/easy_my_coop/views/subscription_request_view.xml index 6e724a6..e6ecc23 100644 --- a/easy_my_coop/views/subscription_request_view.xml +++ b/easy_my_coop/views/subscription_request_view.xml @@ -34,7 +34,7 @@
diff --git a/easy_my_coop_loan/data/mail_template_data.xml b/easy_my_coop_loan/data/mail_template_data.xml index 4c708c9..85641ae 100644 --- a/easy_my_coop_loan/data/mail_template_data.xml +++ b/easy_my_coop_loan/data/mail_template_data.xml @@ -1,113 +1,113 @@ - - - - - - Loan Subscription Confirmation Email - ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} - ${object.company_id.name} Loan subscription confirmation (Ref ${object.loan_issue_id.name or 'n/a'}) - ${object.partner_id.email} - ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} - - - ${object.partner_id.lang} - - - -

Hello ${object.partner_id.name},

- -

Your request will be soon processed by our team. If all the provided info are correct you will soon receive the payment information in another email

- -
-

If you have any question, do not hesitate to contact us.

-
- -

Sustainably your,

-

${object.company_id.name}.

- - % if object.company_id.street: - ${object.company_id.street} - % endif - % if object.company_id.street2: - ${object.company_id.street2}
- % endif - % if object.company_id.city or object.company_id.zip: - ${object.company_id.zip} ${object.company_id.city}
- % endif - % if object.company_id.country_id: - ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
- % endif - % if object.company_id.phone: - Phone:  ${object.company_id.phone} - % endif - - % if object.company_id.website: - - %endif - -
- -
- - ]]> - - - - Loan Issue Payment Request - Send by Email - ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} - ${object.company_id.name} Payment request (Ref ${object.loan_issue_id.name or 'n/a'}) - ${object.partner_id.id} - ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} - - - ${object.partner_id.lang} - - - -

Hello ${object.partner_id.name},

- -

Find here after the necessary information for the payment. We kindly remind you that your subscription will be effective only once we received the payment.

- -

Amount: ${object.amount} ${object.loan_issue_id.company_currency_id.symbol}

-

Account number: ${object.company_id.bank_ids[0].sanitized_acc_number}

-

Communication: ${object.loan_issue_id.name} + ${object.partner_id.name}

- -

Sustainably your,

-

${object.company_id.name}.

- - % if object.company_id.street: - ${object.company_id.street} - % endif - % if object.company_id.street2: - ${object.company_id.street2}
- % endif - % if object.company_id.city or object.company_id.zip: - ${object.company_id.zip} ${object.company_id.city}
- % endif - % if object.company_id.country_id: - ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
- % endif - % if object.company_id.phone: - Phone:  ${object.company_id.phone} - % endif - - % if object.company_id.website: - - %endif - -
- -
- - ]]> - - - - + + + + + + Loan Subscription Confirmation Email + ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} + ${object.company_id.name} Loan subscription confirmation (Ref ${object.loan_issue_id.name or 'n/a'}) + ${object.partner_id.email} + ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} + + + ${object.partner_id.lang} + + + +

Hello ${object.partner_id.name},

+ +

Your request will be soon processed by our team. If all the provided info are correct you will soon receive the payment information in another email

+ +
+

If you have any question, do not hesitate to contact us.

+
+ +

Sustainably your,

+

${object.company_id.name}.

+ + % if object.company_id.street: + ${object.company_id.street} + % endif + % if object.company_id.street2: + ${object.company_id.street2}
+ % endif + % if object.company_id.city or object.company_id.zip: + ${object.company_id.zip} ${object.company_id.city}
+ % endif + % if object.company_id.country_id: + ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
+ % endif + % if object.company_id.phone: + Phone:  ${object.company_id.phone} + % endif + + % if object.company_id.website: + + %endif + +
+ +
+ + ]]> + + + + Loan Issue Payment Request - Send by Email + ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} + ${object.company_id.name} Payment request (Ref ${object.loan_issue_id.name or 'n/a'}) + ${object.partner_id.id} + ${(object.company_id.coop_email_contact or object.loan_issue_id.user_id.email)|safe} + + + ${object.partner_id.lang} + + + +

Hello ${object.partner_id.name},

+ +

Find here after the necessary information for the payment. We kindly remind you that your subscription will be effective only once we received the payment.

+ +

Amount: ${object.amount} ${object.loan_issue_id.company_currency_id.symbol}

+

Account number: ${object.company_id.bank_ids[0].sanitized_acc_number}

+

Communication: ${object.loan_issue_id.name} + ${object.partner_id.name}

+ +

Sustainably your,

+

${object.company_id.name}.

+ + % if object.company_id.street: + ${object.company_id.street} + % endif + % if object.company_id.street2: + ${object.company_id.street2}
+ % endif + % if object.company_id.city or object.company_id.zip: + ${object.company_id.zip} ${object.company_id.city}
+ % endif + % if object.company_id.country_id: + ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
+ % endif + % if object.company_id.phone: + Phone:  ${object.company_id.phone} + % endif + + % if object.company_id.website: + + %endif + +
+ +
+ + ]]> + + + + diff --git a/easy_my_coop_loan/models/loan.py b/easy_my_coop_loan/models/loan.py index 90abdc1..f9f282f 100644 --- a/easy_my_coop_loan/models/loan.py +++ b/easy_my_coop_loan/models/loan.py @@ -20,7 +20,6 @@ class LoanIssue(models.Model): name = fields.Char(string="Name", translate=True) - is_bond = fields.Boolean(string="Is a bond issue?") default_issue = fields.Boolean(string="Default issue") subscription_start_date = fields.Date(string="Start date subscription period") subscription_end_date = fields.Date(string="End date subscription period") @@ -94,7 +93,6 @@ class LoanIssue(models.Model): @api.multi def get_web_issues(self, is_company): bond_issues = self.search([ - ('is_bond', '=', True), ('display_on_website', '=', True), ('state', '=', 'ongoing') ]) diff --git a/easy_my_coop_loan/views/loan_view.xml b/easy_my_coop_loan/views/loan_view.xml index 2544a1d..e3786d5 100644 --- a/easy_my_coop_loan/views/loan_view.xml +++ b/easy_my_coop_loan/views/loan_view.xml @@ -56,18 +56,17 @@ - - - - - + + + +