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

Progress

Browse source
This commit is contained in:
Zach Fox 2017-08-24 15:39:26 -07:00
parent e2c74d8b88
commit bdc1f7b236
1 changed files with 97 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,18 +54,16 @@ Rectangle {
onBuyResult: { onBuyResult: {
if (result.status !== 'success') { if (result.status !== 'success') {
buyButton.text = result.message; console.log("ZRF " + JSON.stringify(result));
buyButton.enabled = false; failureErrorText.text = "Here's some more info about the error:<br><br>" + (result.message);
root.activeView = "checkoutFailure";
} else { } else {
if (urlHandler.canHandleUrl(itemHref)) { root.activeView = "checkoutSuccess";
urlHandler.handleUrl(itemHref);
}
sendToScript({method: 'checkout_buySuccess', itemId: itemId});
} }
} }
onBalanceResult: { onBalanceResult: {
if (result.status !== 'success') { if (result.status !== 'success') {
console.log("Failed to get balance", result.message); console.log("Failed to get balance", result.data.message);
} else { } else {
balanceReceived = true; balanceReceived = true;
hfcBalanceText.text = parseFloat(result.data.balance/100).toFixed(2); hfcBalanceText.text = parseFloat(result.data.balance/100).toFixed(2);
@ -74,7 +72,7 @@ Rectangle {
} }
onInventoryResult: { onInventoryResult: {
if (result.status !== 'success') { if (result.status !== 'success') {
console.log("Failed to get inventory", result.message); console.log("Failed to get inventory", result.data.message);
} else { } else {
inventoryReceived = true; inventoryReceived = true;
console.log('inventory fixme', JSON.stringify(result)); console.log('inventory fixme', JSON.stringify(result));
@ -103,7 +101,7 @@ Rectangle {
// Title Bar text // Title Bar text
RalewaySemiBold { RalewaySemiBold {
id: titleBarText; id: titleBarText;
text: "WALLET"; text: "MARKETPLACE";
// Text size // Text size
size: hifi.fontSizes.overlayTitle; size: hifi.fontSizes.overlayTitle;
// Anchors // Anchors
@ -465,7 +463,7 @@ Rectangle {
// ACTION BUTTONS AND TEXT START // ACTION BUTTONS AND TEXT START
// //
Item { Item {
id: actionButtonsContainer; id: checkoutActionButtonsContainer;
// Size // Size
width: root.width; width: root.width;
height: 130; height: 130;
@ -476,7 +474,7 @@ Rectangle {
// "Cancel" button // "Cancel" button
HifiControlsUit.Button { HifiControlsUit.Button {
id: cancelButton; id: cancelPurchaseButton;
color: hifi.buttons.black; color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
anchors.top: parent.top; anchors.top: parent.top;
@ -505,21 +503,24 @@ Rectangle {
width: parent.width/2 - anchors.rightMargin*2; width: parent.width/2 - anchors.rightMargin*2;
text: (inventoryReceived && balanceReceived) ? ("Buy") : "--"; text: (inventoryReceived && balanceReceived) ? ("Buy") : "--";
onClicked: { onClicked: {
buyButton.enabled = false;
commerce.buy(itemId, itemPriceFull); commerce.buy(itemId, itemPriceFull);
} }
} }
RalewayRegular { RalewayRegular {
id: buyText; id: buyText;
text: "This item will be added to your Inventory, which can be accessed from Marketplace."; text: (balanceAfterPurchase >= 0) ? "This item will be added to your <b>Inventory</b>, which can be accessed from <b>Marketplace</b>." : "OUT OF MONEY LOL";
// Text size // Text size
size: 24; size: 20;
// Anchors // Anchors
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: 10; anchors.bottomMargin: 10;
height: paintedHeight; height: paintedHeight;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 10;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 10;
// Style // Style
color: hifi.colors.faintGray; color: hifi.colors.faintGray;
wrapMode: Text.WordWrap; wrapMode: Text.WordWrap;
@ -549,7 +550,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
@ -567,7 +568,7 @@ Rectangle {
} }
Item { Item {
id: actionButtonsContainer; id: checkoutSuccessActionButtonsContainer;
// Size // Size
width: root.width; width: root.width;
height: 130; height: 130;
@ -576,7 +577,6 @@ Rectangle {
anchors.topMargin: 10; anchors.topMargin: 10;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
height: 50;
// "Rez Now!" button // "Rez Now!" button
HifiControlsUit.Button { HifiControlsUit.Button {
@ -640,14 +640,7 @@ Rectangle {
width: parent.width/2 - anchors.rightMargin*2; width: parent.width/2 - anchors.rightMargin*2;
text: "Continue Shopping"; text: "Continue Shopping";
onClicked: { onClicked: {
if (!alreadyOwned) { sendToScript({method: 'checkout_continueShopping', itemId: itemId});
commerce.buy(itemId, parseFloat(itemPriceText.text*100));
} else {
if (urlHandler.canHandleUrl(itemHref)) {
urlHandler.handleUrl(itemHref);
}
sendToScript({method: 'checkout_continueShopping', itemId: itemId});
}
} }
} }
} }
@ -656,6 +649,86 @@ Rectangle {
// CHECKOUT SUCCESS END // CHECKOUT SUCCESS END
// //
//
// CHECKOUT FAILURE START
//
Item {
id: checkoutFailure;
visible: root.activeView === "checkoutFailure";
anchors.top: titleBarContainer.bottom;
anchors.bottom: root.bottom;
anchors.left: parent.left;
anchors.right: parent.right;
RalewayRegular {
id: failureHeaderText;
text: "<b>Purchase Failed.</b><br>Your Inventory and HFC balance haven't changed.";
// Text size
size: 24;
// Anchors
anchors.top: parent.top;
anchors.topMargin: 80;
height: paintedHeight;
anchors.left: parent.left;
anchors.right: parent.right;
// Style
color: hifi.colors.faintGray;
wrapMode: Text.WordWrap;
// Alignment
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
}
RalewayRegular {
id: failureErrorText;
// Text size
size: 16;
// Anchors
anchors.top: failureHeaderText.bottom;
anchors.topMargin: 35;
height: paintedHeight;
anchors.left: parent.left;
anchors.right: parent.right;
// Style
color: hifi.colors.faintGray;
wrapMode: Text.WordWrap;
// Alignment
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
}
Item {
id: backToMarketplaceButtonContainer;
// Size
width: root.width;
height: 130;
// Anchors
anchors.left: parent.left;
anchors.bottom: parent.bottom;
anchors.bottomMargin: 8;
// "Back to Marketplace" button
HifiControlsUit.Button {
id: backToMarketplaceButton;
color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark;
anchors.top: parent.top;
anchors.topMargin: 3;
anchors.bottom: parent.bottom;
anchors.bottomMargin: 3;
anchors.right: parent.right;
anchors.rightMargin: 20;
width: parent.width/2 - anchors.rightMargin*2;
text: "Back to Marketplace";
onClicked: {
sendToScript({method: 'checkout_continueShopping', itemId: itemId});
}
}
}
}
//
// CHECKOUT FAILURE END
//
// //
// FUNCTION DEFINITIONS START // FUNCTION DEFINITIONS START
// //