@pelcro/react-pelcro-js 3.26.0-beta.76 → 3.26.0-beta.78

package/dist/index.cjs.js

@@ -3835,7 +3835,8 @@ var buttons$l = {
 var messages$10 = {
 	orderConfirmed: {
 		title: "Order confirmed!",
-		body: "Your order has been confirmed and will be shipped within the next few days. You'll shortly receive an email confirmation of this order."
+		body: "Your order has been confirmed and will be shipped within the next few days. You'll shortly receive an email confirmation of this order.",
+		bodyDigital: "Your order has been confirmed. You'll shortly receive an email confirmation of this order."
 	},
 	haveQuestions: "If you have any queries please don't hesitate to contact us!",
 	multipleCurrencies: "Your cart currently contains items which are available in different currencies. In order to proceed with the checkout, please make sure that all items have the same currency.",
@@ -4797,9 +4798,10 @@ var buttons$f = {
 var messages$J = {
 	orderConfirmed: {
 		title: "Votre commande est confirmée !",
-		body: "Votre commande a été confirmée et vous sera expédiée dans les prochains jours. Vous recevrez un courriel de confirmation sous peu."
+		body: "Votre commande a été confirmée et vous sera expédiée dans les prochains jours. Vous recevrez un courriel de confirmation sous peu.",
+		bodyDigital: "Votre commande a été confirmée. Vous recevrez un courriel de confirmation sous peu."
 	},
-	haveQuestions: "N’hésitez pas à nous contacter pour toute question !",
+	haveQuestions: "N'hésitez pas à nous contacter pour toute question !",
 	multipleCurrencies: "Votre panier contient des articles disponibles dans différentes devises. Avant de passer à la caisse, veuillez vous assurer que tous les articles ont la même devise.",
 	currencyMismatch: "Les articles sélectionnés ne sont pas compatibles avec la devise associée à votre compte ({{currency}}). Veuillez choisir des articles uniquement offerts dans cette devise."
 };
@@ -5747,7 +5749,8 @@ var buttons$9 = {
 var messages$q = {
 	orderConfirmed: {
 		title: "주문이 확인되었습니다!",
-		body: "귀하의 주문이 확인되었으며 며칠 안에 배송될 예정입니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다."
+		body: "귀하의 주문이 확인되었으며 며칠 안에 배송될 예정입니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다.",
+		bodyDigital: "귀하의 주문이 확인되었습니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다."
 	},
 	haveQuestions: "질문이 있으면 언제든 저희에게 연락주시기 바랍니다!",
 	multipleCurrencies: "장바구니에 다른 통화로만 결제가 가능한 아이템이 있습니다. 결제를 계속 진행하려면 모든 아이템의 결제 통화가 동일한지 확인하십시오.",
@@ -6800,7 +6803,8 @@ var buttons$3 = {
 var messages$7 = {
 	orderConfirmed: {
 		title: "¡Orden confirmada!",
-		body: "Tu orden ha sido confirmada y será enviada en los próximos días. En breve recibirás un correo electrónico de confirmación de esta orden."
+		body: "Tu orden ha sido confirmada y será enviada en los próximos días. En breve recibirás un correo electrónico de confirmación de esta orden.",
+		bodyDigital: "Tu orden ha sido confirmada. En breve recibirás un correo electrónico de confirmación de esta orden."
 	},
 	haveQuestions: "¡Si tienes alguna pregunta, no dudes en contactarnos!",
 	multipleCurrencies: "Tu carrito actualmente contiene artículos que están disponibles en diferentes divisas. Para proceder a la compra, asegúrate de que todos los artículos tengan la misma divisa.",
@@ -18210,7 +18214,9 @@ class CybersourceGateway {
           quantity = 1,
           addressId,
           isExistingSource,
-          fingerprint_session_id
+          fingerprint_session_id,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18226,6 +18232,8 @@ class CybersourceGateway {
           coupon_code: couponCode,
           address_id: product.address_required ? addressId : null,
           fingerprint_session_id: fingerprint_session_id,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18242,7 +18250,9 @@ class CybersourceGateway {
           couponCode,
           product,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18257,6 +18267,8 @@ class CybersourceGateway {
           campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
           subscription_id: subscriptionIdToRenew,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18274,7 +18286,9 @@ class CybersourceGateway {
           giftRecipient,
           quantity = 1,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18294,6 +18308,8 @@ class CybersourceGateway {
           gift_start_date: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.startDate,
           gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18310,7 +18326,9 @@ class CybersourceGateway {
           plan,
           couponCode,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18324,6 +18342,8 @@ class CybersourceGateway {
           coupon_code: couponCode,
           subscription_id: subscriptionIdToRenew,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18338,7 +18358,9 @@ class CybersourceGateway {
           items,
           couponCode,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18353,7 +18375,9 @@ class CybersourceGateway {
           ...params,
           ...(addressId && {
             address_id: addressId
-          })
+          }),
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear
         }, (err, res) => {
           callback(err, res);
         });
@@ -18794,7 +18818,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           }
         });
       }
-      handleCybersourcePayment(response.token, state);
+      handleCybersourcePayment(response, state);
     });
   };
   function handleCybersourcePayment(paymentRequest, state) {
@@ -18812,7 +18836,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       window.Pelcro.source.create({
         auth_token: window.Pelcro.user.read().auth_token,
         token: paymentRequest,
-        gateway: "cybersource"
+        gateway: "cybersource",
+        cardExpirationMonth: state.month,
+        cardExpirationYear: state.year
       }, (err, res) => {
         dispatch({
           type: DISABLE_SUBMIT,
@@ -18840,6 +18866,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+
+        // Reinitialize Cybersource microform after successful payment
+        setTimeout(() => {
+          cybersourceInstanceRef.current = null;
+          initCybersourceScript();
+        }, 1000);
         onSuccess(res);
       } //
       );
@@ -18863,11 +18895,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           subscriptionIdToRenew,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (giftSubscriprition) {
@@ -18880,11 +18920,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           giftRecipient,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (renewSubscription) {
@@ -18897,11 +18945,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           subscriptionIdToRenew,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (createSubscription) {
@@ -18914,22 +18970,27 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           addressId: selectedAddressId,
-          fingerprint_session_id: state.cyberSourceSessionId
+          fingerprint_session_id: state.cyberSourceSessionId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       }
     }
   }
-  const tokenizeCard = (error, microformInstance) => {
-    if (error) {
-      return;
-    }
-    cybersourceInstanceRef.current = microformInstance;
-  };
+
+  // No longer needed - microform instance is stored directly in initCybersourceScript
+
   const appendCybersourceFingerprintScripts = () => {
     var _window$Pelcro$site$r, _window$Pelcro$site$r2, _window$Pelcro$site$r3, _window$Pelcro$site$r4;
     const uniqueId = crypto.randomUUID();
@@ -18953,6 +19014,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
   };
   const initCybersourceScript = () => {
+    // Clear existing card number field before reinitializing
+    const cardNumberElement = document.querySelector("#cybersourceCardNumber");
+    if (cardNumberElement) {
+      cardNumberElement.innerHTML = "";
+    }
+
     // jwk api call
     window.Pelcro.payment.getJWK({
       auth_token: window.Pelcro.user.read().auth_token,
@@ -18977,35 +19044,56 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         });
       }
       const {
-        key: jwk
+        key: jwk,
+        captureContext,
+        js_client
       } = res;
-      // SETUP MICROFORM
-      // eslint-disable-next-line no-undef
-      FLEX.microform({
-        keyId: jwk.kid,
-        keystore: jwk,
-        container: "#cybersourceCardNumber",
-        placeholder: "Card Number",
-        styles: {
-          input: {
-            "font-size": "14px",
-            "font-family": "helvetica, tahoma, calibri, sans-serif",
-            color: "#555"
-          },
-          ":focus": {
-            color: "blue"
-          },
-          ":disabled": {
-            cursor: "not-allowed"
-          },
-          valid: {
-            color: "#3c763d"
-          },
-          invalid: {
-            color: "#a94442"
+
+      // Load the SDK from the dynamic URL (if not already loaded)
+      const existingScript = document.querySelector(`script[src="${js_client}"]`);
+      if (!existingScript) {
+        window.Pelcro.helpers.loadSDK(js_client, "cybersource-cdn");
+      }
+      const initializeMicroform = () => {
+        // SETUP MICROFORM
+        // eslint-disable-next-line no-undef
+        const flex = new Flex(captureContext);
+        const microform = flex.microform({
+          styles: {
+            input: {
+              "font-size": "14px",
+              "font-family": "helvetica, tahoma, calibri, sans-serif",
+              color: "#555"
+            },
+            ":focus": {
+              color: "blue"
+            },
+            ":disabled": {
+              cursor: "not-allowed"
+            },
+            valid: {
+              color: "#3c763d"
+            },
+            invalid: {
+              color: "#a94442"
+            }
           }
-        }
-      }, tokenizeCard);
+        });
+        const number = microform.createField("number", {
+          placeholder: "Enter your card number"
+        });
+        number.load("#cybersourceCardNumber");
+        cybersourceInstanceRef.current = microform;
+      };
+
+      // Wait for SDK to load then initialize microform
+      if (existingScript) {
+        // Script already loaded, initialize immediately
+        initializeMicroform();
+      } else {
+        // Wait for new script to load
+        document.querySelector(`script[src="${js_client}"]`).addEventListener("load", initializeMicroform);
+      }
     });
   };
 
@@ -20201,13 +20289,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       if (cardProcessor === "tap" && !selectedPaymentMethodId && window.Tapjsli) {
         initTapScript();
       }
-      if (cardProcessor === "cybersource" && !selectedPaymentMethodId && !window.FLEX) {
-        window.Pelcro.helpers.loadSDK("https://flex.cybersource.com/cybersource/assets/microform/0.4/flex-microform.min.js", "cybersource-cdn");
-        document.querySelector('script[src="https://flex.cybersource.com/cybersource/assets/microform/0.4/flex-microform.min.js"]').addEventListener("load", () => {
-          initCybersourceScript();
-        });
-      }
-      if (cardProcessor === "cybersource" && !selectedPaymentMethodId && window.FLEX) {
+      if (cardProcessor === "cybersource" && !selectedPaymentMethodId) {
         initCybersourceScript();
       }
       if (cardProcessor === "cybersource") {
@@ -20806,7 +20888,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_start_date: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.startDate,
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null,
-        metadata: props === null || props === void 0 ? void 0 : props.subCreateMetadata
+        metadata: props === null || props === void 0 ? void 0 : props.subCreateMetadata,
+        cardExpirationMonth: state === null || state === void 0 ? void 0 : state.month,
+        cardExpirationYear: state === null || state === void 0 ? void 0 : state.year
       }, (err, res) => {
         var _res$data;
         if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.setup_intent) {
@@ -20981,7 +21065,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       isExistingSource: Boolean(selectedPaymentMethodId),
       items: mappedOrderItems,
       addressId: selectedAddressId,
-      couponCode
+      couponCode,
+      cardExpirationMonth: state === null || state === void 0 ? void 0 : state.month,
+      cardExpirationYear: state === null || state === void 0 ? void 0 : state.year
     }, (err, orderResponse) => {
       var _window$Pelcro14, _window$Pelcro14$user, _window$Pelcro14$user2;
       if (err) {
@@ -21329,7 +21415,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
         ...(selectedAddressId && {
           address_id: selectedAddressId
-        })
+        }),
+        card_expiration_month: state === null || state === void 0 ? void 0 : state.month,
+        card_expiration_year: state === null || state === void 0 ? void 0 : state.year
       }, (err, res) => {
         if (err) {
           return handlePaymentError(err);
@@ -29244,6 +29332,12 @@ const OrderConfirmModal = props => {
     props === null || props === void 0 ? void 0 : (_props$onClose = props.onClose) === null || _props$onClose === void 0 ? void 0 : _props$onClose.call(props);
     resetView();
   };
+
+  // Check if any items in the order are shippable
+  const hasShippableItems = latestOrder === null || latestOrder === void 0 ? void 0 : latestOrder.items.some(item => {
+    const product = window.Pelcro.ecommerce.products.getBySkuId(item.product_sku_id);
+    return product === null || product === void 0 ? void 0 : product.shippable;
+  });
   return /*#__PURE__*/React__default['default'].createElement(Modal, {
     id: "pelcro-order-confirm-modal",
     className: "plc-border-t-8 plc-border-primary-500",
@@ -29259,7 +29353,7 @@ const OrderConfirmModal = props => {
     className: "plc-text-center plc-text-gray-900"
   }, /*#__PURE__*/React__default['default'].createElement("h4", {
     className: "plc-mb-4 plc-text-3xl"
-  }, t("messages.orderConfirmed.title")), /*#__PURE__*/React__default['default'].createElement("p", null, t("messages.orderConfirmed.body")), /*#__PURE__*/React__default['default'].createElement("p", null, t("messages.haveQuestions")))), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, t("messages.orderConfirmed.title")), /*#__PURE__*/React__default['default'].createElement("p", null, hasShippableItems ? t("messages.orderConfirmed.body") : t("messages.orderConfirmed.bodyDigital")), /*#__PURE__*/React__default['default'].createElement("p", null, t("messages.haveQuestions")))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "plc-mt-5 pelcro-order-summary-wrapper"
   }, /*#__PURE__*/React__default['default'].createElement("p", {
     className: "plc-font-bold pelcro-order-summary-title"

package/dist/index.esm.js

@@ -3805,7 +3805,8 @@ var buttons$l = {
 var messages$10 = {
 	orderConfirmed: {
 		title: "Order confirmed!",
-		body: "Your order has been confirmed and will be shipped within the next few days. You'll shortly receive an email confirmation of this order."
+		body: "Your order has been confirmed and will be shipped within the next few days. You'll shortly receive an email confirmation of this order.",
+		bodyDigital: "Your order has been confirmed. You'll shortly receive an email confirmation of this order."
 	},
 	haveQuestions: "If you have any queries please don't hesitate to contact us!",
 	multipleCurrencies: "Your cart currently contains items which are available in different currencies. In order to proceed with the checkout, please make sure that all items have the same currency.",
@@ -4767,9 +4768,10 @@ var buttons$f = {
 var messages$J = {
 	orderConfirmed: {
 		title: "Votre commande est confirmée !",
-		body: "Votre commande a été confirmée et vous sera expédiée dans les prochains jours. Vous recevrez un courriel de confirmation sous peu."
+		body: "Votre commande a été confirmée et vous sera expédiée dans les prochains jours. Vous recevrez un courriel de confirmation sous peu.",
+		bodyDigital: "Votre commande a été confirmée. Vous recevrez un courriel de confirmation sous peu."
 	},
-	haveQuestions: "N’hésitez pas à nous contacter pour toute question !",
+	haveQuestions: "N'hésitez pas à nous contacter pour toute question !",
 	multipleCurrencies: "Votre panier contient des articles disponibles dans différentes devises. Avant de passer à la caisse, veuillez vous assurer que tous les articles ont la même devise.",
 	currencyMismatch: "Les articles sélectionnés ne sont pas compatibles avec la devise associée à votre compte ({{currency}}). Veuillez choisir des articles uniquement offerts dans cette devise."
 };
@@ -5717,7 +5719,8 @@ var buttons$9 = {
 var messages$q = {
 	orderConfirmed: {
 		title: "주문이 확인되었습니다!",
-		body: "귀하의 주문이 확인되었으며 며칠 안에 배송될 예정입니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다."
+		body: "귀하의 주문이 확인되었으며 며칠 안에 배송될 예정입니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다.",
+		bodyDigital: "귀하의 주문이 확인되었습니다. 이 주문의 확인 이메일이 귀하에게 전송됩니다."
 	},
 	haveQuestions: "질문이 있으면 언제든 저희에게 연락주시기 바랍니다!",
 	multipleCurrencies: "장바구니에 다른 통화로만 결제가 가능한 아이템이 있습니다. 결제를 계속 진행하려면 모든 아이템의 결제 통화가 동일한지 확인하십시오.",
@@ -6770,7 +6773,8 @@ var buttons$3 = {
 var messages$7 = {
 	orderConfirmed: {
 		title: "¡Orden confirmada!",
-		body: "Tu orden ha sido confirmada y será enviada en los próximos días. En breve recibirás un correo electrónico de confirmación de esta orden."
+		body: "Tu orden ha sido confirmada y será enviada en los próximos días. En breve recibirás un correo electrónico de confirmación de esta orden.",
+		bodyDigital: "Tu orden ha sido confirmada. En breve recibirás un correo electrónico de confirmación de esta orden."
 	},
 	haveQuestions: "¡Si tienes alguna pregunta, no dudes en contactarnos!",
 	multipleCurrencies: "Tu carrito actualmente contiene artículos que están disponibles en diferentes divisas. Para proceder a la compra, asegúrate de que todos los artículos tengan la misma divisa.",
@@ -18180,7 +18184,9 @@ class CybersourceGateway {
           quantity = 1,
           addressId,
           isExistingSource,
-          fingerprint_session_id
+          fingerprint_session_id,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18196,6 +18202,8 @@ class CybersourceGateway {
           coupon_code: couponCode,
           address_id: product.address_required ? addressId : null,
           fingerprint_session_id: fingerprint_session_id,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18212,7 +18220,9 @@ class CybersourceGateway {
           couponCode,
           product,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18227,6 +18237,8 @@ class CybersourceGateway {
           campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
           subscription_id: subscriptionIdToRenew,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18244,7 +18256,9 @@ class CybersourceGateway {
           giftRecipient,
           quantity = 1,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18264,6 +18278,8 @@ class CybersourceGateway {
           gift_start_date: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.startDate,
           gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18280,7 +18296,9 @@ class CybersourceGateway {
           plan,
           couponCode,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18294,6 +18312,8 @@ class CybersourceGateway {
           coupon_code: couponCode,
           subscription_id: subscriptionIdToRenew,
           address_id: product.address_required ? addressId : null,
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear,
           ...params
         }, (err, res) => {
           callback(err, res);
@@ -18308,7 +18328,9 @@ class CybersourceGateway {
           items,
           couponCode,
           addressId,
-          isExistingSource
+          isExistingSource,
+          cardExpirationMonth,
+          cardExpirationYear
         } = options;
         const params = isExistingSource ? {
           source_id: token
@@ -18323,7 +18345,9 @@ class CybersourceGateway {
           ...params,
           ...(addressId && {
             address_id: addressId
-          })
+          }),
+          card_expiration_month: cardExpirationMonth,
+          card_expiration_year: cardExpirationYear
         }, (err, res) => {
           callback(err, res);
         });
@@ -18764,7 +18788,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           }
         });
       }
-      handleCybersourcePayment(response.token, state);
+      handleCybersourcePayment(response, state);
     });
   };
   function handleCybersourcePayment(paymentRequest, state) {
@@ -18782,7 +18806,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       window.Pelcro.source.create({
         auth_token: window.Pelcro.user.read().auth_token,
         token: paymentRequest,
-        gateway: "cybersource"
+        gateway: "cybersource",
+        cardExpirationMonth: state.month,
+        cardExpirationYear: state.year
       }, (err, res) => {
         dispatch({
           type: DISABLE_SUBMIT,
@@ -18810,6 +18836,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             content: t("messages.sourceUpdated")
           }
         });
+
+        // Reinitialize Cybersource microform after successful payment
+        setTimeout(() => {
+          cybersourceInstanceRef.current = null;
+          initCybersourceScript();
+        }, 1000);
         onSuccess(res);
       } //
       );
@@ -18833,11 +18865,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           subscriptionIdToRenew,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (giftSubscriprition) {
@@ -18850,11 +18890,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           giftRecipient,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (renewSubscription) {
@@ -18867,11 +18915,19 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           subscriptionIdToRenew,
-          addressId: selectedAddressId
+          addressId: selectedAddressId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       } else if (createSubscription) {
@@ -18884,22 +18940,27 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           product,
           isExistingSource: isUsingExistingPaymentMethod,
           addressId: selectedAddressId,
-          fingerprint_session_id: state.cyberSourceSessionId
+          fingerprint_session_id: state.cyberSourceSessionId,
+          cardExpirationMonth: state.month,
+          cardExpirationYear: state.year
         }, (err, res) => {
           if (err) {
             return handlePaymentError(err);
           }
+
+          // Reinitialize Cybersource microform after successful payment
+          setTimeout(() => {
+            cybersourceInstanceRef.current = null;
+            initCybersourceScript();
+          }, 1000);
           onSuccess(res);
         });
       }
     }
   }
-  const tokenizeCard = (error, microformInstance) => {
-    if (error) {
-      return;
-    }
-    cybersourceInstanceRef.current = microformInstance;
-  };
+
+  // No longer needed - microform instance is stored directly in initCybersourceScript
+
   const appendCybersourceFingerprintScripts = () => {
     var _window$Pelcro$site$r, _window$Pelcro$site$r2, _window$Pelcro$site$r3, _window$Pelcro$site$r4;
     const uniqueId = crypto.randomUUID();
@@ -18923,6 +18984,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     }
   };
   const initCybersourceScript = () => {
+    // Clear existing card number field before reinitializing
+    const cardNumberElement = document.querySelector("#cybersourceCardNumber");
+    if (cardNumberElement) {
+      cardNumberElement.innerHTML = "";
+    }
+
     // jwk api call
     window.Pelcro.payment.getJWK({
       auth_token: window.Pelcro.user.read().auth_token,
@@ -18947,35 +19014,56 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         });
       }
       const {
-        key: jwk
+        key: jwk,
+        captureContext,
+        js_client
       } = res;
-      // SETUP MICROFORM
-      // eslint-disable-next-line no-undef
-      FLEX.microform({
-        keyId: jwk.kid,
-        keystore: jwk,
-        container: "#cybersourceCardNumber",
-        placeholder: "Card Number",
-        styles: {
-          input: {
-            "font-size": "14px",
-            "font-family": "helvetica, tahoma, calibri, sans-serif",
-            color: "#555"
-          },
-          ":focus": {
-            color: "blue"
-          },
-          ":disabled": {
-            cursor: "not-allowed"
-          },
-          valid: {
-            color: "#3c763d"
-          },
-          invalid: {
-            color: "#a94442"
+
+      // Load the SDK from the dynamic URL (if not already loaded)
+      const existingScript = document.querySelector(`script[src="${js_client}"]`);
+      if (!existingScript) {
+        window.Pelcro.helpers.loadSDK(js_client, "cybersource-cdn");
+      }
+      const initializeMicroform = () => {
+        // SETUP MICROFORM
+        // eslint-disable-next-line no-undef
+        const flex = new Flex(captureContext);
+        const microform = flex.microform({
+          styles: {
+            input: {
+              "font-size": "14px",
+              "font-family": "helvetica, tahoma, calibri, sans-serif",
+              color: "#555"
+            },
+            ":focus": {
+              color: "blue"
+            },
+            ":disabled": {
+              cursor: "not-allowed"
+            },
+            valid: {
+              color: "#3c763d"
+            },
+            invalid: {
+              color: "#a94442"
+            }
           }
-        }
-      }, tokenizeCard);
+        });
+        const number = microform.createField("number", {
+          placeholder: "Enter your card number"
+        });
+        number.load("#cybersourceCardNumber");
+        cybersourceInstanceRef.current = microform;
+      };
+
+      // Wait for SDK to load then initialize microform
+      if (existingScript) {
+        // Script already loaded, initialize immediately
+        initializeMicroform();
+      } else {
+        // Wait for new script to load
+        document.querySelector(`script[src="${js_client}"]`).addEventListener("load", initializeMicroform);
+      }
     });
   };
 
@@ -20171,13 +20259,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       if (cardProcessor === "tap" && !selectedPaymentMethodId && window.Tapjsli) {
         initTapScript();
       }
-      if (cardProcessor === "cybersource" && !selectedPaymentMethodId && !window.FLEX) {
-        window.Pelcro.helpers.loadSDK("https://flex.cybersource.com/cybersource/assets/microform/0.4/flex-microform.min.js", "cybersource-cdn");
-        document.querySelector('script[src="https://flex.cybersource.com/cybersource/assets/microform/0.4/flex-microform.min.js"]').addEventListener("load", () => {
-          initCybersourceScript();
-        });
-      }
-      if (cardProcessor === "cybersource" && !selectedPaymentMethodId && window.FLEX) {
+      if (cardProcessor === "cybersource" && !selectedPaymentMethodId) {
         initCybersourceScript();
       }
       if (cardProcessor === "cybersource") {
@@ -20776,7 +20858,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_start_date: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.startDate,
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null,
-        metadata: props === null || props === void 0 ? void 0 : props.subCreateMetadata
+        metadata: props === null || props === void 0 ? void 0 : props.subCreateMetadata,
+        cardExpirationMonth: state === null || state === void 0 ? void 0 : state.month,
+        cardExpirationYear: state === null || state === void 0 ? void 0 : state.year
       }, (err, res) => {
         var _res$data;
         if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.setup_intent) {
@@ -20951,7 +21035,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       isExistingSource: Boolean(selectedPaymentMethodId),
       items: mappedOrderItems,
       addressId: selectedAddressId,
-      couponCode
+      couponCode,
+      cardExpirationMonth: state === null || state === void 0 ? void 0 : state.month,
+      cardExpirationYear: state === null || state === void 0 ? void 0 : state.year
     }, (err, orderResponse) => {
       var _window$Pelcro14, _window$Pelcro14$user, _window$Pelcro14$user2;
       if (err) {
@@ -21299,7 +21385,9 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
         ...(selectedAddressId && {
           address_id: selectedAddressId
-        })
+        }),
+        card_expiration_month: state === null || state === void 0 ? void 0 : state.month,
+        card_expiration_year: state === null || state === void 0 ? void 0 : state.year
       }, (err, res) => {
         if (err) {
           return handlePaymentError(err);
@@ -29214,6 +29302,12 @@ const OrderConfirmModal = props => {
     props === null || props === void 0 ? void 0 : (_props$onClose = props.onClose) === null || _props$onClose === void 0 ? void 0 : _props$onClose.call(props);
     resetView();
   };
+
+  // Check if any items in the order are shippable
+  const hasShippableItems = latestOrder === null || latestOrder === void 0 ? void 0 : latestOrder.items.some(item => {
+    const product = window.Pelcro.ecommerce.products.getBySkuId(item.product_sku_id);
+    return product === null || product === void 0 ? void 0 : product.shippable;
+  });
   return /*#__PURE__*/React__default.createElement(Modal, {
     id: "pelcro-order-confirm-modal",
     className: "plc-border-t-8 plc-border-primary-500",
@@ -29229,7 +29323,7 @@ const OrderConfirmModal = props => {
     className: "plc-text-center plc-text-gray-900"
   }, /*#__PURE__*/React__default.createElement("h4", {
     className: "plc-mb-4 plc-text-3xl"
-  }, t("messages.orderConfirmed.title")), /*#__PURE__*/React__default.createElement("p", null, t("messages.orderConfirmed.body")), /*#__PURE__*/React__default.createElement("p", null, t("messages.haveQuestions")))), /*#__PURE__*/React__default.createElement("div", {
+  }, t("messages.orderConfirmed.title")), /*#__PURE__*/React__default.createElement("p", null, hasShippableItems ? t("messages.orderConfirmed.body") : t("messages.orderConfirmed.bodyDigital")), /*#__PURE__*/React__default.createElement("p", null, t("messages.haveQuestions")))), /*#__PURE__*/React__default.createElement("div", {
     className: "plc-mt-5 pelcro-order-summary-wrapper"
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "plc-font-bold pelcro-order-summary-title"

package/package.json

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