taler-docs

commit e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf
parent b981558c685503b50e26b295fa51dc43b917dd53
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 26 May 2016 15:23:32 +0200

change edate to wire_transfer_deadline/delay (#4521)

Diffstat:
M
api-exchange.rst
 | 
2
+-
M
impl-merchant.rst
 | 
6
++++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/api-exchange.rst b/api-exchange.rst
@@ -514,7 +514,7 @@ denomination.
 
       // indicative time by which the exchange undertakes to transfer the funds to
       // the merchant, in case of successful payment.
-      edate: Timestamp;
+      pay_deadline: Timestamp;
 
       // 64-bit transaction id for the transaction between merchant and customer
       transaction_id: number;
diff --git a/impl-merchant.rst b/impl-merchant.rst
@@ -117,9 +117,11 @@ The following API are made available by the merchant's `backend` to the merchant
   **Request:**
 
   The `frontend` passes the :ref:`deposit permission <deposit-permission>`
-  received from the wallet, and optionally adding a field named `edate`,
+  received from the wallet, and optionally adding a field named `pay_deadline`,
   indicating a deadline by which he would expect to receive the bank transfer
-  for this deal.  Note that the `edate` must be after the `refund_deadline`.
+  for this deal.  Note that the `pay_deadline` must be after the `refund_deadline`.
+  The backend calculates the `pay_deadline` by adding the `wire_transfer_delay`
+  value found in the configuration to the current time.
 
   **Response:**