@pelcro/react-pelcro-js 3.40.0 → 3.42.0

package/dist/index.cjs.js

@@ -11768,7 +11768,10 @@ const loadPaymentSDKs = () => {
     window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/paypal-checkout.min.js", "braintree-paypal-sdk");
   }
   if (supportsBraintree) {
-    window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/three-d-secure.min.js", "braintree-3D-secure-sdk");
+    // window.Pelcro.helpers.loadSDK(
+    //   "https://js.braintreegateway.com/web/3.99.0/js/three-d-secure.min.js",
+    //   "braintree-3D-secure-sdk"
+    // );
     window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/hosted-fields.min.js", "braintree-hosted-fields-sdk");
   }
 
@@ -18302,7 +18305,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
 
   /* ====== Start Braintree integration  ======== */
   const braintreeInstanceRef = React__default['default'].useRef(null);
-  const braintree3DSecureInstanceRef = React__default['default'].useRef(null);
   function getClientToken() {
     return new Promise((resolve, reject) => {
       window.Pelcro.payment.generateClientToken({
@@ -18363,12 +18365,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             type: SKELETON_LOADER,
             payload: true
           });
-          braintree3DSecureInstanceRef.current = new window.braintree.threeDSecure.create({
-            version: 2,
-            authorization: braintreeToken
-          }).then(threeDSecureInstance => {
-            return threeDSecureInstance;
-          });
           return window.braintree.hostedFields.create(options);
         });
         braintreeInstanceRef.current.then(hostedFieldInstance => {
@@ -18515,7 +18511,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
   };
   const submitUsingBraintree = (state, dispatch) => {
-    var _ref6, _ref7, _state$updatedPrice2;
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using braintree
@@ -18524,22 +18519,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     if (!braintreeInstanceRef.current) {
       return console.error("Braintree sdk script wasn't loaded, you need to load braintree sdk before rendering the braintree payment flow");
     }
-    const getOrderItemsTotal = () => {
-      if (!order) {
-        return null;
-      }
-      const isQuickPurchase = !Array.isArray(order);
-      if (isQuickPurchase) {
-        return order.price * order.quantity;
-      }
-      if (order.length === 0) {
-        return null;
-      }
-      return order.reduce((total, item) => {
-        return total + item.price * item.quantity;
-      }, 0);
-    };
-    const totalAmount = (_ref6 = (_ref7 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref7 !== void 0 ? _ref7 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref6 !== void 0 ? _ref6 : getOrderItemsTotal();
     braintreeInstanceRef.current.then(hostedFieldInstance => {
       hostedFieldInstance.tokenize((tokenizeErr, payload) => {
         if (tokenizeErr) {
@@ -18559,79 +18538,28 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (type == "updatePaymentSource" || type == "deletePaymentSource") {
-          handleBraintreePayment(payload, state.couponCode);
-        } else {
-          braintree3DSecureInstanceRef.current.then(threeDSecureInstance => {
-            threeDSecureInstance.verifyCard({
-              onLookupComplete: function (data, next) {
-                next();
-              },
-              amount: totalAmount !== null && totalAmount !== void 0 ? totalAmount : "0.00",
-              nonce: payload.nonce,
-              bin: payload.details.bin
-            }).then(payload => {
-              if (payload.liabilityShifted) {
-                handleBraintreePayment(payload, state.couponCode);
-              } else if (payload.liabilityShiftPossible) {
-                dispatch({
-                  type: DISABLE_SUBMIT,
-                  payload: false
-                });
-                dispatch({
-                  type: LOADING,
-                  payload: false
-                });
-                return dispatch({
-                  type: SHOW_ALERT,
-                  payload: {
-                    type: "error",
-                    content: "We encountered an issue verifying your transaction with 3D Secure, please try again."
-                  }
-                });
-              } else {
-                // Liability has not shifted and will not shift
-                dispatch({
-                  type: DISABLE_SUBMIT,
-                  payload: false
-                });
-                dispatch({
-                  type: LOADING,
-                  payload: false
-                });
-                return dispatch({
-                  type: SHOW_ALERT,
-                  payload: {
-                    type: "error",
-                    content: "We encountered an issue verifying your transaction with 3D Secure, please try another payment method."
-                  }
-                });
-              }
-            }).catch(error => {
-              console.error(error);
-              dispatch({
-                type: DISABLE_SUBMIT,
-                payload: false
-              });
-              dispatch({
-                type: LOADING,
-                payload: false
-              });
-              return dispatch({
-                type: SHOW_ALERT,
-                payload: {
-                  type: "error",
-                  content: "There was a problem with your request."
-                }
-              });
-            });
-          });
-        }
+
+        // Directly handle the payment with the tokenized payload
+        handleBraintreePayment(payload, state.couponCode);
       });
     }).catch(error => {
       if (error) {
         console.error(error);
-        return;
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: "There was a problem with your request."
+          }
+        });
       }
     });
   };
@@ -18682,6 +18610,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceCreated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -19222,13 +19151,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
 
       // When Google pay / Apple pay source created
-      paymentRequest.on("source", _ref8 => {
+      paymentRequest.on("source", _ref6 => {
         var _source$card;
         let {
           complete,
           source,
           ...data
-        } = _ref8;
+        } = _ref6;
         dispatch({
           type: DISABLE_COUPON_BUTTON,
           payload: true
@@ -19243,11 +19172,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         });
         complete("success");
         if ((source === null || source === void 0 ? void 0 : (_source$card = source.card) === null || _source$card === void 0 ? void 0 : _source$card.three_d_secure) === "required") {
-          return generate3DSecureSource(source).then(_ref9 => {
+          return generate3DSecureSource(source).then(_ref7 => {
             let {
               source,
               error
-            } = _ref9;
+            } = _ref7;
             if (error) {
               return handlePaymentError(error);
             }
@@ -19964,11 +19893,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   const createPaymentSource = (state, dispatch) => {
     return stripe.createSource({
       type: "card"
-    }).then(_ref10 => {
+    }).then(_ref8 => {
       let {
         source,
         error
-      } = _ref10;
+      } = _ref8;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20082,11 +20011,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } = paymentMethodToDelete;
     return stripe.createSource({
       type: "card"
-    }).then(_ref11 => {
+    }).then(_ref9 => {
       let {
         source,
         error
-      } = _ref11;
+      } = _ref9;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20184,12 +20113,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
     stripe.createSource({
       type: "card"
-    }).then(_ref12 => {
-      var _ref13, _ref14, _state$updatedPrice3;
+    }).then(_ref10 => {
+      var _ref11, _ref12, _state$updatedPrice2;
       let {
         source,
         error
-      } = _ref12;
+      } = _ref10;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20208,7 +20137,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           return total + item.price * item.quantity;
         }, 0);
       };
-      (_ref13 = (_ref14 = (_state$updatedPrice3 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice3 !== void 0 ? _state$updatedPrice3 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref14 !== void 0 ? _ref14 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref13 !== void 0 ? _ref13 : getOrderItemsTotal();
+      (_ref11 = (_ref12 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref12 !== void 0 ? _ref12 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref11 !== void 0 ? _ref11 : getOrderItemsTotal();
       return handlePayment(source);
     }).catch(error => {
       return handlePaymentError(error);

package/dist/index.esm.js

@@ -11738,7 +11738,10 @@ const loadPaymentSDKs = () => {
     window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/paypal-checkout.min.js", "braintree-paypal-sdk");
   }
   if (supportsBraintree) {
-    window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/three-d-secure.min.js", "braintree-3D-secure-sdk");
+    // window.Pelcro.helpers.loadSDK(
+    //   "https://js.braintreegateway.com/web/3.99.0/js/three-d-secure.min.js",
+    //   "braintree-3D-secure-sdk"
+    // );
     window.Pelcro.helpers.loadSDK("https://js.braintreegateway.com/web/3.99.0/js/hosted-fields.min.js", "braintree-hosted-fields-sdk");
   }
 
@@ -18272,7 +18275,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
 
   /* ====== Start Braintree integration  ======== */
   const braintreeInstanceRef = React__default.useRef(null);
-  const braintree3DSecureInstanceRef = React__default.useRef(null);
   function getClientToken() {
     return new Promise((resolve, reject) => {
       window.Pelcro.payment.generateClientToken({
@@ -18333,12 +18335,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             type: SKELETON_LOADER,
             payload: true
           });
-          braintree3DSecureInstanceRef.current = new window.braintree.threeDSecure.create({
-            version: 2,
-            authorization: braintreeToken
-          }).then(threeDSecureInstance => {
-            return threeDSecureInstance;
-          });
           return window.braintree.hostedFields.create(options);
         });
         braintreeInstanceRef.current.then(hostedFieldInstance => {
@@ -18485,7 +18481,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
   };
   const submitUsingBraintree = (state, dispatch) => {
-    var _ref6, _ref7, _state$updatedPrice2;
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using braintree
@@ -18494,22 +18489,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     if (!braintreeInstanceRef.current) {
       return console.error("Braintree sdk script wasn't loaded, you need to load braintree sdk before rendering the braintree payment flow");
     }
-    const getOrderItemsTotal = () => {
-      if (!order) {
-        return null;
-      }
-      const isQuickPurchase = !Array.isArray(order);
-      if (isQuickPurchase) {
-        return order.price * order.quantity;
-      }
-      if (order.length === 0) {
-        return null;
-      }
-      return order.reduce((total, item) => {
-        return total + item.price * item.quantity;
-      }, 0);
-    };
-    const totalAmount = (_ref6 = (_ref7 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref7 !== void 0 ? _ref7 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref6 !== void 0 ? _ref6 : getOrderItemsTotal();
     braintreeInstanceRef.current.then(hostedFieldInstance => {
       hostedFieldInstance.tokenize((tokenizeErr, payload) => {
         if (tokenizeErr) {
@@ -18529,79 +18508,28 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        if (type == "updatePaymentSource" || type == "deletePaymentSource") {
-          handleBraintreePayment(payload, state.couponCode);
-        } else {
-          braintree3DSecureInstanceRef.current.then(threeDSecureInstance => {
-            threeDSecureInstance.verifyCard({
-              onLookupComplete: function (data, next) {
-                next();
-              },
-              amount: totalAmount !== null && totalAmount !== void 0 ? totalAmount : "0.00",
-              nonce: payload.nonce,
-              bin: payload.details.bin
-            }).then(payload => {
-              if (payload.liabilityShifted) {
-                handleBraintreePayment(payload, state.couponCode);
-              } else if (payload.liabilityShiftPossible) {
-                dispatch({
-                  type: DISABLE_SUBMIT,
-                  payload: false
-                });
-                dispatch({
-                  type: LOADING,
-                  payload: false
-                });
-                return dispatch({
-                  type: SHOW_ALERT,
-                  payload: {
-                    type: "error",
-                    content: "We encountered an issue verifying your transaction with 3D Secure, please try again."
-                  }
-                });
-              } else {
-                // Liability has not shifted and will not shift
-                dispatch({
-                  type: DISABLE_SUBMIT,
-                  payload: false
-                });
-                dispatch({
-                  type: LOADING,
-                  payload: false
-                });
-                return dispatch({
-                  type: SHOW_ALERT,
-                  payload: {
-                    type: "error",
-                    content: "We encountered an issue verifying your transaction with 3D Secure, please try another payment method."
-                  }
-                });
-              }
-            }).catch(error => {
-              console.error(error);
-              dispatch({
-                type: DISABLE_SUBMIT,
-                payload: false
-              });
-              dispatch({
-                type: LOADING,
-                payload: false
-              });
-              return dispatch({
-                type: SHOW_ALERT,
-                payload: {
-                  type: "error",
-                  content: "There was a problem with your request."
-                }
-              });
-            });
-          });
-        }
+
+        // Directly handle the payment with the tokenized payload
+        handleBraintreePayment(payload, state.couponCode);
       });
     }).catch(error => {
       if (error) {
         console.error(error);
-        return;
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: "There was a problem with your request."
+          }
+        });
       }
     });
   };
@@ -18652,6 +18580,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceCreated")
           }
         });
+        refreshUser();
         onSuccess(res);
       });
     }
@@ -19192,13 +19121,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       });
 
       // When Google pay / Apple pay source created
-      paymentRequest.on("source", _ref8 => {
+      paymentRequest.on("source", _ref6 => {
         var _source$card;
         let {
           complete,
           source,
           ...data
-        } = _ref8;
+        } = _ref6;
         dispatch({
           type: DISABLE_COUPON_BUTTON,
           payload: true
@@ -19213,11 +19142,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         });
         complete("success");
         if ((source === null || source === void 0 ? void 0 : (_source$card = source.card) === null || _source$card === void 0 ? void 0 : _source$card.three_d_secure) === "required") {
-          return generate3DSecureSource(source).then(_ref9 => {
+          return generate3DSecureSource(source).then(_ref7 => {
             let {
               source,
               error
-            } = _ref9;
+            } = _ref7;
             if (error) {
               return handlePaymentError(error);
             }
@@ -19934,11 +19863,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   const createPaymentSource = (state, dispatch) => {
     return stripe.createSource({
       type: "card"
-    }).then(_ref10 => {
+    }).then(_ref8 => {
       let {
         source,
         error
-      } = _ref10;
+      } = _ref8;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20052,11 +19981,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } = paymentMethodToDelete;
     return stripe.createSource({
       type: "card"
-    }).then(_ref11 => {
+    }).then(_ref9 => {
       let {
         source,
         error
-      } = _ref11;
+      } = _ref9;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20154,12 +20083,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
     stripe.createSource({
       type: "card"
-    }).then(_ref12 => {
-      var _ref13, _ref14, _state$updatedPrice3;
+    }).then(_ref10 => {
+      var _ref11, _ref12, _state$updatedPrice2;
       let {
         source,
         error
-      } = _ref12;
+      } = _ref10;
       if (error) {
         return handlePaymentError(error);
       }
@@ -20178,7 +20107,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           return total + item.price * item.quantity;
         }, 0);
       };
-      (_ref13 = (_ref14 = (_state$updatedPrice3 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice3 !== void 0 ? _state$updatedPrice3 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref14 !== void 0 ? _ref14 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref13 !== void 0 ? _ref13 : getOrderItemsTotal();
+      (_ref11 = (_ref12 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref12 !== void 0 ? _ref12 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref11 !== void 0 ? _ref11 : getOrderItemsTotal();
       return handlePayment(source);
     }).catch(error => {
       return handlePaymentError(error);

package/package.json

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