diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/taler-merchant-httpd_get-orders-ID.c | 2 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c | 29 |
2 files changed, 27 insertions, 4 deletions
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c index 2b1117a4..8dd858a3 100644 --- a/src/backend/taler-merchant-httpd_get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_get-orders-ID.c @@ -888,6 +888,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, /* At this point, we know the contract was paid. Let's check for refunds */ + GNUNET_assert (GNUNET_OK == TALER_amount_get_zero (TMH_currency, + &god->refund_amount)); qs = TMH_db->lookup_refunds_detailed (TMH_db->cls, hc->instance->settings.id, &god->h_contract_terms, diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c index 6db0497a..942892f9 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c +++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c @@ -189,10 +189,31 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh, TALER_EC_REFUND_MERCHANT_DB_COMMIT_ERROR, "Internal database error"); case TALER_MERCHANTDB_RS_NO_SUCH_ORDER: - return TALER_MHD_reply_with_error (connection, - MHD_HTTP_NOT_FOUND, - TALER_EC_REFUND_ORDER_ID_UNKNOWN, - "Order unknown (or never paid)"); + { + enum GNUNET_DB_QueryStatus qs; + json_t *contract_terms; + uint64_t order_serial; + + qs = TMH_db->lookup_contract_terms (TMH_db->cls, + hc->instance->settings.id, + hc->infix, + &contract_terms, + &order_serial); + if (qs == 1) + { + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_CONFLICT, + TALER_EC_REFUND_ORDER_ID_UNKNOWN, + "Order never paid"); + } + else + { + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_NOT_FOUND, + TALER_EC_REFUND_ORDER_ID_UNKNOWN, + "Order unknown"); + } + } case TALER_MERCHANTDB_RS_SUCCESS: break; } |