@pelcro/react-pelcro-js 3.22.0-beta.4 → 3.22.0-beta.6

package/dist/index.cjs.js

@@ -14079,7 +14079,6 @@ class SelectModal extends React.Component {
             });
           });
         });
-        console.log("bugsnag Triggered");
       }
     });
     _defineProperty$3(this, "componentWillUnmount", () => {
@@ -16355,6 +16354,8 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     onFailure = () => {},
     ...props
   } = _ref;
+  const [vantivPaymentRequest, setVantivPaymentRequest] = React.useState(null);
+  const [updatedCouponCode, setUpdatedCouponCode] = React.useState("");
   const {
     t
   } = useTranslation("payment");
@@ -16397,7 +16398,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   }, []);
 
   /*====== Start Tap integration ========*/
-  const submitUsingTap = () => {
+  const submitUsingTap = state => {
     var _ref2, _ref3, _ref4, _state$updatedPrice;
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
@@ -16492,7 +16493,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                       content: null
                     }
                   });
-                  handleTapPayment(tapID);
+                  handleTapPayment(tapID, state);
                 }
               };
 
@@ -16505,7 +16506,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       }
     });
   };
-  function handleTapPayment(paymentRequest) {
+  function handleTapPayment(paymentRequest, state) {
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (type === "createPayment") {
       handleTapSubscription();
@@ -16683,7 +16684,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   };
   /*====== End Tap integration ========*/
 
-  const submitUsingVantiv = () => {
+  const submitUsingVantiv = state => {
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using vantiv
@@ -16696,12 +16697,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     /*     
     calls handleVantivPayment to either handle a payment or update a source by simply creating a new source 
     */
-    vantivInstanceRef.current.getPaypageRegistrationId({
+    handleVantivPayment(vantivInstanceRef.current.getPaypageRegistrationId({
       id: orderId,
       orderId: orderId
-    });
+    }), state);
   };
-  function handleVantivPayment(paymentRequest) {
+  function handleVantivPayment(paymentRequest, couponCode) {
     if (paymentRequest) {
       const SUCCESS_STATUS = "870";
       if (paymentRequest.response !== SUCCESS_STATUS) {
@@ -16767,7 +16768,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       const renewSubscription = !isGift && subscriptionIdToRenew;
       const giftSubscriprition = isGift && !subscriptionIdToRenew;
       const renewGift = isRenewingGift;
-      const couponCode = state.couponCode || window.Pelcro.coupon.getFromUrl() || "";
       if (renewGift) {
         return payment.execute({
           type: PAYMENT_TYPES.RENEW_GIFTED_SUBSCRIPTION,
@@ -16853,7 +16853,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         height: "245",
         timeout: 50000,
         div: "eProtectiframe",
-        callback: handleVantivPayment,
+        callback: paymentRequest => setVantivPaymentRequest(paymentRequest),
         showCvv: true,
         numYears: 8,
         placeholderText: {
@@ -16868,6 +16868,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
     }
   }, [selectedPaymentMethodId]);
+
+  //Trigger the handleVantivPayment method when a vantivePaymentRequest is present
+  React.useEffect(() => {
+    if (vantivPaymentRequest) {
+      handleVantivPayment(vantivPaymentRequest, updatedCouponCode);
+    }
+  }, [vantivPaymentRequest]);
   React.useEffect(() => {
     whenUserReady(() => {
       if (skipPayment && ((plan === null || plan === void 0 ? void 0 : plan.amount) === 0 || (order === null || order === void 0 ? void 0 : order.price) === 0)) return;
@@ -16996,6 +17003,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
       if (err) {
         onFailure(err);
+
+        //reset the coupon code in local state
+        setUpdatedCouponCode("");
         dispatch({
           type: SET_COUPON_ERROR,
           payload: getErrorMessages(err)
@@ -17054,6 +17064,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         type: SET_COUPON,
         payload: res.data.coupon
       });
+
+      //set the coupon code in local state to be able to use with Vantiv
+      setUpdatedCouponCode(res.data.coupon.code);
       dispatch({
         type: SET_PERCENT_OFF,
         payload: `${(_res$data$coupon = res.data.coupon) === null || _res$data$coupon === void 0 ? void 0 : _res$data$coupon.percent_off}%`
@@ -17124,6 +17137,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   const debouncedApplyCouponCode = React.useRef(debounce(onApplyCouponCode, 1000)).current;
   const removeAppliedCoupon = state => {
     state.couponCode = "";
+
+    //reset the coupon code in local state
+    setUpdatedCouponCode("");
     dispatch({
       type: SET_COUPON_ERROR,
       payload: ""
@@ -17808,10 +17824,10 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             return submitPayment(state);
           }
           if (getSiteCardProcessor() === "vantiv") {
-            return submitUsingVantiv();
+            return submitUsingVantiv(state);
           }
           if (getSiteCardProcessor() === "tap") {
-            return submitUsingTap();
+            return submitUsingTap(state);
           }
           if (selectedPaymentMethodId) {
             // pay with selected method (source) if exists already

package/dist/index.esm.js

@@ -14049,7 +14049,6 @@ class SelectModal extends Component {
             });
           });
         });
-        console.log("bugsnag Triggered");
       }
     });
     _defineProperty$3(this, "componentWillUnmount", () => {
@@ -16325,6 +16324,8 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     onFailure = () => {},
     ...props
   } = _ref;
+  const [vantivPaymentRequest, setVantivPaymentRequest] = useState(null);
+  const [updatedCouponCode, setUpdatedCouponCode] = useState("");
   const {
     t
   } = useTranslation("payment");
@@ -16367,7 +16368,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   }, []);
 
   /*====== Start Tap integration ========*/
-  const submitUsingTap = () => {
+  const submitUsingTap = state => {
     var _ref2, _ref3, _ref4, _state$updatedPrice;
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
@@ -16462,7 +16463,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
                       content: null
                     }
                   });
-                  handleTapPayment(tapID);
+                  handleTapPayment(tapID, state);
                 }
               };
 
@@ -16475,7 +16476,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       }
     });
   };
-  function handleTapPayment(paymentRequest) {
+  function handleTapPayment(paymentRequest, state) {
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (type === "createPayment") {
       handleTapSubscription();
@@ -16653,7 +16654,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   };
   /*====== End Tap integration ========*/
 
-  const submitUsingVantiv = () => {
+  const submitUsingVantiv = state => {
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using vantiv
@@ -16666,12 +16667,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     /*     
     calls handleVantivPayment to either handle a payment or update a source by simply creating a new source 
     */
-    vantivInstanceRef.current.getPaypageRegistrationId({
+    handleVantivPayment(vantivInstanceRef.current.getPaypageRegistrationId({
       id: orderId,
       orderId: orderId
-    });
+    }), state);
   };
-  function handleVantivPayment(paymentRequest) {
+  function handleVantivPayment(paymentRequest, couponCode) {
     if (paymentRequest) {
       const SUCCESS_STATUS = "870";
       if (paymentRequest.response !== SUCCESS_STATUS) {
@@ -16737,7 +16738,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       const renewSubscription = !isGift && subscriptionIdToRenew;
       const giftSubscriprition = isGift && !subscriptionIdToRenew;
       const renewGift = isRenewingGift;
-      const couponCode = state.couponCode || window.Pelcro.coupon.getFromUrl() || "";
       if (renewGift) {
         return payment.execute({
           type: PAYMENT_TYPES.RENEW_GIFTED_SUBSCRIPTION,
@@ -16823,7 +16823,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         height: "245",
         timeout: 50000,
         div: "eProtectiframe",
-        callback: handleVantivPayment,
+        callback: paymentRequest => setVantivPaymentRequest(paymentRequest),
         showCvv: true,
         numYears: 8,
         placeholderText: {
@@ -16838,6 +16838,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
     }
   }, [selectedPaymentMethodId]);
+
+  //Trigger the handleVantivPayment method when a vantivePaymentRequest is present
+  useEffect(() => {
+    if (vantivPaymentRequest) {
+      handleVantivPayment(vantivPaymentRequest, updatedCouponCode);
+    }
+  }, [vantivPaymentRequest]);
   useEffect(() => {
     whenUserReady(() => {
       if (skipPayment && ((plan === null || plan === void 0 ? void 0 : plan.amount) === 0 || (order === null || order === void 0 ? void 0 : order.price) === 0)) return;
@@ -16966,6 +16973,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
       if (err) {
         onFailure(err);
+
+        //reset the coupon code in local state
+        setUpdatedCouponCode("");
         dispatch({
           type: SET_COUPON_ERROR,
           payload: getErrorMessages(err)
@@ -17024,6 +17034,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         type: SET_COUPON,
         payload: res.data.coupon
       });
+
+      //set the coupon code in local state to be able to use with Vantiv
+      setUpdatedCouponCode(res.data.coupon.code);
       dispatch({
         type: SET_PERCENT_OFF,
         payload: `${(_res$data$coupon = res.data.coupon) === null || _res$data$coupon === void 0 ? void 0 : _res$data$coupon.percent_off}%`
@@ -17094,6 +17107,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   const debouncedApplyCouponCode = useRef(debounce(onApplyCouponCode, 1000)).current;
   const removeAppliedCoupon = state => {
     state.couponCode = "";
+
+    //reset the coupon code in local state
+    setUpdatedCouponCode("");
     dispatch({
       type: SET_COUPON_ERROR,
       payload: ""
@@ -17778,10 +17794,10 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             return submitPayment(state);
           }
           if (getSiteCardProcessor() === "vantiv") {
-            return submitUsingVantiv();
+            return submitUsingVantiv(state);
           }
           if (getSiteCardProcessor() === "tap") {
-            return submitUsingTap();
+            return submitUsingTap(state);
           }
           if (selectedPaymentMethodId) {
             // pay with selected method (source) if exists already

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pelcro/react-pelcro-js",
   "description": "Pelcro's React UI Elements",
-  "version": "3.22.0-beta.4",
+  "version": "3.22.0-beta.6",
   "license": "MIT",
   "private": false,
   "main": "dist/index.cjs.js",