Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 13:41:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Minor changes found by Chang

Browse source
This commit is contained in:
Zach Fox 2018-11-02 09:33:06 -07:00
parent 4a56f769e5
commit 2b50c40224
3 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -937,9 +937,9 @@ Rectangle {
} }
} }
// "Continue Shopping" button // "Continue" button
HifiControlsUit.Button { HifiControlsUit.Button {
id: continueShoppingButton; id: continueButton;
color: hifi.buttons.noneBorderlessGray; color: hifi.buttons.noneBorderlessGray;
colorScheme: hifi.colorSchemes.light; colorScheme: hifi.colorSchemes.light;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
@ -947,9 +947,9 @@ Rectangle {
anchors.right: parent.right; anchors.right: parent.right;
width: 193; width: 193;
height: 44; height: 44;
text: "Continue Shopping"; text: "Continue";
onClicked: { onClicked: {
sendToScript({method: 'checkout_continueShopping', itemId: itemId}); sendToScript({method: 'checkout_continue', itemId: itemId});
} }
} }
} }
@ -1038,7 +1038,7 @@ Rectangle {
width: parent.width/2 - anchors.leftMargin*2; width: parent.width/2 - anchors.leftMargin*2;
text: "Back to Marketplace"; text: "Back to Marketplace";
onClicked: { onClicked: {
sendToScript({method: 'checkout_continueShopping', itemId: itemId}); sendToScript({method: 'checkout_continue', itemId: itemId});
} }
} }
} }

53
interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
View file

@ -28,7 +28,7 @@ Rectangle {
property string itemName: "--"; property string itemName: "--";
property string itemOwner: "--"; property string itemOwner: "--";
property string itemEdition: "--"; property string itemEdition: "--";
property string dateOfPurchase: "--"; property string dateAcquired: "--";
property string itemCost: "--"; property string itemCost: "--";
property string certTitleTextColor: hifi.colors.darkGray; property string certTitleTextColor: hifi.colors.darkGray;
property string certTextColor: hifi.colors.white; property string certTextColor: hifi.colors.white;
@ -64,7 +64,7 @@ Rectangle {
root.itemName = ""; root.itemName = "";
root.itemEdition = ""; root.itemEdition = "";
root.itemOwner = ""; root.itemOwner = "";
root.dateOfPurchase = ""; root.dateAcquired = "";
root.itemCost = ""; root.itemCost = "";
errorText.text = "Information about this certificate is currently unavailable. Please try again later."; errorText.text = "Information about this certificate is currently unavailable. Please try again later.";
} }
@ -77,8 +77,9 @@ Rectangle {
// "\u2022" is the Unicode character 'BULLET' - it's what's used in password fields on the web, etc // "\u2022" is the Unicode character 'BULLET' - it's what's used in password fields on the web, etc
root.itemOwner = root.isMyCert ? Account.username : root.itemOwner = root.isMyCert ? Account.username :
"\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022"; "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
root.dateOfPurchase = root.isMyCert ? getFormattedDate(result.data.transfer_created_at * 1000) : "Undisclosed"; root.dateAcquired = root.isMyCert ? getFormattedDate(result.data.transfer_created_at * 1000) : "Undisclosed";
root.itemCost = (root.isMyCert && result.data.cost !== undefined) ? result.data.cost : "Undisclosed"; root.itemCost = (root.isMyCert && result.data.cost !== undefined) ?
(parseInt(result.data.cost) > 0 ? result.data.cost : "Free") : "Undisclosed";
} }
if (root.certInfoReplaceMode > 4) { if (root.certInfoReplaceMode > 4) {
root.itemEdition = result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run); root.itemEdition = result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run);
@ -86,7 +87,7 @@ Rectangle {
if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
if (root.isMyCert) { if (root.isMyCert) {
errorText.text = "This item is an uncertified copy of an item you purchased."; errorText.text = "This item is an uncertified copy of an item you acquired.";
} else { } else {
errorText.text = "The person who placed this item doesn't own it."; errorText.text = "The person who placed this item doesn't own it.";
} }
@ -102,8 +103,8 @@ Rectangle {
showInMarketplaceButton.visible = false; showInMarketplaceButton.visible = false;
// "Edition" text previously set above in this function // "Edition" text previously set above in this function
// "Owner" text previously set above in this function // "Owner" text previously set above in this function
// "Purchase Date" text previously set above in this function // "Date Acquired" text previously set above in this function
// "Purchase Price" text previously set above in this function // "Original Price" text previously set above in this function
if (result.data.invalid_reason) { if (result.data.invalid_reason) {
errorText.text = result.data.invalid_reason; errorText.text = result.data.invalid_reason;
} }
@ -117,8 +118,8 @@ Rectangle {
showInMarketplaceButton.visible = true; showInMarketplaceButton.visible = true;
// "Edition" text previously set above in this function // "Edition" text previously set above in this function
// "Owner" text previously set above in this function // "Owner" text previously set above in this function
// "Purchase Date" text previously set above in this function // "Date Acquired" text previously set above in this function
// "Purchase Price" text previously set above in this function // "Original Price" text previously set above in this function
errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " + errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
"this entity will be cleaned up by the domain."; "this entity will be cleaned up by the domain.";
} }
@ -145,8 +146,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
// "Edition" text will be set in "onCertificateInfoResult()" // "Edition" text will be set in "onCertificateInfoResult()"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Purchase Date" text will be set in "onCertificateInfoResult()" // "Date Acquired" text will be set in "onCertificateInfoResult()"
// "Purchase Price" text will be set in "onCertificateInfoResult()" // "Original Price" text will be set in "onCertificateInfoResult()"
errorText.text = ""; errorText.text = "";
} else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
root.useGoldCert = false; root.useGoldCert = false;
@ -160,7 +161,7 @@ Rectangle {
root.itemName = ""; root.itemName = "";
root.itemEdition = ""; root.itemEdition = "";
root.itemOwner = ""; root.itemOwner = "";
root.dateOfPurchase = ""; root.dateAcquired = "";
root.itemCost = ""; root.itemCost = "";
errorText.text = "Your request to inspect this item timed out. Please try again later."; errorText.text = "Your request to inspect this item timed out. Please try again later.";
} else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED } else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
@ -175,8 +176,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
// "Edition" text will be set in "onCertificateInfoResult()" // "Edition" text will be set in "onCertificateInfoResult()"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Purchase Date" text will be set in "onCertificateInfoResult()" // "Date Acquired" text will be set in "onCertificateInfoResult()"
// "Purchase Price" text will be set in "onCertificateInfoResult()" // "Original Price" text will be set in "onCertificateInfoResult()"
errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item."; errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
} else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
root.useGoldCert = false; root.useGoldCert = false;
@ -190,8 +191,8 @@ Rectangle {
// "Item Name" text will be set in "onCertificateInfoResult()" // "Item Name" text will be set in "onCertificateInfoResult()"
root.itemEdition = "Uncertified Copy" root.itemEdition = "Uncertified Copy"
// "Owner" text will be set in "onCertificateInfoResult()" // "Owner" text will be set in "onCertificateInfoResult()"
// "Purchase Date" text will be set in "onCertificateInfoResult()" // "Date Acquired" text will be set in "onCertificateInfoResult()"
// "Purchase Price" text will be set in "onCertificateInfoResult()" // "Original Price" text will be set in "onCertificateInfoResult()"
// "Error Text" text will be set in "onCertificateInfoResult()" // "Error Text" text will be set in "onCertificateInfoResult()"
} else { } else {
console.log("Unknown certificate status received from ledger signal!"); console.log("Unknown certificate status received from ledger signal!");
@ -485,8 +486,8 @@ Rectangle {
} }
RalewayRegular { RalewayRegular {
id: dateOfPurchaseHeader; id: dateAcquiredHeader;
text: "PURCHASE DATE"; text: "DATE ACQUIRED";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors
@ -500,15 +501,15 @@ Rectangle {
color: hifi.colors.darkGray; color: hifi.colors.darkGray;
} }
AnonymousProRegular { AnonymousProRegular {
id: dateOfPurchase; id: dateAcquired;
text: root.dateOfPurchase; text: root.dateAcquired;
// Text size // Text size
size: 18; size: 18;
// Anchors // Anchors
anchors.top: dateOfPurchaseHeader.bottom; anchors.top: dateAcquiredHeader.bottom;
anchors.topMargin: 8; anchors.topMargin: 8;
anchors.left: dateOfPurchaseHeader.left; anchors.left: dateAcquiredHeader.left;
anchors.right: dateOfPurchaseHeader.right; anchors.right: dateAcquiredHeader.right;
height: paintedHeight; height: paintedHeight;
// Style // Style
color: root.infoTextColor; color: root.infoTextColor;
@ -516,7 +517,7 @@ Rectangle {
RalewayRegular { RalewayRegular {
id: priceHeader; id: priceHeader;
text: "PURCHASE PRICE"; text: "ORIGINAL PRICE";
// Text size // Text size
size: 16; size: 16;
// Anchors // Anchors
@ -530,7 +531,7 @@ Rectangle {
} }
HiFiGlyphs { HiFiGlyphs {
id: hfcGlyph; id: hfcGlyph;
visible: priceText.text !== "Undisclosed" && priceText.text !== ""; visible: priceText.text !== "Undisclosed" && priceText.text !== "" && priceText.text !== "Free";
text: hifi.glyphs.hfc; text: hifi.glyphs.hfc;
// Size // Size
size: 24; size: 24;
@ -618,7 +619,7 @@ Rectangle {
root.itemName = "--"; root.itemName = "--";
root.itemOwner = "--"; root.itemOwner = "--";
root.itemEdition = "--"; root.itemEdition = "--";
root.dateOfPurchase = "--"; root.dateAcquired = "--";
root.marketplaceUrl = ""; root.marketplaceUrl = "";
root.itemCost = "--"; root.itemCost = "--";
root.isMyCert = false; root.isMyCert = false;

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

@ -554,7 +554,7 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
case 'checkout_itemLinkClicked': case 'checkout_itemLinkClicked':
openMarketplace(message.itemId); openMarketplace(message.itemId);
break; break;
case 'checkout_continueShopping': case 'checkout_continue':
openMarketplace(); openMarketplace();
break; break;
case 'checkout_rezClicked': case 'checkout_rezClicked':