diff options
author | Christian Grothoff <christian@grothoff.org> | 2023-05-01 00:09:55 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2023-05-01 00:09:55 +0200 |
commit | 583c01c6224dd317f9665e623b02a32b74fdf74a (patch) | |
tree | 0b12e40c9dafde2b235c3c405a1ee032ff0e70d4 /src/backend/taler-merchant-httpd_private-get-orders-ID.c | |
parent | a7fe1d1b77ce1d7959522262f85788807d56316b (diff) |
first rough cut at merchant update for #7810 (still with known bugs)
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-get-orders-ID.c')
-rw-r--r-- | src/backend/taler-merchant-httpd_private-get-orders-ID.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index 87ebc44e..cff03c7e 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -468,7 +468,7 @@ deposit_get_cb (void *cls, qs = TMH_db->insert_deposit_to_transfer (TMH_db->cls, tq->deposit_serial, - &dr->details.success); + &dr->details.ok); if (qs < 0) { gorc_report (gorc, @@ -487,7 +487,7 @@ deposit_get_cb (void *cls, if (0 > TALER_amount_add (&gorc->deposits_total, &gorc->deposits_total, - &dr->details.success.coin_contribution)) + &dr->details.ok.coin_contribution)) { gorc_report (gorc, TALER_EC_MERCHANT_PRIVATE_GET_ORDERS_ID_AMOUNT_ARITHMETIC_FAILURE, @@ -592,16 +592,12 @@ deposit_get_cb (void *cls, * @param cls closure with a `struct GetOrderRequestContext *` * @param hr HTTP response details * @param eh handle to the exchange context - * @param payto_uri payto://-URI of the exchange - * @param wire_fee current applicable wire fee for dealing with @a eh, NULL if not available * @param exchange_trusted true if this exchange is trusted by config */ static void exchange_found_cb (void *cls, const struct TALER_EXCHANGE_HttpResponse *hr, struct TALER_EXCHANGE_Handle *eh, - const char *payto_uri, - const struct TALER_Amount *wire_fee, bool exchange_trusted) { struct TransferQuery *tq = cls; @@ -697,8 +693,7 @@ deposit_cb (void *cls, tq->amount_with_fee = *amount_with_fee; tq->deposit_fee = *deposit_fee; tq->fo = TMH_EXCHANGES_find_exchange (exchange_url, - NULL, - GNUNET_NO, + false, &exchange_found_cb, tq); if (NULL == tq->fo) |