12968: fix product import update

chahmedejaz · Nov 25, 2024 · 3a3d729 · 3a3d729
1 parent 2837061
commit 3a3d729
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/models/product_import/entry_validator.rb b/app/models/product_import/entry_validator.rb
@@ -161,7 +161,7 @@ def primary_producer_error(entry)
     end
 
     def unit_fields_validation(entry)
-      unit_types = ['g', 'oz', 'lb', 'kg', 't', 'ml', 'l', 'kl', '']
+      unit_types = ['mg', 'g', 'kg', 'oz', 'lb', 't', 'ml', 'cl', 'dl', 'l', 'kl', 'gal', '']
 
       if entry.units.blank?
         mark_as_invalid(entry, attribute: 'units',

diff --git a/app/models/product_import/unit_converter.rb b/app/models/product_import/unit_converter.rb
@@ -32,14 +32,18 @@ def convert_custom_unit_fields
 
     def unit_scales
       {
+        'mg' => { scale: 0.001, unit: 'weight' },
         'g' => { scale: 1, unit: 'weight' },
         'kg' => { scale: 1000, unit: 'weight' },
         'oz' => { scale: 28.35, unit: 'weight' },
         'lb' => { scale: 453.6, unit: 'weight' },
         't' => { scale: 1_000_000, unit: 'weight' },
         'ml' => { scale: 0.001, unit: 'volume' },
+        'cl' => { scale: 0.01, unit: 'volume' },
+        'dl' => { scale: 0.1, unit: 'volume' },
         'l' => { scale: 1, unit: 'volume' },
-        'kl' => { scale: 1000, unit: 'volume' }
+        'kl' => { scale: 1000, unit: 'volume' },
+        'gal' => { scale: 4.54609, unit: 'volume' },
       }
     end