Update Purchases

interface/resources/qml/hifi/commerce/common/SortableListModel.qml

@@ -0,0 +1,68 @@
+//
+//  SortableListModel.qml
+//  qml/hifi/commerce/common
+//
+//  SortableListModel
+//
+//  Created by Zach Fox on 2017-09-28
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+
+ListModel {
+    id: root;
+    property string sortColumnName: "";
+    property bool isSortingDescending: true;
+
+    function swap(a, b) {
+        if (a < b) {
+            move(a, b, 1);
+            move (b - 1, a, 1);
+        } else if (a > b) {
+            move(b, a, 1);
+            move(a - 1, b, 1);
+        }
+    }
+
+    function partition(begin, end, pivot) {
+        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;
+                }
+            }
+        }
+        swap(end - 1, store);
+
+        return store;
+    }
+
+    function qsort(begin, end) {
+        if (end - 1 > begin) {
+            var pivot = begin + Math.floor(Math.random() * (end - begin));
+
+            pivot = partition(begin, end, pivot);
+
+            qsort(begin, pivot);
+            qsort(pivot + 1, end);
+        }
+    }
+
+    function quickSort() {
+        qsort(0, count)
+    }
+}

interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml

@@ -30,12 +30,20 @@ Rectangle {
     property string itemOwner: "--";
     property string itemEdition: "--";
     property string dateOfPurchase: "";
-    property bool closeGoesToPurchases: false;
+    property bool isLightbox: false;
     // Style
     color: hifi.colors.faintGray;
     Hifi.QmlCommerce {
         id: commerce;
-    }    
+    }
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
 
     Image {
         anchors.fill: parent;
@@ -262,7 +270,11 @@ Rectangle {
             height: 50;
             text: "close";
             onClicked: {
-                sendToScript({method: 'inspectionCertificate_closeClicked', closeGoesToPurchases: root.closeGoesToPurchases});
+                if (root.isLightbox) {
+                    root.visible = false;
+                } else {
+                    sendToScript({method: 'inspectionCertificate_closeClicked', closeGoesToPurchases: root.closeGoesToPurchases});
+                }
             }
         }   
 
@@ -303,7 +315,6 @@ Rectangle {
         switch (message.method) {
             case 'inspectionCertificate_setMarketplaceId':
                 root.marketplaceId = message.marketplaceId;
-                root.closeGoesToPurchases = message.closeGoesToPurchases;
             break;
             case 'inspectionCertificate_setItemInfo':
                 root.itemName = message.itemName;

interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml

@@ -34,7 +34,7 @@ Item {
     property string itemId;
     property string itemPreviewImageUrl;
     property string itemHref;
-    property int ownedItemCount;
+    property int displayedItemCount;
     property int itemEdition;
 
     property string originalStatusText;
@@ -182,7 +182,7 @@ Item {
         Item {
             id: statusContainer;
 
-            visible: root.purchaseStatus || root.ownedItemCount > 1;
+            visible: root.purchaseStatus || root.displayedItemCount > 1;
             anchors.left: itemName.left;
             anchors.top: certificateContainer.bottom;
             anchors.topMargin: 8;
@@ -201,8 +201,8 @@ Item {
                             "PENDING..."
                         } else if (root.purchaseStatus === "invalidated") {
                             "INVALIDATED"
-                        } else if (root.ownedItemCount > 1) {
-                            "<font color='#6a6a6a'>(#" + root.itemEdition + ")</font> <u>You own " + (root.ownedItemCount - 1) + " others</u>"
+                        } else if (root.displayedItemCount > 1) {
+                            ("#" + root.itemEdition)
                         } else {
                             ""
                         }
@@ -213,8 +213,8 @@ Item {
                             hifi.colors.blueAccent
                         } else if (root.purchaseStatus === "invalidated") {
                             hifi.colors.redAccent
-                        } else if (root.ownedItemCount > 1) {
-                            hifi.colors.blueAccent
+                        } else if (root.displayedItemCount > 1) {
+                            hifi.colors.lightGray
                         } else {
                             hifi.colors.baseGray
                         }
@@ -246,8 +246,6 @@ Item {
                             hifi.colors.blueAccent
                         } else if (root.purchaseStatus === "invalidated") {
                             hifi.colors.redAccent
-                        } else if (root.ownedItemCount > 1) {
-                            hifi.colors.blueAccent
                         } else {
                             hifi.colors.baseGray
                         }
@@ -263,8 +261,6 @@ Item {
                         sendToPurchases({method: 'showPendingLightbox'});
                     } else if (root.purchaseStatus === "invalidated") {
                         sendToPurchases({method: 'showInvalidatedLightbox'});
-                    } else if (root.ownedItemCount > 1) {
-                        sendToPurchases({method: 'setFilterText', filterText: root.itemName});
                     }
                 }
                 onEntered: {
@@ -274,9 +270,6 @@ Item {
                     } else if (root.purchaseStatus === "invalidated") {
                         statusText.color = hifi.colors.redAccent;
                         statusIcon.color = hifi.colors.redAccent;
-                    } else if (root.ownedItemCount > 1) {
-                        statusText.color = hifi.colors.blueHighlight;
-                        statusIcon.color = hifi.colors.blueHighlight;
                     }
                 }
                 onExited: {
@@ -286,9 +279,6 @@ Item {
                     } else if (root.purchaseStatus === "invalidated") {
                         statusText.color = hifi.colors.redHighlight;
                         statusIcon.color = hifi.colors.redHighlight;
-                    } else if (root.ownedItemCount > 1) {
-                        statusText.color = hifi.colors.blueAccent;
-                        statusIcon.color = hifi.colors.blueAccent;
                     }
                 }
             }

interface/resources/qml/hifi/commerce/purchases/Purchases.qml

@@ -19,6 +19,7 @@ import "../../../controls-uit" as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 import "../common" as HifiCommerceCommon
+import "../inspectionCertificate" as HifiInspectionCertificate
 
 // references XXX from root context
 
@@ -121,6 +122,19 @@ Rectangle {
         }
     }
 
+    HifiInspectionCertificate.InspectionCertificate {
+        id: inspectionCertificate;
+        z: 999;
+        visible: false;
+        anchors.fill: parent;
+
+        Connections {
+            onSendToScript: {
+                sendToScript(message);
+            }
+        }
+    }
+
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         visible: false;
@@ -331,7 +345,7 @@ Rectangle {
         ListModel {
             id: previousPurchasesModel;
         }
-        ListModel {
+        HifiCommerceCommon.SortableListModel {
             id: filteredPurchasesModel;
         }
 
@@ -418,7 +432,7 @@ Rectangle {
                 purchaseStatus: status;
                 purchaseStatusChanged: statusChanged;
                 itemEdition: model.edition_number;
-                ownedItemCount: model.ownedItemCount;
+                displayedItemCount: model.displayedItemCount;
                 anchors.topMargin: 12;
                 anchors.bottomMargin: 12;
 
@@ -427,6 +441,8 @@ Rectangle {
                         if (msg.method === 'purchases_itemInfoClicked') {
                             sendToScript({method: 'purchases_itemInfoClicked', itemId: itemId});
                         } else if (msg.method === 'purchases_itemCertificateClicked') {
+                            inspectionCertificate.visible = true;
+                            inspectionCertificate.isLightbox = true;
                             sendToScript(msg);
                         } else if (msg.method === "showInvalidatedLightbox") {
                             lightboxPopup.titleText = "Item Invalidated";
@@ -532,18 +548,7 @@ Rectangle {
     // FUNCTION DEFINITIONS START
     //
 
-    function buildFilteredPurchasesModel() {
-        filteredPurchasesModel.clear();
-        for (var i = 0; i < purchasesModel.count; i++) {
-            if (purchasesModel.get(i).title.toLowerCase().indexOf(filterBar.text.toLowerCase()) !== -1) {
-                if (purchasesModel.get(i).status !== "confirmed") {
-                    filteredPurchasesModel.insert(0, purchasesModel.get(i));
-                } else {
-                    filteredPurchasesModel.append(purchasesModel.get(i));
-                }
-            }
-        }
-
+    function populateDisplayedItemCounts() {
         var itemCountDictionary = {};
         var currentItemId;
         for (var i = 0; i < filteredPurchasesModel.count; i++) {
@@ -556,10 +561,32 @@ Rectangle {
         }
 
         for (var i = 0; i < filteredPurchasesModel.count; i++) {
-            filteredPurchasesModel.setProperty(i, "ownedItemCount", itemCountDictionary[currentItemId]);
+            filteredPurchasesModel.setProperty(i, "displayedItemCount", itemCountDictionary[filteredPurchasesModel.get(i).id]);
         }
     }
 
+    function sortByDate() {
+        filteredPurchasesModel.sortColumnName = "purchase_date";
+        filteredPurchasesModel.isSortingDescending = false;
+        filteredPurchasesModel.quickSort();
+    }
+
+    function buildFilteredPurchasesModel() {
+        filteredPurchasesModel.clear();
+        for (var i = 0; i < purchasesModel.count; i++) {
+            if (purchasesModel.get(i).title.toLowerCase().indexOf(filterBar.text.toLowerCase()) !== -1) {
+                if (purchasesModel.get(i).status !== "confirmed") {
+                    filteredPurchasesModel.insert(0, purchasesModel.get(i));
+                } else {
+                    filteredPurchasesModel.append(purchasesModel.get(i));
+                }
+            }
+        }
+
+        populateDisplayedItemCounts();
+        sortByDate();
+    }
+
     function checkIfAnyItemStatusChanged() {
         var currentPurchasesModelId, currentPurchasesModelEdition, currentPurchasesModelStatus;
         var previousPurchasesModelStatus;
@@ -609,6 +636,10 @@ Rectangle {
                     commerce.inventory();
                 }
             break;
+            case 'inspectionCertificate_setMarketplaceId':
+            case 'inspectionCertificate_setItemInfo':
+                inspectionCertificate.fromScript(message);
+            break;
             default:
                 console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
         }

scripts/system/marketplaces/marketplaces.js

@@ -128,12 +128,11 @@
         }
     }
 
-    function setCertificateInfo(currentEntityWithContextOverlay, itemMarketplaceId, closeGoesToPurchases) {
+    function setCertificateInfo(currentEntityWithContextOverlay, itemMarketplaceId) {
         wireEventBridge(true);
         tablet.sendToQml({
             method: 'inspectionCertificate_setMarketplaceId',
-            marketplaceId: itemMarketplaceId || Entities.getEntityProperties(currentEntityWithContextOverlay, ['marketplaceID']).marketplaceID,
-            closeGoesToPurchases: closeGoesToPurchases
+            marketplaceId: itemMarketplaceId || Entities.getEntityProperties(currentEntityWithContextOverlay, ['marketplaceID']).marketplaceID
         });
         // ZRF FIXME! Make a call to the endpoint to get item info instead of this silliness
         Script.setTimeout(function () {
@@ -338,17 +337,11 @@
                 tablet.loadQMLSource("TabletAddressDialog.qml");
                 break;
             case 'purchases_itemCertificateClicked':
-                tablet.loadQMLSource("../commerce/inspectionCertificate/InspectionCertificate.qml");
-                setCertificateInfo("", message.itemMarketplaceId, true);
+                console.log("ZRFJIOSE FJSOPIEFJSE OIFJSOPEI FJSIOEFJ ")
+                setCertificateInfo("", message.itemMarketplaceId);
                 break;
             case 'inspectionCertificate_closeClicked':
-                if (message.closeGoesToPurchases) {
-                    referrerURL = MARKETPLACE_URL_INITIAL;
-                    filterText = "";
-                    tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
-                } else {
-                    tablet.gotoHomeScreen();
-                }
+                tablet.gotoHomeScreen();
                 break;
             case 'inspectionCertificate_showInMarketplaceClicked':
                 tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL);