[GNUnet-SVN] [taler-merchant] branch master updated: subtract refund after checking for fee coverage

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 4b47e46  subtract refund after checking for fee coverage
4b47e46 is described below

commit 4b47e468889379e97da465bbc13f9a7314d8c6f2
Author: Florian Dold <address@hidden>
AuthorDate: Sat Aug 31 14:07:54 2019 +0200

    subtract refund after checking for fee coverage
---
 src/backend/taler-merchant-httpd_pay.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index 3a6bde5..d381c7e 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -733,14 +733,6 @@ check_payment_sufficient (struct PayContext *pc)
          &wire_fee_customer_contribution));
   }
 
-  /* Do not count any refunds towards the payment */
-  GNUNET_assert
-    (GNUNET_SYSERR != TALER_amount_subtract (&acc_amount,
-                                             &acc_amount,
-                                             &pc->total_refunded));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Subtracting total refunds from paid amount: %s\n",
-              TALER_amount_to_string (&pc->total_refunded));
   /**
    * Deposit fees of *all* the coins are higher than
    * the fixed limit that the merchant is willing to
@@ -849,6 +841,15 @@ check_payment_sufficient (struct PayContext *pc)
     }
   }
 
+  /* Do not count any refunds towards the payment */
+  GNUNET_assert
+    (GNUNET_SYSERR != TALER_amount_subtract (&acc_amount,
+                                             &acc_amount,
+                                             &pc->total_refunded));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Subtracting total refunds from paid amount: %s\n",
+              TALER_amount_to_string (&pc->total_refunded));
+
   return TALER_EC_NONE;
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.