Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master themes ecommerce layout issue #25200

Closed
wants to merge 1 commit into from
Closed

Master themes ecommerce layout issue #25200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions addons/payment/views/payment_templates.xml
View file
Open in desktop
Expand Up @@ -40,12 +40,12 @@
<input type="hidden" t-if="error_url" name="error_url" t-att-value="error_url"/>
<input type="hidden" t-if="callback_method" name="callback_method" t-att-value="callback_method"/>

<div class="card">
<ul class="list-group">
<t t-set="acquirers_count" t-value="(len(s2s_acquirers) if s2s_acquirers else 0) + (len(form_acquirers) if form_acquirers else 0)"/>
<t t-set="pms_count" t-value="len(pms) if pms else 0"/>
<t t-set="MAX_BRAND_LINE" t-value="3"/>
<t t-foreach="s2s_acquirers" t-as="acq">
<div class="card-body">
<li class="list-group-item">
<label>
<t t-if="mode == 'manage'">
<input type="radio" t-att-data-acquirer-id="acq.id"
Expand Down Expand Up @@ -80,7 +80,7 @@
<t t-set="i" t-value="i+1"/>
</t>
</ul>
</div>
</li>
<div t-attf-id="o_payment_add_token_acq_{{acq.id}}" t-attf-class="card-footer {{'d-none' if(acquirers_count &gt; 1 and pms_count==0 and s2s_acquirers[0]!=acq) else 'd-none' if pms_count &gt;0 else ''}}">
<div class="clearfix">
<t t-call="{{acq.sudo().get_s2s_form_xml_id()}}">
Expand All @@ -92,14 +92,14 @@
</div>
</t>
<t t-if="mode == 'payment'" t-foreach="form_acquirers" t-as="acq">
<div class="card-body">
<label>
<li class="list-group-item">
<input type="radio" t-att-data-acquirer-id="acq.id"
t-att-data-form-payment="true"
t-att-data-provider="acq.provider"
t-att-class="'d-none' if (acquirers_count==1 and pms_count==0) else ''"
t-att-checked="acquirers_count==1 and pms_count==0"
name="pm_id" t-attf-value="form_{{acq.id}}"/>
<label>
<span class="payment_icon_name" t-esc="acq.name"/>
</label>
<ul class="float-right list-inline payment_icon_list">
Expand All @@ -117,7 +117,7 @@
<t t-set="i" t-value="i+1"/>
</t>
</ul>
</div>
</li>
<div t-attf-id="o_payment_form_acq_{{acq.id}}" t-attf-class="d-none {{'card-footer' if acq.save_token == 'ask' else ''}}">
<label t-if="acq.save_token == 'ask'"><input type="checkbox" name="o_payment_form_save_token" data-remove-me=""/> Save my payment data</label>
</div>
Expand All @@ -139,7 +139,7 @@
</button>
</div>
</t>
</div>
</ul>
<div t-if='back_button_txt' class="float-left mt-2">
<a role="button" t-att-href="back_button_link or '#'" t-att-class="back_button_class or 'btn btn-lg btn-secondary'">
<i t-if="back_button_icon_class" t-attf-class="fa {{back_button_icon_class}}"/>
Expand Down
10 changes: 4 additions & 6 deletions addons/website_sale/static/src/scss/website_sale.scss
View file
Open in desktop
Expand Up @@ -45,17 +45,14 @@

.td-qty {
width: 130px;
a.input-group-addon {
background-color: transparent;
border: 0px;
}
}
.td-action {
width: 30px;
}

.td-price,
.td-price-total {
.td-price-total,
#cart_total tr td:last-child {
width: 100px;
}

Expand All @@ -69,7 +66,8 @@
width: 60px;
}

.td-price {
.td-price,
#cart_total tr td:last-child {
width: 80px;
}
}
Expand Down
158 changes: 83 additions & 75 deletions addons/website_sale/views/templates.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion addons/website_sale_comparison/static/src/scss/website_sale_comparison.scss
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@
}
.o_product_circle {
vertical-align: 6px;
padding: 0 3px;
line-height: 14px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion addons/website_sale_comparison/views/website_sale_comparison_template.xml
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@

<form action="/shop/cart/update" method="post" class="text-center">
<input name="product_id" t-att-value="product.id" type="hidden"/>
<a role="button" class="btn btn-primary btn-block a-submit"><i class="fa fa-shopping-cart"></i>&amp;nbsp;Add to Cart</a>
<a role="button" class="btn btn-primary btn-block a-submit"><i class="fa fa-shopping-cart"></i><span class="d-none d-md-inline">&amp;nbsp;Add to Cart</span></a>
</form>
</div>
</td>
Expand Down
14 changes: 7 additions & 7 deletions addons/website_sale_delivery/views/website_sale_delivery_templates.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<xpath expr="//tr[@id='order_total_untaxed']" position="before">
<tr id="order_delivery" t-if="website_sale_order and website_sale_order.carrier_id">
<td class="text-right noborder text-muted" title="Delivery will be updated after choosing a new delivery method">Delivery:</td>
<td class="text-left-not-lg text-right-lg noborder text-muted" >
<td class="text-right noborder text-muted" >
<span t-field="website_sale_order.amount_delivery" style="white-space: nowrap;" t-options='{
"widget": "monetary",
"display_currency": website_sale_order.currency_id,
Expand All @@ -26,12 +26,12 @@
<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="'d-none' 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>
<span t-if="delivery.fixed_price > 0.0" class="badge float-right mt-1" 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 float-right mt-1">Free</span>
</t>
<t t-else="">
<span class="badge d-none" 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>
<span class="badge d-none float-right mt-1" 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 float-right mt-1">Select to compute delivery rate</span>
</t>
<t t-if="delivery.website_description">
<div t-field="delivery.website_description" class="text-muted mt8"/>
Expand All @@ -49,10 +49,10 @@
</div>
</xpath>
<xpath expr="//div[@id='payment_method']" position="before">
<div t-if="deliveries" class="col-lg-12" id="delivery_carrier">
<div t-if="deliveries" id="delivery_carrier">
<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="card" id="delivery_method">
<div t-if="delivery_nb &gt; 1" id="delivery_method">
<ul class="list-group">
<t t-foreach="deliveries" t-as="delivery">
<li class="list-group-item">
Expand Down
2 changes: 1 addition & 1 deletion addons/website_sale_options/views/website_sale_options_templates.xml
View file
Open in desktop
Expand Up @@ -123,7 +123,7 @@
}'/>
<p class="css_not_available_msg bg-danger" style="padding: 5px;">Product not available</p>

<div class='mt8'>
<div>
<input type="hidden" class="js_optional_same_quantity" t-attf-name="optional-add-#{product_index}" value="0"/>
<a role="button" href="#" class="js_add btn btn-info"><strong>Add<span class='d-none d-md-inline'> to Cart</span></strong></a>
<span class="js_remove d-none">
Expand Down
2 changes: 1 addition & 1 deletion addons/website_sale_wishlist/static/src/scss/website_sale_wishlist.scss
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
@include media-breakpoint-down(sm) {
.oe_website_sale {
.td-wish-btn {
width: 100px;
width: 65px;
}
}
}
4 changes: 2 additions & 2 deletions addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@
<small class='d-none d-md-block'><p t-field="wish.product_id.description_sale" class="text-muted"/></small>
<button type="button" class="btn btn-link o_wish_rm no-decoration"><small><i class='fa fa-trash-o'></i> Remove</small></button>
</td>
<td style='width:80px'>
<td style='width:120px' class="text-right">
<t t-if='wish.price_new != wish.price'>
<del class='text-danger'><t t-esc='wish.price' t-options="{'widget': 'monetary', 'display_currency': wish.currency_id}"/></del>
<br/>
Expand All @@ -73,7 +73,7 @@
</td>
<td class='text-center td-wish-btn'>
<input name="product_id" t-att-value="wish.product_id.id" type="hidden"/>
<button type="button" role="button" class="btn btn-secondary btn-block o_wish_add mb4" >Add <span class='d-none d-md-inline'>to Cart</span></button>
<button type="button" role="button" class="btn btn-secondary btn-block o_wish_add mb4 px-0" ><i class="fa fa-shopping-cart"></i><span class='d-none d-md-inline'> Add to Cart</span></button>
</td>
</tr>
</t>
Expand Down