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

Progress!

Browse source
This commit is contained in:
Zach Fox 2017-08-25 12:13:51 -07:00
parent e606e3dfb3
commit dd9bb17791
1 changed files with 55 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ Rectangle {
} }
} }
onKeyFilePathResult: { onKeyFilePathIfExistsResult: {
if (path === "" && root.activeView !== "notSetUp") { if (path === "" && root.activeView !== "notSetUp") {
root.activeView = "notSetUp"; root.activeView = "notSetUp";
} }
@ -52,7 +52,6 @@ Rectangle {
onBuyResult: { onBuyResult: {
if (result.status !== 'success') { if (result.status !== 'success') {
console.log("ZRF " + JSON.stringify(result));
failureErrorText.text = "Here's some more info about the error:<br><br>" + (result.message); failureErrorText.text = "Here's some more info about the error:<br><br>" + (result.message);
root.activeView = "checkoutFailure"; root.activeView = "checkoutFailure";
} else { } else {
@ -522,6 +521,54 @@ Rectangle {
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
} }
} }
// "Balance After Purchase" container
Item {
id: balanceAfterPurchaseContainer;
// Anchors
anchors.top: totalCostContainer.bottom;
anchors.topMargin: 16;
anchors.left: parent.left;
anchors.leftMargin: 16;
anchors.right: parent.right;
anchors.rightMargin: 16;
height: childrenRect.height;
RalewaySemiBold {
id: balanceAfterPurchaseTextLabel;
text: "Balance After Purchase:";
// Anchors
anchors.top: parent.top;
anchors.left: parent.left;
width: paintedWidth;
height: paintedHeight;
// Text size
size: 20;
// Style
color: hifi.colors.lightGrayText;
// Alignment
horizontalAlignment: Text.AlignLeft;
verticalAlignment: Text.AlignVCenter;
}
RalewayRegular {
id: balanceAfterPurchaseText;
text: balanceAfterPurchase + " HFC";
// Text size
size: balanceAfterPurchaseTextLabel.size;
// Anchors
anchors.top: parent.top;
anchors.left: totalCostTextLabel.right;
anchors.leftMargin: 16;
anchors.right: parent.right;
anchors.rightMargin: 16;
height: paintedHeight;
// Style
color: (balanceAfterPurchase >= 0) ? hifi.colors.lightGrayText : hifi.colors.redHighlight;
// Alignment
horizontalAlignment: Text.AlignRight;
verticalAlignment: Text.AlignVCenter;
}
}
} }
// //
// ITEM DESCRIPTION END // ITEM DESCRIPTION END
@ -535,7 +582,7 @@ Rectangle {
id: checkoutActionButtonsContainer; id: checkoutActionButtonsContainer;
// Size // Size
width: root.width; width: root.width;
height: root.alreadyOwned ? 180 : 130; height: root.alreadyOwned ? 200 : 130;
// Anchors // Anchors
anchors.left: parent.left; anchors.left: parent.left;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
@ -566,8 +613,8 @@ Rectangle {
id: cancelPurchaseButton; id: cancelPurchaseButton;
color: hifi.buttons.black; color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
anchors.top: parent.top; anchors.top: goToInventoryButton.visible ? goToInventoryButton.bottom : parent.top;
anchors.topMargin: 3; anchors.topMargin: goToInventoryButton.visible ? 20 : 3;
height: 40; height: 40;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 20; anchors.leftMargin: 20;
@ -584,8 +631,8 @@ Rectangle {
enabled: balanceAfterPurchase >= 0 && inventoryReceived && balanceReceived; enabled: balanceAfterPurchase >= 0 && inventoryReceived && balanceReceived;
color: hifi.buttons.black; color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
anchors.top: parent.top; anchors.top: goToInventoryButton.visible ? goToInventoryButton.bottom : parent.top;
anchors.topMargin: 3; anchors.topMargin: goToInventoryButton.visible ? 20 : 3;
height: 40; height: 40;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 20; anchors.rightMargin: 20;
@ -641,7 +688,7 @@ Rectangle {
RalewayRegular { RalewayRegular {
id: completeText; id: completeText;
text: "<b>Purchase Complete.</b><br>You bought " + (itemNameText.text) + " by " (itemAuthorText.text); text: "<b>Purchase Complete.</b><br>You bought " + (itemNameText.text) + " by " + (itemAuthorText.text);
// Text size // Text size
size: 24; size: 24;
// Anchors // Anchors