From f7a489028ae91dbde9359632b3ef3c51487faafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC?= Date: Fri, 31 Oct 2025 12:21:19 +0300 Subject: [PATCH 1/4] added new recurrent terms --- proto/domain.thrift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proto/domain.thrift b/proto/domain.thrift index 23db9493..127cf34e 100644 --- a/proto/domain.thrift +++ b/proto/domain.thrift @@ -2070,6 +2070,7 @@ struct ProvisionTermSet { 1: optional PaymentsProvisionTerms payments 2: optional RecurrentPaytoolsProvisionTerms recurrent_paytools 3: optional WalletProvisionTerms wallet + 4: optional HiddenRecurrentProvisionTerms hidden_recurrent } struct PaymentsProvisionTerms { @@ -2129,6 +2130,8 @@ struct RecurrentPaytoolsProvisionTerms { 4: optional RiskScoreSelector risk_coverage } +struct HiddenRecurrentProvisionTerms {} + struct WalletProvisionTerms { 1: optional TurnoverLimitSelector turnover_limit 2: optional WithdrawalProvisionTerms withdrawals From 9a4f5738ba790d2d03676dcd3402f10cda77c4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC?= Date: Fri, 31 Oct 2025 12:50:51 +0300 Subject: [PATCH 2/4] renamed and added to payment --- proto/domain.thrift | 5 +++-- proto/proxy_provider.thrift | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proto/domain.thrift b/proto/domain.thrift index 127cf34e..45aeaf78 100644 --- a/proto/domain.thrift +++ b/proto/domain.thrift @@ -323,6 +323,7 @@ struct InvoicePayment { 12: optional PartyConfigRef party_ref 13: optional ShopConfigRef shop_ref 14: optional bool make_recurrent + 18: optional bool skipped_recurrent 15: optional string external_id 16: optional base.Timestamp processing_deadline 17: optional InvoicePaymentRegistrationOrigin registration_origin @@ -2070,7 +2071,7 @@ struct ProvisionTermSet { 1: optional PaymentsProvisionTerms payments 2: optional RecurrentPaytoolsProvisionTerms recurrent_paytools 3: optional WalletProvisionTerms wallet - 4: optional HiddenRecurrentProvisionTerms hidden_recurrent + 4: optional SkippedRecurrentProvisionTerms skipped_recurrent } struct PaymentsProvisionTerms { @@ -2130,7 +2131,7 @@ struct RecurrentPaytoolsProvisionTerms { 4: optional RiskScoreSelector risk_coverage } -struct HiddenRecurrentProvisionTerms {} +struct SkippedRecurrentProvisionTerms {} struct WalletProvisionTerms { 1: optional TurnoverLimitSelector turnover_limit diff --git a/proto/proxy_provider.thrift b/proto/proxy_provider.thrift index 1502f577..654e4ed0 100644 --- a/proto/proxy_provider.thrift +++ b/proto/proxy_provider.thrift @@ -174,6 +174,7 @@ struct InvoicePayment { 5: required Cash cost 7: required domain.ContactInfo contact_info 8: optional bool make_recurrent + 10: optional bool skipped_recurrent 9: optional base.Timestamp processing_deadline } From ab06d5f1466269db27b0515cf4c0c5f5941be605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC?= Date: Fri, 31 Oct 2025 12:51:43 +0300 Subject: [PATCH 3/4] fixed --- proto/proxy_provider.thrift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/proxy_provider.thrift b/proto/proxy_provider.thrift index 654e4ed0..cd7e33d7 100644 --- a/proto/proxy_provider.thrift +++ b/proto/proxy_provider.thrift @@ -174,7 +174,7 @@ struct InvoicePayment { 5: required Cash cost 7: required domain.ContactInfo contact_info 8: optional bool make_recurrent - 10: optional bool skipped_recurrent + 12: optional bool skipped_recurrent 9: optional base.Timestamp processing_deadline } From 736723a57c67cb85748756d4860d3b23d5049da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC?= Date: Sat, 1 Nov 2025 11:32:08 +0300 Subject: [PATCH 4/4] renamed --- proto/domain.thrift | 8 +++++--- proto/payment_processing.thrift | 4 ++++ proto/proxy_provider.thrift | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/proto/domain.thrift b/proto/domain.thrift index 45aeaf78..22c42f74 100644 --- a/proto/domain.thrift +++ b/proto/domain.thrift @@ -323,7 +323,7 @@ struct InvoicePayment { 12: optional PartyConfigRef party_ref 13: optional ShopConfigRef shop_ref 14: optional bool make_recurrent - 18: optional bool skipped_recurrent + 18: optional bool skip_recurrent 15: optional string external_id 16: optional base.Timestamp processing_deadline 17: optional InvoicePaymentRegistrationOrigin registration_origin @@ -2071,7 +2071,7 @@ struct ProvisionTermSet { 1: optional PaymentsProvisionTerms payments 2: optional RecurrentPaytoolsProvisionTerms recurrent_paytools 3: optional WalletProvisionTerms wallet - 4: optional SkippedRecurrentProvisionTerms skipped_recurrent + 4: optional ExtendedProvisionTerms extension } struct PaymentsProvisionTerms { @@ -2131,7 +2131,9 @@ struct RecurrentPaytoolsProvisionTerms { 4: optional RiskScoreSelector risk_coverage } -struct SkippedRecurrentProvisionTerms {} +struct ExtendedProvisionTerms { + 1: optional bool skip_recurrent +} struct WalletProvisionTerms { 1: optional TurnoverLimitSelector turnover_limit diff --git a/proto/payment_processing.thrift b/proto/payment_processing.thrift index 59de4be3..773afb21 100644 --- a/proto/payment_processing.thrift +++ b/proto/payment_processing.thrift @@ -199,6 +199,7 @@ struct InvoicePaymentRouteChanged { 2: optional set candidates 3: optional map scores 4: optional RouteLimitContext limits + 5: optional RouteDecisionContext decision } /** @@ -869,6 +870,9 @@ struct TurnoverLimitValue { typedef map> RouteLimitContext +struct RouteDecisionContext { + 1: optional bool skip_recurrent +} // Exceptions diff --git a/proto/proxy_provider.thrift b/proto/proxy_provider.thrift index cd7e33d7..ba916061 100644 --- a/proto/proxy_provider.thrift +++ b/proto/proxy_provider.thrift @@ -174,7 +174,7 @@ struct InvoicePayment { 5: required Cash cost 7: required domain.ContactInfo contact_info 8: optional bool make_recurrent - 12: optional bool skipped_recurrent + 12: optional bool skip_recurrent 9: optional base.Timestamp processing_deadline }