Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:24:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Secret to Coupon ID

Browse source
This commit is contained in:
Zach Fox 2018-12-05 16:34:53 -08:00
parent ab184c5c2b
commit 02307d2308
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
View file

@ -120,10 +120,10 @@ Item {
if (result.status === 'success') { if (result.status === 'success') {
root.authorizationID = result.data.authorization_id; root.authorizationID = result.data.authorization_id;
authorizationIDText.text = root.authorizationID; authorizationIDText.text = root.authorizationID;
root.couponID = result.data.secret; root.couponID = result.data.coupon_id;
couponIDText.text = root.couponID couponIDText.text = root.couponID
if (couponIDTextField.text !== root.couponID) { if (couponIDTextField.text !== root.couponID) {
console.log("SendAsset: Returned secret doesn't match client-generated secret!"); console.log("SendAsset: Returned coupon ID doesn't match client-generated coupon ID!");
} }
root.nextActiveView = 'paymentSuccess'; root.nextActiveView = 'paymentSuccess';
} else { } else {

4
interface/src/commerce/Ledger.cpp
View file

@ -442,10 +442,10 @@ void Ledger::transferAssetToUsername(const QString& hfc_key, const QString& user
} }
} }
void Ledger::authorizeAssetTransfer(const QString& hfc_key, const QString& secret, const QString& certificateID, const int& amount, const QString& optionalMessage) { void Ledger::authorizeAssetTransfer(const QString& hfc_key, const QString& couponID, const QString& certificateID, const int& amount, const QString& optionalMessage) {
QJsonObject transaction; QJsonObject transaction;
transaction["public_key"] = hfc_key; transaction["public_key"] = hfc_key;
transaction["secret"] = secret; transaction["coupon_id"] = couponID;
transaction["quantity"] = amount; transaction["quantity"] = amount;
transaction["message"] = optionalMessage; transaction["message"] = optionalMessage;
if (!certificateID.isEmpty()) { if (!certificateID.isEmpty()) {

2
interface/src/commerce/Ledger.h
View file

@ -36,7 +36,7 @@ public:
void certificateInfo(const QString& certificateId); void certificateInfo(const QString& certificateId);
void transferAssetToNode(const QString& hfc_key, const QString& nodeID, const QString& certificateID, const int& amount, const QString& optionalMessage); void transferAssetToNode(const QString& hfc_key, const QString& nodeID, const QString& certificateID, const int& amount, const QString& optionalMessage);
void transferAssetToUsername(const QString& hfc_key, const QString& username, const QString& certificateID, const int& amount, const QString& optionalMessage); void transferAssetToUsername(const QString& hfc_key, const QString& username, const QString& certificateID, const int& amount, const QString& optionalMessage);
void authorizeAssetTransfer(const QString& hfc_key, const QString& secret, const QString& certificateID, const int& amount, const QString& optionalMessage); void authorizeAssetTransfer(const QString& hfc_key, const QString& couponID, const QString& certificateID, const int& amount, const QString& optionalMessage);
void alreadyOwned(const QString& marketplaceId); void alreadyOwned(const QString& marketplaceId);
void getAvailableUpdates(const QString& itemId = "", const int& pageNumber = 1, const int& itemsPerPage = 10); void getAvailableUpdates(const QString& itemId = "", const int& pageNumber = 1, const int& itemsPerPage = 10);
void updateItem(const QString& hfc_key, const QString& certificate_id); void updateItem(const QString& hfc_key, const QString& certificate_id);

4
interface/src/commerce/QmlCommerce.cpp
View file

@ -247,7 +247,7 @@ void QmlCommerce::transferAssetToUsername(const QString& username,
ledger->transferAssetToUsername(key, username, certificateID, amount, optionalMessage); ledger->transferAssetToUsername(key, username, certificateID, amount, optionalMessage);
} }
void QmlCommerce::authorizeAssetTransfer(const QString& secret, void QmlCommerce::authorizeAssetTransfer(const QString& couponID,
const QString& certificateID, const QString& certificateID,
const int& amount, const int& amount,
const QString& optionalMessage) { const QString& optionalMessage) {
@ -259,7 +259,7 @@ void QmlCommerce::authorizeAssetTransfer(const QString& secret,
return emit authorizeAssetTransferResult(result); return emit authorizeAssetTransferResult(result);
} }
QString key = keys[0]; QString key = keys[0];
ledger->authorizeAssetTransfer(key, secret, certificateID, amount, optionalMessage); ledger->authorizeAssetTransfer(key, couponID, certificateID, amount, optionalMessage);
} }
void QmlCommerce::replaceContentSet(const QString& itemHref, const QString& certificateID) { void QmlCommerce::replaceContentSet(const QString& itemHref, const QString& certificateID) {

2
interface/src/commerce/QmlCommerce.h
View file

@ -85,7 +85,7 @@ protected:
Q_INVOKABLE void transferAssetToNode(const QString& nodeID, const QString& certificateID, const int& amount, const QString& optionalMessage); Q_INVOKABLE void transferAssetToNode(const QString& nodeID, const QString& certificateID, const int& amount, const QString& optionalMessage);
Q_INVOKABLE void transferAssetToUsername(const QString& username, const QString& certificateID, const int& amount, const QString& optionalMessage); Q_INVOKABLE void transferAssetToUsername(const QString& username, const QString& certificateID, const int& amount, const QString& optionalMessage);
Q_INVOKABLE void authorizeAssetTransfer(const QString& secret, const QString& certificateID, const int& amount, const QString& optionalMessage); Q_INVOKABLE void authorizeAssetTransfer(const QString& couponID, const QString& certificateID, const int& amount, const QString& optionalMessage);
Q_INVOKABLE void replaceContentSet(const QString& itemHref, const QString& certificateID); Q_INVOKABLE void replaceContentSet(const QString& itemHref, const QString& certificateID);