diff --git a/package.json b/package.json index 53c1ad0..96a0a70 100755 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "1.0.2", "description": "freeplanet serverside", "main": "server/server.js", + "type": "module", "scripts": { "start": "node src/server/server.js", "dev": "NODE_ENV=development nodemon src/server/server.js", diff --git a/src/server/models/cart.js b/src/server/models/cart.js index b796e41..b9647e3 100755 --- a/src/server/models/cart.js +++ b/src/server/models/cart.js @@ -143,6 +143,7 @@ async function filterValidItems(mycart) { try { mycart.newitems = []; let haschanged = false; + for (let item of mycart.items) { try { if ( diff --git a/src/server/models/order.js b/src/server/models/order.js index 83b8ba9..db5ed94 100755 --- a/src/server/models/order.js +++ b/src/server/models/order.js @@ -329,7 +329,7 @@ module.exports.updateTotals = async function (order, codice_sconto) { module.exports.getTotalOrderById = async function (id) { const query = [ - { $match: { _id: new mongoose.Types.ObjectId(id) } }, + { $match: { _id: new ObjectId(id) } }, { $lookup: { from: 'products', @@ -543,6 +543,8 @@ module.exports.getTotalOrderById = async function (id) { }, ]; + + const ris = await Order.aggregate(query); return ris; }; diff --git a/src/server/utils/pick.js b/src/server/utils/pick.js index da70f4b..439e1ca 100644 --- a/src/server/utils/pick.js +++ b/src/server/utils/pick.js @@ -1,7 +1,11 @@ -// @ts-check -export function pick(obj, keys) { - /** @type {any} */ - const out = {}; - for (const k of keys) if (k in obj) out[k] = obj[k]; - return out; +function pick(obj, keys) { + const result = {}; + for (const key of keys) { + if (obj[key] !== undefined) { + result[key] = obj[key]; + } + } + return result; } + +module.exports = { pick };