mirror of
https://gitlab.com/bmcgonag/get_my.git
synced 2026-03-27 00:08:49 +00:00
Updating framework to meteor 3 and later
This commit is contained in:
parent
717994508a
commit
cca29bc591
58 changed files with 2332 additions and 1611 deletions
|
|
@ -25,38 +25,48 @@ Meteor.methods({
|
|||
let iname = itemName.charAt(0).toUpperCase() + itemName.slice(1);
|
||||
|
||||
// look up the item from the Products collection
|
||||
let prodInfo = Products.findOne({ prodName: iname });
|
||||
if (!prodInfo) {
|
||||
Meteor.call("add.product", itemName, [""], function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding item to products: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding item to Products.");
|
||||
const prodIsIn = async() => {
|
||||
let prodInfo = await Products.findOneAsync({ prodName: iname });
|
||||
try {
|
||||
if (!prodInfo) {
|
||||
// add product info first
|
||||
const addProd = async() => {
|
||||
let added = await Meteor.callAsync("add.product", itemName, [""]);
|
||||
if (!added) {
|
||||
console.log(" ERROR adding item to products: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding item to Products.");
|
||||
|
||||
return ListItems.insert({
|
||||
return ListItems.insertAsync({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: result,
|
||||
addedBy: this.userId,
|
||||
itemStore: "",
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return ListItems.insertAsync({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: result,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: "",
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return ListItems.insert({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding new product and item: " + error);
|
||||
}
|
||||
}
|
||||
let prodIn = prodIsIn();
|
||||
return prodIn;
|
||||
},
|
||||
'add.itemsFromMenuItem' (itemIds, listId) {
|
||||
check(itemIds, [String]);
|
||||
|
|
@ -75,7 +85,7 @@ Meteor.methods({
|
|||
if (onList == 0) {
|
||||
// now pull the product
|
||||
let prodInfo = Products.findOne({ _id: itemIds[i] });
|
||||
ListItems.insert({
|
||||
ListItems.insertAsync({
|
||||
itemName: prodInfo.prodName,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
|
|
@ -98,7 +108,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as ordered. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: true,
|
||||
dateOrdered: new Date(),
|
||||
|
|
@ -116,7 +126,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as not ordered. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: false,
|
||||
dateUnOrdered: new Date(),
|
||||
|
|
@ -130,7 +140,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as received. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: true,
|
||||
dateReceived: new Date(),
|
||||
|
|
@ -145,7 +155,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as not received. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: false,
|
||||
dateNotReceived: new Date(),
|
||||
|
|
@ -164,7 +174,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemName: itemName,
|
||||
}
|
||||
|
|
@ -177,6 +187,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete list items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.remove({ _id: itemId });
|
||||
return ListItems.removeAsync({ _id: itemId });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue