[FIX]merge 12.0 into 12.0-attribute-value-quantity-bizz-shs

Author: bizzappdev

product_configurator/models/product_attribute.py

@@ -105,6 +105,13 @@ def onchange_quantity(self):
     attr_product_id = fields.Many2one(
         comodel_name="product.product", string="Product"
     )
+    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
 
@@ -170,6 +177,7 @@ def onchange_attribute(self):
         self.custom = self.attribute_id.val_custom
         self.quantity = self.attribute_id.quantity
         self.attr_product_id = self.attribute_id.attr_product_id
+        self.hide = self.attribute_id.hide
         # TODO: Remove all dependencies pointed towards the attribute being
         # changed
 
@@ -201,6 +209,12 @@ def onchange_values(self):
         search="_search_product_template_value_ids"
     )
     quantity = fields.Boolean(string="Quantity")
+    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
 

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"/>

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"/>

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)))

website_product_configurator/data/config_form_templates.xml

@@ -277,16 +277,17 @@
                 <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 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"
                                   t-att-data-attr-required="line.required"
                                   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-hide="line.hide">
 
                                   <!-- t-att-disabled="'disabled' if not available_val_ids and not line.custom else None" -->
                             <option name=""/>
@@ -337,16 +338,17 @@
                 <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 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"
                             t-att-data-attr-required="line.required"
                             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-hide="line.hide">
                             <t t-foreach="line.value_ids" t-as="value">
                                 <div class="radio-card-container">
                                     <div class="info_config_attr_value_radio">

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 && $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')) {
+                    attr_box.removeClass('d-none');
+                }
             });
         },