Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 22:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

inventory text filter

Browse source
This commit is contained in:
howard-stearns 2018-06-07 17:01:48 -07:00
parent 2761688d39
commit 348d5fc359
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -560,6 +560,7 @@ Rectangle {
Commerce.inventory( Commerce.inventory(
root.isShowingMyItems ? "proofs" : "purchased", root.isShowingMyItems ? "proofs" : "purchased",
filterBar.primaryFilter_filterName.toLowerCase(), filterBar.primaryFilter_filterName.toLowerCase(),
filterBar.text,
purchasesModel.currentPageToRetrieve, purchasesModel.currentPageToRetrieve,
purchasesModel.itemsPerPage purchasesModel.itemsPerPage
); );

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

@ -134,10 +134,11 @@ void Ledger::balance(const QStringList& keys) {
keysQuery("balance", "balanceSuccess", "balanceFailure"); keysQuery("balance", "balanceSuccess", "balanceFailure");
} }
void Ledger::inventory(const QString& editionFilter, const QString& typeFilter, const int& page, const int& perPage) { void Ledger::inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
QJsonObject params; QJsonObject params;
params["edition_filter"] = editionFilter; params["edition_filter"] = editionFilter;
params["type_filter"] = typeFilter; params["type_filter"] = typeFilter;
params["title_filter"] = titleFilter;
params["page"] = page; params["page"] = page;
params["per_page"] = perPage; params["per_page"] = perPage;
keysQuery("inventory", "inventorySuccess", "inventoryFailure", params); keysQuery("inventory", "inventorySuccess", "inventoryFailure", params);

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

@ -28,7 +28,7 @@ public:
void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false); void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false);
bool receiveAt(const QString& hfc_key, const QString& signing_key); bool receiveAt(const QString& hfc_key, const QString& signing_key);
void balance(const QStringList& keys); void balance(const QStringList& keys);
void inventory(const QString& editionFilter, const QString& typeFilter, const int& page, const int& perPage); void inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
void history(const QStringList& keys, const int& pageNumber, const int& itemsPerPage); void history(const QStringList& keys, const int& pageNumber, const int& itemsPerPage);
void account(); void account();
void updateLocation(const QString& asset_id, const QString& location, const bool& alsoUpdateSiblings = false, const bool controlledFailure = false); void updateLocation(const QString& asset_id, const QString& location, const bool& alsoUpdateSiblings = false, const bool controlledFailure = false);

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

@ -105,12 +105,12 @@ void QmlCommerce::balance() {
} }
} }
void QmlCommerce::inventory(const QString& editionFilter, const QString& typeFilter, const int& page, const int& perPage) { void QmlCommerce::inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
auto ledger = DependencyManager::get<Ledger>(); auto ledger = DependencyManager::get<Ledger>();
auto wallet = DependencyManager::get<Wallet>(); auto wallet = DependencyManager::get<Wallet>();
QStringList cachedPublicKeys = wallet->listPublicKeys(); QStringList cachedPublicKeys = wallet->listPublicKeys();
if (!cachedPublicKeys.isEmpty()) { if (!cachedPublicKeys.isEmpty()) {
ledger->inventory(editionFilter, typeFilter, page, perPage); ledger->inventory(editionFilter, typeFilter, titleFilter, page, perPage);
} }
} }

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

@ -73,7 +73,7 @@ protected:
Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false); Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
Q_INVOKABLE void balance(); Q_INVOKABLE void balance();
Q_INVOKABLE void inventory(const QString& editionFilter = QString(), const QString& typeFilter = QString(), const int& page = 1, const int& perPage = 20); Q_INVOKABLE void inventory(const QString& editionFilter = QString(), const QString& typeFilter = QString(), const QString& titleFilter = QString(), const int& page = 1, const int& perPage = 20);
Q_INVOKABLE void history(const int& pageNumber, const int& itemsPerPage = 100); Q_INVOKABLE void history(const int& pageNumber, const int& itemsPerPage = 100);
Q_INVOKABLE void generateKeyPair(); Q_INVOKABLE void generateKeyPair();
Q_INVOKABLE void account(); Q_INVOKABLE void account();