瀏覽代碼

Change order calculator to display bottles for bottle ingredients.

Lee Morgan 5 年之前
父節點
當前提交
bba935f6ee
共有 2 個文件被更改,包括 12 次插入2 次删除
  1. 6 1
      views/dashboardPage/bundle.js
  2. 6 1
      views/dashboardPage/js/sidebars/orderCalculator.js

+ 6 - 1
views/dashboardPage/bundle.js

@@ -2632,9 +2632,14 @@ let orderCalculator = {
         }
 
         for(let i = 0; i < calculations.length; i++){
+            let outputString = `${calculations[i].output.toFixed(2)} ${calculations[i].ingredient.unit.toUpperCase()}`
+            if(calculations[i].ingredient.specialUnit === "bottle"){
+                outputString = `${calculations[i].output.toFixed(2)} BOTTLES`;
+            }
+        
             let item = template.cloneNode(true);
             item.children[0].innerText = calculations[i].ingredient.name,
-            item.children[1].innerText = `${calculations[i].output.toFixed(2)} ${calculations[i].ingredient.unit.toUpperCase()}`;
+            item.children[1].innerText = outputString;
             calculatorItems.appendChild(item);
         }
     },

+ 6 - 1
views/dashboardPage/js/sidebars/orderCalculator.js

@@ -9,9 +9,14 @@ let orderCalculator = {
         }
 
         for(let i = 0; i < calculations.length; i++){
+            let outputString = `${calculations[i].output.toFixed(2)} ${calculations[i].ingredient.unit.toUpperCase()}`
+            if(calculations[i].ingredient.specialUnit === "bottle"){
+                outputString = `${calculations[i].output.toFixed(2)} BOTTLES`;
+            }
+        
             let item = template.cloneNode(true);
             item.children[0].innerText = calculations[i].ingredient.name,
-            item.children[1].innerText = `${calculations[i].output.toFixed(2)} ${calculations[i].ingredient.unit.toUpperCase()}`;
+            item.children[1].innerText = outputString;
             calculatorItems.appendChild(item);
         }
     },