@pelcro/react-pelcro-js 3.26.0-beta.21 → 3.26.0-beta.23

package/dist/index.cjs.js

@@ -9517,6 +9517,43 @@ const calcAndFormatItemsTotal = (items, currency) => {
   }
   return getFormattedPriceByLocal(totalWithoutDividingBy100, currency, getPageOrDefaultLanguage());
 };
+const getOrderInfo = order => {
+  if (!order) {
+    return {
+      price: null,
+      currency: null,
+      label: null
+    };
+  }
+  const isQuickPurchase = !Array.isArray(order);
+  if (isQuickPurchase) {
+    return {
+      price: order.price * order.quantity,
+      currency: order.currency,
+      label: order.name
+    };
+  }
+  if (order.length === 0) {
+    return {
+      price: null,
+      currency: null,
+      label: null
+    };
+  }
+  if (order.length === 1) {
+    return {
+      price: order[0].price * order[0].quantity,
+      currency: order[0].currency,
+      label: order[0].name
+    };
+  }
+  const price = order.reduce((total, item) => total + item.price * item.quantity, 0);
+  return {
+    price,
+    currency: order[0].currency,
+    label: price === 0 ? "Free Items" : "Order"
+  };
+};
 
 /**
  * returns true if the URL contains a supported view trigger URL
@@ -21257,7 +21294,7 @@ const ApplePayButton = _ref => {
           if (pelcroApplyPayButton) {
             pelcroApplyPayButton.style.display = "block";
           }
-          console.log("canMakePayments", canMakePayments);
+          console.log("ApplePay canMakePayments: ", canMakePayments);
         }
       });
     } else {
@@ -21299,7 +21336,7 @@ const ApplePayButton = _ref => {
           amount: updatedPrice / 100
         }
       };
-      console.log(ApplePayPaymentRequest);
+
       // Create ApplePaySession
       // @todo - Clarify supported version parameter
       // @odo - Apple Pay demo uses version 6 (https://applepaydemo.apple.com/)
@@ -21312,7 +21349,6 @@ const ApplePayButton = _ref => {
         const {
           validationURL
         } = event;
-        console.log("then merchantSession step", event);
         // Call your own server to request a new merchant session.
         window.Pelcro.payment.startSession({
           auth_token: window.Pelcro.user.read().auth_token,
@@ -21321,7 +21357,6 @@ const ApplePayButton = _ref => {
         }, (err, res) => {
           if (err) {
             // Handle any errors during merchant validation
-            console.error("Merchant validation SDK error: ", err);
             session.abort();
             return dispatch({
               type: SHOW_ALERT,
@@ -21332,13 +21367,11 @@ const ApplePayButton = _ref => {
             });
           }
           // Complete merchant validation with the merchant session object
-          console.log("Merchant validation SDK response: ", res);
           const merchantSession = res;
           session.completeMerchantValidation(merchantSession);
         });
       };
       session.onpaymentmethodselected = event => {
-        console.log("payment method selected step", event);
         // Define ApplePayPaymentMethodUpdate based on the selected payment method.
         // No updates or errors are needed, pass an empty object.
         const newTotal = {
@@ -21356,7 +21389,6 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if onshippingmethodselected it should be implemented
       // session.onshippingmethodselected = (event) => {
-      //   console.log("on shipping method selected step", event);
       //   // Define ApplePayShippingMethodUpdate based on the selected shipping method.
       //   // No updates or errors are needed, pass an empty object.
       //   const newTotal = {
@@ -21378,14 +21410,12 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if onshippingcontactselected it should be implemented
       // session.onshippingcontactselected = (event) => {
-      //   console.log("on shipping contact selected step", event);
       //   // Define ApplePayShippingContactUpdate based on the selected shipping contact.
       //   const update = {};
       //   session.completeShippingContactSelection(update);
       // };
 
       session.onpaymentauthorized = event => {
-        console.log("on payment authorized step", event);
         // Define ApplePayPaymentAuthorizationResult
         const result = {
           status: ApplePaySession.STATUS_SUCCESS // eslint-disable-line no-undef
@@ -21414,7 +21444,6 @@ const ApplePayButton = _ref => {
             transactionId: transactionId
           }
         };
-        console.log(applePayToken);
         const orderId = `pelcro-${new Date().getTime()}`;
         const eProtectRequest = {
           paypageId: payPageId,
@@ -21430,7 +21459,6 @@ const ApplePayButton = _ref => {
           const {
             expDate
           } = vantivResponse;
-          console.log("Response:", vantivResponse);
           const expMonth = expDate.substring(0, 2);
           const expYear = expDate.substring(2);
           const vantivPaymentRequest = {
@@ -21469,7 +21497,6 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if oncouponcodechanged it should be implemented
       // session.oncouponcodechanged = (event) => {
-      //   console.log("on coupon code changed step", event);
       //   // Define ApplePayCouponCodeUpdate
       //   const newTotal = calculateNewTotal(event.couponCode);
       //   const newLineItems = calculateNewLineItems(event.couponCode);
@@ -21488,7 +21515,6 @@ const ApplePayButton = _ref => {
 
       session.oncancel = event => {
         // Payment cancelled by WebKit
-        console.log("on cancel step", event);
         dispatch({
           type: LOADING,
           payload: false
@@ -21558,11 +21584,9 @@ function PaymentMethodView(_ref) {
     className: "plc-w-full plc-p-2 plc-mb-4 plc-font-semibold plc-text-center plc-text-gray-900 plc-bg-gray-100 plc-border plc-border-gray-200"
   }, /*#__PURE__*/React__default['default'].createElement("p", {
     className: "plc-text-gray-600"
-  }, !Array.isArray(order) ? /*#__PURE__*/React__default['default'].createElement("span", {
-    className: "plc-tracking-wider plc-uppercase"
-  }, order === null || order === void 0 ? void 0 : order.name) : /*#__PURE__*/React__default['default'].createElement("span", {
+  }, /*#__PURE__*/React__default['default'].createElement("span", {
     className: "plc-tracking-wider plc-uppercase"
-  }, t("labels.freeItems")), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement("span", {
+  }, getOrderInfo(order).label), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement("span", {
     className: "plc-text-xl plc-font-semibold plc-text-primary-600"
   }, (_calcAndFormatItemsTo = calcAndFormatItemsTotal(order, (_order$ = order[0]) === null || _order$ === void 0 ? void 0 : _order$.currency)) !== null && _calcAndFormatItemsTo !== void 0 ? _calcAndFormatItemsTo : getFormattedPriceByLocal(order === null || order === void 0 ? void 0 : order.price, order === null || order === void 0 ? void 0 : order.currency, getPageOrDefaultLanguage())))), cardProcessor === "stripe" && !showSubscriptionButton && !showOrderButton && /*#__PURE__*/React__default['default'].createElement("div", {
     className: "plc-flex plc-items-center plc-w-full plc-px-4 plc-py-2 plc-text-center plc-text-green-600 plc-border plc-border-green-400 plc-rounded plc-bg-green-50"

package/dist/index.esm.js

@@ -9487,6 +9487,43 @@ const calcAndFormatItemsTotal = (items, currency) => {
   }
   return getFormattedPriceByLocal(totalWithoutDividingBy100, currency, getPageOrDefaultLanguage());
 };
+const getOrderInfo = order => {
+  if (!order) {
+    return {
+      price: null,
+      currency: null,
+      label: null
+    };
+  }
+  const isQuickPurchase = !Array.isArray(order);
+  if (isQuickPurchase) {
+    return {
+      price: order.price * order.quantity,
+      currency: order.currency,
+      label: order.name
+    };
+  }
+  if (order.length === 0) {
+    return {
+      price: null,
+      currency: null,
+      label: null
+    };
+  }
+  if (order.length === 1) {
+    return {
+      price: order[0].price * order[0].quantity,
+      currency: order[0].currency,
+      label: order[0].name
+    };
+  }
+  const price = order.reduce((total, item) => total + item.price * item.quantity, 0);
+  return {
+    price,
+    currency: order[0].currency,
+    label: price === 0 ? "Free Items" : "Order"
+  };
+};
 
 /**
  * returns true if the URL contains a supported view trigger URL
@@ -21227,7 +21264,7 @@ const ApplePayButton = _ref => {
           if (pelcroApplyPayButton) {
             pelcroApplyPayButton.style.display = "block";
           }
-          console.log("canMakePayments", canMakePayments);
+          console.log("ApplePay canMakePayments: ", canMakePayments);
         }
       });
     } else {
@@ -21269,7 +21306,7 @@ const ApplePayButton = _ref => {
           amount: updatedPrice / 100
         }
       };
-      console.log(ApplePayPaymentRequest);
+
       // Create ApplePaySession
       // @todo - Clarify supported version parameter
       // @odo - Apple Pay demo uses version 6 (https://applepaydemo.apple.com/)
@@ -21282,7 +21319,6 @@ const ApplePayButton = _ref => {
         const {
           validationURL
         } = event;
-        console.log("then merchantSession step", event);
         // Call your own server to request a new merchant session.
         window.Pelcro.payment.startSession({
           auth_token: window.Pelcro.user.read().auth_token,
@@ -21291,7 +21327,6 @@ const ApplePayButton = _ref => {
         }, (err, res) => {
           if (err) {
             // Handle any errors during merchant validation
-            console.error("Merchant validation SDK error: ", err);
             session.abort();
             return dispatch({
               type: SHOW_ALERT,
@@ -21302,13 +21337,11 @@ const ApplePayButton = _ref => {
             });
           }
           // Complete merchant validation with the merchant session object
-          console.log("Merchant validation SDK response: ", res);
           const merchantSession = res;
           session.completeMerchantValidation(merchantSession);
         });
       };
       session.onpaymentmethodselected = event => {
-        console.log("payment method selected step", event);
         // Define ApplePayPaymentMethodUpdate based on the selected payment method.
         // No updates or errors are needed, pass an empty object.
         const newTotal = {
@@ -21326,7 +21359,6 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if onshippingmethodselected it should be implemented
       // session.onshippingmethodselected = (event) => {
-      //   console.log("on shipping method selected step", event);
       //   // Define ApplePayShippingMethodUpdate based on the selected shipping method.
       //   // No updates or errors are needed, pass an empty object.
       //   const newTotal = {
@@ -21348,14 +21380,12 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if onshippingcontactselected it should be implemented
       // session.onshippingcontactselected = (event) => {
-      //   console.log("on shipping contact selected step", event);
       //   // Define ApplePayShippingContactUpdate based on the selected shipping contact.
       //   const update = {};
       //   session.completeShippingContactSelection(update);
       // };
 
       session.onpaymentauthorized = event => {
-        console.log("on payment authorized step", event);
         // Define ApplePayPaymentAuthorizationResult
         const result = {
           status: ApplePaySession.STATUS_SUCCESS // eslint-disable-line no-undef
@@ -21384,7 +21414,6 @@ const ApplePayButton = _ref => {
             transactionId: transactionId
           }
         };
-        console.log(applePayToken);
         const orderId = `pelcro-${new Date().getTime()}`;
         const eProtectRequest = {
           paypageId: payPageId,
@@ -21400,7 +21429,6 @@ const ApplePayButton = _ref => {
           const {
             expDate
           } = vantivResponse;
-          console.log("Response:", vantivResponse);
           const expMonth = expDate.substring(0, 2);
           const expYear = expDate.substring(2);
           const vantivPaymentRequest = {
@@ -21439,7 +21467,6 @@ const ApplePayButton = _ref => {
 
       // TODO: Check if oncouponcodechanged it should be implemented
       // session.oncouponcodechanged = (event) => {
-      //   console.log("on coupon code changed step", event);
       //   // Define ApplePayCouponCodeUpdate
       //   const newTotal = calculateNewTotal(event.couponCode);
       //   const newLineItems = calculateNewLineItems(event.couponCode);
@@ -21458,7 +21485,6 @@ const ApplePayButton = _ref => {
 
       session.oncancel = event => {
         // Payment cancelled by WebKit
-        console.log("on cancel step", event);
         dispatch({
           type: LOADING,
           payload: false
@@ -21528,11 +21554,9 @@ function PaymentMethodView(_ref) {
     className: "plc-w-full plc-p-2 plc-mb-4 plc-font-semibold plc-text-center plc-text-gray-900 plc-bg-gray-100 plc-border plc-border-gray-200"
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "plc-text-gray-600"
-  }, !Array.isArray(order) ? /*#__PURE__*/React__default.createElement("span", {
-    className: "plc-tracking-wider plc-uppercase"
-  }, order === null || order === void 0 ? void 0 : order.name) : /*#__PURE__*/React__default.createElement("span", {
+  }, /*#__PURE__*/React__default.createElement("span", {
     className: "plc-tracking-wider plc-uppercase"
-  }, t("labels.freeItems")), /*#__PURE__*/React__default.createElement("br", null), /*#__PURE__*/React__default.createElement("span", {
+  }, getOrderInfo(order).label), /*#__PURE__*/React__default.createElement("br", null), /*#__PURE__*/React__default.createElement("span", {
     className: "plc-text-xl plc-font-semibold plc-text-primary-600"
   }, (_calcAndFormatItemsTo = calcAndFormatItemsTotal(order, (_order$ = order[0]) === null || _order$ === void 0 ? void 0 : _order$.currency)) !== null && _calcAndFormatItemsTo !== void 0 ? _calcAndFormatItemsTo : getFormattedPriceByLocal(order === null || order === void 0 ? void 0 : order.price, order === null || order === void 0 ? void 0 : order.currency, getPageOrDefaultLanguage())))), cardProcessor === "stripe" && !showSubscriptionButton && !showOrderButton && /*#__PURE__*/React__default.createElement("div", {
     className: "plc-flex plc-items-center plc-w-full plc-px-4 plc-py-2 plc-text-center plc-text-green-600 plc-border plc-border-green-400 plc-rounded plc-bg-green-50"

package/package.json

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