Przeglądaj źródła

Small change of variable name

Lee Morgan 6 lat temu
rodzic
commit
56906f5536

+ 3 - 3
controllers/orderData.js

@@ -8,7 +8,7 @@ module.exports = {
     GET - get the 25 most recent orders
     return = [
         _id: id of order,
-        orderId: user created id for order,
+        name: user created id for order,
         date: date order was created,
         ingredients: [{
             _id: unused id of this object,
@@ -29,7 +29,7 @@ module.exports = {
             {$sort: {date: -1}},
             {$limit: 25},
             {$project: {
-                orderId: 1,
+                name: 1,
                 date: 1,
                 ingredients: 1
             }}
@@ -45,7 +45,7 @@ module.exports = {
     /*
     POST - Creates a new order from the site
     req.body = {
-        orderId: user created order id
+        name: user created order id
         date: creation date
         ingredients: [{
             ingredient: id of the ingredient

+ 1 - 1
controllers/validator.js

@@ -97,7 +97,7 @@ module.exports = {
     },
 
     order: function(order){
-        if(!this.isSanitary([order.orderId])){
+        if(!this.isSanitary([order.name])){
             return "Order name contains illegal characters";
         }
 

+ 1 - 1
models/order.js

@@ -6,7 +6,7 @@ const OrderSchema = new mongoose.Schema({
         ref: "Merchant",
         required: true
     },
-    orderId: String,
+    name: String,
     date: {
         type: Date,
         default: Date.now,

+ 2 - 2
views/dashboardPage/components/components.js

@@ -269,7 +269,7 @@ let newOrderComp = {
         }
 
         let data = {
-            orderId: document.getElementById("orderName").value,
+            name: document.getElementById("orderName").value,
             date: document.getElementById("orderDate").value,
             ingredients: ingredients
         }
@@ -291,7 +291,7 @@ let newOrderComp = {
                 }else{
                     let order = new Order(
                        response._id,
-                       response.orderId,
+                       response.name,
                        response.date,
                        response.ingredients,
                        merchant 

+ 1 - 1
views/dashboardPage/orders.js

@@ -23,7 +23,7 @@ window.ordersStrandObj = {
                         for(let i = 0; i < response.length; i++){
                             newOrders.push(new Order(
                                 response[i]._id,
-                                response[i].orderId,
+                                response[i].name,
                                 response[i].date,
                                 response[i].ingredients,
                                 merchant

+ 1 - 1
views/shared/validation.js

@@ -158,7 +158,7 @@ let validator = {
     order: function(order, createBanner = true){
         let errors = [];
 
-        if(!validator.isSanitary(order.orderId, false)){
+        if(!validator.isSanitary(order.name, false)){
             errors.push("Your string contains illegal characters");
         }