diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala index 470d6ff75..512a90aac 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala @@ -948,10 +948,8 @@ trait APIMethods500 { val vrpViewId = s"_VRP-${UUID.randomUUID.toString}".dropRight(5)// to make sure the length of the viewId is 36. val targetPermissions = List(//may need getTransactionRequest .. so far only this payments. - "can_add_transaction_request_to_own_account", - "can_add_transaction_request_to_any_account", -// "can_add_transaction_request_to_beneficiary" - ) //TODO,here need to be checked later. + "can_add_transaction_request_to_beneficiary" + ) val targetCreateCustomViewJson = CreateCustomViewJson( name = vrpViewId, diff --git a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala index 287f716ff..08d997b44 100644 --- a/obp-api/src/main/scala/code/views/system/ViewDefinition.scala +++ b/obp-api/src/main/scala/code/views/system/ViewDefinition.scala @@ -298,9 +298,15 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many } //internal transfer between my own accounts + + @deprecated("we added new field `canAddTransactionRequestToBeneficiary_`","25-07-2024") object canAddTransactionRequestToOwnAccount_ extends MappedBoolean(this){ override def defaultValue = false } + + object canAddTransactionRequestToBeneficiary_ extends MappedBoolean(this){ + override def defaultValue = false + } // transfer to any account object canAddTransactionRequestToAnyAccount_ extends MappedBoolean(this){ @@ -438,7 +444,7 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many canAddWhereTag_(actions.exists(_ == "can_add_where_tag")) canSeeWhereTag_(actions.exists(_ == "can_see_where_tag")) canDeleteWhereTag_(actions.exists(_ == "can_delete_where_tag")) - canAddTransactionRequestToOwnAccount_(actions.exists(_ == "can_add_transaction_request_to_own_account")) //added following two for payments + canAddTransactionRequestToBeneficiary_(actions.exists(_ == "can_add_transaction_request_to_beneficiary")) canAddTransactionRequestToAnyAccount_(actions.exists(_ == "can_add_transaction_request_to_any_account")) canSeeBankAccountCreditLimit_(actions.exists(_ == "can_see_bank_account_credit_limit")) canCreateDirectDebit_(actions.exists(_ == "can_create_direct_debit")) @@ -585,8 +591,9 @@ class ViewDefinition extends View with LongKeyedMapper[ViewDefinition] with Many def canSeeWhereTag : Boolean = canSeeWhereTag_.get def canDeleteWhereTag : Boolean = canDeleteWhereTag_.get - def canAddTransactionRequestToOwnAccount: Boolean = canAddTransactionRequestToOwnAccount_.get //added following two for payments + def canAddTransactionRequestToOwnAccount: Boolean = false //we do not need this field, set this to false. def canAddTransactionRequestToAnyAccount: Boolean = canAddTransactionRequestToAnyAccount_.get + def canAddTransactionRequestToBeneficiary: Boolean = canSeeBankAccountCreditLimit_.get def canSeeBankAccountCreditLimit: Boolean = canSeeBankAccountCreditLimit_.get def canCreateDirectDebit: Boolean = canCreateDirectDebit_.get diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala index 4cf6b06fb..a4b0fcf9f 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/ViewModel.scala @@ -421,6 +421,7 @@ trait View { def canAddTransactionRequestToOwnAccount: Boolean //added following two for payments def canAddTransactionRequestToAnyAccount: Boolean + def canAddTransactionRequestToBeneficiary: Boolean def canSeeBankAccountCreditLimit: Boolean