From 72b88eee9e130417275e87e08a5e0c3d29d29f5a Mon Sep 17 00:00:00 2001
From: Mark Moffat <mark@192-168-1-105.tpgi.com.au>
Date: Fri, 12 Jul 2019 17:20:07 +0930
Subject: [PATCH] Linting + trying to fix travis test

---
 routes/order.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/routes/order.js b/routes/order.js
index 11041ec..6247f7b 100644
--- a/routes/order.js
+++ b/routes/order.js
@@ -9,7 +9,7 @@ router.get('/admin/orders', restrict, (req, res, next) => {
     const db = req.app.db;
 
     // 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){
             console.info(err.stack);
         }
@@ -44,8 +44,8 @@ router.get('/admin/orders/bystatus/:orderstatus', restrict, (req, res, next) =>
     }
 
     // case insensitive search
-    let regex = new RegExp(['^', req.params.orderstatus, '$'].join(''), 'i');
-    db.orders.find({ orderStatus: regex }).sort({ 'orderDate': -1 }).limit(10).toArray((err, orders) => {
+    const regex = new RegExp(['^', req.params.orderstatus, '$'].join(''), 'i');
+    db.orders.find({ orderStatus: regex }).sort({ orderDate: -1 }).limit(10).toArray((err, orders) => {
         if(err){
             console.info(err.stack);
         }
@@ -96,10 +96,12 @@ router.get('/admin/order/view/:id', restrict, (req, res) => {
 // Admin section
 router.get('/admin/orders/filter/:search', restrict, (req, res, next) => {
     const db = req.app.db;
-    let searchTerm = req.params.search;
-    let ordersIndex = req.app.ordersIndex;
+    const searchTerm = req.params.search;
+    const ordersIndex = req.app.ordersIndex;
 
-    let lunrIdArray = [];
+    console.log('searchTerm', searchTerm);
+
+    const lunrIdArray = [];
     ordersIndex.search(searchTerm).forEach((id) => {
         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(req.apiAuthenticated){
+            console.log('returning json');
             return res.status(200).json({
                 orders
             });
         }
 
+        console.log('returning view');
         return res.render('orders', {
             title: 'Order results',
             orders: orders,