diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-26 15:23:32 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-26 15:23:32 +0200 |
| commit | e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf (patch) | |
| tree | 52a98b070f2cbde0bcdaf378a7ea4d6cca676bcd | |
| parent | b981558c685503b50e26b295fa51dc43b917dd53 (diff) | |
| download | docs-e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf.tar.gz docs-e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf.tar.bz2 docs-e3fd0565cef4fb9c542d824e0f39d7d0bb6f5dcf.zip | |
change edate to wire_transfer_deadline/delay (#4521)
| -rw-r--r-- | api-exchange.rst | 2 | ||||
| -rw-r--r-- | impl-merchant.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/api-exchange.rst b/api-exchange.rst index 28acac75..d9dc14aa 100644 --- 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 index 38f354a4..7ae4e3d1 100644 --- 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:** |