fix product attribute name

2 files changed, 16 insertions, 9 deletions

diff --git a/indoteknik_custom/models/product_attribute.py b/indoteknik_custom/models/product_attribute.py
index 784ccd81..e3076805 100644
--- a/indoteknik_custom/models/product_attribute.py
+++ b/indoteknik_custom/models/product_attribute.py
@@ -5,11 +5,16 @@ import re
 class ProductAttributeValue(models.Model):
     _inherit = 'product.attribute.value'
 
+   
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
+
+
+
         
\ No newline at end of file
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index cf3df153..2ce2c185 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -104,11 +104,12 @@ class ProductTemplate(models.Model):
     
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%-]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%-]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, strip, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
     
     # def write(self, vals):
     #     if 'solr_flag' not in vals and self.solr_flag == 1:
@@ -374,11 +375,12 @@ class ProductProduct(models.Model):
     
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%-]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%-]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, strip, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
     
     def _get_qty_incoming_bandengan(self):
         for product in self: