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

[IMP] website_sale: Improve address/log in display according to configuration

Browse Source 
Part-of: odoo/odoo#82999
This commit is contained in:
Yannick Tivisse
2022-02-08 14:53:38 +00:00
parent 324f7c52ba
commit e7fc008d38
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/controllers/main.py
+1
View File
@@ -858,6 +858,7 @@ class WebsiteSale(http.Controller):
'error': errors,
'callback': kw.get('callback'),
'only_services': order and order.only_services,
'account_on_checkout': request.website.account_on_checkout,
}
render_values.update(self._get_country_related_render_values(kw, render_values))
return request.render("website_sale.address", render_values)
addons/website_sale/views/templates.xml
+5 -4
View File
@@ -1410,9 +1410,10 @@
<div class="col-12 col-xl order-xl-1 oe_cart">
<div>
<t t-if="mode == ('new', 'billing')">
<h2 class="o_page_header mt8">Your Address
<small> or </small>
<a role="button" href='/web/login?redirect=/shop/checkout' class='btn btn-primary' style="margin-top: -11px">Log In</a>
<h2 class="o_page_header mt8">
<span t-if="account_on_checkout != 'mandatory'">Your Address</span>
<small t-if="account_on_checkout == 'optional'"> or </small>
<a t-if="account_on_checkout != 'disabled'" role="button" href='/web/login?redirect=/shop/checkout' class='btn btn-primary' style="margin-top: -11px">Log In</a>
</h2>
</t>
<t t-if="mode == ('edit', 'billing')">
@@ -1433,7 +1434,7 @@
<t t-if="error" t-foreach="error.get('error_message', [])" t-as="err">
<h5 class="text-danger" t-esc="err" />
</t>
<form action="/shop/address" method="post" class="checkout_autoformat">
<form t-if="account_on_checkout != 'mandatory'" action="/shop/address" method="post" class="checkout_autoformat">
<div class="form-row">
<div t-attf-class="form-group #{error.get('name') and 'o_has_error' or ''} col-lg-12 div_name">
<label class="col-form-label" for="name">Name</label>