pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_sale, stock: add email in additional address

Browse Source 
improved various things into this commit:

- added OPTIONAL email field on the new ship-to address for the eCommerce
- if the email field is empty on the shipping address,
  it will send the confirmation email only to their parent

task-2194014
Closes #47347

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
This commit is contained in:
Dhwani Patel
2021-02-17 09:11:34 +00:00
committed by Jeremy Kersten
parent c8c30b0743
commit 8c08d7be0b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/data/mail_template_data.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">Delivery: Send by Email</field>
<field name="model_id" ref="model_stock_picking"/>
<field name="subject">${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field>
<field name="partner_to">${object.partner_id.email and object.partner_id.id or object.partner_id.parent_id.id}</field>
<field name="body_html" type="html">
<div style="margin: 0px; padding: 0px;">
<p style="margin: 0px; padding: 0px; font-size: 13px;">
addons/website_sale/views/templates.xml
+4 -6
View File
@@ -1356,12 +1356,10 @@
<input type="text" name="name" t-attf-class="form-control #{error.get('name') and 'is-invalid' or ''}" t-att-value="'name' in checkout and checkout['name']" />
</div>
<div class="w-100"/>
<t t-if="mode[1] == 'billing'">
<div t-attf-class="form-group #{error.get('email') and 'o_has_error' or ''} col-lg-6" id="div_email">
<label class="col-form-label" for="email">Email</label>
<input type="email" name="email" t-attf-class="form-control #{error.get('email') and 'is-invalid' or ''}" t-att-value="'email' in checkout and checkout['email']" />
</div>
</t>
<div t-attf-class="form-group #{error.get('email') and 'o_has_error' or ''} col-lg-6" id="div_email">
<label t-attf-class="col-form-label #{mode[1] == 'shipping' and 'label-optional' or ''}" for="email">Email</label>
<input type="email" name="email" t-attf-class="form-control #{error.get('email') and 'is-invalid' or ''}" t-att-value="'email' in checkout and checkout['email']" />
</div>
<div t-attf-class="form-group #{error.get('phone') and 'o_has_error' or ''} col-lg-6" id="div_phone">
<label class="col-form-label" for="phone">Phone</label>
<input type="tel" name="phone" t-attf-class="form-control #{error.get('phone') and 'is-invalid' or ''}" t-att-value="'phone' in checkout and checkout['phone']" />