diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-08-18 20:01:58 +0530 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-08-18 20:01:58 +0530 |
| commit | f90d0e3aab659614c6cb0c32506220ad4a369cde (patch) | |
| tree | fccded5b94de68ea8e4227edc33a1d26d896bf63 | |
| parent | d8e64ae258b911d4243a0fd62e46585f54bb445b (diff) | |
| download | merchant-f90d0e3aab659614c6cb0c32506220ad4a369cde.tar.gz merchant-f90d0e3aab659614c6cb0c32506220ad4a369cde.tar.bz2 merchant-f90d0e3aab659614c6cb0c32506220ad4a369cde.zip | |
fix logic for (un)claimed orders
| -rw-r--r-- | src/backend/taler-merchant-httpd_get-orders-ID.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c index 9e67f92c..d6a52f40 100644 --- a/src/backend/taler-merchant-httpd_get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_get-orders-ID.c @@ -919,6 +919,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, enum GNUNET_DB_QueryStatus qs; bool contract_match = false; bool token_match = false; + bool contract_available = false; if (NULL == god) { @@ -1083,6 +1084,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, { struct GNUNET_HashCode h; + contract_available = true; + if (GNUNET_OK != TALER_JSON_contract_hash (god->contract_terms, &h)) @@ -1133,7 +1136,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, TALER_EC_GET_ORDERS_DB_LOOKUP_ERROR, "database error looking up order"); } - god->unclaimed = (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs); + god->unclaimed = (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs) && !contract_available; if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) && (NULL == god->contract_terms) ) { |