fix: card brand configuration error added (#362)

Co-authored-by: Pritish Budhiraja <[email protected]>
juspay · May 10, 2024 · f14c591 · f14c591
1 parent e2cb755
commit f14c591
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 6 deletions.
diff --git a/src/CardUtils.res b/src/CardUtils.res
@@ -110,6 +110,25 @@ let getCardType = val => {
   }
 }
 
+let getCardStringFromType = val => {
+  switch val {
+  | VISA => "Visa"
+  | MASTERCARD => "Mastercard"
+  | AMEX => "AmericanExpress"
+  | MAESTRO => "Maestro"
+  | DINERSCLUB => "DinersClub"
+  | DISCOVER => "Discover"
+  | BAJAJ => "BAJAJ"
+  | SODEXO => "SODEXO"
+  | RUPAY => "RuPay"
+  | JCB => "JCB"
+  | CARTESBANCAIRES => "CartesBancaires"
+  | UNIONPAY => "UnionPay"
+  | INTERAC => "Interac"
+  | NOTFOUND => "NOTFOUND"
+  }
+}
+
 let getobjFromCardPattern = cardBrand => {
   let patternsDict = CardPattern.cardPatterns
   patternsDict

diff --git a/src/LocaleStrings/ArabicLocale.res b/src/LocaleStrings/ArabicLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: `اسم البطاقة (اختياري)`,
   cardExpiredText: `انتهت صلاحية هذه البطاقة`,
   cardHeader: `معلومات البطاقة`,
+  cardBrandConfiguredErrorText: str => `${str} غير مدعوم في الوقت الحالي.`,
 }
diff --git a/src/LocaleStrings/CatalanLocale.res b/src/LocaleStrings/CatalanLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Seleccioneu una forma de pagament i torneu-ho a provar`,
   cardExpiredText: `Aquesta targeta ha caducat`,
   cardHeader: `Informació de la targeta`,
+  cardBrandConfiguredErrorText: str => `${str} no està suportat en aquest moment.`,
 }
diff --git a/src/LocaleStrings/DeutschLocale.res b/src/LocaleStrings/DeutschLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: `Kartenname (optional)`,
   cardExpiredText: `Diese Karte ist abgelaufen`,
   cardHeader: `Kartendaten`,
+  cardBrandConfiguredErrorText: str => `${str} wird derzeit nicht unterstützt.`,
 }
diff --git a/src/LocaleStrings/DutchLocale.res b/src/LocaleStrings/DutchLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Selecteer een betaalmethode en probeer het opnieuw`,
   cardExpiredText: `Deze kaart is verlopen`,
   cardHeader: `Kaartinformatie`,
+  cardBrandConfiguredErrorText: str => `${str} wordt op dit moment niet ondersteund.`,
 }
diff --git a/src/LocaleStrings/EnglishGBLocale.res b/src/LocaleStrings/EnglishGBLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: "Card Nickname (Optional)",
   cardExpiredText: `This card has expired`,
   cardHeader: `Card information`,
+  cardBrandConfiguredErrorText: str => `${str} is not supported at the moment.`,
 }
diff --git a/src/LocaleStrings/EnglishLocale.res b/src/LocaleStrings/EnglishLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: "Card Nickname (Optional)",
   cardExpiredText: `This card has expired`,
   cardHeader: `Card information`,
+  cardBrandConfiguredErrorText: str => `${str} is not supported at the moment.`,
 }
diff --git a/src/LocaleStrings/FrenchBelgiumLocale.res b/src/LocaleStrings/FrenchBelgiumLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Veuillez sélectionner un mode de paiement et réessayer`,
   cardExpiredText: `Cette carte a expiré`,
   cardHeader: `Informations de carte`,
+  cardBrandConfiguredErrorText: str => `${str} n'est pas pris en charge pour le moment.`,
 }
diff --git a/src/LocaleStrings/FrenchLocale.res b/src/LocaleStrings/FrenchLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: `Surnom de la carte (facultatif)`,
   cardExpiredText: `Cette carte a expiré`,
   cardHeader: `Informations de carte`,
+  cardBrandConfiguredErrorText: str => `${str} n'est pas pris en charge pour le moment.`,
 }
diff --git a/src/LocaleStrings/HebrewLocale.res b/src/LocaleStrings/HebrewLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: `כינוי לכרטיס (אופציונלי)`,
   cardExpiredText: `הכרטיס הזה פג תוקף`,
   cardHeader: `מידע כרטיס`,
+  cardBrandConfiguredErrorText: str => `${str} לא נתמך כרגע.`,
 }
diff --git a/src/LocaleStrings/ItalianLocale.res b/src/LocaleStrings/ItalianLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Seleziona un metodo di pagamento e riprova`,
   cardExpiredText: `Questa carta è scaduta`,
   cardHeader: `Informazioni sulla carta`,
+  cardBrandConfiguredErrorText: str => `${str} non è supportato al momento.`,
 }
diff --git a/src/LocaleStrings/JapaneseLocale.res b/src/LocaleStrings/JapaneseLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   nicknamePlaceholder: `カードニックネーム（任意）`,
   cardExpiredText: `このカードは期限切れです`,
   cardHeader: `カード情報`,
+  cardBrandConfiguredErrorText: str => `${str} は現在サポートされていません。`,
 }
diff --git a/src/LocaleStrings/LocaleStringTypes.res b/src/LocaleStrings/LocaleStringTypes.res
@@ -72,4 +72,5 @@ type localeStrings = {
   nicknamePlaceholder: string,
   cardExpiredText: string,
   cardHeader: string,
+  cardBrandConfiguredErrorText: string => string,
 }
diff --git a/src/LocaleStrings/PolishLocale.res b/src/LocaleStrings/PolishLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Wybierz metodę płatności i spróbuj ponownie`,
   cardExpiredText: `Ta karta wygasła`,
   cardHeader: `Informacje o karcie`,
+  cardBrandConfiguredErrorText: str => `${str} nie jest obecnie obsługiwany.`,
 }
diff --git a/src/LocaleStrings/PortugueseLocale.res b/src/LocaleStrings/PortugueseLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Selecione uma forma de pagamento e tente novamente`,
   cardExpiredText: `Este cartão expirou`,
   cardHeader: `Informações do cartão`,
+  cardBrandConfiguredErrorText: str => `${str} não é suportado no momento.`,
 }
diff --git a/src/LocaleStrings/RussianLocale.res b/src/LocaleStrings/RussianLocale.res
@@ -84,4 +84,6 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Пожалуйста, выберите способ оплаты и повторите попытку.`,
   cardExpiredText: `Эта карта истекла`,
   cardHeader: `Информация о карте`,
+  cardBrandConfiguredErrorText: str =>
+    `${str} в данный момент не поддерживается.`,
 }
diff --git a/src/LocaleStrings/SpanishLocale.res b/src/LocaleStrings/SpanishLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Por favor seleccione un método de pago y vuelva a intentarlo`,
   cardExpiredText: `Esta tarjeta ha caducado`,
   cardHeader: `Información de la tarjeta`,
+  cardBrandConfiguredErrorText: str => `${str} no está soportado en este momento.`,
 }
diff --git a/src/LocaleStrings/SwedishLocale.res b/src/LocaleStrings/SwedishLocale.res
@@ -81,4 +81,5 @@ let localeStrings: LocaleStringTypes.localeStrings = {
   selectPaymentMethodText: `Välj en betalningsmetod och försök igen`,
   cardExpiredText: `Detta kort har gått ut`,
   cardHeader: `Kortinformation`,
+  cardBrandConfiguredErrorText: str => `${str} stöds inte för tillfället.`,
 }
diff --git a/src/Payments/CardPayment.res b/src/Payments/CardPayment.res
@@ -73,6 +73,28 @@ let make = (
     postFailedSubmitResponse(~errortype="validation_error", ~message)
   }
 
+  let combinedCardNetworks = React.useMemo1(() => {
+    let cardPaymentMethod =
+      paymentMethodListValue.payment_methods
+      ->Array.find(ele => ele.payment_method === "card")
+      ->Option.getOr({
+        payment_method: "card",
+        payment_method_types: [],
+      })
+
+    let cardNetworks = cardPaymentMethod.payment_method_types->Array.map(ele => ele.card_networks)
+
+    let cardNetworkNames =
+      cardNetworks->Array.map(ele =>
+        ele->Array.map(val => val.card_network->CardUtils.getCardStringFromType->String.toLowerCase)
+      )
+
+    cardNetworkNames
+    ->Array.reduce([], (acc, ele) => acc->Array.concat(ele))
+    ->Utils.getUniqueArray
+  }, [paymentMethodListValue])
+  let isCardBrandValid = combinedCardNetworks->Array.includes(cardBrand->String.toLowerCase)
+
   let (requiredFieldsBody, setRequiredFieldsBody) = React.useState(_ => Dict.make())
 
   let areRequiredFieldsValid = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsValid)
@@ -130,12 +152,8 @@ let make = (
       defaultCardBody
     }
     if confirm.doSubmit {
-      let validFormat =
-        (isBancontact ||
-        (isCVCValid->Option.getOr(false) &&
-        isCardValid->Option.getOr(false) &&
-        isExpiryValid->Option.getOr(false))) && areRequiredFieldsValid
-      if validFormat && (showFields || isBancontact) {
+      let validFormat = (isBancontact || complete) && areRequiredFieldsValid
+      if validFormat && (showFields || isBancontact) && isCardBrandValid {
         intent(
           ~bodyArr={
             (isBancontact ? banContactBody : cardBody)
@@ -165,6 +183,9 @@ let make = (
         if !validFormat {
           setUserError(localeString.enterValidDetailsText)
         }
+        if !isCardBrandValid {
+          setUserError(localeString.cardBrandConfiguredErrorText(cardBrand))
+        }
       }
     }
   }, (
@@ -174,6 +195,7 @@ let make = (
     complete,
     isCustomerAcceptanceRequired,
     nickname,
+    isCardBrandValid,
   ))
   useSubmitPaymentData(submitCallback)
 

diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
@@ -1242,3 +1242,5 @@ let walletElementPaymentType: array<CardThemeType.mode> = [
 let isWalletElementPaymentType = (paymentType: CardThemeType.mode) => {
   walletElementPaymentType->Array.includes(paymentType)
 }
+
+let getUniqueArray = arr => arr->Array.map(item => (item, ""))->Dict.fromArray->Dict.keysToArray