diff options
| author | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-24 17:38:09 -0400 |
|---|---|---|
| committer | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2020-06-24 17:38:09 -0400 |
| commit | 0fbdd6c6cda1c7e0ad0b4ffc3f22bac3e1176c1d (patch) | |
| tree | 8935dc12924a27e8c1112314b88fa895e1bf1240 /src/backenddb | |
| parent | ebfa7888c0cbb461cf70a8d809b1d183011713ce (diff) | |
| download | merchant-0fbdd6c6cda1c7e0ad0b4ffc3f22bac3e1176c1d.tar.gz merchant-0fbdd6c6cda1c7e0ad0b4ffc3f22bac3e1176c1d.tar.bz2 merchant-0fbdd6c6cda1c7e0ad0b4ffc3f22bac3e1176c1d.zip | |
got refunds working and tested
Diffstat (limited to 'src/backenddb')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 8c6eb802..b5c9ad01 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -2774,16 +2774,16 @@ process_deposits_for_refund_cb (void *cls, case GNUNET_DB_STATUS_HARD_ERROR: GNUNET_break (0); ctx->rs = TALER_MERCHANTDB_RS_HARD_ERROR; + return; break; case GNUNET_DB_STATUS_SOFT_ERROR: ctx->rs = TALER_MERCHANTDB_RS_SOFT_ERROR; + return; break; default: - GNUNET_break (0); - ctx->rs = TALER_MERCHANTDB_RS_HARD_ERROR; + ctx->rs = qs; break; } - return; } /* stop immediately if we are done */ @@ -6096,7 +6096,17 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) 2), /* for postgres_lookup_order_summary() */ GNUNET_PQ_make_prepare ("lookup_order_summary", - "SELECT" + "(SELECT" + " creation_time" + ",order_serial" + " FROM merchant_contract_terms" + " WHERE merchant_contract_terms.merchant_serial=" + " (SELECT merchant_serial " + " FROM merchant_instances" + " WHERE merchant_id=$1)" + " AND merchant_contract_terms.order_id=$2)" + "UNION" + "(SELECT" " creation_time" ",order_serial" " FROM merchant_orders" @@ -6104,7 +6114,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) " (SELECT merchant_serial " " FROM merchant_instances" " WHERE merchant_id=$1)" - " AND merchant_orders.order_id=$2", + " AND merchant_orders.order_id=$2)", 2), /* for postgres_lookup_orders() */ GNUNET_PQ_make_prepare ("lookup_orders_inc", |