properly deploy procedures.sql, add trigger for taler-merchant-depositcheck, rename field to match contract terms

1 files changed, 12 insertions, 11 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 d2d0fb6b..75be6ff5 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -95,14 +95,14 @@ enum PayPhase
 
   /**
    * Perform batch deposits with exchange(s).
-   */ 
+   */
   PP_BATCH_DEPOSITS,
 
   /**
    * Return response in payment context.
    */
   PP_RETURN_RESPONSE,
-  
+
   /**
    * Return #MHD_YES to end processing.
    */
@@ -113,7 +113,7 @@ enum PayPhase
    */
   PP_END_NO
 };
-  
+
 
 /**
  * Information kept during a pay request for each coin.
@@ -450,9 +450,9 @@ struct PayContext
 
   /**
    * Payment processing phase we are in.
-   */ 
+   */
   enum PayPhase phase;
-  
+
   /**
    * #GNUNET_NO if the @e connection was not suspended,
    * #GNUNET_YES if the @e connection was suspended,
@@ -984,6 +984,7 @@ batch_deposit_transaction (const struct ExchangeGroup *eg,
     dr->details.ok.deposit_timestamp,
     &pc->h_contract_terms,
     eg->exchange_url,
+    pc->wire_transfer_deadline,
     &total_without_fees,
     &eg->wire_fee,
     &pc->wm->h_wire,
@@ -1668,8 +1669,8 @@ phase_success_response (struct PayContext *pc)
              GNUNET_JSON_pack_allow_null (
                GNUNET_JSON_pack_string ("pos_confirmation",
                                         pos_confirmation)),
-               GNUNET_JSON_pack_data_auto ("sig",
-                                           &sig)));
+             GNUNET_JSON_pack_data_auto ("sig",
+                                         &sig)));
   GNUNET_free (pos_confirmation);
 }
 
@@ -2480,7 +2481,7 @@ phase_contract_paid (struct PayContext *pc)
              pc->connection,
              MHD_HTTP_CONFLICT,
              TALER_MHD_PACK_EC (
-                                TALER_EC_MERCHANT_POST_ORDERS_ID_PAY_ALREADY_PAID),
+               TALER_EC_MERCHANT_POST_ORDERS_ID_PAY_ALREADY_PAID),
              GNUNET_JSON_pack_array_steal ("refunds",
                                            refunds)));
 }
@@ -2637,7 +2638,7 @@ phase_check_contract (struct PayContext *pc)
     return;
   }
 
-  for (unsigned int i=0;i<pc->coins_cnt;i++)
+  for (unsigned int i = 0; i<pc->coins_cnt; i++)
   {
     struct DepositConfirmation *dc = &pc->dc[i];
 
@@ -2854,7 +2855,7 @@ phase_parse_pay (struct PayContext *pc)
                    MHD_HTTP_BAD_REQUEST,
                    TALER_EC_GENERIC_PARAMETER_MALFORMED,
                    "inconsistent: 'age_commitment' vs. 'minimum_age_sig'"
-                                             ));
+                   ));
         return;
       }
 
@@ -3001,7 +3002,7 @@ TMH_post_orders_ID_pay (const struct TMH_RequestHandler *rh,
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Processing /pay ends due to shutdown in phase %d\n",
                   (int) pc->phase);
-      return MHD_NO; 
+      return MHD_NO;
     case GNUNET_NO:
       /* continue to next phase */
       break;