[taler-merchant] 02/03: Revert "fix broken JSON packing, fix condition for order status 'gone'"

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

commit 553fe3742f811ed5f1ccd273299613ff9c376985
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Wed Aug 12 00:46:27 2020 +0530

    Revert "fix broken JSON packing, fix condition for order status 'gone'"
    
    This reverts commit 89a9423ab2020b9278808d7cdac97bd0d4635285.
---
 src/backend/taler-merchant-httpd_get-orders-ID.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 5e399b9..d60b158 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -1099,9 +1099,9 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
           GNUNET_memcmp (&h,
                          &god->h_contract_terms))
       {
-        if (0 == GNUNET_is_zero (&god->h_contract_terms))
+        if (0 == GNUNET_is_zero (&god->claim_token))
         {
-          /* The client provided a h_contract that's wrong, so complain! */
+          /* The client did not provide any claim token, just a wrong 
h_contract */
           GNUNET_break_op (0);
           return TALER_MHD_reply_with_error (connection,
                                              MHD_HTTP_FORBIDDEN,
@@ -1195,7 +1195,6 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
     else
       return TALER_MHD_reply_json_pack (connection,
                                         MHD_HTTP_GONE,
-                                        "{s:s}",
                                         "fulfillment_url",
                                         god->fulfillment_url);
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.