resolved conflicts

Author: tsdk02

api-reference/essentials/error_codes.mdx

@@ -9766,6 +9766,28 @@
             "enum": [
               "user_vpa_id"
             ]
+          },
+          {
+            "type": "object",
+            "required": [
+              "language_preference"
+            ],
+            "properties": {
+              "language_preference": {
+                "type": "object",
+                "required": [
+                  "options"
+                ],
+                "properties": {
+                  "options": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
           }
         ],
         "description": "Possible field type of required fields in payment_method_data"
@@ -12177,6 +12199,10 @@
           "date_of_birth": {
             "type": "string",
             "format": "date"
+          },
+          "language_preference": {
+            "type": "string",
+            "nullable": true
           }
         }
       },

api-reference/openapi_spec.json

@@ -26,6 +26,7 @@ certificate = "/path/to/certificate.pem"
 # http_url = "http proxy url"   # Proxy all HTTP traffic via this proxy
 # https_url = "https proxy url" # Proxy all HTTPS traffic via this proxy
 idle_pool_connection_timeout = 90 # Timeout for idle pool connections (defaults to 90s)
+bypass_proxy_urls = []            # A list of URLs that should bypass the proxy
 
 
 # Configuration for the Key Manager Service
@@ -284,30 +285,30 @@ stripe = { banks = "alior_bank,bank_millennium,bank_nowy_bfg_sa,bank_pekao_sa,ba
 wallets = ["klarna", "mifinity", "braintree", "applepay"]
 rewards = ["cashtocode", "zen"]
 cards = [
-    "adyen",
-    "adyenplatform",
-    "authorizedotnet",
-    "coinbase",
-    "cryptopay",
-    "braintree",
-    "checkout",
-    "cybersource",
-    "datatrans",
-    "globalpay",
-    "globepay",
-    "gocardless",
-    "gpayments",
-    "helcim",
-    "mollie",
-    "paypal",
-    "shift4",
-    "square",
-    "stax",
-    "stripe",
-    "threedsecureio",
-    "worldpay",
-    "zen",
-    "zsl",
+  "adyen",
+  "adyenplatform",
+  "authorizedotnet",
+  "coinbase",
+  "cryptopay",
+  "braintree",
+  "checkout",
+  "cybersource",
+  "datatrans",
+  "globalpay",
+  "globepay",
+  "gocardless",
+  "gpayments",
+  "helcim",
+  "mollie",
+  "paypal",
+  "shift4",
+  "square",
+  "stax",
+  "stripe",
+  "threedsecureio",
+  "worldpay",
+  "zen",
+  "zsl",
 ]
 
 # Scheduler settings provides a point to modify the behaviour of scheduler flow.
@@ -438,13 +439,13 @@ card.debit = { connector_list = "cybersource" }  # Update Mandate supported paym
 # Required fields info used while listing the payment_method_data
 [required_fields.pay_later] # payment_method = "pay_later"
 afterpay_clearpay = { fields = { stripe = [ # payment_method_type = afterpay_clearpay, connector = "stripe"
-    # Required fields vector with its respective display name in front-end and field_type
-    { required_field = "shipping.address.first_name", display_name = "first_name", field_type = "text" },
-    { required_field = "shipping.address.last_name", display_name = "last_name", field_type = "text" },
-    { required_field = "shipping.address.country", display_name = "country", field_type = { drop_down = { options = [
-        "US",
-        "IN",
-    ] } } },
+  # Required fields vector with its respective display name in front-end and field_type
+  { required_field = "shipping.address.first_name", display_name = "first_name", field_type = "text" },
+  { required_field = "shipping.address.last_name", display_name = "last_name", field_type = "text" },
+  { required_field = "shipping.address.country", display_name = "country", field_type = { drop_down = { options = [
+    "US",
+    "IN",
+  ] } } },
 ] } }
 
 [payouts]
@@ -484,7 +485,7 @@ boleto = { country = "BR", currency = "BRL" }
 open_banking_uk = { country = "DE,GB,AT,BE,CY,EE,ES,FI,FR,GR,HR,IE,IT,LT,LU,LV,MT,NL,PT,SI,SK,BG,CZ,DK,HU,NO,PL,RO,SE,AU,BR", currency = "EUR,GBP,DKK,NOK,PLN,SEK,AUD,BRL" }
 
 [pm_filters.razorpay]
-upi_collect = {country = "IN", currency = "INR"}
+upi_collect = { country = "IN", currency = "INR" }
 
 [pm_filters.zen]
 credit = { not_available_flows = { capture_method = "manual" } }
@@ -586,7 +587,7 @@ card = "credit,debit"
 
 #Payout Method Filters Based on Country and Currency
 [payout_method_filters.adyenplatform]
-sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH" , currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
+sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH", currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
 
 [payout_method_filters.stripe]
 ach = { country = "US", currency = "USD" }
@@ -636,19 +637,19 @@ enabled = true                      # Switch to enable or disable PayPal onboard
 source = "logs" # The event sink to push events supports kafka or logs (stdout)
 
 [events.kafka]
-brokers = []                               # Kafka broker urls for bootstrapping the client
-fraud_check_analytics_topic = "topic"      # Kafka topic to be used for FraudCheck events
-intent_analytics_topic = "topic"           # Kafka topic to be used for PaymentIntent events
-attempt_analytics_topic = "topic"          # Kafka topic to be used for PaymentAttempt events
-refund_analytics_topic = "topic"           # Kafka topic to be used for Refund events
-api_logs_topic = "topic"                   # Kafka topic to be used for incoming api events
-connector_logs_topic = "topic"             # Kafka topic to be used for connector api events
-outgoing_webhook_logs_topic = "topic"      # Kafka topic to be used for outgoing webhook events
-dispute_analytics_topic = "topic"          # Kafka topic to be used for Dispute events
-audit_events_topic = "topic"               # Kafka topic to be used for Payment Audit events
-payout_analytics_topic = "topic"           # Kafka topic to be used for Payouts and PayoutAttempt events
-consolidated_events_topic = "topic"        # Kafka topic to be used for Consolidated events
-authentication_analytics_topic = "topic"   # Kafka topic to be used for Authentication events
+brokers = []                             # Kafka broker urls for bootstrapping the client
+fraud_check_analytics_topic = "topic"    # Kafka topic to be used for FraudCheck events
+intent_analytics_topic = "topic"         # Kafka topic to be used for PaymentIntent events
+attempt_analytics_topic = "topic"        # Kafka topic to be used for PaymentAttempt events
+refund_analytics_topic = "topic"         # Kafka topic to be used for Refund events
+api_logs_topic = "topic"                 # Kafka topic to be used for incoming api events
+connector_logs_topic = "topic"           # Kafka topic to be used for connector api events
+outgoing_webhook_logs_topic = "topic"    # Kafka topic to be used for outgoing webhook events
+dispute_analytics_topic = "topic"        # Kafka topic to be used for Dispute events
+audit_events_topic = "topic"             # Kafka topic to be used for Payment Audit events
+payout_analytics_topic = "topic"         # Kafka topic to be used for Payouts and PayoutAttempt events
+consolidated_events_topic = "topic"      # Kafka topic to be used for Consolidated events
+authentication_analytics_topic = "topic" # Kafka topic to be used for Authentication events
 
 # File storage configuration
 [file_storage]

config/config.example.toml

@@ -43,9 +43,9 @@ partner_id = "paypal_partner_id"
 
 [connector_request_reference_id_config]
 merchant_ids_send_payment_id_as_connector_request_id = [
-    "merchant_id_1",
-    "merchant_id_2",
-    "etc.,",
+  "merchant_id_1",
+  "merchant_id_2",
+  "etc.,",
 ]
 
 [cors]
@@ -70,19 +70,19 @@ sts_role_session_name = "" # An identifier for the assumed role session, used to
 source = "logs" # The event sink to push events supports kafka or logs (stdout)
 
 [events.kafka]
-brokers = []                               # Kafka broker urls for bootstrapping the client
-intent_analytics_topic = "topic"           # Kafka topic to be used for PaymentIntent events
-attempt_analytics_topic = "topic"          # Kafka topic to be used for PaymentAttempt events
-refund_analytics_topic = "topic"           # Kafka topic to be used for Refund events
-api_logs_topic = "topic"                   # Kafka topic to be used for incoming api events
-connector_logs_topic = "topic"             # Kafka topic to be used for connector api events
-outgoing_webhook_logs_topic = "topic"      # Kafka topic to be used for outgoing webhook events
-dispute_analytics_topic = "topic"          # Kafka topic to be used for Dispute events
-audit_events_topic = "topic"               # Kafka topic to be used for Payment Audit events
-payout_analytics_topic = "topic"           # Kafka topic to be used for Payouts and PayoutAttempt events
-consolidated_events_topic = "topic"        # Kafka topic to be used for Consolidated events
-authentication_analytics_topic = "topic"   # Kafka topic to be used for Authentication events
-fraud_check_analytics_topic = "topic"      # Kafka topic to be used for Fraud Check events
+brokers = []                             # Kafka broker urls for bootstrapping the client
+intent_analytics_topic = "topic"         # Kafka topic to be used for PaymentIntent events
+attempt_analytics_topic = "topic"        # Kafka topic to be used for PaymentAttempt events
+refund_analytics_topic = "topic"         # Kafka topic to be used for Refund events
+api_logs_topic = "topic"                 # Kafka topic to be used for incoming api events
+connector_logs_topic = "topic"           # Kafka topic to be used for connector api events
+outgoing_webhook_logs_topic = "topic"    # Kafka topic to be used for outgoing webhook events
+dispute_analytics_topic = "topic"        # Kafka topic to be used for Dispute events
+audit_events_topic = "topic"             # Kafka topic to be used for Payment Audit events
+payout_analytics_topic = "topic"         # Kafka topic to be used for Payouts and PayoutAttempt events
+consolidated_events_topic = "topic"      # Kafka topic to be used for Consolidated events
+authentication_analytics_topic = "topic" # Kafka topic to be used for Authentication events
+fraud_check_analytics_topic = "topic"    # Kafka topic to be used for Fraud Check events
 
 # File storage configuration
 [file_storage]
@@ -190,6 +190,7 @@ redis_expiry = 900          # Redis expiry time in milliseconds
 [proxy]
 http_url = "http://proxy_http_url"    # Outgoing proxy http URL to proxy the HTTP traffic
 https_url = "https://proxy_https_url" # Outgoing proxy https URL to proxy the HTTPS traffic
+bypass_proxy_urls = []                # A list of URLs that should bypass the proxy
 
 # Redis credentials
 [redis]
@@ -210,8 +211,8 @@ unresponsive_timeout = 10 # An optional timeout for Unresponsive commands in sec
 max_feed_count = 200 # The maximum number of frames that will be fed to a socket before flushing.
 cluster_enabled = true # boolean
 cluster_urls = [
-    "redis.cluster.uri-1:8080",
-    "redis.cluster.uri-2:4115",
+  "redis.cluster.uri-1:8080",
+  "redis.cluster.uri-2:4115",
 ] # List of redis cluster urls
 
 # Replica SQL data store credentials
@@ -295,7 +296,7 @@ enabled = false
 global_tenant = { schema = "public", redis_key_prefix = "" }
 
 [multitenancy.tenants]
-public = { name = "hyperswitch", base_url = "http://localhost:8080", schema = "public", redis_key_prefix = "", clickhouse_database = "default"}
+public = { name = "hyperswitch", base_url = "http://localhost:8080", schema = "public", redis_key_prefix = "", clickhouse_database = "default" }
 
 [user_auth_methods]
 encryption_key = "user_auth_table_encryption_key" # Encryption key used for encrypting data in user_authentication_methods table

config/deployments/env_specific.toml

@@ -470,6 +470,7 @@ pub enum FieldType {
     DropDown { options: Vec<String> },
     UserDateOfBirth,
     UserVpaId,
+    LanguagePreference { options: Vec<String> },
 }
 
 impl FieldType {
@@ -556,6 +557,7 @@ impl PartialEq for FieldType {
             ) => options_self.eq(options_other),
             (Self::UserDateOfBirth, Self::UserDateOfBirth) => true,
             (Self::UserVpaId, Self::UserVpaId) => true,
+            (Self::LanguagePreference { .. }, Self::LanguagePreference { .. }) => true,
             _unused => false,
         }
     }

crates/api_models/src/enums.rs

@@ -2785,6 +2785,7 @@ pub struct SwishQrData {}
 pub struct MifinityData {
     #[schema(value_type = Date)]
     pub date_of_birth: Secret<Date>,
+    pub language_preference: Option<String>,
 }
 
 #[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]