[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: fix #7104
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: fix #7104 |
Date: |
Thu, 25 Nov 2021 23:13:13 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 17f156ab fix #7104
17f156ab is described below
commit 17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Nov 25 23:13:11 2021 +0100
fix #7104
---
src/backend/taler-merchant-httpd_post-orders-ID-pay.c | 2 +-
src/lib/merchant_api_post_order_pay.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index d1ed63fd..d9eb723e 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -933,7 +933,7 @@ deposit_cb (void *cls,
resume_pay_with_error (pc,
MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_DB_STORE_FAILED,
- "deposit");
+ "insert_deposit");
return;
}
}
diff --git a/src/lib/merchant_api_post_order_pay.c
b/src/lib/merchant_api_post_order_pay.c
index 158fa322..d053c856 100644
--- a/src/lib/merchant_api_post_order_pay.c
+++ b/src/lib/merchant_api_post_order_pay.c
@@ -172,7 +172,7 @@ check_coin_history (const struct TALER_MERCHANT_PaidCoin
*pc,
* exchange/merchant
* @return #GNUNET_OK if proof checks out
*/
-static int
+static enum GNUNET_GenericReturnValue
check_conflict (struct TALER_MERCHANT_OrderPayHandle *oph,
const json_t *json)
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] branch master updated: fix #7104,
gnunet <=