From 11f897beb098e0dd0464370ab34bb09adcc1fc01 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 20 Feb 2018 10:39:36 -0800 Subject: [PATCH] Initial app support --- interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 2 +- scripts/system/marketplaces/marketplaces.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index 891c8142bf..bf73decf9b 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -530,7 +530,7 @@ Rectangle { // "Buy" button HifiControlsUit.Button { id: buyButton; - visible: !(root.itemType === "avatar" && viewInMyPurchasesButton.visible) + visible: !((root.itemType === "avatar" || root.itemType === "app") && viewInMyPurchasesButton.visible) enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived) || (!root.isCertified); color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue; colorScheme: hifi.colorSchemes.light; diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index c61272119d..45085b2d45 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -550,7 +550,11 @@ var selectionDisplay = null; // for gridTool.js to ignore break; case 'checkout_rezClicked': case 'purchases_rezClicked': - rezEntity(message.itemHref, message.itemType); + if (message.itemType === "app") { + + } else { + rezEntity(message.itemHref, message.itemType); + } break; case 'header_marketplaceImageClicked': case 'purchases_backClicked':