From e91b44074a84b6714dc2ad109d26cec91e3ccaad Mon Sep 17 00:00:00 2001
From: Mark Moffat <mark@Marks-MacBook-Pro-2.local>
Date: Wed, 25 Mar 2020 12:48:23 +1030
Subject: [PATCH] Fixed order sorting + instore orders missing values

---
 locales/en.json        | 3 ++-
 routes/order.js        | 4 +++-
 views/order-create.hbs | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index c95eb7c..b347f38 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -206,5 +206,6 @@
 	"Company": "Company",
 	"View": "View",
 	"Related products": "Related products",
-	"Disable stock tracking": "Disable stock tracking"
+	"Disable stock tracking": "Disable stock tracking",
+	"Company name": "Company name"
 }
\ No newline at end of file
diff --git a/routes/order.js b/routes/order.js
index 859aae1..2a52f64 100644
--- a/routes/order.js
+++ b/routes/order.js
@@ -21,7 +21,7 @@ router.get('/admin/orders/:page?', restrict, async (req, res, next) => {
     }
 
     // Get our paginated data
-    const orders = await paginateData(false, req, pageNum, 'orders', {}, { productAddedDate: -1 });
+    const orders = await paginateData(false, req, pageNum, 'orders', {}, { orderDate: -1 });
 
     // If API request, return json
     if(req.apiAuthenticated){
@@ -133,7 +133,9 @@ router.post('/admin/order/create', async (req, res, next) => {
         orderShipping: req.session.totalCartShipping,
         orderItemCount: req.session.totalCartItems,
         orderProductCount: req.session.totalCartProducts,
+        orderCustomer: getId(req.session.customerId),
         orderEmail: req.body.email || req.session.customerEmail,
+        orderCompany: req.body.company || req.session.customerCompany,
         orderFirstname: req.body.firstName || req.session.customerFirstname,
         orderLastname: req.body.lastName || req.session.customerLastname,
         orderAddr1: req.body.address1 || req.session.customerAddress1,
diff --git a/views/order-create.hbs b/views/order-create.hbs
index 24e8278..30d6996 100644
--- a/views/order-create.hbs
+++ b/views/order-create.hbs
@@ -44,6 +44,12 @@
                             <input type="text" class="form-control" name="orderLastName" id="orderLastName" value="{{session.customerLastname}}" placeholder="Last name" required>
                         </div>
                     </div>
+                    <div class="col-12">
+                        <div class="form-group">
+                            <label class="control-label">{{ @root.__ "Company name" }}</label>   
+                            <input type="text" class="form-control" name="orderCompany" id="orderCompany" value="{{session.customerCompany}}" placeholder="Company name">
+                        </div>
+                    </div>
                     <div class="col-12">
                         <div class="form-group">
                             <label class="control-label">{{ @root.__ "Address 1" }} *</label>