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

Show item name when sending item

Browse source
This commit is contained in:
Zach Fox 2018-11-27 10:19:14 -08:00
parent a9fd443f28
commit 67dfccafec
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
View file

@ -107,6 +107,14 @@ Item {
root.nextActiveView = 'paymentFailure'; root.nextActiveView = 'paymentFailure';
} }
} }
onCertificateInfoResult: {
if (result.status !== 'success') {
console.log("Failed to get certificate info", result.data.message);
} else {
root.assetName = result.data.marketplace_item_name;
}
}
} }
Connections { Connections {
@ -864,7 +872,7 @@ Item {
RalewaySemiBold { RalewaySemiBold {
id: sendAssetText_sendAssetStep; id: sendAssetText_sendAssetStep;
text: sendAssetStep.referrer === "payIn" && root.assetCertID !== "" ? "Send Item:" : text: sendAssetStep.referrer === "payIn" && root.assetCertID !== "" ? "Send \"" + root.assetName + "\":" :
(root.assetCertID === "" ? "Send Money To:" : "Gift \"" + root.assetName + "\" To:"); (root.assetCertID === "" ? "Send Money To:" : "Gift \"" + root.assetName + "\" To:");
// Anchors // Anchors
anchors.top: parent.top; anchors.top: parent.top;
@ -1429,7 +1437,7 @@ Item {
Item { Item {
id: giftContainer_paymentSuccess; id: giftContainer_paymentSuccess;
visible: root.assetCertID !== "" && sendAssetStep.referrer !== "payIn"; visible: root.assetCertID !== "";
anchors.top: sendToContainer_paymentSuccess.bottom; anchors.top: sendToContainer_paymentSuccess.bottom;
anchors.topMargin: 8; anchors.topMargin: 8;
anchors.left: parent.left; anchors.left: parent.left;
@ -1440,7 +1448,7 @@ Item {
RalewaySemiBold { RalewaySemiBold {
id: gift_paymentSuccess; id: gift_paymentSuccess;
text: "Gift:"; text: sendAssetStep.referrer === "payIn" ? "Item:" : "Gift:";
// Anchors // Anchors
anchors.top: parent.top; anchors.top: parent.top;
anchors.left: parent.left; anchors.left: parent.left;
@ -1526,7 +1534,7 @@ Item {
RalewaySemiBold { RalewaySemiBold {
id: optionalMessage_paymentSuccess; id: optionalMessage_paymentSuccess;
visible: root.assetCertID === "" || sendAssetStep.referrer === "payIn"; visible: root.assetCertID === "";
text: optionalMessage.text; text: optionalMessage.text;
// Anchors // Anchors
anchors.top: amountContainer_paymentSuccess.visible ? amountContainer_paymentSuccess.bottom : sendToContainer_paymentSuccess.bottom; anchors.top: amountContainer_paymentSuccess.visible ? amountContainer_paymentSuccess.bottom : sendToContainer_paymentSuccess.bottom;
@ -1895,6 +1903,7 @@ Item {
amountTextField.text = message.amount || 1; amountTextField.text = message.amount || 1;
} else { } else {
amountTextField.text = ""; amountTextField.text = "";
Commerce.certificateInfo(root.assetCertID);
} }
sendAssetStep.referrer = "payIn"; sendAssetStep.referrer = "payIn";
sendAssetStep.selectedRecipientNodeID = ""; sendAssetStep.selectedRecipientNodeID = "";