[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: fix logic for (un)claimed orders
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: fix logic for (un)claimed orders |
Date: |
Tue, 18 Aug 2020 16:32:06 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new f90d0e3 fix logic for (un)claimed orders
f90d0e3 is described below
commit f90d0e3aab659614c6cb0c32506220ad4a369cde
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Tue Aug 18 20:01:58 2020 +0530
fix logic for (un)claimed orders
---
src/backend/taler-merchant-httpd_get-orders-ID.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 9e67f92..d6a52f4 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) )
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: fix logic for (un)claimed orders,
gnunet <=