Merge branch '12.0-T3118-fix-float-validation-input-support-comma-bizz-chp' into '12.0'

12.0 t3118 fix float validation input support comma bizz chp

See merge request pledra/odoo-product-configurator!80

Author: Paul Catinean

website_product_configurator/controllers/main.py

@@ -270,9 +270,12 @@ def get_orm_form_vals(self, form_vals, config_session):
             custom_field_value = values.get(custom_field, False)
 
             if attr_line.custom and custom_field_value:
+                lang = request.env['ir.qweb.field'].user_lang()
                 custom_field_value = custom_field_value[0]
                 if attr_line.attribute_id.custom_type in ['int', 'float']:
-                    custom_field_value = safe_eval(custom_field_value)
+                    custom_field_value = safe_eval(
+                        custom_field_value.replace(lang.decimal_point, '.')
+                    )
 
             if attr_line.multi:
                 field_value = [[6, False, field_value]]

website_product_configurator/data/config_form_templates.xml

@@ -207,7 +207,7 @@
                     t-att-data-type="custom_type"
                     t-att-name="'%s%s' % (custom_field_prefix, line.attribute_id.id)"
                     t-att-class="'form-control custom_config_value spinner_qty' + (' required_config_attrib' if (custom_value or not line.value_ids) and line.required else '')"
-                    t-att-value="custom_value and custom_value.value or line.attribute_id.min_val or '0'"/>
+                    t-att-value="custom_value and product_tmpl.get_float_custom_val(custom_value.value) or line.attribute_id.min_val or '0'"/>
                 <div class="input-group-append">
                     <a t-attf-href="#" aria-label="Add one" title="Add one"
                         t-att-class="'btn btn-link float_left d-md-inline-block js_add_qty'  + (' btn-disabled' if custom_val and line.attribute_id.max_val and custom_val &gt;= line.attribute_id.max_val else '')">

website_product_configurator/models/__init__.py

@@ -1,3 +1,4 @@
 from . import product_config
 from . import res_config_settings
 from . import sale_order
+from . import product_template

website_product_configurator/models/product_template.py

@@ -0,0 +1,12 @@
+from odoo import api, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    @api.model
+    def get_float_custom_val(self, custom_value):
+        lang = self.env['ir.qweb.field'].user_lang()
+        if not custom_value:
+            return False
+        return custom_value.replace('.', lang.decimal_point)

website_product_configurator/static/src/js/config_form.js

@@ -105,7 +105,6 @@ odoo.define('website_product_configurator.config_form', function (require) {
                         } else {
                             var values = data.value;
                             var domains = data.domain;
-
                             var open_cfg_step_line_ids = data.open_cfg_step_line_ids;
                             var config_image_vals = data.config_image_vals;
 
@@ -483,6 +482,17 @@ odoo.define('website_product_configurator.config_form', function (require) {
             this._checkRequiredFields(custom_value);
         },
 
+        convert_to_float: function (value) {
+            var l10n = _t.database.parameters;
+            return value.split(l10n.decimal_point).join('.')
+        },
+
+        convert_to_str: function (value) {
+            value = value.toString()
+            var l10n = _t.database.parameters;
+            return value.split('.').join(l10n.decimal_point)
+        },
+
         _handleSppinerCustomValue: function (ev) {
             var self = this;
             ev.preventDefault();
@@ -493,7 +503,8 @@ odoo.define('website_product_configurator.config_form', function (require) {
             var max_val = parseFloat(custom_value.attr('max') || Infinity);
             var min_val = parseFloat(custom_value.attr('min') || 0);
             var new_qty = min_val;
-            var ui_val = parseFloat(custom_value.val());
+            var value = self.convert_to_float(custom_value.val())
+            var ui_val = parseFloat(value);
             var custom_type = custom_value.attr('data-type');
             if (isNaN(ui_val)) {
                 var message = "Please enter a number.";
@@ -522,6 +533,7 @@ odoo.define('website_product_configurator.config_form', function (require) {
                     new_qty = min_val;
                 }
             }
+            new_qty = self.convert_to_str(new_qty)
             custom_value.val(new_qty);
             self._disableEnableAddRemoveQtyButton(current_target, new_qty ,max_val ,min_val)
             return custom_value;