diff --git a/routes/admin.js b/routes/admin.js index 54a94c7..b556cb1 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -410,7 +410,7 @@ router.post('/product/insert', common.restrict, (req, res) => { res.redirect('/admin/product/new'); }else{ // get the new ID - let newId = newDoc.insertedIds; + let newId = newDoc.insertedIds[0]; // add to lunr index common.indexProducts(req.app) diff --git a/routes/payments/paypal.js b/routes/payments/paypal.js index 0446afd..aeba43f 100644 --- a/routes/payments/paypal.js +++ b/routes/payments/paypal.js @@ -12,7 +12,7 @@ router.get('/checkout_return', (req, res, next) => { let db = req.app.db; let config = common.getConfig(); let paymentId = req.session.paymentId; - let payerId = req.param('PayerID'); + let payerId = req.query['PayerID']; let details = {'payer_id': payerId}; paypal.payment.execute(paymentId, details, (error, payment) => { @@ -190,10 +190,7 @@ router.post('/checkout_action', (req, res, next) => { } // get the new ID - let newId = ''; - if(newDoc.insertedIds.length > 0){ - newId = newDoc.insertedIds[0].toString(); - } + let newId = newDoc.insertedIds['0']; // set the order ID in the session req.session.orderId = newId; diff --git a/routes/payments/stripe.js b/routes/payments/stripe.js index efd8bc3..55b6cfb 100644 --- a/routes/payments/stripe.js +++ b/routes/payments/stripe.js @@ -60,7 +60,7 @@ router.post('/checkout_action', (req, res, next) => { } // get the new ID - let newId = newDoc.insertedIds; + let newId = newDoc.insertedIds['0']; // add to lunr index common.indexOrders(req.app) @@ -70,7 +70,7 @@ router.post('/checkout_action', (req, res, next) => { // set the results req.session.messageType = 'success'; req.session.message = 'Your payment was successfully completed'; - req.session.paymentEmailAddr = newDoc.orderEmail; + req.session.paymentEmailAddr = newDoc.ops[0].orderEmail; req.session.paymentApproved = true; req.session.paymentDetails = '

Order ID: ' + newId + '

Transaction ID: ' + charge.id + '

'; diff --git a/views/settings.hbs b/views/settings.hbs index e83e0e0..1072a5c 100644 --- a/views/settings.hbs +++ b/views/settings.hbs @@ -66,6 +66,7 @@