diff options
| author | Dhaval Panchal <dpa@odoo.com> | 2016-10-14 17:41:39 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-02-10 14:04:30 +0100 |
| commit | d3ff48533fb818ae9d87b72f3598ee85698105fa (patch) | |
| tree | 3848d2d99fad9694c85a7139def983f7c5393110 | |
| parent | 18ce1c9215f8724a33029b5f1362291ca941900e (diff) | |
[IMP] website_sale: Enable billing/delivery address on checkout process
Purpose
=======
Address management is not clear. If you use the eCommerce, you can set 2 different addresses (billing / shipping) in the checkout process while the related access right group is not activated (group_sale_delivery_address). So you don't see such dates in the backend, which leads to potential conflicts with customer (if the delivery address is different).
Functional spec
===============
- Hide shipping stuff in checkout if option is not activated:
- When eCommerce is installed, group_sale_delivery_address should be activated automatically.
- If you uncheck it from user access (already it is disable in sale settings) , it has to disappear in both the bakend AND the frontend.
| -rw-r--r-- | addons/website_sale/security/website_sale.xml | 5 | ||||
| -rw-r--r-- | addons/website_sale/views/templates.xml | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 77410d72f51..8c6c7a64e51 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -44,4 +44,9 @@ <record id="sales_team.group_sale_manager" model="res.groups"> <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/> </record> + + <record id="base.group_user" model="res.groups"> + <field name="implied_ids" eval="[(4, ref('sale.group_delivery_invoice_address'))]"/> + </record> + </odoo> diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index bec827eac68..40378b94405 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -740,15 +740,15 @@ <t t-if="step>20 and step<50"> <a href="/shop/checkout" class="text-success"> <!-- billing if not loggedin - TODO --> - <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services">Shipping &</t> - Billing<span class="chevron"/> + <t>Billing</t> + <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services" groups="sale.group_delivery_invoice_address"> & Shipping</t> + <span class="chevron"/> </a> </t> <t t-if="not (step>20 and step<50)"> - <!-- why website_sale_order is not set here ? --> - <t t-set="website_sale_order" t-value="website.sale_get_order()" /> - <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services">Shipping &</t> - Billing<span class="chevron"/> + <t>Billing</t> + <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services" groups="sale.group_delivery_invoice_address"> & Shipping</t> + <span class="chevron"/> </t> </li> <li t-att-class="(step==40 and 'text-primary') or 'text-muted'" id="step40"> @@ -1076,7 +1076,7 @@ </t> </div> </div> - <t t-if="not only_services"> + <t t-if="not only_services" groups="sale.group_delivery_invoice_address"> <div class="row"> <div class="col-md-12"> <h3 class="page-header mt16">Shipping Address @@ -1738,7 +1738,7 @@ <div class='o_div_text_overflow' t-field="order.partner_invoice_id" t-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" /> </div> </div> - <t t-if="not order.only_services"> + <t t-if="not order.only_services" groups="sale.group_delivery_invoice_address"> <div class="panel panel-info break-word"> <div class="panel-heading">Ship To:</div> <div class="panel-body"> |