From 34c8dab3c7b82acb53d8b4f3d85dc88181d03b07 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Tue, 11 Feb 2020 12:46:18 +0530
Subject: [PATCH 01/15] [FIX]remove first line for the license and add comments

---
 website_product_configurator/models/sale_order.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/website_product_configurator/models/sale_order.py b/website_product_configurator/models/sale_order.py
index f31ac51f..6c38cc4b 100644
--- a/website_product_configurator/models/sale_order.py
+++ b/website_product_configurator/models/sale_order.py
@@ -1,4 +1,3 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
 import logging
 from odoo import api, models, _
 from odoo.http import request
@@ -17,6 +16,7 @@ def _cart_update(self, product_id=None, line_id=None,
         self.ensure_one()
         product_context = dict(self.env.context)
         product_context.setdefault('lang', self.sudo().partner_id.lang)
+        # BizzAppDev Customization
         cfg_product = self.env['product.product'].with_context(
             product_context
         ).browse(int(product_id))
@@ -28,6 +28,7 @@ def _cart_update(self, product_id=None, line_id=None,
                 set_qty=set_qty,
                 kwargs=kwargs
             )
+        # BizzAppDev Customization End
 
         SaleOrderLineSudo = self.env['sale.order.line'].sudo().\
             with_context(product_context)
@@ -85,9 +86,12 @@ def _cart_update(self, product_id=None, line_id=None,
             combination = product_template._get_closest_possible_combination(
                 received_combination)
 
+
+            # BizzAppDev Customization
             # prevent to change variant in cart
             # get or create (if dynamic) the correct variant
             # product = product_template._create_product_variant(combination)
+            # BizzAppDev Customization End
 
             if not product:
                 raise UserError(_(
@@ -204,6 +208,7 @@ def _cart_update(self, product_id=None, line_id=None,
                     'quantity': quantity,
                     'date': order.date_order,
                     'pricelist': order.pricelist_id.id,
+                    'force_company': order.company_id.id,
                 })
                 product = self.env['product.product'].with_context(
                     product_context).browse(product_id)

From 45b0b9f8401ffa735e2c85ab3cfce8a006e24342 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Wed, 12 Feb 2020 12:45:46 +0530
Subject: [PATCH 02/15] [FIX]flake8

---
 website_product_configurator/models/sale_order.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website_product_configurator/models/sale_order.py b/website_product_configurator/models/sale_order.py
index 6c38cc4b..4f808715 100644
--- a/website_product_configurator/models/sale_order.py
+++ b/website_product_configurator/models/sale_order.py
@@ -86,7 +86,6 @@ def _cart_update(self, product_id=None, line_id=None,
             combination = product_template._get_closest_possible_combination(
                 received_combination)
 
-
             # BizzAppDev Customization
             # prevent to change variant in cart
             # get or create (if dynamic) the correct variant

From 805e4a17ea7daa7107c7b47f9418c90f498f4813 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Thu, 20 Feb 2020 13:01:13 +0530
Subject: [PATCH 03/15] [FIX]fix test

---
 .../tests/test_product_config.py                 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/product_configurator/tests/test_product_config.py b/product_configurator/tests/test_product_config.py
index e868371a..68e39408 100644
--- a/product_configurator/tests/test_product_config.py
+++ b/product_configurator/tests/test_product_config.py
@@ -552,14 +552,14 @@ def test_18_onchange_attribute(self):
                 self.attribute_vals_2.id])],
             'domain_id': self.productConfigDomainId.id
         })
-        with self.assertRaises(ValidationError):
-            config_line.onchange_attribute()
-
-        self.assertFalse(
-            config_line.value_ids,
-            'Error: If value_ids True\
-            Method: onchange_attribute()'
-        )
+        # with self.assertRaises(ValidationError):
+        #     config_line.onchange_attribute()
+
+        # self.assertFalse(
+        #     config_line.value_ids,
+        #     'Error: If value_ids True\
+        #     Method: onchange_attribute()'
+        # )
 
     def test_19_eval(self):
         self.attr_color.custom_type = 'binary'

From 90fe1c6ab78e2e3a354db7a65054f70bee236c3b Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Thu, 5 Mar 2020 21:58:06 +0530
Subject: [PATCH 04/15] [FIX]fix test case for onchange_attribute

---
 .../tests/test_product_config.py              | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/product_configurator/tests/test_product_config.py b/product_configurator/tests/test_product_config.py
index 68e39408..a2e10798 100644
--- a/product_configurator/tests/test_product_config.py
+++ b/product_configurator/tests/test_product_config.py
@@ -552,14 +552,36 @@ def test_18_onchange_attribute(self):
                 self.attribute_vals_2.id])],
             'domain_id': self.productConfigDomainId.id
         })
-        # with self.assertRaises(ValidationError):
-        #     config_line.onchange_attribute()
-
-        # self.assertFalse(
-        #     config_line.value_ids,
-        #     'Error: If value_ids True\
-        #     Method: onchange_attribute()'
-        # )
+
+        line_vals = {
+            'product_tmpl_id': self.product_tmpl_id.id,
+            'attribute_line_id': self.attributeLine1.id,
+            'value_ids': [(6, 0, [
+                self.attribute_vals_1.id,
+                self.attribute_vals_2.id])],
+            'domain_id': self.productConfigDomainId.id
+        }
+        order_line_obj = self.env['product.config.line']
+        specs = order_line_obj._onchange_spec()
+        updates = order_line_obj.onchange(
+            line_vals, ['attribute_line_id'], specs
+        )
+        values = updates.get('value', {})
+        for name, val in values.items():
+            if isinstance(val, tuple):
+                values[name] = val[0]
+
+        self.assertFalse(
+            values.get('domain_id'),
+            'Error: If value_ids True\
+            Method: onchange_attribute()'
+        )
+        self.assertEqual(
+            values.get('value_ids')[0],
+            (5,),
+            'Error: If value_ids True\
+            Method: onchange_attribute()'
+        )
 
     def test_19_eval(self):
         self.attr_color.custom_type = 'binary'

From 27d8d69de0ca16bc0b1c75dcb703ed8983fb174b Mon Sep 17 00:00:00 2001
From: Paul <paulcatinean@gmail.com>
Date: Thu, 7 May 2020 14:19:00 +0200
Subject: [PATCH 05/15] Make the config_session store json-serializable /
 string key vs int & search by passed user_id (if any

---
 product_configurator/models/product_config.py    | 16 +++++++++++-----
 website_product_configurator/controllers/main.py |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/product_configurator/models/product_config.py b/product_configurator/models/product_config.py
index c84bcc0e..5d8a00f5 100644
--- a/product_configurator/models/product_config.py
+++ b/product_configurator/models/product_config.py
@@ -911,10 +911,14 @@ def get_variant_vals(self, value_ids=None, custom_vals=None, **kwargs):
 
     @api.multi
     def get_session_search_domain(self, product_tmpl_id, state='draft',
-                                  parent_id=None):
+                                  parent_id=None, user_id=None):
+
+        if not user_id:
+            user_id = self.env.uid
+
         domain = [
             ('product_tmpl_id', '=', product_tmpl_id),
-            ('user_id', '=', self.env.uid),
+            ('user_id', '=', user_id),
             ('state', '=', state),
         ]
         if parent_id:
@@ -1422,10 +1426,11 @@ def search_variant(
         return products
 
     @api.multi
-    def search_session(self, product_tmpl_id, parent_id=None):
+    def search_session(self, product_tmpl_id, parent_id=None, user_id=None):
         domain = self.get_session_search_domain(
             product_tmpl_id=product_tmpl_id,
-            parent_id=parent_id
+            parent_id=parent_id,
+            user_id=user_id
         )
         session = self.search(domain, order='create_date desc', limit=1)
         return session
@@ -1436,7 +1441,8 @@ def create_get_session(self, product_tmpl_id, parent_id=None,
         if not force_create:
             session = self.search_session(
                 product_tmpl_id=product_tmpl_id,
-                parent_id=parent_id
+                parent_id=parent_id,
+                user_id=user_id,
             )
             if session:
                 return session
diff --git a/website_product_configurator/controllers/main.py b/website_product_configurator/controllers/main.py
index 3e90e7fc..9f5e766b 100644
--- a/website_product_configurator/controllers/main.py
+++ b/website_product_configurator/controllers/main.py
@@ -30,7 +30,7 @@ def get_config_session(self, product_tmpl_id):
             {}
         )
         is_public_user = request.env.user.has_group('base.group_public')
-        cfg_session_id = product_config_sessions.get(product_tmpl_id.id)
+        cfg_session_id = product_config_sessions.get(str(product_tmpl_id.id))
         if cfg_session_id:
             cfg_session = cfg_session_obj.browse(int(cfg_session_id))
 
@@ -42,7 +42,7 @@ def get_config_session(self, product_tmpl_id):
                 user_id=request.env.user.id
             )
             product_config_sessions.update({
-                product_tmpl_id.id: cfg_session.id
+                str(product_tmpl_id.id): cfg_session.id
             })
             request.session['product_config_session'] = product_config_sessions
 

From bd73d4a3b08596396a81fe4cff5fd39ea38f3da5 Mon Sep 17 00:00:00 2001
From: Paul <paulcatinean@gmail.com>
Date: Thu, 7 May 2020 14:41:42 +0200
Subject: [PATCH 06/15] Fix missing session update in cfg_session method

---
 website_product_configurator/controllers/main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website_product_configurator/controllers/main.py b/website_product_configurator/controllers/main.py
index 9f5e766b..e34d578e 100644
--- a/website_product_configurator/controllers/main.py
+++ b/website_product_configurator/controllers/main.py
@@ -513,12 +513,12 @@ def cfg_session(self, product_id, **post):
             key=lambda obj: obj.attribute_id.sequence
         )
         pricelist = get_pricelist()
-        product_config_session = request.session.get('product_config_session')
-        if (product_config_session and
-                product_config_session.get(product_tmpl_id.id)):
-
+        product_config_session = request.session.get(
+            'product_config_session', {}
+        )
+        if product_config_session.get(str(product_tmpl_id.id)):
             # Bizzappdev end code
-            del product_config_session[product_tmpl_id.id]
+            del product_config_session[str(product_tmpl_id.id)]
             request.session['product_config_session'] = product_config_session
         values = {
             'product_id': product_id,

From 958dab69a7c1ee001f63afdf03e82f8bf4105c0b Mon Sep 17 00:00:00 2001
From: Paul Catinean <pca@pledra.com>
Date: Thu, 7 May 2020 14:00:47 +0000
Subject: [PATCH 07/15] Removing unused variables

---
 product_configurator/tests/test_product_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/product_configurator/tests/test_product_config.py b/product_configurator/tests/test_product_config.py
index a2e10798..8e4c5047 100644
--- a/product_configurator/tests/test_product_config.py
+++ b/product_configurator/tests/test_product_config.py
@@ -544,7 +544,7 @@ def test_18_onchange_attribute(self):
         })
         self.productConfigDomainId.compute_domain()
         # create attribute value line 1
-        config_line = self.env['product.config.line'].create({
+        self.env['product.config.line'].create({
             'product_tmpl_id': self.product_tmpl_id.id,
             'attribute_line_id': self.attributeLine1.id,
             'value_ids': [(6, 0, [

From 9ea1166215d2e8e62ce2201937c423195e6f00b7 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Sun, 28 Jun 2020 00:24:35 +0530
Subject: [PATCH 08/15] [FIX]hide attribute if no value is available

---
 .../data/config_form_templates.xml                        | 8 ++++----
 website_product_configurator/static/src/js/config_form.js | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/website_product_configurator/data/config_form_templates.xml b/website_product_configurator/data/config_form_templates.xml
index 9b2e5c86..da45e2ad 100644
--- a/website_product_configurator/data/config_form_templates.xml
+++ b/website_product_configurator/data/config_form_templates.xml
@@ -277,8 +277,8 @@
                 <t t-set="custom_field_prefix" t-value="prefixes.get('custom_field_prefix')"/>
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
-                    <t t-set="available_val" t-value="any(val.id in available_value_ids for val in line.value_ids)"/>
-                    <div t-att-class="'attribute_container'">
+                    <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
+                    <div t-att-class="'attribute_container' + ((not available_val) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <select t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                                   t-att-data-oe-id="line.attribute_id.id"
@@ -337,8 +337,8 @@
                 <t t-set="custom_field_prefix" t-value="prefixes.get('custom_field_prefix')"/>
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
-                    <t t-set="available_val" t-value="any(val.id in available_value_ids for val in line.value_ids)"/>
-                    <div t-att-class="'attribute_container'">
+                    <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
+                    <div t-att-class="'attribute_container' + ((not available_val) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <fieldset t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                             t-att-data-oe-id="line.attribute_id.id"
diff --git a/website_product_configurator/static/src/js/config_form.js b/website_product_configurator/static/src/js/config_form.js
index a72bb106..8a96dfdc 100644
--- a/website_product_configurator/static/src/js/config_form.js
+++ b/website_product_configurator/static/src/js/config_form.js
@@ -181,6 +181,14 @@ odoo.define('website_product_configurator.config_form', function (require) {
                 ) {
                     $selection.addClass('required_config_attrib');
                 }
+
+                var attr_box = $selection.closest('.attribute_container');
+                if (!domain[0][2].length && !attr_box.hasClass('d-none')) {
+                    attr_box.addClass('d-none');
+                    $selection.removeClass('textbox-border-color');
+                } else if (domain[0][2].length && attr_box.hasClass('d-none')) {
+                    attr_box.removeClass('d-none');
+                }
             });
         },
 

From 46cda27d34fb542c3f93638bc55b2bc823ae6359 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Mon, 29 Jun 2020 22:08:51 +0530
Subject: [PATCH 09/15] [FIX]add field invisible to hide attribute when boolean
 ticked and no value is available

---
 website_product_configurator/__manifest__.py  |  1 +
 .../data/config_form_templates.xml            | 10 ++++---
 .../models/__init__.py                        |  1 +
 .../models/product_attribute.py               | 29 +++++++++++++++++++
 .../static/src/js/config_form.js              |  2 +-
 .../views/product_attribute_view.xml          | 15 ++++++++++
 .../views/product_view.xml                    |  3 ++
 7 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 website_product_configurator/models/product_attribute.py
 create mode 100644 website_product_configurator/views/product_attribute_view.xml

diff --git a/website_product_configurator/__manifest__.py b/website_product_configurator/__manifest__.py
index afc02239..7d364b6a 100644
--- a/website_product_configurator/__manifest__.py
+++ b/website_product_configurator/__manifest__.py
@@ -15,6 +15,7 @@
         'data/config_form_templates.xml',
         'data/cron.xml',
         'views/assets.xml',
+        "views/product_attribute_view.xml",
         'views/product_view.xml',
         'views/templates.xml',
         'views/res_config_settings_view.xml',
diff --git a/website_product_configurator/data/config_form_templates.xml b/website_product_configurator/data/config_form_templates.xml
index da45e2ad..e8d05705 100644
--- a/website_product_configurator/data/config_form_templates.xml
+++ b/website_product_configurator/data/config_form_templates.xml
@@ -278,7 +278,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
                     <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
-                    <div t-att-class="'attribute_container' + ((not available_val) and ' d-none' or '')">
+                    <div t-att-class="'attribute_container' + ((not available_val and line.invisible) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <select t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                                   t-att-data-oe-id="line.attribute_id.id"
@@ -286,7 +286,8 @@
                                   t-att-multiple="'multiple' if line.multi else None"
                                   t-att-name="'%s%s' % (field_prefix, line.attribute_id.id)"
                                   t-att-class="'form-control config_attribute' + (' required_config_attrib' if (not available_val and line.required and line.custom) or (available_val and line.required) else '') + (' d-none' if not line.value_ids else '')"
-                                  t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''">
+                                  t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''"
+                                  t-att-data-attr-invisible="line.invisible">
 
                                   <!-- t-att-disabled="'disabled' if not available_val_ids and not line.custom else None" -->
                             <option name=""/>
@@ -338,7 +339,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
                     <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
-                    <div t-att-class="'attribute_container' + ((not available_val) and ' d-none' or '')">
+                    <div t-att-class="'attribute_container' + ((not available_val and line.invisible) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <fieldset t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                             t-att-data-oe-id="line.attribute_id.id"
@@ -346,7 +347,8 @@
                             t-att-name="'%s%s' % (field_prefix, line.attribute_id.id)"
                             t-att-class="'form-control config_attribute' + (' required_config_attrib' if (not available_val and line.required and line.custom) or (available_val and line.required) else '') + (' d-none' if not line.value_ids else '')"
                             style="height: unset;"
-                            t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''">
+                            t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''"
+                            t-att-data-attr-invisible="line.invisible">
                             <t t-foreach="line.value_ids" t-as="value">
                                 <div class="radio-card-container">
                                     <div class="info_config_attr_value_radio">
diff --git a/website_product_configurator/models/__init__.py b/website_product_configurator/models/__init__.py
index 09c4b485..d3cae557 100644
--- a/website_product_configurator/models/__init__.py
+++ b/website_product_configurator/models/__init__.py
@@ -2,3 +2,4 @@
 from . import res_config_settings
 from . import sale_order
 from . import product_template
+from . import product_attribute
diff --git a/website_product_configurator/models/product_attribute.py b/website_product_configurator/models/product_attribute.py
new file mode 100644
index 00000000..3ae63ea3
--- /dev/null
+++ b/website_product_configurator/models/product_attribute.py
@@ -0,0 +1,29 @@
+from odoo import api, fields, models
+
+
+class ProductAttribute(models.Model):
+    _inherit = 'product.attribute'
+
+    invisible = fields.Boolean(
+        string="Invisible",
+        help="Set in order to make attribute invisible, "
+        "when there is no available attribute values, in the configuration "
+        "interface"
+    )
+
+
+class ProductAttributeLine(models.Model):
+    _inherit = "product.template.attribute.line"
+
+    invisible = fields.Boolean(
+        string="Invisible",
+        help="Set in order to make attribute invisible, "
+        "when there is no available attribute values, in the configuration "
+        "interface"
+    )
+
+    @api.onchange("attribute_id")
+    def onchange_attribute(self):
+        res = super(ProductAttributeLine, self).onchange_attribute()
+        self.invisible = self.attribute_id.invisible
+        return res
diff --git a/website_product_configurator/static/src/js/config_form.js b/website_product_configurator/static/src/js/config_form.js
index 8a96dfdc..f0c39cc6 100644
--- a/website_product_configurator/static/src/js/config_form.js
+++ b/website_product_configurator/static/src/js/config_form.js
@@ -183,7 +183,7 @@ odoo.define('website_product_configurator.config_form', function (require) {
                 }
 
                 var attr_box = $selection.closest('.attribute_container');
-                if (!domain[0][2].length && !attr_box.hasClass('d-none')) {
+                if (!domain[0][2].length && $selection.attr('data-attr-invisible') && !attr_box.hasClass('d-none')) {
                     attr_box.addClass('d-none');
                     $selection.removeClass('textbox-border-color');
                 } else if (domain[0][2].length && attr_box.hasClass('d-none')) {
diff --git a/website_product_configurator/views/product_attribute_view.xml b/website_product_configurator/views/product_attribute_view.xml
new file mode 100644
index 00000000..1c76368c
--- /dev/null
+++ b/website_product_configurator/views/product_attribute_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="product_attribute_form_view_configurator">
+        <field name="name">product.attribute.form.view.configurator</field>
+        <field name="model">product.attribute</field>
+        <field name="inherit_id" ref="product_configurator.product_attribute_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='required']" position="before">
+                <field name="invisible"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/website_product_configurator/views/product_view.xml b/website_product_configurator/views/product_view.xml
index 368d1757..83311cc6 100644
--- a/website_product_configurator/views/product_view.xml
+++ b/website_product_configurator/views/product_view.xml
@@ -10,6 +10,9 @@
             <xpath expr="//notebook/page[@name='configurator']//field[@name='config_step_line_ids']//tree//field[@name='attribute_line_ids']" position="after">
                 <field name="website_tmpl_id"/>
             </xpath>
+            <xpath expr="//field[@name='attribute_line_ids']//tree//field[@name='required']" position="before">
+                <field name="invisible" invisible="not context.get('default_config_ok', False)"/>
+            </xpath>
         </field>
     </record>
 

From ae8e9bb92c9dbfa00df7ea79ea5ed7074140f9fd Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Mon, 29 Jun 2020 22:21:29 +0530
Subject: [PATCH 10/15] [FIX]change attribute name

---
 .../data/config_form_templates.xml                        | 8 ++++----
 website_product_configurator/models/product_attribute.py  | 6 +++---
 website_product_configurator/static/src/js/config_form.js | 2 +-
 .../views/product_attribute_view.xml                      | 2 +-
 website_product_configurator/views/product_view.xml       | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website_product_configurator/data/config_form_templates.xml b/website_product_configurator/data/config_form_templates.xml
index e8d05705..e4c48c5c 100644
--- a/website_product_configurator/data/config_form_templates.xml
+++ b/website_product_configurator/data/config_form_templates.xml
@@ -278,7 +278,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
                     <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
-                    <div t-att-class="'attribute_container' + ((not available_val and line.invisible) and ' d-none' or '')">
+                    <div t-att-class="'attribute_container' + ((not available_val and line.hide) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <select t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                                   t-att-data-oe-id="line.attribute_id.id"
@@ -287,7 +287,7 @@
                                   t-att-name="'%s%s' % (field_prefix, line.attribute_id.id)"
                                   t-att-class="'form-control config_attribute' + (' required_config_attrib' if (not available_val and line.required and line.custom) or (available_val and line.required) else '') + (' d-none' if not line.value_ids else '')"
                                   t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''"
-                                  t-att-data-attr-invisible="line.invisible">
+                                  t-att-data-attr-hide="line.hide">
 
                                   <!-- t-att-disabled="'disabled' if not available_val_ids and not line.custom else None" -->
                             <option name=""/>
@@ -339,7 +339,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t t-set="custom_value" t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"/>
                     <t t-set="available_val" t-value="any(val in available_value_ids for val in (line.value_ids.ids + (line.custom and [custom_val_id.id] or [])))"/>
-                    <div t-att-class="'attribute_container' + ((not available_val and line.invisible) and ' d-none' or '')">
+                    <div t-att-class="'attribute_container' + ((not available_val and line.hide) and ' d-none' or '')">
                         <label class="control-label" t-esc="line.attribute_id.name" t-att-data-oe-id="line.attribute_id.id"></label>
                         <fieldset t-att-id="'%s%s' % (field_prefix, line.attribute_id.id)"
                             t-att-data-oe-id="line.attribute_id.id"
@@ -348,7 +348,7 @@
                             t-att-class="'form-control config_attribute' + (' required_config_attrib' if (not available_val and line.required and line.custom) or (available_val and line.required) else '') + (' d-none' if not line.value_ids else '')"
                             style="height: unset;"
                             t-att-data-old-val-id="(value_ids &amp; line.value_ids) and (value_ids &amp; line.value_ids).ids[0] or ''"
-                            t-att-data-attr-invisible="line.invisible">
+                            t-att-data-attr-hide="line.hide">
                             <t t-foreach="line.value_ids" t-as="value">
                                 <div class="radio-card-container">
                                     <div class="info_config_attr_value_radio">
diff --git a/website_product_configurator/models/product_attribute.py b/website_product_configurator/models/product_attribute.py
index 3ae63ea3..170c86aa 100644
--- a/website_product_configurator/models/product_attribute.py
+++ b/website_product_configurator/models/product_attribute.py
@@ -4,7 +4,7 @@
 class ProductAttribute(models.Model):
     _inherit = 'product.attribute'
 
-    invisible = fields.Boolean(
+    hide = fields.Boolean(
         string="Invisible",
         help="Set in order to make attribute invisible, "
         "when there is no available attribute values, in the configuration "
@@ -15,7 +15,7 @@ class ProductAttribute(models.Model):
 class ProductAttributeLine(models.Model):
     _inherit = "product.template.attribute.line"
 
-    invisible = fields.Boolean(
+    hide = fields.Boolean(
         string="Invisible",
         help="Set in order to make attribute invisible, "
         "when there is no available attribute values, in the configuration "
@@ -25,5 +25,5 @@ class ProductAttributeLine(models.Model):
     @api.onchange("attribute_id")
     def onchange_attribute(self):
         res = super(ProductAttributeLine, self).onchange_attribute()
-        self.invisible = self.attribute_id.invisible
+        self.hide = self.attribute_id.hide
         return res
diff --git a/website_product_configurator/static/src/js/config_form.js b/website_product_configurator/static/src/js/config_form.js
index f0c39cc6..b85ffcae 100644
--- a/website_product_configurator/static/src/js/config_form.js
+++ b/website_product_configurator/static/src/js/config_form.js
@@ -183,7 +183,7 @@ odoo.define('website_product_configurator.config_form', function (require) {
                 }
 
                 var attr_box = $selection.closest('.attribute_container');
-                if (!domain[0][2].length && $selection.attr('data-attr-invisible') && !attr_box.hasClass('d-none')) {
+                if (!domain[0][2].length && $selection.attr('data-attr-hide') && !attr_box.hasClass('d-none')) {
                     attr_box.addClass('d-none');
                     $selection.removeClass('textbox-border-color');
                 } else if (domain[0][2].length && attr_box.hasClass('d-none')) {
diff --git a/website_product_configurator/views/product_attribute_view.xml b/website_product_configurator/views/product_attribute_view.xml
index 1c76368c..bb6ae6c0 100644
--- a/website_product_configurator/views/product_attribute_view.xml
+++ b/website_product_configurator/views/product_attribute_view.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="product_configurator.product_attribute_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='required']" position="before">
-                <field name="invisible"/>
+                <field name="hide"/>
             </xpath>
         </field>
     </record>
diff --git a/website_product_configurator/views/product_view.xml b/website_product_configurator/views/product_view.xml
index 83311cc6..a0a6e75d 100644
--- a/website_product_configurator/views/product_view.xml
+++ b/website_product_configurator/views/product_view.xml
@@ -11,7 +11,7 @@
                 <field name="website_tmpl_id"/>
             </xpath>
             <xpath expr="//field[@name='attribute_line_ids']//tree//field[@name='required']" position="before">
-                <field name="invisible" invisible="not context.get('default_config_ok', False)"/>
+                <field name="hide" invisible="not context.get('default_config_ok', False)"/>
             </xpath>
         </field>
     </record>

From 1540d9b3e51e860d35d7496792b2d7a577dd9887 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Tue, 30 Jun 2020 20:44:19 +0530
Subject: [PATCH 11/15] [FIX]hide not availble attributes in backend wizard

---
 .../models/product_attribute.py               | 13 +++++++++
 .../views/product_attribute_view.xml          |  1 +
 product_configurator/views/product_view.xml   |  1 +
 .../wizard/product_configurator.py            |  4 +++
 website_product_configurator/__manifest__.py  |  1 -
 .../models/__init__.py                        |  1 -
 .../models/product_attribute.py               | 29 -------------------
 .../views/product_attribute_view.xml          | 15 ----------
 .../views/product_view.xml                    |  3 --
 9 files changed, 19 insertions(+), 49 deletions(-)
 delete mode 100644 website_product_configurator/models/product_attribute.py
 delete mode 100644 website_product_configurator/views/product_attribute_view.xml

diff --git a/product_configurator/models/product_attribute.py b/product_configurator/models/product_attribute.py
index 0ae7eb30..6fd8c22d 100644
--- a/product_configurator/models/product_attribute.py
+++ b/product_configurator/models/product_attribute.py
@@ -95,6 +95,12 @@ def onchange_val_custom_field(self):
         string='Unit of Measure'
     )
     image = fields.Binary(string='Image')
+    hide = fields.Boolean(
+        string="Invisible",
+        help="Set in order to make attribute invisible, "
+        "when there is no available attribute values, in the configuration "
+        "interface"
+    )
 
     # TODO prevent the same attribute from being defined twice on the
     # attribute lines
@@ -159,6 +165,7 @@ def onchange_attribute(self):
         self.required = self.attribute_id.required
         self.multi = self.attribute_id.multi
         self.custom = self.attribute_id.val_custom
+        self.hide = self.attribute_id.hide
         # TODO: Remove all dependencies pointed towards the attribute being
         # changed
 
@@ -189,6 +196,12 @@ def onchange_values(self):
         comodel_name='product.template.attribute.value',
         search="_search_product_template_value_ids"
     )
+    hide = fields.Boolean(
+        string="Invisible",
+        help="Set in order to make attribute invisible, "
+        "when there is no available attribute values, in the configuration "
+        "interface"
+    )
     # TODO: Constraint not allowing introducing dependencies that do not exist
     # on the product.template
 
diff --git a/product_configurator/views/product_attribute_view.xml b/product_configurator/views/product_attribute_view.xml
index 607a176a..e4d66f37 100644
--- a/product_configurator/views/product_attribute_view.xml
+++ b/product_configurator/views/product_attribute_view.xml
@@ -66,6 +66,7 @@
                         <group>
                             <group>
                                 <!--<field name="type"/> -->
+                                <field name="hide"/>
                                 <field name="required"/>
                                 <field name="multi" attrs="{'readonly': [('val_custom','=',True)]}" force_save="1"/>
                                 <field name="val_custom" attrs="{'readonly': [('multi', '=', True)]}" force_save="1"/>
diff --git a/product_configurator/views/product_view.xml b/product_configurator/views/product_view.xml
index d65eb237..3f0ed432 100644
--- a/product_configurator/views/product_view.xml
+++ b/product_configurator/views/product_view.xml
@@ -63,6 +63,7 @@
                     context="{'show_attribute': False}"
                     options="{'no_create': True, 'no_create_edit': True}"
                     invisible="not context.get('default_config_ok', False)"/>
+                <field name="hide" invisible="not context.get('default_config_ok', False)"/>
                 <field name="required" invisible="not context.get('default_config_ok', False)"/>
                 <field name="multi" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('custom','=',True)]}" force_save="1"/>
                 <field name="custom" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('multi','=',True)]}" force_save="1"/>
diff --git a/product_configurator/wizard/product_configurator.py b/product_configurator/wizard/product_configurator.py
index 3fbd5aa7..169ec1fa 100644
--- a/product_configurator/wizard/product_configurator.py
+++ b/product_configurator/wizard/product_configurator.py
@@ -657,6 +657,10 @@ def add_dynamic_fields(self, res, dynamic_fields, wiz):
                         attrs['readonly'].append(
                             (dependee_field, 'not in', list(val_ids)))
 
+                    if not attr_line.custom and attr_line.hide:
+                        attrs['invisible'].append(
+                            (dependee_field, 'not in', list(val_ids)))
+
                     if attr_line.required and not attr_line.custom:
                         attrs['required'].append(
                             (dependee_field, 'in', list(val_ids)))
diff --git a/website_product_configurator/__manifest__.py b/website_product_configurator/__manifest__.py
index 7d364b6a..afc02239 100644
--- a/website_product_configurator/__manifest__.py
+++ b/website_product_configurator/__manifest__.py
@@ -15,7 +15,6 @@
         'data/config_form_templates.xml',
         'data/cron.xml',
         'views/assets.xml',
-        "views/product_attribute_view.xml",
         'views/product_view.xml',
         'views/templates.xml',
         'views/res_config_settings_view.xml',
diff --git a/website_product_configurator/models/__init__.py b/website_product_configurator/models/__init__.py
index d3cae557..09c4b485 100644
--- a/website_product_configurator/models/__init__.py
+++ b/website_product_configurator/models/__init__.py
@@ -2,4 +2,3 @@
 from . import res_config_settings
 from . import sale_order
 from . import product_template
-from . import product_attribute
diff --git a/website_product_configurator/models/product_attribute.py b/website_product_configurator/models/product_attribute.py
deleted file mode 100644
index 170c86aa..00000000
--- a/website_product_configurator/models/product_attribute.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from odoo import api, fields, models
-
-
-class ProductAttribute(models.Model):
-    _inherit = 'product.attribute'
-
-    hide = fields.Boolean(
-        string="Invisible",
-        help="Set in order to make attribute invisible, "
-        "when there is no available attribute values, in the configuration "
-        "interface"
-    )
-
-
-class ProductAttributeLine(models.Model):
-    _inherit = "product.template.attribute.line"
-
-    hide = fields.Boolean(
-        string="Invisible",
-        help="Set in order to make attribute invisible, "
-        "when there is no available attribute values, in the configuration "
-        "interface"
-    )
-
-    @api.onchange("attribute_id")
-    def onchange_attribute(self):
-        res = super(ProductAttributeLine, self).onchange_attribute()
-        self.hide = self.attribute_id.hide
-        return res
diff --git a/website_product_configurator/views/product_attribute_view.xml b/website_product_configurator/views/product_attribute_view.xml
deleted file mode 100644
index bb6ae6c0..00000000
--- a/website_product_configurator/views/product_attribute_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record model="ir.ui.view" id="product_attribute_form_view_configurator">
-        <field name="name">product.attribute.form.view.configurator</field>
-        <field name="model">product.attribute</field>
-        <field name="inherit_id" ref="product_configurator.product_attribute_form_view"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='required']" position="before">
-                <field name="hide"/>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>
diff --git a/website_product_configurator/views/product_view.xml b/website_product_configurator/views/product_view.xml
index a0a6e75d..368d1757 100644
--- a/website_product_configurator/views/product_view.xml
+++ b/website_product_configurator/views/product_view.xml
@@ -10,9 +10,6 @@
             <xpath expr="//notebook/page[@name='configurator']//field[@name='config_step_line_ids']//tree//field[@name='attribute_line_ids']" position="after">
                 <field name="website_tmpl_id"/>
             </xpath>
-            <xpath expr="//field[@name='attribute_line_ids']//tree//field[@name='required']" position="before">
-                <field name="hide" invisible="not context.get('default_config_ok', False)"/>
-            </xpath>
         </field>
     </record>
 

From 64eeb698d9325fe21f321b5caa23cef0e8e2c7e0 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Wed, 15 Jul 2020 13:51:18 +0530
Subject: [PATCH 12/15] [FIX]add fields quantity in product attribute

---
 product_configurator/models/product_attribute.py   | 14 +++++++++++++-
 .../views/product_attribute_view.xml               |  2 ++
 product_configurator/views/product_view.xml        |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/product_configurator/models/product_attribute.py b/product_configurator/models/product_attribute.py
index 6fd8c22d..23f1c4e7 100644
--- a/product_configurator/models/product_attribute.py
+++ b/product_configurator/models/product_attribute.py
@@ -36,6 +36,7 @@ def onchange_custom_type(self):
     def onchange_val_custom_field(self):
         if not self.val_custom:
             self.custom_type = False
+            self.quantity = False
 
     CUSTOM_TYPES = [
         ('char', 'Char'),
@@ -101,7 +102,10 @@ def onchange_val_custom_field(self):
         "when there is no available attribute values, in the configuration "
         "interface"
     )
-
+    quantity = fields.Boolean(string="Quantity")
+    attr_product_id = fields.Many2one(
+        comodel_name="product.product", string="Product"
+    )
     # TODO prevent the same attribute from being defined twice on the
     # attribute lines
 
@@ -166,6 +170,8 @@ def onchange_attribute(self):
         self.multi = self.attribute_id.multi
         self.custom = self.attribute_id.val_custom
         self.hide = self.attribute_id.hide
+        self.quantity = self.attribute_id.quantity
+        self.attr_product_id = self.attribute_id.attr_product_id
         # TODO: Remove all dependencies pointed towards the attribute being
         # changed
 
@@ -202,9 +208,15 @@ def onchange_values(self):
         "when there is no available attribute values, in the configuration "
         "interface"
     )
+    quantity = fields.Boolean(string="Quantity")
     # TODO: Constraint not allowing introducing dependencies that do not exist
     # on the product.template
 
+    @api.onchange('custom')
+    def onchange_custom_field(self):
+        if not self.custom:
+            self.quantity = False
+
     def _search_product_template_value_ids(self, operator, value):
         return [('id', operator, value)]
 
diff --git a/product_configurator/views/product_attribute_view.xml b/product_configurator/views/product_attribute_view.xml
index e4d66f37..a022bcc8 100644
--- a/product_configurator/views/product_attribute_view.xml
+++ b/product_configurator/views/product_attribute_view.xml
@@ -70,9 +70,11 @@
                                 <field name="required"/>
                                 <field name="multi" attrs="{'readonly': [('val_custom','=',True)]}" force_save="1"/>
                                 <field name="val_custom" attrs="{'readonly': [('multi', '=', True)]}" force_save="1"/>
+                                <field name="quantity" attrs="{'invisible': [('val_custom', '=', False)], 'required': [('val_custom', '!=', False)]}"/>
                             </group>
                             <group>
                                 <field name="uom_id"/>
+                                <field name="attr_product_id" attrs="{'invisible': [('quantity', '=', False)]}"/>
                             </group>
                             <field name="description" colspan="4"/>
                         </group>
diff --git a/product_configurator/views/product_view.xml b/product_configurator/views/product_view.xml
index 3f0ed432..a6c46562 100644
--- a/product_configurator/views/product_view.xml
+++ b/product_configurator/views/product_view.xml
@@ -67,6 +67,7 @@
                 <field name="required" invisible="not context.get('default_config_ok', False)"/>
                 <field name="multi" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('custom','=',True)]}" force_save="1"/>
                 <field name="custom" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('multi','=',True)]}" force_save="1"/>
+                <field name="quantity" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('custom','!=',True)]}" force_save="1"/>
             </xpath>
 
             <xpath expr="//field[@name='attribute_line_ids']/tree/field[@name='value_ids']" position="attributes">

From b4c494bffce8058a44b6d7abf53f24613e4af412 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Sun, 19 Jul 2020 02:02:56 +0530
Subject: [PATCH 13/15] [FIX]is quantity ticked and product is there on
 attribute then add in price custom-val * attribute-product-price

---
 .../models/product_attribute.py               |  7 +++++++
 product_configurator/models/product_config.py | 21 +++++++++++++++++--
 .../views/product_attribute_view.xml          |  2 +-
 product_configurator/views/product_view.xml   |  1 -
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/product_configurator/models/product_attribute.py b/product_configurator/models/product_attribute.py
index 23f1c4e7..b9511afb 100644
--- a/product_configurator/models/product_attribute.py
+++ b/product_configurator/models/product_attribute.py
@@ -38,6 +38,11 @@ def onchange_val_custom_field(self):
             self.custom_type = False
             self.quantity = False
 
+    @api.onchange('quantity')
+    def onchange_quantity(self):
+        if self.quantity:
+            self.custom_type = "int"
+
     CUSTOM_TYPES = [
         ('char', 'Char'),
         ('int', 'Integer'),
@@ -216,6 +221,8 @@ def onchange_values(self):
     def onchange_custom_field(self):
         if not self.custom:
             self.quantity = False
+        else:
+            self.quantity = self.attribute_id.quantity
 
     def _search_product_template_value_ids(self, operator, value):
         return [('id', operator, value)]
diff --git a/product_configurator/models/product_config.py b/product_configurator/models/product_config.py
index 5d8a00f5..9e4acbfb 100644
--- a/product_configurator/models/product_config.py
+++ b/product_configurator/models/product_config.py
@@ -819,7 +819,7 @@ def get_cfg_price(self, value_ids=None, custom_vals=None):
             value_ids = self.value_ids.ids
 
         if custom_vals is None:
-            custom_vals = {}
+            custom_vals = self._get_custom_vals_dict()
 
         product_tmpl = self.product_tmpl_id
         self = self.with_context({'active_id': product_tmpl.id})
@@ -834,7 +834,24 @@ def get_cfg_price(self, value_ids=None, custom_vals=None):
             pt_attr_value_ids=av_ids,
         )
         price_extra = sum(extra_prices.values())
-        return product_tmpl.list_price + price_extra
+
+        pricelist = self.env.context.get("pricelist")
+        if pricelist:
+            pricelist = self.env["product.pricelist"].browse(pricelist)
+        else:
+            pricelist = self.env.user.partner_id.property_product_pricelist
+        custom_vals_price = 0
+        print("custom_vals ", custom_vals)
+        for attribute, custom_val in custom_vals.items():
+            attribute_id = self.env["product.attribute"].browse(attribute)
+            if attribute_id.quantity and attribute_id.attr_product_id:
+                custom_vals_price += (
+                    attribute_id.attr_product_id.with_context(
+                        pricelist=pricelist.id
+                    ).price * custom_val
+                )
+
+        return product_tmpl.list_price + price_extra + custom_vals_price
 
     def _get_config_image(
             self, value_ids=None, custom_vals=None, size=None):
diff --git a/product_configurator/views/product_attribute_view.xml b/product_configurator/views/product_attribute_view.xml
index a022bcc8..e61e4991 100644
--- a/product_configurator/views/product_attribute_view.xml
+++ b/product_configurator/views/product_attribute_view.xml
@@ -82,7 +82,7 @@
                     <page string="Custom Values" attrs="{'invisible': [('val_custom', '!=', True)]}" groups="product_configurator.group_product_configurator_manager">
                         <group>
                             <group>
-                                <field name="custom_type"/>
+                                <field name="custom_type" attrs="{'readonly': [('quantity', '=', True)]}" force_save="1"/>
                                 <field name="min_val" attrs="{'invisible': [('custom_type','not in',['int','float'])]}"/>
                                 <field name="max_val" attrs="{'invisible': [('custom_type','not in',['int','float'])]}"/>
                             </group>
diff --git a/product_configurator/views/product_view.xml b/product_configurator/views/product_view.xml
index a6c46562..3f0ed432 100644
--- a/product_configurator/views/product_view.xml
+++ b/product_configurator/views/product_view.xml
@@ -67,7 +67,6 @@
                 <field name="required" invisible="not context.get('default_config_ok', False)"/>
                 <field name="multi" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('custom','=',True)]}" force_save="1"/>
                 <field name="custom" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('multi','=',True)]}" force_save="1"/>
-                <field name="quantity" invisible="not context.get('default_config_ok', False)" attrs="{'readonly': [('custom','!=',True)]}" force_save="1"/>
             </xpath>
 
             <xpath expr="//field[@name='attribute_line_ids']/tree/field[@name='value_ids']" position="attributes">

From 54fa86be8bd181c1474fb0cea82dcbc9fa77f053 Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Sun, 19 Jul 2020 02:05:50 +0530
Subject: [PATCH 14/15] [FIX]update attr_product on change of quantity

---
 product_configurator/models/product_attribute.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/product_configurator/models/product_attribute.py b/product_configurator/models/product_attribute.py
index b9511afb..b9a75069 100644
--- a/product_configurator/models/product_attribute.py
+++ b/product_configurator/models/product_attribute.py
@@ -221,8 +221,10 @@ def onchange_values(self):
     def onchange_custom_field(self):
         if not self.custom:
             self.quantity = False
+            self.attr_product_id = False
         else:
             self.quantity = self.attribute_id.quantity
+            self.attr_product_id = self.attribute_id.attr_product_id
 
     def _search_product_template_value_ids(self, operator, value):
         return [('id', operator, value)]

From cc08f6c4b8232c775763b14e3511c5007870471e Mon Sep 17 00:00:00 2001
From: Shruti Singh <shruti.singh@bizzappdev.com>
Date: Mon, 20 Jul 2020 15:16:09 +0530
Subject: [PATCH 15/15] [FIX]removed print

---
 product_configurator/models/product_config.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/product_configurator/models/product_config.py b/product_configurator/models/product_config.py
index 9e4acbfb..99bae6fe 100644
--- a/product_configurator/models/product_config.py
+++ b/product_configurator/models/product_config.py
@@ -841,7 +841,6 @@ def get_cfg_price(self, value_ids=None, custom_vals=None):
         else:
             pricelist = self.env.user.partner_id.property_product_pricelist
         custom_vals_price = 0
-        print("custom_vals ", custom_vals)
         for attribute, custom_val in custom_vals.items():
             attribute_id = self.env["product.attribute"].browse(attribute)
             if attribute_id.quantity and attribute_id.attr_product_id: