From cc4726b24b89f7c53311b4e3ba9bc619b6aabff1 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 14 Mar 2018 15:47:19 -0700
Subject: [PATCH] Some bugfixes

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml   | 4 ++--
 .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml   | 4 ++--
 interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 463ba73071..d64e31ddc9 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -588,7 +588,7 @@ Rectangle {
             HifiControlsUit.Button {
                 id: buyButton;
                 visible: !((root.itemType === "avatar" || root.itemType === "app") && viewInMyPurchasesButton.visible)
-                enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived && availableUpdatesReceived) || (!root.isCertified);
+                enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived && availableUpdatesReceived) || (!root.isCertified) || root.isUpdating;
                 color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: viewInMyPurchasesButton.visible ? viewInMyPurchasesButton.bottom :
@@ -1063,7 +1063,7 @@ Rectangle {
                 root.itemHref = message.params.itemHref;
                 root.referrer = message.params.referrer;
                 root.itemAuthor = message.params.itemAuthor;
-                root.itemEdition = message.params.itemEdition;
+                root.itemEdition = message.params.itemEdition || -1;
                 refreshBuyUI();
             break;
             default:
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 38b0e16846..fc2e3fa24c 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -368,7 +368,7 @@ Item {
 
         Item {
             id: statusContainer;
-            visible: root.purchaseStatus === "pending" || root.purchaseStatus === "invalidated" || root.purchaseStatusChanged;
+            visible: root.purchaseStatus === "pending" || root.purchaseStatus === "invalidated" || root.purchaseStatusChanged || root.numberSold > -1;
             anchors.left: itemName.left;
             anchors.top: certificateContainer.bottom;
             anchors.topMargin: 8;
@@ -387,7 +387,7 @@ Item {
                             "PENDING..."
                         } else if (root.purchaseStatus === "invalidated") {
                             "INVALIDATED"
-                        } else if (root.numberSold !== -1) {
+                        } else if (root.numberSold > -1) {
                             ("Sales: " + root.numberSold + "/" + (root.limitedRun === -1 ? "\u221e" : root.limitedRun))
                         } else {
                             ""
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 88339e172b..3b03b41da9 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -740,9 +740,8 @@ Rectangle {
             } else {
                 currentItemType = "unknown";
             }
-
             if (filterBar.primaryFilter_displayName !== "" &&
-                ((filterBar.primaryFilter_displayName === "Updatable" && tempPurchasesModel.get(i).upgradeUrl !== "") ||
+                ((filterBar.primaryFilter_displayName === "Updatable" && tempPurchasesModel.get(i).upgrade_url === "") ||
                 (filterBar.primaryFilter_displayName !== "Updatable" && filterBar.primaryFilter_filterName.toLowerCase() !== currentItemType.toLowerCase()))) {
                 tempPurchasesModel.remove(i);
                 i--;