Fixed calculation errors

foodcoops · Jul 15, 2022 · 1e328cd · 1e328cd
1 parent 32f478d
commit 1e328cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/assets/javascripts/group-order-form.js b/app/assets/javascripts/group-order-form.js
@@ -131,12 +131,12 @@ class GroupOrderForm {
     if (isNaN(tolerance)) {
       tolerance = 0;
     }
-    const packSize = quantity$.data('ratio-group-order-unit-supplier-unit');
-    const othersQuantity = quantity$.data('others-quantity');
-    const othersTolerance = quantity$.data('others-tolerance');
-    const usedQuantity = quantity$.data('used-quantity');
-    const minimumOrderQuantity = quantity$.data('minimum-order-quantity');
-    const price = quantity$.data('price');
+    const packSize = parseFloat(quantity$.data('ratio-group-order-unit-supplier-unit'));
+    const othersQuantity = parseFloat(quantity$.data('others-quantity'));
+    const othersTolerance = parseFloat(quantity$.data('others-tolerance'));
+    const usedQuantity = parseFloat(quantity$.data('used-quantity'));
+    const minimumOrderQuantity = parseFloat(quantity$.data('minimum-order-quantity'));
+    const price = parseFloat(quantity$.data('price'));
 
     const totalQuantity = quantity + othersQuantity;
     const totalTolerance = tolerance + othersTolerance;

diff --git a/app/views/group_orders/_form.html.haml b/app/views/group_orders/_form.html.haml
@@ -134,7 +134,7 @@
                   %i.icon-plus
 
             %td.tolerance.group-order-input{style: ('display:none' if @order.stockit?)}
-              - if (@ordering_data[:order_articles][order_article.id][:ratio_group_order_unit_supplier_unit] != 1 || (order_article.price.minimum_order_quantity.presence || 0) > order_article.price.group_order_granularity)
+              - if (@ordering_data[:order_articles][order_article.id][:ratio_group_order_unit_supplier_unit] != order_article.price.group_order_granularity || (order_article.price.minimum_order_quantity.presence || 0) > order_article.price.group_order_granularity)
                 %span.used= @ordering_data[:order_articles][order_article.id][:used_tolerance]
                 +
                 %span.unused= @ordering_data[:order_articles][order_article.id][:tolerance] - @ordering_data[:order_articles][order_article.id][:used_tolerance]