summaryrefslogtreecommitdiff
path: root/src/backenddb
diff options
context:
space:
mode:
authorJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-06-12 18:52:20 -0400
committerJonathan Buchanan <jonathan.russ.buchanan@gmail.com>2020-06-12 18:52:20 -0400
commitae2bfdbeaaa2ef289e79c0b57c428672a8157ff0 (patch)
tree775e7f19c117c442a81efe68a5f61f38eb231099 /src/backenddb
parent3f2b7316255c1a583c7720b3e7624ab16d4378b2 (diff)
downloadmerchant-ae2bfdbeaaa2ef289e79c0b57c428672a8157ff0.tar.gz
merchant-ae2bfdbeaaa2ef289e79c0b57c428672a8157ff0.tar.bz2
merchant-ae2bfdbeaaa2ef289e79c0b57c428672a8157ff0.zip
fixed authorize tip and tests for GET /private/tips
Diffstat (limited to 'src/backenddb')
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index ac180443..0f338ff1 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -7561,7 +7561,11 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
",tips_committed_val"
",tips_committed_frac"
" FROM merchant_tip_reserves"
- " WHERE exchange_initial_balance_val - tips_committed_val >= $2"
+ " WHERE"
+ " exchange_initial_balance_val - tips_committed_val > $2"
+ " OR"
+ " (exchange_initial_balance_val - tips_committed_val = $2"
+ " AND exchange_initial_balance_frac - tips_committed_frac >= $3)"
" AND merchant_serial ="
" (SELECT merchant_serial"
" FROM merchant_instances"