Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel

Browse source 
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
This commit is contained in:
Zach Fox 2017-12-20 09:18:10 -08:00 committed by GitHub
commit 08edc52932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ Rectangle {
property bool debugCheckoutSuccess: false;
property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
property bool isWearable;
property string referrer;
// Style
color: hifi.colors.white;
Connections {
@ -131,7 +132,7 @@ Rectangle {
id: notSetUpTimer;
interval: 200;
onTriggered: {
sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId});
sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId, referrer: referrer});
}
}
@ -877,6 +878,7 @@ Rectangle {
itemName = message.params.itemName;
root.itemPrice = message.params.itemPrice;
itemHref = message.params.itemHref;
referrer = message.params.referrer;
setBuyText();
break;
default:

2
interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
View file

@ -252,7 +252,7 @@ Item {
height: 50;
text: "Cancel";
onClicked: {
sendSignalToWallet({method: 'walletSetup_cancelClicked'});
sendSignalToWallet({method: 'walletSetup_cancelClicked', referrer: root.referrer });
}
}
}

18
scripts/system/commerce/wallet.js
View file

@ -61,10 +61,26 @@
function fromQml(message) {
switch (message.method) {
case 'passphrasePopup_cancelClicked':
case 'walletSetup_cancelClicked':
case 'needsLogIn_cancelClicked':
tablet.gotoHomeScreen();
break;
case 'walletSetup_cancelClicked':
switch (message.referrer) {
case '': // User clicked "Wallet" app
case undefined:
case null:
tablet.gotoHomeScreen();
break;
case 'purchases':
case 'marketplace cta':
case 'mainPage':
tablet.gotoWebScreen(MARKETPLACE_URL, MARKETPLACES_INJECT_SCRIPT_URL);
break;
default: // User needs to return to an individual marketplace item URL
tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.referrer, MARKETPLACES_INJECT_SCRIPT_URL);
break;
}
break;
case 'needsLogIn_loginClicked':
openLoginWindow();
break;

11
scripts/system/html/js/marketplacesInject.js
View file

@ -243,13 +243,14 @@
});
}
function buyButtonClicked(id, name, author, price, href) {
function buyButtonClicked(id, name, author, price, href, referrer) {
EventBridge.emitWebEvent(JSON.stringify({
type: "CHECKOUT",
itemId: id,
itemName: name,
itemPrice: price ? parseInt(price, 10) : 0,
itemHref: href
itemHref: href,
referrer: referrer
}));
}
@ -316,7 +317,8 @@
$(this).closest('.grid-item').find('.item-title').text(),
$(this).closest('.grid-item').find('.creator').find('.value').text(),
$(this).closest('.grid-item').find('.item-cost').text(),
$(this).attr('data-href'));
$(this).attr('data-href'),
"mainPage");
});
}
@ -420,7 +422,8 @@
$('#top-center').find('h1').text(),
$('#creator').find('.value').text(),
cost,
href);
href,
"itemPage");
}
});
maybeAddPurchasesButton();

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

@ -436,7 +436,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
wireEventBridge(true);
tablet.sendToQml({
method: 'updateWalletReferrer',
referrer: message.itemId
referrer: message.referrer === "itemPage" ? message.itemId : message.referrer
});
openWallet();
break;