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

[IMP] website_sale_delivery: More discrete delivery section if single delivery carrier available

Browse Source 
This commit will replace the delivery carrier list choice by a single and more
discrete line bellow the billing/shipping section when there is only one
carrier available.

opw-1832976
This commit is contained in:
Hetashree Chauhan
2018-07-17 13:49:21 +02:00
committed by Romain Derie
parent 762adedece
commit 5836f1611a
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/views/templates.xml
+1 -1
View File
@@ -1296,7 +1296,7 @@
</div>
<div class="col-lg-8 col-lg-pull-4 col-sm-12 col-xs-12 oe_cart">
<div class="row">
<div class='col-md-12'>
<div class='col-md-12' id="shipping_and_billing">
<div class="panel panel-default">
<div class="panel-headisng"></div>
<div class="panel-body">
addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+29 -18
View File
@@ -22,30 +22,41 @@
</xpath>
</template>
<template id="payment_delivery_methods">
<input t-att-value="delivery.id" t-att-id="'delivery_%i' % delivery.id" type="radio" name="delivery_type" t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False" t-att-class="'hidden' if delivery_nb == 1 else ''"/>
<label class="label-optional" t-field="delivery.name" t-att-for="'delivery_%i' % delivery.id"/>
<t t-if="delivery.delivery_type == 'fixed'">
<span t-if="delivery.fixed_price > 0.0" class="badge" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/>
<span t-else="" class="badge">Free</span>
</t>
<t t-else="">
<span class="badge hidden" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/>
<span class="badge o_delivery_compute">Select to compute delivery rate</span>
</t>
<t t-if="delivery.website_description">
<div t-field="delivery.website_description" class="text-muted mt8"/>
</t>
</template>
<template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
<xpath expr="//div[@id='shipping_and_billing']/div/div[hasclass('panel-body')]" position="inside">
<t t-set="delivery_nb" t-value="deliveries and len(deliveries)"/>
<div t-if="delivery_nb == 1" id="delivery_carrier" class="mt4">
<b>Shipping Method: </b>
<t t-foreach="deliveries" t-as="delivery">
<t t-call="website_sale_delivery.payment_delivery_methods"/>
</t>
</div>
</xpath>
<xpath expr="//div[@id='payment_method']" position="before">
<div t-if="deliveries" class="col-md-12" id="delivery_carrier">
<h3 class="mb24">Choose a delivery method</h3>
<div class="panel panel-default" id="delivery_method">
<t t-set="delivery_nb" t-value="len(deliveries)"/>
<h3 t-if="delivery_nb &gt; 1" class="mb24">Choose a delivery method</h3>
<div t-if="delivery_nb &gt; 1" class="panel panel-default" id="delivery_method">
<ul class="list-group">
<t t-set="delivery_nb" t-value="len(deliveries)" />
<t t-foreach="deliveries" t-as="delivery">
<li class="list-group-item">
<input t-att-value="delivery.id" t-att-id="'delivery_%i' % delivery.id" type="radio" name="delivery_type" t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False" t-att-class="'hidden' if delivery_nb == 1 else ''"/>
<label class="label-optional" t-field="delivery.name" t-att-for="'delivery_%i' % delivery.id"/>
<t t-if="delivery.delivery_type == 'fixed'">
<span t-if="delivery.fixed_price > 0.0" class="badge pull-right"
t-field="delivery.fixed_price" t-options='{"widget": "monetary",
"from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/>
<span t-else="" class="badge pull-right">Free</span>
</t>
<t t-else="">
<span class="badge pull-right hidden" t-field="delivery.fixed_price" t-options='{"widget": "monetary", "from_currency": delivery.product_id.company_id.currency_id, "display_currency": website_sale_order.currency_id}'/>
<span class="badge pull-right o_delivery_compute">Select to compute delivery rate</span>
</t>
<t t-if="delivery.website_description">
<div t-field="delivery.website_description" class="text-muted mt8"/>
</t>
<t t-call="website_sale_delivery.payment_delivery_methods"/>
</li>
</t>
</ul>