From 1920bedaf3342d47f9da5fece8c44557b8852699 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 23 Jan 2018 13:41:15 -0800
Subject: [PATCH] Fix the text filter in My Purchases

---
 .../commerce/common/SortableListModel.qml     | 58 ++++++++++++++-----
 .../qml/hifi/commerce/purchases/Purchases.qml |  2 +-
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
index 2d82e42ddb..0951d25950 100644
--- a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
+++ b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
@@ -17,6 +17,7 @@ ListModel {
     id: root;
     property string sortColumnName: "";
     property bool isSortingDescending: true;
+    property bool valuesAreNumerical: false;
 
     function swap(a, b) {
         if (a < b) {
@@ -29,26 +30,51 @@ ListModel {
     }
 
     function partition(begin, end, pivot) {
-        var piv = get(pivot)[sortColumnName];
-        swap(pivot, end - 1);
-        var store = begin;
+        if (valuesAreNumerical) {
+            var piv = get(pivot)[sortColumnName];
+            swap(pivot, end - 1);
+            var store = begin;
 
-        for (var i = begin; i < end - 1; ++i) {
-            if (isSortingDescending) {
-                if (get(i)[sortColumnName] < piv) {
-                    swap(store, i);
-                    ++store;
-                }
-            } else {
-                if (get(i)[sortColumnName] > piv) {
-                    swap(store, i);
-                    ++store;
+            for (var i = begin; i < end - 1; ++i) {
+                var currentElement = get(i)[sortColumnName];
+                if (isSortingDescending) {
+                    if (currentElement < piv) {
+                        swap(store, i);
+                        ++store;
+                    }
+                } else {
+                    if (currentElement > piv) {
+                        swap(store, i);
+                        ++store;
+                    }
                 }
             }
-        }
-        swap(end - 1, store);
+            swap(end - 1, store);
 
-        return store;
+            return store;
+        } else {
+            var piv = get(pivot)[sortColumnName].toLowerCase();
+            swap(pivot, end - 1);
+            var store = begin;
+
+            for (var i = begin; i < end - 1; ++i) {
+                var currentElement = get(i)[sortColumnName].toLowerCase();
+                if (isSortingDescending) {
+                    if (currentElement < piv) {
+                        swap(store, i);
+                        ++store;
+                    }
+                } else {
+                    if (currentElement > piv) {
+                        swap(store, i);
+                        ++store;
+                    }
+                }
+            }
+            swap(end - 1, store);
+
+            return store;
+        }
     }
 
     function qsort(begin, end) {
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 87b784bc4e..a9961dc17e 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -677,7 +677,7 @@ Rectangle {
             }
         }
 
-        if (sameItemCount !== tempPurchasesModel.count) {
+        if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== "") {
             filteredPurchasesModel.clear();
             for (var i = 0; i < tempPurchasesModel.count; i++) {
                 filteredPurchasesModel.append(tempPurchasesModel.get(i));