diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-08-25 15:11:32 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-08-25 15:11:32 +0200 |
commit | f4dbe12c3d8f659890a93e566a46738911157c14 (patch) | |
tree | 803d6584a26fc97d12f6e1bd0f80c40299e3b540 | |
parent | c6d35da32576000f5c713cb256d515e2cb1c6774 (diff) | |
parent | d8eec3e1153ef49b0b98acaed8520a264970e2d8 (diff) | |
download | docs-f4dbe12c3d8f659890a93e566a46738911157c14.tar.gz docs-f4dbe12c3d8f659890a93e566a46738911157c14.tar.bz2 docs-f4dbe12c3d8f659890a93e566a46738911157c14.zip |
Merge branch 'master' of git+ssh://git.taler.net/docs
-rw-r--r-- | core/taler-uri.rst | 14 | ||||
-rw-r--r-- | taler-wallet.rst | 25 |
2 files changed, 14 insertions, 25 deletions
diff --git a/core/taler-uri.rst b/core/taler-uri.rst index 4dda319f..23ebc1ed 100644 --- a/core/taler-uri.rst +++ b/core/taler-uri.rst @@ -148,17 +148,3 @@ the user to confirm/decline adding the auditor to the list of trusted auditors. taler://auditor/{auditor_host}{/auditor_prefix_path*}/ ----------------------------- -Special URLs for fulfillment ----------------------------- - -The special ``fulfillment-success`` action can be used in a fulfillment URI to indicate success -with a message, without directing the user to a website. This is useful in applications that are not Web-based: - -When wallets encounter this URI in any other circumstance than going to a fulfillment URL, they must raise an error. - -Example: - -.. code:: none - - taler://fulfillment-success/Thank+you+for+donating+to+GNUnet diff --git a/taler-wallet.rst b/taler-wallet.rst index 6fa493f8..7f0f7dbb 100644 --- a/taler-wallet.rst +++ b/taler-wallet.rst @@ -337,7 +337,7 @@ Transactions are all operations or events that are affecting the balance. type: string = "payment", // Additional information about the payment. - info: TransactionInfo; + info: OrderShortInfo; // The current status of this payment. status: PaymentStatus; @@ -350,9 +350,9 @@ Transactions are all operations or events that are affecting the balance. amountEffective: Amount; } - .. ts:def:: TransactionInfo + .. ts:def:: OrderShortInfo - interface TransactionInfo { + interface OrderShortInfo { // Order ID, uniquely identifies the order within a merchant instance orderId: string; @@ -369,7 +369,13 @@ Transactions are all operations or events that are affecting the balance. products: Product[]; // URL of the fulfillment, given by the merchant - fulfillmentUrl: string; + fulfillmentUrl?: string; + + // Message shown to the user after the payment is complete. + fulfillmentMessage?: string; + + // Map from IETF BCP 47 language tags to localized fulfillment messages + fulfillmentMessage_i18n: { [lang_tag: string]: string }; } .. ts:def:: PaymentStatus @@ -401,7 +407,7 @@ Transactions are all operations or events that are affecting the balance. refundedTransactionId: string; // Additional information about the refunded payment - info: TransactionInfo; + info: OrderShortInfo; // Part of the refund that couldn't be applied because the refund permissions were expired amountInvalid: Amount; @@ -775,9 +781,8 @@ Prepare Pay // Amount that will be subtracted from the wallet balance amountEffective: Amount; - // Redirect URL for the fulfillment page, - // only given if paid==true. - nextUrl?: string; + // Verbatim contract terms as generated by the merchant. + contractTerms: ContractTerms; } @@ -800,9 +805,7 @@ Confirm Payment interface ConfirmPayResultDone { type: "done"; - // Fulfillment URL augmented with order ID - // or a special taler://fulfillment-success URL - nextUrl: string; + contractTerms: ContractTerms; } .. ts:def:: ConfirmPayResultPending |