Browse Source

Fix some style issues on orders page. Update bug in order details sidebar

Lee Morgan 5 years ago
parent
commit
6254ecf926

+ 1 - 1
views/dashboardPage/bundle.js

@@ -3330,8 +3330,8 @@ let orders = {
                 banner.createError(response);
             }else{
                 let orders = [];
-                let ingredients = [];
                 for(let i = 0; i < response.length; i++){
+                    let ingredients = [];
                     for(let j = 0; j < response[i].ingredients.length; j++){
                         for(let k = 0; k < merchant.ingredients.length; k++){
                             if(merchant.ingredients[k].ingredient.id === response[i].ingredients[j].ingredient){

+ 10 - 0
views/dashboardPage/dashboard.css

@@ -172,6 +172,16 @@ Multi-strand use classes
     left: 15px;
 }
 
+.buttonBox{
+    display: flex;
+    justify-content: space-around;
+    margin-top: 50px;
+}
+
+    .buttonBox > *{
+        margin-right: 10px;
+    }
+
 /* 
 Home Strand 
 */

+ 1 - 1
views/dashboardPage/js/orders.js

@@ -47,8 +47,8 @@ let orders = {
                 banner.createError(response);
             }else{
                 let orders = [];
-                let ingredients = [];
                 for(let i = 0; i < response.length; i++){
+                    let ingredients = [];
                     for(let j = 0; j < response[i].ingredients.length; j++){
                         for(let k = 0; k < merchant.ingredients.length; k++){
                             if(merchant.ingredients[k].ingredient.id === response[i].ingredients[j].ingredient){

+ 0 - 7
views/dashboardPage/sidebars/sidebars.css

@@ -295,13 +295,6 @@ Ingredient Details
             color: white;
         }
 
-    .buttonBox{
-        display: flex;
-        justify-content: space-around;
-        width: 100%;
-        margin-top: 50px;
-    }
-
 /*
 EDIT INGREDIENT
 */