From f070ab25101244fd44bc49ac87ebb518156d0879 Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Sat, 16 Dec 2023 12:09:59 +0530 Subject: [PATCH] Dec 16 : [UPDT] Updated 'product_visibility_website' --- product_visibility_website/__manifest__.py | 2 +- .../controllers/main.py | 46 +++++++++++++------ .../doc/RELEASE_NOTES.md | 5 ++ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/product_visibility_website/__manifest__.py b/product_visibility_website/__manifest__.py index 83a3b98a3..c9c7488f1 100644 --- a/product_visibility_website/__manifest__.py +++ b/product_visibility_website/__manifest__.py @@ -22,7 +22,7 @@ ################################################################################ { 'name': 'Website Product Visibility', - 'version': '16.0.1.1.2', + 'version': '16.0.1.1.3', 'category': 'Website', 'summary': 'Website Product visibility for Users', 'description': """Website Product visibility for Users""", diff --git a/product_visibility_website/controllers/main.py b/product_visibility_website/controllers/main.py index eab20d277..245f33aff 100644 --- a/product_visibility_website/controllers/main.py +++ b/product_visibility_website/controllers/main.py @@ -97,6 +97,16 @@ class ProductVisibilityCon(WebsiteSale): 'False')) available_categ = request.env['product.public.category'].search( [('id', 'in', cat)]) + Category_avail = [] + Category = request.env['product.public.category'] + for ids in available_categ: + if not ids.parent_id.id in available_categ.ids: + Category_avail.append(ids.id) + categ = request.env['product.public.category'].search( + [('id', 'in', Category_avail)]) + if mode == 'product_only': + categ = Category.search([( + 'product_tmpl_ids', 'in', available_products.ids)]) else: partner = request.env['res.partner'].sudo().search( [('id', '=', user.partner_id.id)]) @@ -104,17 +114,16 @@ class ProductVisibilityCon(WebsiteSale): if mode == 'product_only': available_products = self.available_products() available_categ = partner.website_available_cat_ids - Category_avail = [] - Category = request.env['product.public.category'] - for ids in available_categ: - if not ids.parent_id.id in available_categ.ids: - Category_avail.append(ids.id) - categ = request.env['product.public.category'].search( - [('id', 'in', Category_avail)]) - if mode == 'product_only': - categ = Category.search([('parent_id', '=', False), ( - 'product_tmpl_ids', 'in', available_products.ids)]) - # supering shop*** + Category_avail = [] + Category = request.env['product.public.category'] + for ids in available_categ: + if not ids.parent_id.id in available_categ.ids: + Category_avail.append(ids.id) + categ = request.env['product.public.category'].search( + [('id', 'in', Category_avail)]) + if mode == 'product_only': + categ = Category.search([( + 'product_tmpl_ids', 'in', available_products.ids)]) if not available_categ and not available_products and \ request.env.user.has_group( 'base.group_portal'): @@ -133,10 +142,17 @@ class ProductVisibilityCon(WebsiteSale): 'False')) available_categ = request.env['product.public.category'].search( [('id', 'in', cat)]) - - if not available_categ and not available_products and \ - not request.env.user.has_group( - 'base.group_user'): + Category_avail = [] + Category = request.env['product.public.category'] + for ids in available_categ: + if not ids.parent_id.id in available_categ.ids: + Category_avail.append(ids.id) + categ = request.env['product.public.category'].search( + [('id', 'in', Category_avail)]) + if mode == 'product_only': + categ = Category.search([( + 'product_tmpl_ids', 'in', available_products.ids)]) + if not available_categ and not available_products: return super(ProductVisibilityCon, self).shop(page, category, search, ppg, **post) add_qty = int(post.get('add_qty', 1)) diff --git a/product_visibility_website/doc/RELEASE_NOTES.md b/product_visibility_website/doc/RELEASE_NOTES.md index 14c13fa6e..9e6d35bcf 100644 --- a/product_visibility_website/doc/RELEASE_NOTES.md +++ b/product_visibility_website/doc/RELEASE_NOTES.md @@ -18,3 +18,8 @@ #### Version 16.0.1.1.2 ##### FIX - The issue with the product/product-category search functionality has been fixed + +#### 12.12.2023 +#### Version 16.0.1.1.3 +##### FIX +- The issue with the category in some cases has been fixed