Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions apps/party_management/src/pm_provider.erl
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ reduce_payment_terms(PaymentTerms, VS, DomainRevision) ->
),
risk_coverage = reduce_if_defined(PaymentTerms#domain_PaymentsProvisionTerms.risk_coverage, VS, DomainRevision),
turnover_limits =
reduce_if_defined(PaymentTerms#domain_PaymentsProvisionTerms.turnover_limits, VS, DomainRevision)
reduce_if_defined(PaymentTerms#domain_PaymentsProvisionTerms.turnover_limits, VS, DomainRevision),
allow_exchange =
reduce_predicate_if_defined(PaymentTerms#domain_PaymentsProvisionTerms.allow_exchange, VS, DomainRevision)
}.

reduce_payment_hold_terms(PaymentHoldTerms, VS, DomainRevision) ->
Expand Down Expand Up @@ -206,7 +208,8 @@ merge_payment_terms(
refunds = PRefunds,
chargebacks = PChargebacks,
risk_coverage = PRiskCoverage,
turnover_limits = PTurnoverLimits
turnover_limits = PTurnoverLimits,
allow_exchange = PAllowExchange
},
#domain_PaymentsProvisionTerms{
allow = TAllow,
Expand All @@ -220,7 +223,8 @@ merge_payment_terms(
refunds = TRefunds,
chargebacks = TChargebacks,
risk_coverage = TRiskCoverage,
turnover_limits = TTurnoverLimits
turnover_limits = TTurnoverLimits,
allow_exchange = TAllowExchange
}
) ->
#domain_PaymentsProvisionTerms{
Expand All @@ -235,7 +239,8 @@ merge_payment_terms(
refunds = pm_utils:select_defined(TRefunds, PRefunds),
chargebacks = pm_utils:select_defined(TChargebacks, PChargebacks),
risk_coverage = pm_utils:select_defined(TRiskCoverage, PRiskCoverage),
turnover_limits = pm_utils:select_defined(TTurnoverLimits, PTurnoverLimits)
turnover_limits = pm_utils:select_defined(TTurnoverLimits, PTurnoverLimits),
allow_exchange = pm_utils:select_defined(TAllowExchange, PAllowExchange)
};
merge_payment_terms(ProviderTerms, TerminalTerms) ->
pm_utils:select_defined(TerminalTerms, ProviderTerms).
Expand Down
6 changes: 4 additions & 2 deletions apps/party_management/test/pm_party_tests_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,8 @@ compute_provider_terminal_terms_ok(C) ->
upper_boundary = 5000000,
domain_revision = _
}
]}
]},
allow_exchange = {constant, true}
},
recurrent_paytools = #domain_RecurrentPaytoolsProvisionTerms{
cash_value = {value, ?cash(1000, <<"RUB">>)}
Expand Down Expand Up @@ -1402,7 +1403,8 @@ construct_domain_fixture(PartyRef, PrevRev) ->
{value,
?ordset([
?pmt(bank_card, ?bank_card(<<"visa">>))
])}
])},
allow_exchange = {constant, true}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
command: /sbin/init

dmt:
image: ghcr.io/valitydev/dominant-v2:sha-c9430b5
image: ghcr.io/valitydev/dominant-v2:sha-ab393d5
command: /opt/dmt/bin/dmt foreground
healthcheck:
test: "/opt/dmt/bin/dmt ping"
Expand Down
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{prometheus, "4.11.0"},
{prometheus_cowboy, "0.1.9"},
{woody, {git, "https://github.com/valitydev/woody_erlang.git", {tag, "v1.1.0"}}},
{damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.33"}}},
{damsel, {git, "https://github.com/valitydev/damsel.git", {tag, "v2.2.38"}}},
{payproc_errors, {git, "https://github.com/valitydev/payproc-errors-erlang.git", {branch, "master"}}},
{dmt_client, {git, "https://github.com/valitydev/dmt_client.git", {tag, "v2.0.3"}}},
{scoper, {git, "https://github.com/valitydev/scoper.git", {tag, "v1.1.0"}}},
Expand Down
2 changes: 1 addition & 1 deletion rebar.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2},
{<<"damsel">>,
{git,"https://github.com/valitydev/damsel.git",
{ref,"e7a302a684deba1bb18a00d1056879329219d280"}},
{ref,"c529750144dea43ada113436762ee1e340f5503d"}},
0},
{<<"dmt_client">>,
{git,"https://github.com/valitydev/dmt_client.git",
Expand Down
Loading