Some more minimum order quantity fixes

foodcoopsat · Jun 5, 2022 · 7b8f1b0 · 7b8f1b0
1 parent cde1f1d
commit 7b8f1b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/javascripts/group-order-form.js b/app/assets/javascripts/group-order-form.js
@@ -157,7 +157,7 @@ class GroupOrderForm {
 
     const unused = quantity - used;
 
-    const availableForTolerance = Math.max(0, available - used - othersTolerance);
+    const availableForTolerance = quantity < minimumOrderQuantity ? minimumOrderQuantity - quantity : Math.max(0, available - used - othersTolerance);
     const usedTolerance = Math.min(availableForTolerance, tolerance);
     const unusedTolerance = tolerance - usedTolerance;
 
@@ -169,7 +169,7 @@ class GroupOrderForm {
     usedTolerance$.text(usedTolerance);
     unusedTolerance$.text(unusedTolerance);
 
-    totalPacks$.text(isNaN(totalPacks) ? '?' : totalPacks);
+    totalPacks$.text(totalPacks);
 
     totalPacks$.css('color', this.packCompletedFromTolerance(packSize, totalQuantity, totalTolerance) ? 'grey' : 'auto');
 
@@ -205,7 +205,7 @@ class GroupOrderForm {
 
   calcMissingItems(packSize, quantity, tolerance, minimumOrderQuantity) {
     if (quantity < minimumOrderQuantity) {
-      return minimumOrderQuantity - quantity;
+      return minimumOrderQuantity - quantity + tolerance;
     }
 
     var remainder = quantity % packSize

diff --git a/app/models/order_article.rb b/app/models/order_article.rb
@@ -81,12 +81,11 @@ def update_results!
   #      4        |    5     |     4     |           2
   #
   def calculate_units_to_order(quantity, tolerance = 0)
-    minimum_order_quantity = price.minimum_order_quantity.nil? ? nil : price.convert_quantity(price.minimum_order_quantity, price.supplier_order_unit, price.group_order_unit)
-    unit_size = price.convert_quantity(1, price.supplier_order_unit, price.group_order_unit)
-    if quantity > 0 && !price.minimum_order_quantity.nil? && quantity < price.minimum_order_quantity && quantity + tolerance >= minimum_order_quantity
-      return price.minimum_order_quantity / unit_size
+    if quantity > 0 && !price.minimum_order_quantity.nil? && quantity < price.minimum_order_quantity && quantity + tolerance >= price.minimum_order_quantity
+      return price.minimum_order_quantity
     end
 
+    unit_size = price.convert_quantity(1, price.supplier_order_unit, price.group_order_unit)
     units = quantity / unit_size
     remainder = quantity % unit_size
     units += ((remainder > 0) && (remainder + tolerance >= unit_size) ? 1 : 0)