From acdd1e32e4080ea1844a07b616e22f4ecb867e22 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 9 Oct 2017 12:11:07 -0700
Subject: [PATCH] First round

---
 .../qml/hifi/commerce/checkout/Checkout.qml          |  4 +++-
 .../qml/hifi/commerce/purchases/Purchases.qml        | 12 ++++++------
 .../resources/qml/hifi/commerce/wallet/Wallet.qml    |  4 +++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 09c2f6fa76..38a938c535 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -79,6 +79,8 @@ Rectangle {
                 failureErrorText.text = result.message;
                 root.activeView = "checkoutFailure";
             } else {
+                root.itemHref = result.data.download_url;
+                console.log("ZRF TEST " + root.itemHref);
                 root.activeView = "checkoutSuccess";
             }
         }
@@ -125,7 +127,7 @@ Rectangle {
         id: notSetUpTimer;
         interval: 200;
         onTriggered: {
-            sendToScript({method: 'checkout_walletNotSetUp'});
+            sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId});
         }
     }
 
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 990fd348c6..ea32c139d4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -78,6 +78,10 @@ Rectangle {
         onInventoryResult: {
             purchasesReceived = true;
 
+            if (root.pendingInventoryReply) {
+                inventoryTimer.start();
+            }
+
             if (result.status !== 'success') {
                 console.log("Failed to get purchases", result.message);
             } else {
@@ -98,10 +102,6 @@ Rectangle {
                 previousPurchasesModel.append(inventoryResult);
 
                 buildFilteredPurchasesModel();
-
-                if (root.pendingInventoryReply) {
-                    inventoryTimer.start();
-                }
             }
 
             root.pendingInventoryReply = false;
@@ -112,7 +112,7 @@ Rectangle {
         id: notSetUpTimer;
         interval: 200;
         onTriggered: {
-            sendToScript({method: 'checkout_walletNotSetUp'});
+            sendToScript({method: 'purchases_walletNotSetUp'});
         }
     }
 
@@ -426,7 +426,7 @@ Rectangle {
                 itemName: title;
                 itemId: id;
                 itemPreviewImageUrl: preview;
-                itemHref: root_file_url;
+                itemHref: download_url;
                 purchaseStatus: status;
                 purchaseStatusChanged: statusChanged;
                 itemEdition: model.edition_number;
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 9056d5bed3..9beadd3361 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -176,6 +176,8 @@ Rectangle {
                         commerce.getWalletStatus();
                     } else if (msg.referrer === 'purchases') {
                         sendToScript({method: 'goToPurchases'});
+                    } else {
+                        sendToScript({method: 'goToMarketplaceItemPage', itemId: msg.referrer});
                     }
                 } else if (msg.method === 'walletSetup_raiseKeyboard') {
                     root.keyboardRaised = true;
@@ -283,7 +285,7 @@ Rectangle {
         Connections {
             onSendSignalToParent: {
                 if (msg.method === "authSuccess") {
-                    root.activeView = "walletHome";
+                    commerce.getWalletStatus();
                 } else {
                     sendToScript(msg);
                 }