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

Use asynchronous commerce API

Browse source
This commit is contained in:
Zach Fox 2017-08-11 16:17:13 -07:00
parent 56d57ea160
commit 9120e678f1
2 changed files with 46 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
interface/resources/qml/hifi/commerce/Checkout.qml
View file

@ -24,40 +24,43 @@ Rectangle {
HifiConstants { id: hifi; }
id: checkoutRoot;
property string itemId;
property string itemHref;
property int balanceAfterPurchase: commerce.balance() - parseInt(itemPriceText.text, 10);
property bool alreadyOwned: checkAlreadyOwned(itemId);
property string itemId: "";
property string itemHref: "";
property int hfcBalance: 0;
property int balanceAfterPurchase: 0;
property bool alreadyOwned: false;
// Style
color: hifi.colors.baseGray;
Hifi.QmlCommerce {
id: commerce;
onBuyResult: {
/*
if (buyFailed) {
if (failureMessage.length) {
sendToScript({method: 'checkout_cancelClicked', params: itemId});
} else {
var success = commerce.buy(itemId, parseInt(itemPriceText.text));
sendToScript({method: 'checkout_buyClicked', success: success, itemId: itemId, itemHref: itemHref});
if (success) {
if (urlHandler.canHandleUrl(itemHref)) {
urlHandler.handleUrl(itemHref);
}
if (urlHandler.canHandleUrl(itemHref)) {
urlHandler.handleUrl(itemHref);
}
}
*/
if (failureMessage.length) {
console.log('buy failed', failureMessage);
//fixme sendToScript({method: 'checkout_cancelClicked', params: itemId});
} else {
console.log('buy ok');
//fixme sendToScript({method: 'checkout_buyClicked', success: , itemId: itemId, itemHref: itemHref});
}
}
// FIXME: remove these two after testing
onBalanceResult: console.log('balance', balance, failureMessage);
onInventoryResult: console.log('inventory', inventory, failureMessage);
onBalanceResult: {
if (failureMessage.length) {
console.log("Failed to get balance", failureMessage);
} else {
hfcBalance = balance;
balanceAfterPurchase = hfcBalance - parseInt(itemPriceText.text, 10);
}
}
onInventoryResult: {
if (failureMessage.length) {
console.log("Failed to get inventory", failureMessage);
} else {
if (inventory.indexOf(itemId) !== -1) {
alreadyOwned = true;
} else {
alreadyOwned = false;
}
}
}
}
//
@ -229,7 +232,7 @@ Rectangle {
}
RalewayRegular {
id: hfcBalanceText;
text: commerce.balance();
text: hfcBalance;
// Text size
size: hfcBalanceTextLabel.size;
// Anchors
@ -397,16 +400,6 @@ Rectangle {
//
// FUNCTION DEFINITIONS START
//
function checkAlreadyOwned(idToCheck) {
var inventory = commerce.inventory();
if (inventory.indexOf(idToCheck) !== -1) {
return true;
} else {
return false;
}
}
//
// Function Name: fromScript()
//
@ -429,6 +422,8 @@ Rectangle {
itemPriceText.text = message.params.itemPrice;
itemHref = message.params.itemHref;
buyButton.buyFailed = false;
commerce.balance();
commerce.inventory();
break;
case 'buyFailed':
buyButton.text = "Buy Failed";

18
interface/resources/qml/hifi/commerce/Inventory.qml
View file

@ -29,6 +29,20 @@ Rectangle {
color: hifi.colors.baseGray;
Hifi.QmlCommerce {
id: commerce;
onBalanceResult: {
if (failureMessage.length) {
console.log("Failed to get balance", failureMessage);
} else {
hfcBalanceText.text = balance;
}
}
onInventoryResult: {
if (failureMessage.length) {
console.log("Failed to get inventory", failureMessage);
} else {
inventoryContentsList.model = inventory;
}
}
}
//
@ -101,7 +115,6 @@ Rectangle {
}
RalewayRegular {
id: hfcBalanceText;
text: commerce.balance();
// Text size
size: hfcBalanceTextLabel.size;
// Anchors
@ -158,7 +171,6 @@ Rectangle {
anchors.left: parent.left;
anchors.bottom: parent.bottom;
width: parent.width;
model: commerce.inventory();
delegate: Item {
width: parent.width;
height: 30;
@ -247,6 +259,8 @@ Rectangle {
switch (message.method) {
case 'updateInventory':
referrerURL = message.referrerURL;
commerce.balance();
commerce.inventory();
break;
default:
console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));