feat: cvc nickname gpay

src/Components/DynamicFields.res

@@ -21,16 +21,11 @@ let make = (
   let {billingAddress} = Recoil.useRecoilValueFromAtom(optionAtom)
 
   //<...>//
-  let paymentMethodTypes = React.useMemo3(() => {
-    PaymentMethodsRecord.getPaymentMethodTypeFromList(
-      ~list,
-      ~paymentMethod,
-      ~paymentMethodType=PaymentUtils.getPaymentMethodName(
-        ~paymentMethodType=paymentMethod,
-        ~paymentMethodName=paymentMethodType,
-      ),
-    )->Belt.Option.getWithDefault(PaymentMethodsRecord.defaultPaymentMethodType)
-  }, (list, paymentMethod, paymentMethodType))
+  let paymentMethodTypes = DynamicFieldsUtils.usePaymentMethodTypeFromList(
+    ~list,
+    ~paymentMethod,
+    ~paymentMethodType,
+  )
 
   let requiredFieldsWithBillingDetails = React.useMemo3(() => {
     if paymentMethod === "card" {

src/Components/NicknamePaymentInput.res

@@ -0,0 +1,19 @@
+@react.component
+let make = (~paymentType: CardThemeType.mode, ~value, ~setValue) => {
+  let {config, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
+
+  let onChange = ev => {
+    let val = ReactEvent.Form.target(ev)["value"]
+    setValue(_ => val)
+  }
+
+  <PaymentInputField
+    fieldName=localeString.nicknameLabel
+    value
+    onChange
+    paymentType
+    appearance=config.appearance
+    inputRef={React.useRef(Js.Nullable.null)}
+    placeholder=localeString.nicknamePlaceholder
+  />
+}

src/Components/SavedCardItem.res

@@ -48,6 +48,7 @@ let make = (
   }, [isActive])
 
   let isCard = paymentItem.paymentMethod === "card"
+  let isRenderCvv = isCard && paymentItem.requiresCvv
 
   let paymentMethodType = switch paymentItem.paymentMethodType {
   | Some(paymentMethodType) => paymentMethodType->Utils.snakeToTitleCase
@@ -90,15 +91,15 @@ let make = (
                 border="1px solid currentColor"
               />
             </div>
-            <div className={`PickerItemIcon mx-3 flex  items-center `}>
-              brandIcon
-            </div>
-            <div className="flex items-center gap-2">
+            <div className={`PickerItemIcon mx-3 flex  items-center `}> brandIcon </div>
+            <div className="flex items-center gap-4">
               {isCard
-                ? <div
-                    className={`PickerItemLabel flex flex-row gap-3 items-center`}>
-                    <div className="tracking-widest"> {React.string(`****`)} </div>
-                    <div> {React.string({paymentItem.card.last4Digits})} </div>
+                ? <div className="flex flex-col items-start">
+                    <div> {React.string(paymentItem.card.nickname)} </div>
+                    <div className={`PickerItemLabel flex flex-row gap-3 items-center`}>
+                      <div className="tracking-widest"> {React.string(`****`)} </div>
+                      <div> {React.string(paymentItem.card.last4Digits)} </div>
+                    </div>
                   </div>
                 : <div> {React.string(paymentMethodType)} </div>}
               <RenderIf condition={paymentItem.defaultPaymentMethodSet}>
@@ -125,7 +126,7 @@ let make = (
         <div className="w-full ">
           <RenderIf condition={isActive}>
             <div className="flex flex-col items-start mx-8">
-              <RenderIf condition={isCard}>
+              <RenderIf condition={isRenderCvv}>
                 <div
                   className={`flex flex-row items-start justify-start gap-2`}
                   style={ReactDOMStyle.make(~fontSize="14px", ~opacity="0.5", ())}>

src/Components/SavedMethods.res

@@ -83,8 +83,16 @@ let make = (
       ->Belt.Array.get(0)
       ->Belt.Option.getWithDefault(PaymentType.defaultCustomerMethods)
     let isCardPaymentMethod = customerMethod.paymentMethod === "card"
+    let isCardPaymentMethodValid = !customerMethod.requiresCvv || (complete && !empty)
+
     let savedPaymentMethodBody = switch customerMethod.paymentMethod {
-    | "card" => PaymentBody.savedCardBody(~paymentToken=token, ~customerId, ~cvcNumber)
+    | "card" =>
+      PaymentBody.savedCardBody(
+        ~paymentToken=token,
+        ~customerId,
+        ~cvcNumber,
+        ~requiresCvv=customerMethod.requiresCvv,
+      )
     | _ => {
         let paymentMethodType = switch customerMethod.paymentMethodType {
         | Some("")
@@ -99,8 +107,9 @@ let make = (
         )
       }
     }
+
     if confirm.doSubmit {
-      if areRequiredFieldsValid && (!isCardPaymentMethod || (complete && !empty)) {
+      if areRequiredFieldsValid && (!isCardPaymentMethod || isCardPaymentMethodValid) {
         intent(
           ~bodyArr=savedPaymentMethodBody
           ->Js.Dict.fromArray

src/LocaleString.res

@@ -67,6 +67,8 @@ type localeStrings = {
   useExistingPaymentMethods: string,
   selectPaymentMethodLabel: string,
   savedPaymentMethodsLabel: string,
+  nicknameLabel: string,
+  nicknamePlaceholder: string,
 }
 
 let defaultLocale = {
@@ -149,6 +151,8 @@ let defaultLocale = {
   useExistingPaymentMethods: "Use saved payment methods",
   selectPaymentMethodLabel: "Select Payment Method",
   savedPaymentMethodsLabel: "Saved Payment Methods",
+  nicknameLabel: "Card Nickname",
+  nicknamePlaceholder: "Card Nickname (Optional)",
 }
 
 type locale = {localeStrings: array<localeStrings>}
@@ -233,6 +237,8 @@ let localeStrings = [
     useExistingPaymentMethods: "Use saved payment methods",
     selectPaymentMethodLabel: "Select Payment Method",
     savedPaymentMethodsLabel: "Saved Payment Methods",
+    nicknameLabel: "Card Nickname",
+    nicknamePlaceholder: "Card Nickname (Optional)",
   },
   {
     locale: "he",
@@ -314,6 +320,8 @@ let localeStrings = [
     useExistingPaymentMethods: `השתמש באמצעי תשלום שמורים`,
     selectPaymentMethodLabel: `בחר שיטת תשלום`,
     savedPaymentMethodsLabel: `אמצעי תשלום שמורים`,
+    nicknameLabel: `כינוי לכרטיס`,
+    nicknamePlaceholder: `כינוי לכרטיס (אופציונלי)`,
   },
   {
     locale: `fr`,
@@ -395,6 +403,8 @@ let localeStrings = [
     useExistingPaymentMethods: `Utiliser les modes de paiement enregistrés`,
     selectPaymentMethodLabel: `Sélectionnez le mode de paiement`,
     savedPaymentMethodsLabel: `Modes de paiement enregistrés`,
+    nicknameLabel: `Pseudonyme de la carte`,
+    nicknamePlaceholder: `Surnom de la carte (facultatif)`,
   },
   {
     locale: "en-GB",
@@ -476,6 +486,8 @@ let localeStrings = [
     useExistingPaymentMethods: "Use saved payment methods",
     selectPaymentMethodLabel: "Select Payment Method",
     savedPaymentMethodsLabel: "Saved Payment Methods",
+    nicknameLabel: "Card Nickname",
+    nicknamePlaceholder: "Card Nickname (Optional)",
   },
   {
     locale: "ar",
@@ -557,6 +569,8 @@ let localeStrings = [
     useExistingPaymentMethods: `استخدم طرق الدفع المحفوظة`,
     selectPaymentMethodLabel: `اختار طريقة الدفع`,
     savedPaymentMethodsLabel: `طرق الدفع المحفوظة`,
+    nicknameLabel: `الاسم علي الكارت`,
+    nicknamePlaceholder: `اسم البطاقة (اختياري)`,
   },
   {
     locale: "ja",
@@ -638,6 +652,8 @@ let localeStrings = [
     useExistingPaymentMethods: `保存した支払い方法を使用する`,
     selectPaymentMethodLabel: `支払い方法を選択してください`,
     savedPaymentMethodsLabel: `保存された支払い方法`,
+    nicknameLabel: `カードのニックネーム`,
+    nicknamePlaceholder: `カードニックネーム（任意）`,
   },
   {
     locale: "de",
@@ -719,5 +735,7 @@ let localeStrings = [
     useExistingPaymentMethods: `Gespeicherte Zahlungsarten nutzen`,
     selectPaymentMethodLabel: `Wählen Sie die Zahlungsmethode`,
     savedPaymentMethodsLabel: `Gespeicherte Zahlungsarten`,
+    nicknameLabel: `Spitzname der Karte`,
+    nicknamePlaceholder: `Kartenname (optional)`,
   },
 ]

src/Payment.res

@@ -252,6 +252,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
           ~cardHolderName="",
           ~cvcNumber,
           ~cardBrand=cardNetwork,
+          (),
         )
       | CardNumberElement =>
         let (month, year) = getExpiryDates(getCardElementValue(iframeId, "card-expiry"))
@@ -263,6 +264,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
           ~cardHolderName="",
           ~cvcNumber=localCvcNumber,
           ~cardBrand=cardNetwork,
+          (),
         )
       | _ => []
       }

src/PaymentElement.res

@@ -108,7 +108,19 @@ let make = (
     None
   }, [savedMethods])
 
-  let (walletList, paymentOptionsList, actualList) = React.useMemo4(() => {
+  let areAllGooglePayRequiredFieldsPrefilled = DynamicFieldsUtils.useAreAllRequiredFieldsPrefilled(
+    ~list,
+    ~paymentMethod="wallet",
+    ~paymentMethodType="google_pay",
+  )
+
+  let areAllApplePayRequiredFieldsPrefilled = DynamicFieldsUtils.useAreAllRequiredFieldsPrefilled(
+    ~list,
+    ~paymentMethod="wallet",
+    ~paymentMethodType="apple_pay",
+  )
+
+  let (walletList, paymentOptionsList, actualList) = React.useMemo6(() => {
     switch methodslist {
     | Loaded(paymentlist) =>
       let paymentOrder =
@@ -119,6 +131,8 @@ let make = (
           ~order=paymentOrder,
           ~showApplePay=isApplePayReady,
           ~showGooglePay=isGooglePayReady,
+          ~areAllGooglePayRequiredFieldsPrefilled,
+          ~areAllApplePayRequiredFieldsPrefilled,
         )
       (
         wallets->Utils.removeDuplicate,
@@ -131,7 +145,14 @@ let make = (
         : ([], [], [])
     | _ => ([], [], [])
     }
-  }, (methodslist, paymentMethodOrder, isApplePayReady, isGooglePayReady))
+  }, (
+    methodslist,
+    paymentMethodOrder,
+    isApplePayReady,
+    isGooglePayReady,
+    areAllGooglePayRequiredFieldsPrefilled,
+    areAllApplePayRequiredFieldsPrefilled,
+  ))
 
   React.useEffect4(() => {
     switch methodslist {

src/Payments/CardPayment.res

@@ -16,6 +16,9 @@ let make = (
   let {config, themeObj, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let options = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
   let loggerState = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
+
+  let (nickname, setNickname) = React.useState(_ => "")
+
   let (
     isCardValid,
     setIsCardValid,
@@ -100,7 +103,15 @@ let make = (
     ~isCvcValidValue,
   )
 
-  let submitCallback = React.useCallback5((ev: Window.event) => {
+  let isCustomerAcceptanceRequired = React.useMemo1(() => {
+    if displaySavedPaymentMethodsCheckbox {
+      isSaveCardsChecked || list.payment_type === SETUP_MANDATE
+    } else {
+      !(isGuestCustomer || list.payment_type === NORMAL)
+    }
+  }, [isSaveCardsChecked])
+
+  let submitCallback = React.useCallback6((ev: Window.event) => {
     let json = ev.data->Js.Json.parseExn
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
     let (month, year) = CardUtils.getExpiryDates(cardExpiry)
@@ -120,18 +131,14 @@ let make = (
       ~cardHolderName="",
       ~cvcNumber,
       ~cardBrand=cardNetwork,
+      ~nickname,
+      (),
     )
     let banContactBody = PaymentBody.bancontactBody()
-    let cardBody = if displaySavedPaymentMethodsCheckbox {
-      if isSaveCardsChecked || list.payment_type === SETUP_MANDATE {
-        defaultCardBody->Js.Array2.concat(onSessionBody)
-      } else {
-        defaultCardBody
-      }
-    } else if isGuestCustomer || list.payment_type === NORMAL {
-      defaultCardBody
-    } else {
+    let cardBody = if isCustomerAcceptanceRequired {
       defaultCardBody->Js.Array2.concat(onSessionBody)
+    } else {
+      defaultCardBody
     }
     if confirm.doSubmit {
       let validFormat =
@@ -171,7 +178,14 @@ let make = (
         }
       }
     }
-  }, (areRequiredFieldsValid, requiredFieldsBody, empty, complete, isSaveCardsChecked))
+  }, (
+    areRequiredFieldsValid,
+    requiredFieldsBody,
+    empty,
+    complete,
+    isCustomerAcceptanceRequired,
+    nickname,
+  ))
   submitPaymentData(submitCallback)
 
   let paymentMethod = isBancontact ? "bank_redirect" : "card"
@@ -182,6 +196,8 @@ let make = (
     options.displaySavedPaymentMethodsCheckbox &&
     !isBancontact
 
+  let nicknameFieldClassName = conditionsForShowingSaveCardCheckbox ? "pt-2" : "pt-5"
+
   <div className="animate-slowShow">
     <RenderIf condition={showFields || isBancontact}>
       <div
@@ -271,6 +287,11 @@ let make = (
               <AnimatedCheckbox isChecked=isSaveCardsChecked setIsChecked=setIsSaveCardsChecked />
             </div>
           </RenderIf>
+          <RenderIf condition={isCustomerAcceptanceRequired}>
+            <div className={`pb-2 ${nicknameFieldClassName}`}>
+              <NicknamePaymentInput paymentType value=nickname setValue=setNickname />
+            </div>
+          </RenderIf>
           <RenderIf
             condition={options.displaySavedPaymentMethods &&
             savedMethods->Array.length > 0 &&

src/Types/PaymentType.res

@@ -114,6 +114,7 @@ type customerCard = {
   expiryYear: string,
   cardToken: string,
   cardHolderName: option<string>,
+  nickname: string,
 }
 type customerMethods = {
   paymentToken: string,
@@ -123,6 +124,7 @@ type customerMethods = {
   card: customerCard,
   paymentMethodType: option<string>,
   defaultPaymentMethodSet: bool,
+  requiresCvv: bool,
 }
 type savedCardsLoadState =
   LoadingSavedCards | LoadedSavedCards(array<customerMethods>, bool) | NoResult(bool)
@@ -164,6 +166,7 @@ let defaultCardDetails = {
   expiryYear: "",
   cardToken: "",
   cardHolderName: None,
+  nickname: "",
 }
 let defaultCustomerMethods = {
   paymentToken: "",
@@ -173,6 +176,7 @@ let defaultCustomerMethods = {
   card: defaultCardDetails,
   paymentMethodType: None,
   defaultPaymentMethodSet: false,
+  requiresCvv: true,
 }
 let defaultLayout = {
   defaultCollapsed: false,
@@ -780,6 +784,7 @@ let getCardDetails = (dict, str) => {
       expiryYear: getString(json, "expiry_year", ""),
       cardToken: getString(json, "card_token", ""),
       cardHolderName: Some(getString(json, "card_holder_name", "")),
+      nickname: getString(json, "nick_name", ""),
     }
   })
   ->Belt.Option.getWithDefault(defaultCardDetails)
@@ -820,6 +825,7 @@ let createCustomerObjArr = dict => {
         card: getCardDetails(dict, "card"),
         paymentMethodType: getPaymentMethodType(dict),
         defaultPaymentMethodSet: getBool(dict, "default_payment_method_set", false),
+        requiresCvv: getBool(dict, "requires_cvv", true),
       }
     })
   LoadedSavedCards(customerPaymentMethods, isGuestCustomer)
@@ -842,6 +848,7 @@ let getCustomerMethods = (dict, str) => {
           card: getCardDetails(json, "card"),
           paymentMethodType: getPaymentMethodType(dict),
           defaultPaymentMethodSet: getBool(dict, "default_payment_method_set", false),
+          requiresCvv: getBool(dict, "requires_cvv", true),
         }
       })
     LoadedSavedCards(customerPaymentMethods, false)