mirror of
https://github.com/OpenBankProject/OBP-API.git
synced 2026-02-06 13:07:02 +00:00
feature/Tweak VRP consent screen. Add text
This commit is contained in:
Marko Milić
parent
8b63cf654c
commit
45b1557352
@ -32,7 +32,8 @@ import code.api.util.{APIUtil, CustomJsonFormats}
|
||||
import code.api.v5_1_0.{APIMethods510, ConsentJsonV510}
|
||||
import code.api.v5_0_0.{APIMethods500, ConsentJsonV500, ConsentRequestResponseJson}
|
||||
import code.api.v3_1_0.{APIMethods310, ConsentChallengeJsonV310, ConsumerJsonV310}
|
||||
import code.consent.{ConsentStatus}
|
||||
import code.consent.ConsentStatus
|
||||
import code.model.dataAccess.AuthUser
|
||||
import code.util.Helper.{MdcLoggable, ObpS}
|
||||
import net.liftweb.common.Full
|
||||
import net.liftweb.http.rest.RestHelper
|
||||
@ -58,8 +59,25 @@ class VrpConsentCreation extends MdcLoggable with RestHelper with APIMethods510
|
||||
tryo {json.parse(response).extract[ConsentRequestResponseJson]} match {
|
||||
case Full(consentRequestResponseJson) =>
|
||||
val jsonAst = consentRequestResponseJson.payload
|
||||
val currency = (jsonAst \ "to_account" \ "limit" \ "currency").extract[String]
|
||||
val formText =
|
||||
s"""
|
||||
|I, ${AuthUser.currentUser.flatMap(_.user.foreign.map(_.name)).getOrElse("")}
|
||||
|, grant to transfer of funds from my account at ${(jsonAst \ "from_account" \ "bank_routing" \ "address").extract[String]}
|
||||
|, ${(jsonAst \ "from_account" \ "account_routing" \ "address").extract[String]}
|
||||
|, to ${(jsonAst \ "to_account" \ "counterparty_name").extract[String]}
|
||||
|, address ${(jsonAst \ "to_account" \ "bank_routing" \ "address").extract[String]}
|
||||
|, of $currency, ${(jsonAst \ "to_account" \ "limit" \ "max_single_amount").extract[String]}
|
||||
| per transaction, up to $currency, ${(jsonAst \ "to_account" \ "limit" \ "max_monthly_amount").extract[String]}
|
||||
| per month, up to ${(jsonAst \ "to_account" \ "limit" \ "max_number_of_monthly_transactions").extract[String]} transactions per month
|
||||
|, up to $currency, ${(jsonAst \ "to_account" \ "limit" \ "max_yearly_amount").extract[String]}
|
||||
| per year, and up to ${(jsonAst \ "to_account" \ "limit" \ "max_number_of_yearly_transactions").extract[String]} transactions per year
|
||||
|, up to the total amount of $currency, ${(jsonAst \ "to_account" \ "limit" \ "max_total_amount").extract[String]}
|
||||
| and up to a total of ${(jsonAst \ "to_account" \ "limit" \ "max_number_of_transactions").extract[String]} in total.
|
||||
|This consent will be valid from ${(jsonAst \ "valid_from").extract[String]} for ${(jsonAst \ "time_to_live").extract[String]} seconds.
|
||||
|""".stripMargin
|
||||
"#confirm-vrp-consent-request-form-title *" #> s"Please confirm or deny the following consent request:" &
|
||||
// "#confirm-vrp-consent-request-response-json *" #> s"""${json.prettyRender(json.Extraction.decompose(consentRequestResponseJson.payload))}""" &
|
||||
"#confirm-vrp-consent-request-form-text *" #> s"""$formText""" &
|
||||
"#from_bank_routing_scheme [value]" #> s"${(jsonAst \ "from_account" \ "bank_routing" \ "scheme").extract[String]}" &
|
||||
"#from_bank_routing_address [value]" #> s"${(jsonAst \ "from_account" \ "bank_routing" \ "address").extract[String]}" &
|
||||
"#from_branch_routing_scheme [value]" #> s"${(jsonAst \ "from_account" \ "branch_routing" \ "scheme").extract[String]}" &
|
||||
|
||||
@ -31,9 +31,11 @@ Berlin 13359, Germany
|
||||
<div id="confirm-vrp-consent-request-div" style="width: 90%; margin: 0 auto;" data-lift="VrpConsentCreation.confirmVrpConsentRequest">
|
||||
<form method="post">
|
||||
<div class="form-group">
|
||||
<h3 id="confirm-vrp-consent-request-form-title">Please check the VRP Consent Request: 1111 </h3>
|
||||
<h3 id="confirm-vrp-consent-request-form-title">Please check the VRP Consent Request: </h3>
|
||||
<p id="confirm-vrp-consent-request-form-text"></p>
|
||||
</div>
|
||||
<div class="wrap-text">
|
||||
<div class="form-group col-md-6">
|
||||
<h4>From Account</h4>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
@ -65,7 +67,8 @@ Berlin 13359, Germany
|
||||
<input type="text" name="from_routing_address" id="from_routing_address" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<h4>To Account</h4>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-6">
|
||||
@ -99,76 +102,72 @@ Berlin 13359, Germany
|
||||
<input type="text" name="counterparty_name" id="counterparty_name" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
</div>
|
||||
<h4>Limits</h4>
|
||||
<div class="form-group">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="currency">Currency</label>
|
||||
<input type="text" name="currency" id="currency" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_single_amount">Max single amount</label>
|
||||
<input type="number" min="0" value="100" name="max_single_amount" id="max_single_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_monthly_amount">Max monthly amount</label>
|
||||
<input type="number" min="0" value="100" name="max_monthly_amount" id="max_monthly_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_yearly_amount">Max yearly amount</label>
|
||||
<input type="number" min="0" value="1200" name="max_yearly_amount" id="max_yearly_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_total_amount">Max total amount</label>
|
||||
<input type="number" min="0" value="1200" name="max_total_amount" id="max_total_amount" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="currency">Currency</label>
|
||||
<input type="text" name="currency" id="currency" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="max_single_amount">Max single amount</label>
|
||||
<input type="number" min="0" value="100" name="max_single_amount" id="max_single_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="max_monthly_amount">Max monthly amount</label>
|
||||
<input type="number" min="0" value="100" name="max_monthly_amount" id="max_monthly_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="max_yearly_amount">Max yearly amount</label>
|
||||
<input type="number" min="0" value="1200" name="max_yearly_amount" id="max_yearly_amount" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="max_total_amount">Max total amount</label>
|
||||
<input type="number" min="0" value="1200" name="max_total_amount" id="max_total_amount" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="max_number_of_monthly_transactions">Max number of monthly transactions</label>
|
||||
<input type="number" min="0" value="1" name="max_number_of_monthly_transactions" id="max_number_of_monthly_transactions" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_number_of_yearly_transactions">Max number of yearly transactions</label>
|
||||
<input type="number" min="0" value="12" name="max_number_of_yearly_transactions" id="max_number_of_yearly_transactions" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="max_number_of_transactions">Max number of total transactions</label>
|
||||
<input type="number" min="0" value="12" name="max_number_of_transactions" id="max_number_of_transactions" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h4>Other</h4>
|
||||
<div class="form-group">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="time_to_live_in_seconds">Time to live in seconds</label>
|
||||
<input type="number" min="1" value="31556926" name="time_to_live_in_seconds" id="time_to_live_in_seconds" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="valid_from">Valid from</label>
|
||||
<input type="text" name="valid_from" id="valid_from" class="form-control" data-date-format="YYYY-MM-DDTHH:mm:ss">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="valid_from">Valid from</label>
|
||||
<input type="text" name="valid_from" id="valid_from" class="form-control" data-date-format="YYYY-MM-DDTHH:mm:ss">
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label for="time_to_live_in_seconds">Time to live in seconds</label>
|
||||
<input type="number" min="1" value="31556926" name="time_to_live_in_seconds" id="time_to_live_in_seconds" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-group">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="email">Email</label>
|
||||
<input type="text" name="email" id="email" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-6">
|
||||
<label for="phone_number">Phone number</label>
|
||||
<input type="text" name="phone_number" id="phone_number" class="form-control">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="phone_number">Phone number</label>
|
||||
<input type="text" name="phone_number" id="phone_number" class="form-control">
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label for="email">Email</label>
|
||||
<input type="text" name="email" id="email" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user