summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-10-03 16:37:13 +0200
committerChristian Grothoff <christian@grothoff.org>2020-10-03 16:37:13 +0200
commitf468de5715e78d3f901c5058f22a35a1ed5b1ac8 (patch)
tree8eb324518a9cf8522550c266f37b41f662b6687e
parenta8effb778c99a23925bcbf9541c30b2de1e91282 (diff)
downloadsync-f468de5715e78d3f901c5058f22a35a1ed5b1ac8.tar.gz
sync-f468de5715e78d3f901c5058f22a35a1ed5b1ac8.tar.bz2
sync-f468de5715e78d3f901c5058f22a35a1ed5b1ac8.zip
adapt to merchant API change
-rw-r--r--src/sync/sync-httpd_backup_post.c36
1 files changed, 21 insertions, 15 deletions
diff --git a/src/sync/sync-httpd_backup_post.c b/src/sync/sync-httpd_backup_post.c
index 8b5411a..199420b 100644
--- a/src/sync/sync-httpd_backup_post.c
+++ b/src/sync/sync-httpd_backup_post.c
@@ -430,29 +430,35 @@ check_payment_cb (void *cls,
/* refunds are not supported, verify */
bc->omgh = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Payment status checked: %s\n",
- osr->paid ? "paid" : "unpaid");
+ "Payment status checked: %d\n",
+ osr->status);
GNUNET_CONTAINER_DLL_remove (bc_head,
bc_tail,
bc);
MHD_resume_connection (bc->con);
SH_trigger_daemon ();
- if (osr->paid)
+ switch (osr->status)
{
- enum SYNC_DB_QueryStatus qs;
+ case TALER_MERCHANT_OSC_PAID:
+ {
+ enum SYNC_DB_QueryStatus qs;
- qs = db->increment_lifetime_TR (db->cls,
- &bc->account,
- bc->order_id,
- GNUNET_TIME_UNIT_YEARS); /* always annual */
- if (0 <= qs)
+ qs = db->increment_lifetime_TR (db->cls,
+ &bc->account,
+ bc->order_id,
+ GNUNET_TIME_UNIT_YEARS); /* always annual */
+ if (0 <= qs)
+ return; /* continue as planned */
+ GNUNET_break (0);
+ bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_CONFIRM_DB_ERROR,
+ "Failed to persist payment confirmation in sync database");
+ GNUNET_assert (NULL != bc->resp);
+ bc->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
return; /* continue as planned */
- GNUNET_break (0);
- bc->resp = TALER_MHD_make_error (TALER_EC_SYNC_PAYMENT_CONFIRM_DB_ERROR,
- "Failed to persist payment confirmation in sync database");
- GNUNET_assert (NULL != bc->resp);
- bc->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
- return; /* continue as planned */
+ }
+ case TALER_MERCHANT_OSC_UNPAID:
+ case TALER_MERCHANT_OSC_CLAIMED:
+ break;
}
if (NULL != bc->existing_order_id)
{