valitydev/party-management
14
0
Fork 0
mirror of https://github.com/valitydev/party-management.git synced 2024-11-06 09:15:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

P2C-8: Add attempt_limit (#452)

Browse Source 
* P2C-8: Add attempt_limit

* Add missing merge

* Fix order
This commit is contained in:
Sergey Yelin 2020-06-22 18:21:22 +03:00 committed by GitHub
parent d1d957e047
commit e4ee77b3fb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/party_management/src/pm_party.erl
View File

@ -396,7 +396,8 @@ reduce_withdrawals_terms(#domain_WithdrawalServiceTerms{} = Terms, VS, Rev) ->
#domain_WithdrawalServiceTerms{
currencies = reduce_if_defined(Terms#domain_WithdrawalServiceTerms.currencies, VS, Rev),
cash_limit = reduce_if_defined(Terms#domain_WithdrawalServiceTerms.cash_limit, VS, Rev),
cash_flow = reduce_if_defined(Terms#domain_WithdrawalServiceTerms.cash_flow, VS, Rev)
cash_flow = reduce_if_defined(Terms#domain_WithdrawalServiceTerms.cash_flow, VS, Rev),
attempt_limit = reduce_if_defined(Terms#domain_WithdrawalServiceTerms.attempt_limit, VS, Rev)
}.
reduce_p2p_terms(#domain_P2PServiceTerms{} = Terms, VS, Rev) ->
@ -714,18 +715,21 @@ merge_withdrawals_terms(
#domain_WithdrawalServiceTerms{
currencies = Currencies0,
cash_limit = CashLimit0,
cash_flow = CashFlow0
cash_flow = CashFlow0,
attempt_limit = AttemptList0
},
#domain_WithdrawalServiceTerms{
currencies = Currencies1,
cash_limit = CashLimit1,
cash_flow = CashFlow1
cash_flow = CashFlow1,
attempt_limit = AttemptList1
}
) ->
#domain_WithdrawalServiceTerms{
currencies = pm_utils:select_defined(Currencies1, Currencies0),
cash_limit = pm_utils:select_defined(CashLimit1, CashLimit0),
cash_flow = pm_utils:select_defined(CashFlow1, CashFlow0)
cash_flow = pm_utils:select_defined(CashFlow1, CashFlow0),
attempt_limit = pm_utils:select_defined(AttemptList1, AttemptList0)
};
merge_withdrawals_terms(Terms0, Terms1) ->
pm_utils:select_defined(Terms1, Terms0).

2
rebar.lock
View File

@ -10,7 +10,7 @@
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.8.0">>},2},
{<<"damsel">>,
{git,"git@github.com:rbkmoney/damsel.git",
{ref,"a6c9401d85b856df783ed715f70304e7e104f052"}},
{ref,"e9c18627e5cc5d6d95dbd820b323bf6165b0782e"}},
0},
{<<"dmt_client">>,
{git,"git@github.com:rbkmoney/dmt_client.git",