Skip to content

[18.0][FIX] website_sale_product_brand: fix top panel brand filtering and clear filters #1161

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

Open
pilarvargas-tecnativa wants to merge 1 commit into
base: 18.0
Choose a base branch
from
Open

[18.0][FIX] website_sale_product_brand: fix top panel brand filtering and clear filters #1161

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions website_sale_product_brand/controllers/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ def _get_shop_domain(
)
# add selected brands to product search domain
brands_list = self._get_brand_ids(request.httprequest.args)
return self._update_domain(brands_list, domain)
domain = self._update_domain(brands_list, domain)
if "brand_id" in request.context:
domain = expression.AND(
[domain, [("product_brand_id", "=", request.context["brand_id"])]]
)
return domain

def _update_domain(self, brands_list, domain):
selected_brand_ids = [int(brand) for brand in brands_list]
Expand Down Expand Up @@ -93,18 +98,6 @@ def _get_search_options(
res["brand"] = request.context.get("brand_id")
return res

def _get_shop_domain(
self, search, category, attrib_values, search_in_description=True
):
domain = super()._get_shop_domain(
search, category, attrib_values, search_in_description=search_in_description
)
if "brand_id" in request.context:
domain = expression.AND(
[domain, [("product_brand_id", "=", request.context["brand_id"])]]
)
return domain

@http.route(
[
"/shop",
Expand Down
95 changes: 94 additions & 1 deletion website_sale_product_brand/views/templates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
class="accordion-item rounded-0 border-top-0 py-3"
>
<a
t-att-href="keep('/shop' + ('/category/' + slug(category)) if category else None, attribute_value=0, tags=0, selected_brand_ids=0)"
t-att-href="keep('/shop' + ('/category/' + slug(category)) if category else None, attribute_value=0, tags=0, brand=0, brand_ids=0)"
t-attf-class="btn btn-{{navClass}} d-flex align-items-center py-1"
title="Clear Filters"
>
Expand Down Expand Up @@ -85,4 +85,97 @@
</t>
</xpath>
</template>
<template
id="website_sale_filter_brand_top_products_brands"
inherit_id="website_sale.o_wsale_offcanvas"
priority="999"
>
<xpath
expr="//form[@t-if='opt_wsale_attributes or opt_wsale_attributes_top']"
position="inside"
>
<t
t-if="is_view_active('website_sale_product_brand.website_sale_filter_brand_products_brands')"
>
<t t-if="brands">
<!-- status activo si hay marca seleccionada -->
<t
t-set="_brand_status"
t-value="selected_brand_ids and 'active' or 'inactive'"
/>

<div
t-attf-class="accordion-item border-top-0 {{(_brand_status == 'active') and 'order-1' or 'order-2'}}"
>
<h2
class="accordion-header mb-0"
t-attf-id="o_wsale_offcanvas_brand_header"
>
<button
t-attf-class="o_wsale_offcanvas_title accordion-button rounded-0 {{ (not selected_brand_ids) and 'collapsed' }}"
type="button"
t-att-data-status="_brand_status"
data-bs-toggle="collapse"
t-attf-data-bs-target="#o_wsale_offcanvas_brand"
t-att-aria-expanded="_brand_status == 'active' and 'True' or 'False'"
t-attf-aria-controls="o_wsale_offcanvas_brand"
>
<b>Brand</b>
</button>
</h2>
<div
t-attf-id="o_wsale_offcanvas_brand"
t-attf-class="accordion-collapse collapse {{ (_brand_status == 'active') and 'show' }}"
t-att-aria-expanded="(_brand_status == 'active') and 'True' or 'False'"
t-attf-aria-labelledby="o_wsale_offcanvas_brand_header"
>
<div class="accordion-body pt-0">
<div class="list-group list-group-flush">
<t t-foreach="brands" t-as="brand">
<t
t-if="not selected_brand_ids or brand.id in selected_brand_ids"
>
<div
class="list-group-item border-0 ps-0 pb-0"
>
<div class="form-check mb-1">
<input
type="checkbox"
name="brand"
class="form-check-input"
t-att-id="'brand-%s' % brand.id"
t-att-value="brand.id"
t-att-checked="'checked' if brand.id in (selected_brand_ids or []) else None"
/>
<label
class="form-check-label fw-normal"
t-att-for="'brand-%s' % brand.id"
t-field="brand.name"
/>
</div>
</div>
</t>
</t>
</div>
</div>
</div>
</div>
</t>
</t>
</xpath>
<xpath expr="//a[@href='/shop']" position="replace">
<t
t-set="_has_any_filters"
t-value="bool(attrib_values) or bool(isFilteringByPrice) or bool(tags) or bool(selected_brand_ids)"
/>
<a
t-att-href="keep('/shop' + ('/category/' + slug(category)) if category else None, attribute_value=0, tags=0, brand=0, brand_ids=0)"
t-attf-class="btn btn-{{navClass}} d-flex py-1 mb-2 {{ (not _has_any_filters) and 'disabled' }}"
t-att-aria-disabled="(not _has_any_filters) and 'true' or 'false'"
title="Clear Filters"
>
Clear Filters
</a>
</xpath>
</template>
</odoo>