From 0dba3f86fcba17a8c9f4245e64614ac9f2be2f2f Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Fri, 3 Nov 2023 15:23:14 +0530 Subject: [PATCH] Nov 3 : [FIX] Bug Fixed 'website_hide_variants' --- website_hide_variants/README.rst | 0 website_hide_variants/__init__.py | 1 + website_hide_variants/__manifest__.py | 2 +- website_hide_variants/controllers/__init__.py | 1 + .../controllers/hide_variants.py | 11 +++++++++++ website_hide_variants/doc/RELEASE_NOTES.md | 0 website_hide_variants/models/__init__.py | 0 website_hide_variants/models/product.py | 6 ------ .../static/description/assets/icons/check.png | Bin .../static/description/assets/icons/chevron.png | Bin .../static/description/assets/icons/cogs.png | Bin .../description/assets/icons/consultation.png | Bin .../description/assets/icons/ecom-black.png | Bin .../assets/icons/education-black.png | Bin .../description/assets/icons/hotel-black.png | Bin .../static/description/assets/icons/license.png | Bin .../description/assets/icons/lifebuoy.png | Bin .../assets/icons/manufacturing-black.png | Bin .../description/assets/icons/pos-black.png | Bin .../static/description/assets/icons/puzzle.png | Bin .../assets/icons/restaurant-black.png | Bin .../description/assets/icons/service-black.png | Bin .../description/assets/icons/trading-black.png | Bin .../description/assets/icons/training.png | Bin .../static/description/assets/icons/update.png | Bin .../static/description/assets/icons/user.png | Bin .../static/description/assets/icons/wrench.png | Bin .../description/assets/misc/categories.png | Bin .../description/assets/misc/check-box.png | Bin .../static/description/assets/misc/compass.png | Bin .../description/assets/misc/corporate.png | Bin .../assets/misc/customer-support.png | Bin .../description/assets/misc/cybrosys-logo.png | Bin .../static/description/assets/misc/features.png | Bin .../static/description/assets/misc/logo.png | Bin .../static/description/assets/misc/pictures.png | Bin .../description/assets/misc/pie-chart.png | Bin .../description/assets/misc/right-arrow.png | Bin .../static/description/assets/misc/star.png | Bin .../static/description/assets/misc/support.png | Bin .../static/description/assets/misc/whatsapp.png | Bin .../static/description/assets/modules/1.png | Bin .../static/description/assets/modules/2.png | Bin .../static/description/assets/modules/3.png | Bin .../static/description/assets/modules/4.png | Bin .../static/description/assets/modules/5.gif | Bin .../static/description/assets/modules/6.png | Bin .../static/description/assets/screenshots/1.png | Bin .../static/description/assets/screenshots/2.png | Bin .../static/description/assets/screenshots/3.png | Bin .../description/assets/screenshots/hero.gif | Bin .../static/description/banner.png | Bin .../static/description/icon.png | Bin .../static/description/index.html | 0 website_hide_variants/static/src/js/variants.js | 16 ++++------------ website_hide_variants/views/product_views.xml | 0 56 files changed, 18 insertions(+), 19 deletions(-) mode change 100644 => 100755 website_hide_variants/README.rst mode change 100644 => 100755 website_hide_variants/__init__.py mode change 100644 => 100755 website_hide_variants/__manifest__.py create mode 100644 website_hide_variants/controllers/__init__.py create mode 100644 website_hide_variants/controllers/hide_variants.py mode change 100644 => 100755 website_hide_variants/doc/RELEASE_NOTES.md mode change 100644 => 100755 website_hide_variants/models/__init__.py mode change 100644 => 100755 website_hide_variants/models/product.py mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/check.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/chevron.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/cogs.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/consultation.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/ecom-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/education-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/hotel-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/license.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/lifebuoy.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/manufacturing-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/pos-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/puzzle.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/restaurant-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/service-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/trading-black.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/training.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/update.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/user.png mode change 100644 => 100755 website_hide_variants/static/description/assets/icons/wrench.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/categories.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/check-box.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/compass.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/corporate.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/customer-support.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/cybrosys-logo.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/features.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/logo.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/pictures.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/pie-chart.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/right-arrow.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/star.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/support.png mode change 100644 => 100755 website_hide_variants/static/description/assets/misc/whatsapp.png mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/1.png mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/2.png mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/3.png mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/4.png mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/5.gif mode change 100644 => 100755 website_hide_variants/static/description/assets/modules/6.png mode change 100644 => 100755 website_hide_variants/static/description/assets/screenshots/1.png mode change 100644 => 100755 website_hide_variants/static/description/assets/screenshots/2.png mode change 100644 => 100755 website_hide_variants/static/description/assets/screenshots/3.png mode change 100644 => 100755 website_hide_variants/static/description/assets/screenshots/hero.gif mode change 100644 => 100755 website_hide_variants/static/description/banner.png mode change 100644 => 100755 website_hide_variants/static/description/icon.png mode change 100644 => 100755 website_hide_variants/static/description/index.html mode change 100644 => 100755 website_hide_variants/static/src/js/variants.js mode change 100644 => 100755 website_hide_variants/views/product_views.xml diff --git a/website_hide_variants/README.rst b/website_hide_variants/README.rst old mode 100644 new mode 100755 diff --git a/website_hide_variants/__init__.py b/website_hide_variants/__init__.py old mode 100644 new mode 100755 index 970027a5e..983b6fc47 --- a/website_hide_variants/__init__.py +++ b/website_hide_variants/__init__.py @@ -20,3 +20,4 @@ # ############################################################################# from . import models +from . import controllers \ No newline at end of file diff --git a/website_hide_variants/__manifest__.py b/website_hide_variants/__manifest__.py old mode 100644 new mode 100755 index f8ac78ee6..5558d1173 --- a/website_hide_variants/__manifest__.py +++ b/website_hide_variants/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': "Disable Variants in Website", - 'version': '16.0.1.0.0', + 'version': '16.0.2.0.0', 'description': "The module helps to disable products amd product variants from website", 'summary': "Hide Variants", 'author': "Cybrosys Techno Solutions", diff --git a/website_hide_variants/controllers/__init__.py b/website_hide_variants/controllers/__init__.py new file mode 100644 index 000000000..07dd9c8ee --- /dev/null +++ b/website_hide_variants/controllers/__init__.py @@ -0,0 +1 @@ +from . import hide_variants \ No newline at end of file diff --git a/website_hide_variants/controllers/hide_variants.py b/website_hide_variants/controllers/hide_variants.py new file mode 100644 index 000000000..c0aceeb32 --- /dev/null +++ b/website_hide_variants/controllers/hide_variants.py @@ -0,0 +1,11 @@ +from odoo import http +from odoo.http import request + + +class HideVariants(http.Controller): + """Controller for setting routes.Pass all categories and + category wise products as array to a template""" + + @http.route('/variants/', type='json', auth='public',website=True, csrf=False) + def fetch_product_website_hide_variants(self, tmpl_id): + return request.env['product.product'].sudo().browse(tmpl_id).website_hide_variants diff --git a/website_hide_variants/doc/RELEASE_NOTES.md b/website_hide_variants/doc/RELEASE_NOTES.md old mode 100644 new mode 100755 diff --git a/website_hide_variants/models/__init__.py b/website_hide_variants/models/__init__.py old mode 100644 new mode 100755 diff --git a/website_hide_variants/models/product.py b/website_hide_variants/models/product.py old mode 100644 new mode 100755 index 07a0d7a15..b49ea8124 --- a/website_hide_variants/models/product.py +++ b/website_hide_variants/models/product.py @@ -30,9 +30,3 @@ class ProductProduct(models.Model): help="Check right if you want to " "hide the variant in your " "website") - - def product_read(self, data): - if data.get('id', False): - prod_id = int(data.get('id')) - product = self.sudo().browse(prod_id).read(["website_hide_variants"]) - return product diff --git a/website_hide_variants/static/description/assets/icons/check.png b/website_hide_variants/static/description/assets/icons/check.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/chevron.png b/website_hide_variants/static/description/assets/icons/chevron.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/cogs.png b/website_hide_variants/static/description/assets/icons/cogs.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/consultation.png b/website_hide_variants/static/description/assets/icons/consultation.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/ecom-black.png b/website_hide_variants/static/description/assets/icons/ecom-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/education-black.png b/website_hide_variants/static/description/assets/icons/education-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/hotel-black.png b/website_hide_variants/static/description/assets/icons/hotel-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/license.png b/website_hide_variants/static/description/assets/icons/license.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/lifebuoy.png b/website_hide_variants/static/description/assets/icons/lifebuoy.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/manufacturing-black.png b/website_hide_variants/static/description/assets/icons/manufacturing-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/pos-black.png b/website_hide_variants/static/description/assets/icons/pos-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/puzzle.png b/website_hide_variants/static/description/assets/icons/puzzle.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/restaurant-black.png b/website_hide_variants/static/description/assets/icons/restaurant-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/service-black.png b/website_hide_variants/static/description/assets/icons/service-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/trading-black.png b/website_hide_variants/static/description/assets/icons/trading-black.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/training.png b/website_hide_variants/static/description/assets/icons/training.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/update.png b/website_hide_variants/static/description/assets/icons/update.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/user.png b/website_hide_variants/static/description/assets/icons/user.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/icons/wrench.png b/website_hide_variants/static/description/assets/icons/wrench.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/categories.png b/website_hide_variants/static/description/assets/misc/categories.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/check-box.png b/website_hide_variants/static/description/assets/misc/check-box.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/compass.png b/website_hide_variants/static/description/assets/misc/compass.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/corporate.png b/website_hide_variants/static/description/assets/misc/corporate.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/customer-support.png b/website_hide_variants/static/description/assets/misc/customer-support.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/cybrosys-logo.png b/website_hide_variants/static/description/assets/misc/cybrosys-logo.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/features.png b/website_hide_variants/static/description/assets/misc/features.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/logo.png b/website_hide_variants/static/description/assets/misc/logo.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/pictures.png b/website_hide_variants/static/description/assets/misc/pictures.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/pie-chart.png b/website_hide_variants/static/description/assets/misc/pie-chart.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/right-arrow.png b/website_hide_variants/static/description/assets/misc/right-arrow.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/star.png b/website_hide_variants/static/description/assets/misc/star.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/support.png b/website_hide_variants/static/description/assets/misc/support.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/misc/whatsapp.png b/website_hide_variants/static/description/assets/misc/whatsapp.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/1.png b/website_hide_variants/static/description/assets/modules/1.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/2.png b/website_hide_variants/static/description/assets/modules/2.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/3.png b/website_hide_variants/static/description/assets/modules/3.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/4.png b/website_hide_variants/static/description/assets/modules/4.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/5.gif b/website_hide_variants/static/description/assets/modules/5.gif old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/modules/6.png b/website_hide_variants/static/description/assets/modules/6.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/screenshots/1.png b/website_hide_variants/static/description/assets/screenshots/1.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/screenshots/2.png b/website_hide_variants/static/description/assets/screenshots/2.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/screenshots/3.png b/website_hide_variants/static/description/assets/screenshots/3.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/assets/screenshots/hero.gif b/website_hide_variants/static/description/assets/screenshots/hero.gif old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/banner.png b/website_hide_variants/static/description/banner.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/icon.png b/website_hide_variants/static/description/icon.png old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/description/index.html b/website_hide_variants/static/description/index.html old mode 100644 new mode 100755 diff --git a/website_hide_variants/static/src/js/variants.js b/website_hide_variants/static/src/js/variants.js old mode 100644 new mode 100755 index 12e0e6eae..8ae888245 --- a/website_hide_variants/static/src/js/variants.js +++ b/website_hide_variants/static/src/js/variants.js @@ -23,18 +23,10 @@ odoo.define('website_hide_variants.VariantMixin', function(require) { // Check if the selected combination has a valid product ID var product = combination.product_id if (combination.product_id) { - var data = { - 'id': combination.product_id - } - await rpc.query({ - model: 'product.product', - method: 'product_read', - args: [ - [], data - ], - }).then(function(res) { - // Check if the product is marked as "website_hide_variants" - if (res[0].website_hide_variants) { + await ajax.jsonRpc('/variants/'+combination.product_id, 'call', { + }).then(function(res) { +// // Check if the product is marked as "website_hide_variants" + if (res) { // Disable the combination and display an appropriate message to the user combination.is_combination_possible = false count = true diff --git a/website_hide_variants/views/product_views.xml b/website_hide_variants/views/product_views.xml old mode 100644 new mode 100755