Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-05 21:41:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show 'invalidated' label for valid = false

Browse source
This commit is contained in:
Zach Fox 2018-05-14 13:34:20 -07:00
parent fbec285923
commit 83cae54601
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -465,7 +465,7 @@ Item {
Item { Item {
id: statusContainer; id: statusContainer;
visible: root.purchaseStatus === "pending" || root.purchaseStatus === "invalidated" || root.numberSold > -1; visible: root.purchaseStatus === "pending" || !root.valid || root.numberSold > -1;
anchors.left: itemName.left; anchors.left: itemName.left;
anchors.right: itemName.right; anchors.right: itemName.right;
anchors.top: itemName.bottom; anchors.top: itemName.bottom;
@ -482,7 +482,7 @@ Item {
text: { text: {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
"PENDING..." "PENDING..."
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
"INVALIDATED" "INVALIDATED"
} else if (root.numberSold > -1) { } else if (root.numberSold > -1) {
("Sales: " + root.numberSold + "/" + (root.limitedRun === -1 ? "\u221e" : root.limitedRun)) ("Sales: " + root.numberSold + "/" + (root.limitedRun === -1 ? "\u221e" : root.limitedRun))
@ -494,7 +494,7 @@ Item {
color: { color: {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
hifi.colors.blueAccent hifi.colors.blueAccent
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
hifi.colors.redAccent hifi.colors.redAccent
} else { } else {
hifi.colors.baseGray hifi.colors.baseGray
@ -508,7 +508,7 @@ Item {
text: { text: {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
hifi.glyphs.question hifi.glyphs.question
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
hifi.glyphs.question hifi.glyphs.question
} else { } else {
"" ""
@ -525,7 +525,7 @@ Item {
color: { color: {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
hifi.colors.blueAccent hifi.colors.blueAccent
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
hifi.colors.redAccent hifi.colors.redAccent
} else { } else {
hifi.colors.baseGray hifi.colors.baseGray
@ -540,7 +540,7 @@ Item {
onClicked: { onClicked: {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
sendToPurchases({method: 'showPendingLightbox'}); sendToPurchases({method: 'showPendingLightbox'});
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
sendToPurchases({method: 'showInvalidatedLightbox'}); sendToPurchases({method: 'showInvalidatedLightbox'});
} }
} }
@ -548,7 +548,7 @@ Item {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
statusText.color = hifi.colors.blueHighlight; statusText.color = hifi.colors.blueHighlight;
statusIcon.color = hifi.colors.blueHighlight; statusIcon.color = hifi.colors.blueHighlight;
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
statusText.color = hifi.colors.redAccent; statusText.color = hifi.colors.redAccent;
statusIcon.color = hifi.colors.redAccent; statusIcon.color = hifi.colors.redAccent;
} }
@ -557,7 +557,7 @@ Item {
if (root.purchaseStatus === "pending") { if (root.purchaseStatus === "pending") {
statusText.color = hifi.colors.blueAccent; statusText.color = hifi.colors.blueAccent;
statusIcon.color = hifi.colors.blueAccent; statusIcon.color = hifi.colors.blueAccent;
} else if (root.purchaseStatus === "invalidated") { } else if (!root.valid) {
statusText.color = hifi.colors.redHighlight; statusText.color = hifi.colors.redHighlight;
statusIcon.color = hifi.colors.redHighlight; statusIcon.color = hifi.colors.redHighlight;
} }
@ -647,7 +647,6 @@ Item {
width: 160; width: 160;
height: 40; height: 40;
enabled: root.hasPermissionToRezThis && enabled: root.hasPermissionToRezThis &&
root.purchaseStatus !== "invalidated" &&
MyAvatar.skeletonModelURL !== root.itemHref && MyAvatar.skeletonModelURL !== root.itemHref &&
root.valid; root.valid;