Unit conversion fixes for receive form

foodcoops · Jul 17, 2022 · def95de · def95de
1 parent 045e0d1
commit def95de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/HACKATHON_TODOS.md b/HACKATHON_TODOS.md
@@ -0,0 +1 @@
+- Replace all remaining occurrences of `.unit_quantity`
diff --git a/app/assets/javascripts/receive-order-form.js b/app/assets/javascripts/receive-order-form.js
@@ -32,7 +32,7 @@
     }
 
     convertFieldUnit(field$, fromUnit, toUnit) {
-      const units = parseFloat(field$.val());
+      const units = parseFloat(field$.val().replace(',', '.'));
       if (isNaN(units)) {
         return;
       }
@@ -45,7 +45,7 @@
     }
 
     convertToBillingUnit(field$) {
-      field$.val(this.convertFieldUnit(field$, field$.data('supplier-order-unit'), field$.data('billing-unit')));
+      field$.val(round(this.convertFieldUnit(field$, field$.data('supplier-order-unit'), field$.data('billing-unit'))));
     }
 
     convertFromBillingUnit(field$) {

diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
@@ -184,8 +184,8 @@ def update_order_amounts
         if oa.units_received_changed?
           counts[0] += 1
           unless oa.units_received.blank?
-            cunits[0] += oa.units_received * oa.article.unit_quantity
-            oacounts = oa.redistribute oa.units_received * oa.price.unit_quantity, rest_to
+            cunits[0] += oa.units_received
+            oacounts = oa.redistribute oa.units_received, rest_to
             oacounts.each_with_index { |c, i| cunits[i + 1] += c; counts[i + 1] += 1 if c > 0 }
           end
         end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Replace all remaining occurrences of `.unit_quantity`