t1meshift
/
expressCart
mirror of https://github.com/t1meshift/expressCart.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Linting + trying to fix travis test

master
Mark Moffat 2019-07-12 17:20:07 +09:30
parent 8b630529c1
commit 72b88eee9e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
routes/order.js
View File

@ -9,7 +9,7 @@ router.get('/admin/orders', restrict, (req, res, next) => {
const db = req.app.db; const db = req.app.db;
// Top 10 products // Top 10 products
db.orders.find({}).sort({ 'orderDate': -1 }).limit(10).toArray((err, orders) => { db.orders.find({}).sort({ orderDate: -1 }).limit(10).toArray((err, orders) => {
if(err){ if(err){
console.info(err.stack); console.info(err.stack);
} }
@ -44,8 +44,8 @@ router.get('/admin/orders/bystatus/:orderstatus', restrict, (req, res, next) =>
} }
// case insensitive search // case insensitive search
let regex = new RegExp(['^', req.params.orderstatus, '$'].join(''), 'i'); const regex = new RegExp(['^', req.params.orderstatus, '$'].join(''), 'i');
db.orders.find({ orderStatus: regex }).sort({ 'orderDate': -1 }).limit(10).toArray((err, orders) => { db.orders.find({ orderStatus: regex }).sort({ orderDate: -1 }).limit(10).toArray((err, orders) => {
if(err){ if(err){
console.info(err.stack); console.info(err.stack);
} }
@ -96,10 +96,12 @@ router.get('/admin/order/view/:id', restrict, (req, res) => {
// Admin section // Admin section
router.get('/admin/orders/filter/:search', restrict, (req, res, next) => { router.get('/admin/orders/filter/:search', restrict, (req, res, next) => {
const db = req.app.db; const db = req.app.db;
let searchTerm = req.params.search; const searchTerm = req.params.search;
let ordersIndex = req.app.ordersIndex; const ordersIndex = req.app.ordersIndex;
let lunrIdArray = []; console.log('searchTerm', searchTerm);
const lunrIdArray = [];
ordersIndex.search(searchTerm).forEach((id) => { ordersIndex.search(searchTerm).forEach((id) => {
lunrIdArray.push(common.getId(id.ref)); lunrIdArray.push(common.getId(id.ref));
}); });
@ -112,11 +114,13 @@ router.get('/admin/orders/filter/:search', restrict, (req, res, next) => {
// If API request, return json // If API request, return json
if(req.apiAuthenticated){ if(req.apiAuthenticated){
console.log('returning json');
return res.status(200).json({ return res.status(200).json({
orders orders
}); });
} }
console.log('returning view');
return res.render('orders', { return res.render('orders', {
title: 'Order results', title: 'Order results',
orders: orders, orders: orders,