From 238e9183a94a7297e1f95a1522ddcccaf0e0cafc Mon Sep 17 00:00:00 2001
From: olivermrbl <oliver@mrbltech.com>
Date: Wed, 2 Sep 2020 15:53:14 +0200
Subject: [PATCH 1/2] Admin related fixes

---
 .../src/api/routes/admin/orders/archive-order.js |  3 ++-
 packages/medusa/src/services/order.js            | 16 +++++++---------
 packages/medusa/src/services/query-builder.js    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/medusa/src/api/routes/admin/orders/archive-order.js b/packages/medusa/src/api/routes/admin/orders/archive-order.js
index 78b9d6c721..021fe7d30a 100644
--- a/packages/medusa/src/api/routes/admin/orders/archive-order.js
+++ b/packages/medusa/src/api/routes/admin/orders/archive-order.js
@@ -3,7 +3,8 @@ export default async (req, res) => {
 
   try {
     const orderService = req.scope.resolve("orderService")
-    const order = await orderService.archive(id)
+    let order = await orderService.archive(id)
+    order = await orderService.decorate(order, [], ["region"])
     res.json({ order })
   } catch (error) {
     throw error
diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js
index 857adecf0a..9e92601ef3 100644
--- a/packages/medusa/src/services/order.js
+++ b/packages/medusa/src/services/order.js
@@ -252,21 +252,19 @@ class OrderService extends BaseService {
     // Run all other registered events
     const completeOrderJob = await this.eventBus_.emit(
       OrderService.Events.COMPLETED,
-      result
+      order
     )
 
     await completeOrderJob.finished().catch(error => {
       throw error
     })
 
-    return this.orderModel_
-      .updateOne(
-        { _id: order._id },
-        {
-          $set: { status: "completed" },
-        }
-      )
-      .then(async result => {})
+    return this.orderModel_.updateOne(
+      { _id: order._id },
+      {
+        $set: { status: "completed" },
+      }
+    )
   }
 
   /**
diff --git a/packages/medusa/src/services/query-builder.js b/packages/medusa/src/services/query-builder.js
index d121d856f4..7b30d6ab20 100644
--- a/packages/medusa/src/services/query-builder.js
+++ b/packages/medusa/src/services/query-builder.js
@@ -38,7 +38,7 @@ class QueryBuilderService extends BaseService {
     if (_.isEmpty(search)) return
 
     const searchQuery = searchProperties.map(s => ({
-      [s]: new RegExp(search.q),
+      [s]: new RegExp(search.q, "i"),
     }))
 
     return { $or: searchQuery }

From bcd54d7412eaadfcd366c34d18c2b7e11b36adf6 Mon Sep 17 00:00:00 2001
From: olivermrbl <oliver@mrbltech.com>
Date: Thu, 3 Sep 2020 12:32:28 +0200
Subject: [PATCH 2/2] Adds pagination to customerService

---
 .../src/api/routes/admin/customers/list-customers.js |  9 +++++++--
 packages/medusa/src/services/customer.js             | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/medusa/src/api/routes/admin/customers/list-customers.js b/packages/medusa/src/api/routes/admin/customers/list-customers.js
index 013cbd99c2..f1aa3fcebd 100644
--- a/packages/medusa/src/api/routes/admin/customers/list-customers.js
+++ b/packages/medusa/src/api/routes/admin/customers/list-customers.js
@@ -9,9 +9,14 @@ export default async (req, res) => {
       "last_name",
     ])
 
-    const customers = await customerService.list(query)
+    const limit = parseInt(req.query.limit) || 0
+    const offset = parseInt(req.query.offset) || 0
 
-    res.json({ customers })
+    const customers = await customerService.list(query, offset, limit)
+
+    const numCustomers = await customerService.count()
+
+    res.json({ customers, total_count: numCustomers })
   } catch (error) {
     throw error
   }
diff --git a/packages/medusa/src/services/customer.js b/packages/medusa/src/services/customer.js
index 03397b785f..1950e1b470 100644
--- a/packages/medusa/src/services/customer.js
+++ b/packages/medusa/src/services/customer.js
@@ -113,8 +113,16 @@ class CustomerService extends BaseService {
    * @param {Object} selector - the query object for find
    * @return {Promise} the result of the find operation
    */
-  list(selector) {
-    return this.customerModel_.find(selector)
+  list(selector, offset, limit) {
+    return this.customerModel_.find(selector, {}, offset, limit)
+  }
+
+  /**
+   * Return the total number of documents in database
+   * @return {Promise} the result of the count operation
+   */
+  count() {
+    return this.customerModel_.count()
   }
 
   /**