[FIX] website_sale_delivery: fix xpath broken because of previous commit 55725bd

This commit is contained in:
Jeremy Kersten
2015-05-09 21:38:06 +02:00
parent 7d6532d1eb
commit 6e31be7b5e
2 changed files with 16 additions and 13 deletions
+5 -3
View File
@@ -1225,7 +1225,8 @@
<!-- Page Shop my cart and payment total -->
<template id="total">
<div class="row">
<t t-if="website_sale_order">
<div class="row" id="order_total_untaxed">
<span class="col-xs-6 text-right text-muted">Subtotal:</span>
<span class="col-xs-6 text-muted">
<span t-field="website_sale_order.amount_untaxed" style="white-space: nowrap;" t-field-options='{
@@ -1235,7 +1236,7 @@
}'/>
</span>
</div>
<div class="row">
<div class="row" id="order_total_taxes">
<span class="col-xs-6 text-right text-muted" title="Taxes may be updated after providing shipping address"> Taxes:</span>
<span class="col-xs-6 text-muted">
<span t-field="website_sale_order.amount_tax" style="white-space: nowrap;" t-field-options='{
@@ -1245,7 +1246,7 @@
}'/>
</span>
</div>
<div class="row">
<div class="row" id="order_total">
<span class="col-xs-6 text-right h4">Total:</span>
<span class="col-xs-6 h4" style="white-space: nowrap;">
<span t-field="website_sale_order.amount_total" style="white-space: nowrap;" t-field-options='{
@@ -1255,6 +1256,7 @@
}'/>
</span>
</div>
</t>
</template>
<!-- payment acquirer information -->
@@ -3,16 +3,17 @@
<data>
<template id="cart_delivery" name="Delivery Costs" inherit_id="website_sale.total">
<xpath expr="//tr[@id='order_total_taxes']" position="after">
<tr class="text-muted" id="order_delivery">
<td><abbr title="Delivery will be updated after choosing a new delivery method">Delivery:</abbr></td>
<td class="text-right">
<span t-field="website_sale_order.amount_delivery" t-field-options='{
"widget": "monetary",
"display_currency": "website.pricelist_id.currency_id"
}'/>
</td>
</tr>
<xpath expr="//div[@id='order_total_taxes']" position="after">
<div class="row" id="order_delivery">
<span class="col-xs-6 text-right text-muted" title="Delivery will be updated after choosing a new delivery method"> Delivery:</span>
<span class="col-xs-6 text-muted">
<span t-field="website_sale_order.amount_delivery" style="white-space: nowrap;" t-field-options='{
"widget": "monetary",
"from_currency": "website_sale_order.pricelist_id.currency_id",
"display_currency": "user_id.partner_id.property_product_pricelist.currency_id"
}'/>
</span>
</div>
</xpath>
</template>