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

[IMP/FIX] website_sale, website_sale_delivery: fixed alignment issue, removed unexpected spaces, update some view for shop/payment

Browse Source
This commit is contained in:
jpr-odoo
2017-09-30 15:20:17 +02:00
committed by Jeremy Kersten
parent 64557f93d3
commit 59b3f676bb
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/static/src/css/website_sale.css
+3
View File
@@ -659,3 +659,6 @@ a.no-decoration {
box-shadow: 0 0 5px 10px rgba(240, 8, 0, 0.4) !important;
}
.o_rightfit {
padding-right: 0px;
}
addons/website_sale/views/templates.xml
+9 -8
View File
@@ -1264,7 +1264,7 @@
<div id="wrap">
<div class="container oe_website_sale">
<div class="row">
<div class="col-md-offset-2 col-lg-8 col-sm-9">
<div class="col-md-offset-2 col-lg-8 col-sm-9" t-if="errors">
<t t-foreach="errors" t-as="error">
<div class="alert alert-danger" t-if="error">
<h4>
@@ -1279,10 +1279,10 @@
<t t-call="website_sale.wizard_checkout">
<t t-set="step" t-value="40" />
</t>
<h2 class="mb32 ml16">Confirm Order</h2>
</div>
<div class="row">
<div class='col-md-12'>
<div class='col-md-12 o_rightfit'>
<h2 class="mb8 mt8">Confirm Order</h2>
<table class="table table-striped table-condensed" id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
<thead>
<tr>
@@ -1338,7 +1338,7 @@
<div class="clearfix" />
<div class="oe_structure" />
<div id="payment_method" class="mb64 col-md-12" t-if="(form_acquirers or s2s_acquirers or tokens) and website_sale_order.amount_total">
<div id="payment_method" class="col-md-12 o_rightfit" t-if="(form_acquirers or s2s_acquirers or tokens) and website_sale_order.amount_total">
<h3 class="mb24">Pay with </h3>
<t t-call="payment.payment_tokens_list">
<t t-set="mode" t-value="'payment'"/>
@@ -1352,10 +1352,10 @@
</div>
<div t-if="not (form_acquirers or s2s_acquirers)">
<a class="btn btn-default btn-block"
<a class="btn-link"
groups="base.group_system"
t-attf-href="/web#return_label=Website&amp;action=#{payment_action_id}">
<i class="fa fa-plus-square" aria-hidden="true"></i> Configure payment acquirers
<i class="fa fa-arrow-right" aria-hidden="true"></i> Add payment acquirers
</a>
</div>
<div class="js_payment mb64 row" t-if="not website_sale_order.amount_total" id="payment_method">
@@ -1537,8 +1537,9 @@
</span>
</div>
<div class="row" id="order_total">
<span class="col-xs-6 text-right h4">Total:</span>
<span class="col-xs-6 text-right-not-xs text-left-xs h4" style="white-space: nowrap;">
<hr class="mt8 mb0"/>
<span class="col-xs-6 text-right h4 mt0">Total:</span>
<span class="col-xs-6 text-right-not-xs text-left-xs h4 mt0" style="white-space: nowrap;">
<span t-field="website_sale_order.amount_total" style="white-space: nowrap;" t-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
</span>
</div>
addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+4 -4
View File
@@ -23,9 +23,9 @@
<template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
<xpath expr="//div[@id='payment_method']" position="before">
<div t-if="deliveries" class="col-md-12 row" id="delivery_carrier">
<div t-if="deliveries" class="col-md-12 row o_rightfit" id="delivery_carrier">
<div class="col-lg-7 col-sm-8">
<h4>Choose a delivery method <i class="fa fa-question text-muted" title="Delivery price will be updated after choosing a new delivery method" aria-hidden="true"></i></h4>
<h3 title="Delivery price will be updated after choosing a new delivery method">Choose a delivery method</h3>
<ul class="list-unstyled">
<li t-foreach="deliveries" t-as="delivery">
<div id="delivery_method">
@@ -38,10 +38,10 @@
</div>
</li>
</ul>
<a class="btn btn-default btn-block"
<a class="btn-link"
groups="base.group_system"
t-attf-href="/web#return_label=Website&amp;action=#{delivery_action_id}">
<i class="fa fa-plus-square" aria-hidden="true"></i> Configure delivery methods
<i class="fa fa-arrow-right" aria-hidden="true"></i> Add delivery methods
</a>
</div>
</div>