paymob-pixel-alpha 1.1.27 → 1.1.29

package/main.js

@@ -13604,6 +13604,9 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     needsName,
     needsEmail,
     needsPhone,
+    emailRequired = true,
+    phoneRequired = true,
+    nameRequired = true,
     defaultCountryISO = 'EG',
     defaultValues,
     hideLabels,
@@ -13623,7 +13626,8 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     formState: {
       errors,
       isDirty,
-      isValid
+      isValid,
+      dirtyFields
     },
     setValue,
     trigger,
@@ -13729,8 +13733,8 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     } else if (onClientData) {
       onClientData(null);
     }
-    onValidityChange == null || onValidityChange(isValid && (isDirty || !!defaultValues), isDirty || !(verifiedFields != null && verifiedFields.email) || !(verifiedFields != null && verifiedFields.phone));
-  }, [isDirty, isValid, watchFieldsJson]);
+    onValidityChange == null || onValidityChange(isValid && (isDirty || !!defaultValues), !!Object.keys(dirtyFields).length || !(verifiedFields != null && verifiedFields.email) && !!getValues('email') || !(verifiedFields != null && verifiedFields.phone) && !!getValues('phone'));
+  }, [isDirty, isValid, watchFieldsJson, Object.keys(dirtyFields).length]);
   useEffect(() => {
     const getRegionData = async () => {
       setIsLoadingRegionData(true);
@@ -13780,11 +13784,12 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
           setValue(_field, e.target.value);
         }
       },
-      required: {
+      required: emailRequired ? {
         value: true,
         message: t('EMAIL_IS_REQUIRED')
-      },
+      } : false,
       validate: value => {
+        if (!value) return !emailRequired || t('EMAIL_IS_REQUIRED');
         const regex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
         return regex.test(value) || t('EMAIL_NOT_VALID');
       }
@@ -13819,10 +13824,10 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
           }
         }
       },
-      required: {
+      required: nameRequired ? {
         value: true,
         message: t('NAME_IS_REQUIRED')
-      }
+      } : false
     });
   }, []);
   const createPhoneRegister = useCallback(({
@@ -13836,12 +13841,13 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
         const trimmedNumber = phoneNumber.replace(/\D/g, '');
         setValue(_field3, trimmedNumber);
       },
-      required: {
+      required: phoneRequired ? {
         value: true,
         message: t('PHONE_IS_REQUIRED')
-      },
+      } : false,
       validate: value => {
         var _parseMax;
+        if (!value) return !phoneRequired || t('PHONE_IS_REQUIRED');
         return ((_parseMax = parseMax(countryCode + value)) == null ? void 0 : _parseMax.isValid()) || t('PHONE_NOT_VALID');
       }
     });
@@ -21007,6 +21013,7 @@ function formatAmountBasedOnCurrency_formatAmountBasedOnCurrency(amount, currenc
 
 
 
+
 
 
 ;// ../../node_modules/react-loading-skeleton/dist/index.js
@@ -21530,8 +21537,12 @@ function cardFormViewTwo_Card(props) {
     setIsOmanNetCard == null || setIsOmanNetCard(cardType === CARD_TYPES.OMAN);
   }, [cardType, setIsOmanNetCard]);
   useEffect(() => {
-    onDiscount == null || onDiscount(cardNum, isValidCard);
-  }, [isValidCard, cardNum]);
+    onDiscount == null || onDiscount({
+      cardNum,
+      isValidCard,
+      cardType
+    });
+  }, [isValidCard, cardNum, cardType]);
   return /*#__PURE__*/_jsxs("form", {
     onSubmit: handleSubmit(onSubmit),
     noValidate: true,
@@ -21861,8 +21872,12 @@ function mobileCardFormViewTwo_MobileCard(props) {
     }
   }, [expiryWatch, cvcWatch]);
   useEffect(() => {
-    onDiscount == null || onDiscount(cardNum, isValidCard);
-  }, [isValidCard, cardNum]);
+    onDiscount == null || onDiscount({
+      cardNum,
+      isValidCard,
+      cardType
+    });
+  }, [isValidCard, cardNum, cardType]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("form", {
       onSubmit: handleSubmit(onSubmit),
@@ -22063,7 +22078,6 @@ function IframeCard(props) {
   const {
     loading,
     handleCardSubmit,
-    handleOTPSubmit,
     getCardLogo,
     useHookForm,
     isOmanNetCard,
@@ -22120,17 +22134,15 @@ function IframeCard(props) {
       cardNum,
       isValidCard,
       discountsCount,
-      integrationId: hasOmanNetIntegration && isOmanNetCard ? subType.integrationId : integrationId,
-      paymentToken: hasOmanNetIntegration && isOmanNetCard ? subType.paymentToken : paymentToken
+      integrationId: hasOmanNetIntegration && cardType === CARD_TYPES.OMAN ? subType.integrationId : integrationId,
+      paymentToken: hasOmanNetIntegration && cardType === CARD_TYPES.OMAN ? subType.paymentToken : paymentToken
     });
-  }, [cardNum, isValidCard, discountsCount, hasOmanNetIntegration, isOmanNetCard, subType, paymentToken, integrationId]);
+  }, [cardNum, isValidCard, discountsCount, hasOmanNetIntegration, cardType, subType, paymentToken, integrationId]);
   const handleDataFromSDK = event => {
     if (event.data.type === 'setPrevFocus') {
       handlePrevFocusFromSDK(event.data.payload);
     } else if (event.data.type === 'cardData') {
       handleCardDataFromSDK(event.data.payload);
-    } else if (event.data.type === 'otpData') {
-      handleOTPSubmit(event.data.payload);
     } else if (event.data.type === 'customStyles') {
       handleCardStylesFromSDK(event.data.payload);
     } else if (event.data.type === 'cardHolderError') {
@@ -23001,9 +23013,12 @@ function SavedCardsViewTwo(props) {
     setSelectedCardCVV('');
     if ((selectedCard == null ? void 0 : selectedCard.id) === card.id) setSelectedCard(null);else {
       setSelectedCard(card);
-      onDiscount == null || onDiscount(card.identifier, !!card.identifier && !!card.hasDiscount, true);
+      onDiscount == null || onDiscount({
+        cardNum: card.identifier,
+        isValidCard: !!card.identifier && !!card.hasDiscount,
+        savedCardType: card.type
+      });
     }
-    ;
   };
   const handleSelectDeleteCard = (e, card) => {
     e.stopPropagation();
@@ -23397,7 +23412,14 @@ const checkDiscount = (payment_token, integration_id, identifier, isSavedCard) =
     identifier: identifier.replace(/\s/g, '')
   }, isSavedCard && {
     saved_card_token: identifier
-  })).then(res => res).catch(err => err == null ? void 0 : err.response);
+  }));
+};
+const sendOTP = payload => {
+  return lib_axios.post(`/api/acceptance/omannet_callback/otp_verify`, {
+    payment_id: payload.paymentId,
+    otp: payload.otp,
+    payment_token: payload.token
+  }).then(res => res).catch(err => err == null ? void 0 : err.response);
 };
 ;// ./src/utils/getErrorMsg.ts
 const getErrorMsg_isString = data => typeof data === 'string';
@@ -23533,6 +23555,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
   const [sendOTPLoading, setSendOTPLoading] = (0,react.useState)(false);
   const [paymentId, setPaymentId] = (0,react.useState)('');
   const [otpErrorMessage, setOTPErrorMessage] = (0,react.useState)('');
+  const [isOmanNetCard, setIsOmanNetCard] = (0,react.useState)(false);
   const tokenizationResolve = (0,react.useRef)(null);
   const isCardValid = hideCardHolderName ? !isActionBtnDisabled : !(isActionBtnDisabled || !cardHolderName);
   const isAmexCardSelected = (selectedCard == null ? void 0 : selectedCard.type) === src_constants_CARD_TYPES.AMEX;
@@ -23602,29 +23625,23 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     const handlePaymentResponse = ({
       res,
       requiresOTP,
-      isOTPResponse
+      isOmanNetCard
     }) => {
       var _iframeRef$current3, _res$data, _res$data2, _res$data3;
       setShouldSubmitData(false);
       setSendOTPLoading(false);
+      setIsOmanNetCard(false);
       const cardHolderInput = (_iframeRef$current3 = iframeRef.current) == null || (_iframeRef$current3 = _iframeRef$current3.nextElementSibling) == null ? void 0 : _iframeRef$current3.querySelector(`input[name=name]`);
       if (cardHolderInput) {
         setTimeout(() => cardHolderInput.disabled = false, 1000);
       }
       const redirectionUrl = ((_res$data = res.data) == null ? void 0 : _res$data.redirection_url) || ((_res$data2 = res.data) == null ? void 0 : _res$data2.redirect_url);
       if (requiresOTP) {
+        setIsOmanNetCard(!!isOmanNetCard);
         setPaymentId(res.data.payment_id);
         setShowOTP(true);
       } else if (onAfterPaymentComplete && ((_res$data3 = res.data) == null ? void 0 : _res$data3.is_3d_secure) !== 'true') {
         onAfterPaymentComplete(res);
-      } else if (res.status === 200 && isOTPResponse) {
-        if (redirectionUrl && (res.data.result === 'CAPTURED' || res.data.result === 'APPROVED')) {
-          window.location.href = redirectionUrl;
-        } else {
-          setOTPErrorMessage(getErrorMsg(res));
-        }
-      } else if (res.status !== 200 && isOTPResponse) {
-        setOTPErrorMessage(getErrorMsg(res));
       } else if (res.status === 200 && redirectionUrl) {
         window.location.href = redirectionUrl;
       } else if (res.status === 400) {
@@ -23819,10 +23836,13 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setDiscountAppliedMessage(null);
     setTotalAmount("");
   };
-  const handleSavedCardDiscount = async (identifier, hasDiscount) => {
+  const handleSavedCardDiscount = async (identifier, hasDiscount, savedCardType) => {
+    var _payment$subType4, _payment$subType5;
     handleResetDiscountMessages();
     if (!hasDiscount) return;
-    const res = await checkDiscount(payment.token, payment.id, identifier, true);
+    const paymentToken = savedCardType === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType4 = payment.subType) == null ? void 0 : _payment$subType4.token : payment == null ? void 0 : payment.token;
+    const integrationId = savedCardType === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType5 = payment.subType) == null ? void 0 : _payment$subType5.integrationId : payment == null ? void 0 : payment.id;
+    const res = await checkDiscount(paymentToken, integrationId, identifier, savedCardType);
     handleDiscount(res);
   };
   const handleDiscount = res => {
@@ -23874,7 +23894,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setSelectedCardCVV('');
     if ((selectedCard == null ? void 0 : selectedCard.id) === card.id) setSelectedCard(null);else {
       setSelectedCard(card);
-      handleSavedCardDiscount == null || handleSavedCardDiscount(card.identifier, !!card.identifier && !!card.hasDiscount);
+      handleSavedCardDiscount == null || handleSavedCardDiscount(card.identifier, !!card.identifier && !!card.hasDiscount, card.type);
     }
     ;
   };
@@ -23884,7 +23904,7 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     setSelectedDeleteCard(card);
   };
   const handleSavedCardSubmit = async () => {
-    var _payment$subType4;
+    var _payment$subType6, _res$data8, _res$data9, _res$data0;
     if (loading) return;
     setLoading(true);
     if (onBeforePaymentComplete) {
@@ -23896,13 +23916,14 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
         return;
       }
     }
+    const isOmanNet = (selectedCard == null ? void 0 : selectedCard.type) === constants_SAVED_CARD_TYPES.OMAN_NET;
     const data = {
       identifier: selectedCard == null ? void 0 : selectedCard.identifier,
       cvv: selectedCardCVV
     };
     const payload = Object.assign({
       identifier: data.identifier,
-      token: (selectedCard == null ? void 0 : selectedCard.type) === constants_SAVED_CARD_TYPES.OMAN_NET ? payment == null || (_payment$subType4 = payment.subType) == null ? void 0 : _payment$subType4.token : payment == null ? void 0 : payment.token
+      token: isOmanNet ? payment == null || (_payment$subType6 = payment.subType) == null ? void 0 : _payment$subType6.token : payment == null ? void 0 : payment.token
     }, data.cvv && {
       cvv: data.cvv
     }, {
@@ -23910,21 +23931,25 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     });
     const res = await payWithSavedCard(payload);
     setLoading(false);
+    setIsOmanNetCard(false);
+    const isSuccess = String((_res$data8 = res.data) == null ? void 0 : _res$data8.success) === 'true';
+    const isPending = String((_res$data9 = res.data) == null ? void 0 : _res$data9.pending) === 'true';
+    const isOTPGeneration = String((_res$data0 = res.data) == null ? void 0 : _res$data0.otp_generation) === 'true';
     if (res.status === 200) {
-      if (res.data && res.data.is_3d_secure === 'true' && res.data.redirection_url) {
-        window.location.href = res.data.redirection_url;
-      } else if (res.data.success === 'true' && res.data.pending === 'false') {
-        window.location.href = res.data.redirection_url;
+      if (isOmanNet && isOTPGeneration && !isSuccess && isPending) {
+        setIsOmanNetCard(true);
+        setPaymentId(res.data.payment_id);
+        setShowOTP(true);
       } else {
         window.location.href = res.data.redirection_url;
       }
     } else if (res.status === 400) {
-      var _res$data8, _res$data9, _res$data0;
-      if (res.data instanceof Array && res.data[0] === 'Retry limit reached.' || ((_res$data8 = res.data) == null ? void 0 : _res$data8.msg) === 'Retry limit reached.') {
+      var _res$data1, _res$data10, _res$data11;
+      if (res.data instanceof Array && res.data[0] === 'Retry limit reached.' || ((_res$data1 = res.data) == null ? void 0 : _res$data1.msg) === 'Retry limit reached.') {
         setErrorMessage(t('ERR_MSG_EXCEEDED_TRIALS'));
-      } else if (((_res$data9 = res.data) == null ? void 0 : _res$data9.message) === 'Session Error') {
+      } else if (((_res$data10 = res.data) == null ? void 0 : _res$data10.message) === 'Session Error') {
         setErrorMessage(t('ERR_MSG_ALREADY_PROCESSED'));
-      } else if (res.data instanceof Array && res.data[0] === 'Order has already paid.' || ((_res$data0 = res.data) == null ? void 0 : _res$data0.msg) === 'Order has already paid.') {
+      } else if (res.data instanceof Array && res.data[0] === 'Order has already paid.' || ((_res$data11 = res.data) == null ? void 0 : _res$data11.msg) === 'Order has already paid.') {
         setErrorMessage(t('ERR_MSG_ALREADY_PAID'));
       } else {
         setErrorMessage(t('ERR_MSG_DECLINED'));
@@ -23942,19 +23967,24 @@ const CardElement = /*#__PURE__*/(0,react.forwardRef)(({
     }
   };
   const handleOTPSubmit = async otp => {
-    var _iframeRef$current1, _payment$subType5;
+    var _payment$subType7, _res$data12, _res$data13;
     setSendOTPLoading(true);
-    (_iframeRef$current1 = iframeRef.current) == null || (_iframeRef$current1 = _iframeRef$current1.contentWindow) == null || _iframeRef$current1.postMessage({
-      type: 'otpData',
-      payload: {
-        paymentToken: payment.token,
-        subType: {
-          paymentToken: (_payment$subType5 = payment.subType) == null ? void 0 : _payment$subType5.token
-        },
-        otp,
-        paymentId
+    const res = await sendOTP({
+      token: isOmanNetCard ? (_payment$subType7 = payment.subType) == null ? void 0 : _payment$subType7.token : payment.token,
+      otp,
+      paymentId
+    });
+    const redirectionUrl = ((_res$data12 = res.data) == null ? void 0 : _res$data12.redirection_url) || ((_res$data13 = res.data) == null ? void 0 : _res$data13.redirect_url);
+    if (res.status === 200) {
+      if (redirectionUrl && (res.data.result === 'CAPTURED' || res.data.result === 'APPROVED')) {
+        window.location.href = redirectionUrl;
+      } else {
+        setOTPErrorMessage(getErrorMsg(res));
       }
-    }, '*');
+    } else if (res.status !== 200) {
+      setOTPErrorMessage(getErrorMsg(res));
+    }
+    setSendOTPLoading(false);
   };
   const handleShowNewCardForm = () => {
     if (loading) return;
@@ -27682,7 +27712,7 @@ const payForsa = (phone, down_payment, selected_plan, tenure, token) => {
     payment_token: token
   }).then(res => res).catch(err => err == null ? void 0 : err.response);
 };
-const sendOTP = (otp, token, reference) => {
+const forsaService_sendOTP = (otp, token, reference) => {
   return lib_axios.post(`/api/acceptance/forsa_online/submit_loan`, {
     otp: otp,
     payment_token: token,
@@ -27845,7 +27875,7 @@ function ForsaElements({
   const handleOTPSubmit = async otp => {
     setLoading(true);
     resetErrorMessage();
-    const res = await sendOTP(otp, token, reference);
+    const res = await forsaService_sendOTP(otp, token, reference);
     if (res.status === 200) {
       if (window.top) {
         window.top.location.href = res.data.redirection_url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paymob-pixel-alpha",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "keywords": ["paymob","pixel","paymob-pixel"],
   "main": "./main.js",
   "license": "MIT",