Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial app support

Browse source
This commit is contained in:
Zach Fox 2018-02-20 10:39:36 -08:00
parent c4e9c76258
commit 11f897beb0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/commerce/checkout/Checkout.qml
View file

@ -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;

6
scripts/system/marketplaces/marketplaces.js
View file

@ -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':