Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:19:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PurchasedItem logic

Browse source
This commit is contained in:
Zach Fox 2018-05-14 09:54:05 -07:00
parent 81ebb681bb
commit 2a1c2ba7b1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -49,6 +49,7 @@ Item {
property string upgradeTitle; property string upgradeTitle;
property bool updateAvailable: root.upgradeUrl !== "" && !root.isShowingMyItems; property bool updateAvailable: root.upgradeUrl !== "" && !root.isShowingMyItems;
property bool isShowingMyItems; property bool isShowingMyItems;
property bool valid;
property string originalStatusText; property string originalStatusText;
property string originalStatusColor; property string originalStatusColor;
@ -239,6 +240,7 @@ Item {
width: 62; width: 62;
onLoaded: { onLoaded: {
item.enabled = root.valid;
item.buttonGlyphText = hifi.glyphs.gift; item.buttonGlyphText = hifi.glyphs.gift;
item.buttonText = "Gift"; item.buttonText = "Gift";
item.buttonClicked = function() { item.buttonClicked = function() {
@ -646,7 +648,8 @@ Item {
height: 40; height: 40;
enabled: root.hasPermissionToRezThis && enabled: root.hasPermissionToRezThis &&
root.purchaseStatus !== "invalidated" && root.purchaseStatus !== "invalidated" &&
MyAvatar.skeletonModelURL !== root.itemHref; MyAvatar.skeletonModelURL !== root.itemHref &&
root.valid;
onHoveredChanged: { onHoveredChanged: {
if (hovered) { if (hovered) {

1
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -616,6 +616,7 @@ Rectangle {
upgradeTitle: model.upgrade_title; upgradeTitle: model.upgrade_title;
itemType: model.itemType; itemType: model.itemType;
isShowingMyItems: root.isShowingMyItems; isShowingMyItems: root.isShowingMyItems;
valid: model.valid;
anchors.topMargin: 10; anchors.topMargin: 10;
anchors.bottomMargin: 10; anchors.bottomMargin: 10;