@pelcro/react-pelcro-js 3.26.0-beta.16 → 3.26.0-beta.17

package/dist/index.cjs.js

@@ -21189,7 +21189,7 @@ const DonationEmail = props => /*#__PURE__*/React__default['default'].createElem
  * @return {JSX}
  */
 const ApplePayButton = _ref => {
-  var _window$Pelcro$site$r, _order$;
+  var _window$Pelcro$site$r;
   let {
     onClick,
     props,
@@ -21210,24 +21210,39 @@ const ApplePayButton = _ref => {
     apple_pay_merchant_id: ApplePayMerchantId,
     apple_pay_enabled: ApplePayEnabled
   } = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.vantiv_gateway_settings;
-  const getOrderItemsTotal = () => {
+  const getOrderInfo = () => {
     if (!order) {
-      return null;
+      return {
+        price: null,
+        currency: null,
+        label: null
+      };
     }
     const isQuickPurchase = !Array.isArray(order);
     if (isQuickPurchase) {
-      return order.price * order.quantity;
+      return {
+        price: order.price * order.quantity,
+        currency: order.currency,
+        label: order.name
+      };
     }
     if (order.length === 0) {
-      return null;
+      return {
+        price: null,
+        currency: null,
+        label: null
+      };
     }
-    return order.reduce((total, item) => {
-      return total + item.price * item.quantity;
-    }, 0);
+    const price = order.reduce((total, item) => total + item.price * item.quantity, 0);
+    return {
+      price,
+      currency: order[0].currency,
+      label: "Order"
+    };
   };
-  const orderPrice = getOrderItemsTotal();
-  const orderCurrency = !Array.isArray(order) ? order === null || order === void 0 ? void 0 : order.currency : (_order$ = order[0]) === null || _order$ === void 0 ? void 0 : _order$.currency;
-  const orderLabel = !Array.isArray(order) ? order === null || order === void 0 ? void 0 : order.name : "Order";
+  const orderPrice = getOrderInfo().price;
+  const orderCurrency = getOrderInfo().currency;
+  const orderLabel = getOrderInfo().label;
   React.useEffect(() => {
     if (window.ApplePaySession) {
       // Indicates whether the device supports Apple Pay and whether the user has an active card in Wallet.
@@ -21255,7 +21270,15 @@ const ApplePayButton = _ref => {
         return;
       }
       const updatedPrice = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_state$updatedPrice = state.updatedPrice) !== null && _state$updatedPrice !== void 0 ? _state$updatedPrice : props === null || props === void 0 ? void 0 : (_props$plan = props.plan) === null || _props$plan === void 0 ? void 0 : _props$plan.amount) !== null && _ref5 !== void 0 ? _ref5 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : orderPrice) !== null && _ref3 !== void 0 ? _ref3 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref2 !== void 0 ? _ref2 : null;
-      console.log(updatedPrice);
+      const getCurrencyCode = () => {
+        if (plan) {
+          return plan === null || plan === void 0 ? void 0 : plan.currency.toUpperCase();
+        } else if (order) {
+          return orderCurrency.toUpperCase();
+        } else if (invoice) {
+          return invoice === null || invoice === void 0 ? void 0 : invoice.currency.toUpperCase();
+        }
+      };
       dispatch({
         type: DISABLE_SUBMIT,
         payload: true
@@ -21265,7 +21288,7 @@ const ApplePayButton = _ref => {
       // @see https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/creating_an_apple_pay_session
       const ApplePayPaymentRequest = {
         countryCode: ((_window = window) === null || _window === void 0 ? void 0 : (_window$Pelcro = _window.Pelcro) === null || _window$Pelcro === void 0 ? void 0 : (_window$Pelcro$user = _window$Pelcro.user) === null || _window$Pelcro$user === void 0 ? void 0 : (_window$Pelcro$user$l = _window$Pelcro$user.location) === null || _window$Pelcro$user$l === void 0 ? void 0 : _window$Pelcro$user$l.countryCode) || "US",
-        currencyCode: (plan === null || plan === void 0 ? void 0 : plan.currency.toUpperCase()) || orderCurrency.toUpperCase() || (invoice === null || invoice === void 0 ? void 0 : invoice.currency.toUpperCase()),
+        currencyCode: getCurrencyCode(),
         merchantCapabilities: ["supports3DS"],
         supportedNetworks: ["visa", "masterCard", "amex", "discover"],
         total: {

package/dist/index.esm.js

@@ -21159,7 +21159,7 @@ const DonationEmail = props => /*#__PURE__*/React__default.createElement(Email,
  * @return {JSX}
  */
 const ApplePayButton = _ref => {
-  var _window$Pelcro$site$r, _order$;
+  var _window$Pelcro$site$r;
   let {
     onClick,
     props,
@@ -21180,24 +21180,39 @@ const ApplePayButton = _ref => {
     apple_pay_merchant_id: ApplePayMerchantId,
     apple_pay_enabled: ApplePayEnabled
   } = (_window$Pelcro$site$r = window.Pelcro.site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.vantiv_gateway_settings;
-  const getOrderItemsTotal = () => {
+  const getOrderInfo = () => {
     if (!order) {
-      return null;
+      return {
+        price: null,
+        currency: null,
+        label: null
+      };
     }
     const isQuickPurchase = !Array.isArray(order);
     if (isQuickPurchase) {
-      return order.price * order.quantity;
+      return {
+        price: order.price * order.quantity,
+        currency: order.currency,
+        label: order.name
+      };
     }
     if (order.length === 0) {
-      return null;
+      return {
+        price: null,
+        currency: null,
+        label: null
+      };
     }
-    return order.reduce((total, item) => {
-      return total + item.price * item.quantity;
-    }, 0);
+    const price = order.reduce((total, item) => total + item.price * item.quantity, 0);
+    return {
+      price,
+      currency: order[0].currency,
+      label: "Order"
+    };
   };
-  const orderPrice = getOrderItemsTotal();
-  const orderCurrency = !Array.isArray(order) ? order === null || order === void 0 ? void 0 : order.currency : (_order$ = order[0]) === null || _order$ === void 0 ? void 0 : _order$.currency;
-  const orderLabel = !Array.isArray(order) ? order === null || order === void 0 ? void 0 : order.name : "Order";
+  const orderPrice = getOrderInfo().price;
+  const orderCurrency = getOrderInfo().currency;
+  const orderLabel = getOrderInfo().label;
   useEffect(() => {
     if (window.ApplePaySession) {
       // Indicates whether the device supports Apple Pay and whether the user has an active card in Wallet.
@@ -21225,7 +21240,15 @@ const ApplePayButton = _ref => {
         return;
       }
       const updatedPrice = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_state$updatedPrice = state.updatedPrice) !== null && _state$updatedPrice !== void 0 ? _state$updatedPrice : props === null || props === void 0 ? void 0 : (_props$plan = props.plan) === null || _props$plan === void 0 ? void 0 : _props$plan.amount) !== null && _ref5 !== void 0 ? _ref5 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : orderPrice) !== null && _ref3 !== void 0 ? _ref3 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref2 !== void 0 ? _ref2 : null;
-      console.log(updatedPrice);
+      const getCurrencyCode = () => {
+        if (plan) {
+          return plan === null || plan === void 0 ? void 0 : plan.currency.toUpperCase();
+        } else if (order) {
+          return orderCurrency.toUpperCase();
+        } else if (invoice) {
+          return invoice === null || invoice === void 0 ? void 0 : invoice.currency.toUpperCase();
+        }
+      };
       dispatch({
         type: DISABLE_SUBMIT,
         payload: true
@@ -21235,7 +21258,7 @@ const ApplePayButton = _ref => {
       // @see https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/creating_an_apple_pay_session
       const ApplePayPaymentRequest = {
         countryCode: ((_window = window) === null || _window === void 0 ? void 0 : (_window$Pelcro = _window.Pelcro) === null || _window$Pelcro === void 0 ? void 0 : (_window$Pelcro$user = _window$Pelcro.user) === null || _window$Pelcro$user === void 0 ? void 0 : (_window$Pelcro$user$l = _window$Pelcro$user.location) === null || _window$Pelcro$user$l === void 0 ? void 0 : _window$Pelcro$user$l.countryCode) || "US",
-        currencyCode: (plan === null || plan === void 0 ? void 0 : plan.currency.toUpperCase()) || orderCurrency.toUpperCase() || (invoice === null || invoice === void 0 ? void 0 : invoice.currency.toUpperCase()),
+        currencyCode: getCurrencyCode(),
         merchantCapabilities: ["supports3DS"],
         supportedNetworks: ["visa", "masterCard", "amex", "discover"],
         total: {

package/package.json

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