swell-js 3.16.0 → 3.17.3

package/LICENSE

@@ -1,4 +1,6 @@
-Copyright 2019 Schema Technologies, LLC
+MIT License
+
+Copyright (c) 2022 Swell Commerce Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/dist/{api-be1f70ea.js → api-d1c4929d.js}

@@ -2,15 +2,15 @@ import { c as cardApi } from './card-2f5f9866.js';
 import { g as getCookie, s as setCookie } from './cookie-a39e556c.js';
 import { f as trimEnd, e as trimStart, c as trimBoth, b as toSnake, h as stringifyQuery, n as base64Encode, t as toCamel, s as setOptions } from './index-bce8d606.js';
 import { c as cacheApi } from './cache-54abc38e.js';
-import { m as methods } from './cart-bdec9379.js';
+import { m as methods } from './cart-21650912.js';
 import { m as methods$1 } from './account-328cc590.js';
-import { m as methods$2 } from './products-a6a43be8.js';
+import { m as methods$2 } from './products-baf505e7.js';
 import { m as methods$3 } from './categories-e52bebe3.js';
 import { m as methods$4 } from './attributes-db35134e.js';
-import { m as methods$5 } from './subscriptions-eecdd4ff.js';
+import { m as methods$5 } from './subscriptions-0e44e99f.js';
 import { m as methods$6 } from './content-eb42ecce.js';
 import { m as methods$7 } from './settings-b1a4a4af.js';
-import { m as methods$8 } from './payment-fc4a80bf.js';
+import { m as methods$8 } from './payment-fd4a2cbe.js';
 import { m as methods$9 } from './locale-9de8dba1.js';
 import { m as methods$a } from './currency-209bb202.js';
 

package/dist/api.js

@@ -1,4 +1,4 @@
-export { a as default } from './api-be1f70ea.js';
+export { a as default } from './api-d1c4929d.js';
 import './card-2f5f9866.js';
 import './index-bce8d606.js';
 import 'qs';
@@ -16,15 +16,15 @@ import 'deepmerge';
 import 'object-keys-normalizer';
 import './cookie-a39e556c.js';
 import './cache-54abc38e.js';
-import './cart-bdec9379.js';
-import './products-a6a43be8.js';
+import './cart-21650912.js';
+import './products-baf505e7.js';
 import './attributes-db35134e.js';
 import './account-328cc590.js';
 import './categories-e52bebe3.js';
-import './subscriptions-eecdd4ff.js';
+import './subscriptions-0e44e99f.js';
 import './content-eb42ecce.js';
 import './settings-b1a4a4af.js';
-import './payment-fc4a80bf.js';
+import './payment-fd4a2cbe.js';
 import 'lodash/toLower';
 import 'lodash/reduce';
 import 'lodash/isEmpty';

package/dist/{cart-bdec9379.js → cart-21650912.js}

@@ -11,7 +11,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import 'lodash/isEqual';
 import 'deepmerge';
 import 'object-keys-normalizer';
-import { c as cleanProductOptions } from './products-a6a43be8.js';
+import { c as cleanProductOptions } from './products-baf505e7.js';
 
 function methods(request, options) {
   return {

package/dist/cart.js

@@ -1,4 +1,4 @@
-export { m as default } from './cart-bdec9379.js';
+export { m as default } from './cart-21650912.js';
 import 'qs';
 import 'lodash/set';
 import 'lodash/get';
@@ -12,7 +12,7 @@ import 'lodash/cloneDeep';
 import 'lodash/isEqual';
 import 'deepmerge';
 import 'object-keys-normalizer';
-import './products-a6a43be8.js';
+import './products-baf505e7.js';
 import './index-bce8d606.js';
 import './cache-54abc38e.js';
 import './attributes-db35134e.js';

package/dist/index.js

@@ -1,5 +1,5 @@
 export { q as utils } from './index-bce8d606.js';
-export { a as default } from './api-be1f70ea.js';
+export { a as default } from './api-d1c4929d.js';
 import 'qs';
 import 'lodash/set';
 import 'lodash/get';
@@ -16,15 +16,15 @@ import 'object-keys-normalizer';
 import './card-2f5f9866.js';
 import './cookie-a39e556c.js';
 import './cache-54abc38e.js';
-import './cart-bdec9379.js';
-import './products-a6a43be8.js';
+import './cart-21650912.js';
+import './products-baf505e7.js';
 import './attributes-db35134e.js';
 import './account-328cc590.js';
 import './categories-e52bebe3.js';
-import './subscriptions-eecdd4ff.js';
+import './subscriptions-0e44e99f.js';
 import './content-eb42ecce.js';
 import './settings-b1a4a4af.js';
-import './payment-fc4a80bf.js';
+import './payment-fd4a2cbe.js';
 import 'lodash/toLower';
 import 'lodash/reduce';
 import 'lodash/isEmpty';

package/dist/{payment-fc4a80bf.js → payment-fd4a2cbe.js}

@@ -1,6 +1,6 @@
 import get from 'lodash/get';
 import toLower from 'lodash/toLower';
-import { m as methods$1 } from './cart-bdec9379.js';
+import { m as methods$1 } from './cart-21650912.js';
 import { m as methods$2 } from './settings-b1a4a4af.js';
 import { b as toSnake, v as vaultRequest, j as isFunction, o as getLocationParams, p as removeUrlParams } from './index-bce8d606.js';
 import reduce from 'lodash/reduce';
@@ -465,12 +465,12 @@ function methods(request, opts) {
 
     async createElements(elementParams) {
       this.params = elementParams || {};
-      const cart = toSnake(await methods$1.methods(request, options).get());
+      const cart = toSnake(await methods$1(request, options).get());
       if (!cart) {
         throw new Error('Cart not found');
       }
       const payMethods = toSnake(
-        await methods$2.methods(request, options).payments(),
+        await methods$2(request, options).payments(),
       );
       if (payMethods.error) {
         throw new Error(payMethods.error);
@@ -479,12 +479,12 @@ function methods(request, opts) {
     },
 
     async tokenize(params) {
-      const cart = toSnake(await methods$1.methods(request, options).get());
+      const cart = toSnake(await methods$1(request, options).get());
       if (!cart) {
         throw new Error('Cart not found');
       }
       const payMethods = toSnake(
-        await methods$2.methods(request, options).payments(),
+        await methods$2(request, options).payments(),
       );
       if (payMethods.error) {
         throw new Error(payMethods.error);
@@ -498,7 +498,7 @@ function methods(request, opts) {
     },
 
     async handleRedirect(params) {
-      const cart = toSnake(await methods$1.methods(request, options).get());
+      const cart = toSnake(await methods$1(request, options).get());
       if (!cart) {
         throw new Error('Cart not found');
       }
@@ -511,7 +511,7 @@ function methods(request, opts) {
         throw new Error('Payment not found');
       }
       const payMethods = toSnake(
-        await methods$2.methods(request, options).payments(),
+        await methods$2(request, options).payments(),
       );
       if (payMethods.error) {
         throw new Error(payMethods.error);
@@ -699,9 +699,30 @@ async function stripeElements(request, payMethods, params) {
   }
 }
 
+/**
+ * Update cart email with paypal's when no email is present
+ */
+async function shouldUsePayPalEmail(guest, request, options) {
+  // Only check if the email should be updated when the user is not logged in (guest user)
+  if (!guest) return false;
+
+  // Refetch to avoid stale data from the cart
+  const updatedCart = await methods$1(request, options).get();
+  const currentEmail = get(updatedCart, 'account.email');
+
+  // If no email is present, use paypal's email
+  if (!currentEmail) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
 async function payPalButton(request, cart, payMethods, params) {
   const paypal = window.paypal;
   const { paypal: { locale, style, elementId } = {} } = params;
+  const { capture_total, currency, guest } = cart;
+
   const onError = (error) => {
     const errorHandler = get(params, 'paypal.onError');
     if (isFunction(errorHandler)) {
@@ -714,9 +735,7 @@ async function payPalButton(request, cart, payMethods, params) {
     return isFunction(successHandler) && successHandler();
   };
 
-  const { totalDue } = getTotalsDueRemaining(cart);
-
-  if (!(totalDue > 0)) {
+  if (!(capture_total > 0)) {
     throw new Error(
       'Invalid PayPal button amount. Value should be greater than zero.',
     );
@@ -740,8 +759,8 @@ async function payPalButton(request, cart, payMethods, params) {
             purchase_units: [
               {
                 amount: {
-                  value: +totalDue.toFixed(2),
-                  currency_code: cart.currency,
+                  value: +capture_total.toFixed(2),
+                  currency_code: currency,
                 },
               },
             ],
@@ -749,13 +768,19 @@ async function payPalButton(request, cart, payMethods, params) {
         onApprove: (data, actions) =>
           actions.order
             .get()
-            .then((order) => {
+            .then(async (order) => {
               const orderId = order.id;
               const payer = order.payer;
               const shipping = get(order, 'purchase_units[0].shipping');
 
-              return methods$1.methods(request).update({
-                ...(!cart.account_logged_in && {
+              const usePayPalEmail = await shouldUsePayPalEmail(
+                guest,
+                request,
+                options,
+              );
+
+              return methods$1(request).update({
+                ...(usePayPalEmail && {
                   account: {
                     email: payer.email_address,
                   },
@@ -815,9 +840,9 @@ async function braintreePayPalButton(request, cart, payMethods, params) {
             paypalCheckoutInstance
               .tokenizePayment(data)
               .then(({ nonce }) =>
-                methods$1
-                  .methods(request, options)
-                  .update({ billing: { paypal: { nonce } } }),
+                methods$1(request, options).update({
+                  billing: { paypal: { nonce } },
+                }),
               )
               .then(
                 () =>
@@ -846,7 +871,7 @@ async function braintreePayPalButton(request, cart, payMethods, params) {
 }
 
 async function paymentTokenize(request, params, payMethods, cart) {
-  const { totalDue } = getTotalsDueRemaining(cart);
+  const { capture_total, auth_total } = cart;
   const onError = (error) => {
     const errorHandler =
       get(params, 'card.onError') ||
@@ -885,11 +910,10 @@ async function paymentTokenize(request, params, payMethods, cart) {
 
       if (paymentMethod.error) {
         return onError(paymentMethod.error);
-      } else if (totalDue < 1) {
+      } else if (capture_total < 1) {
         // should save payment method data when payment amount is less than 1
         // https://stripe.com/docs/currencies#minimum-and-maximum-charge-amounts
-        return methods$1
-          .methods(request, options)
+        return methods$1(request, options)
           .update({
             billing: {
               method: 'card',
@@ -903,7 +927,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
       const currency = toLower(get(cart, 'currency', 'usd'));
       const amount = stripeAmountByCurrency(
         currency,
-        cart.trial ? cart.trial_initial_capture_total + cart.trial_auth_total : totalDue,
+        capture_total + auth_total,
       );
       const stripeCustomer = get(cart, 'account.stripe_customer');
       const intent = toSnake(
@@ -928,8 +952,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
         );
         return error
           ? onError(error)
-          : await methods$1
-              .methods(request, options)
+          : await methods$1(request, options)
               .update({
                 billing: {
                   method: 'card',
@@ -937,8 +960,8 @@ async function paymentTokenize(request, params, payMethods, cart) {
                   intent: {
                     stripe: {
                       id: paymentIntent.id,
-                      ...(cart.trial && {
-                        auth_amount: cart.trial_auth_total,
+                      ...(!!auth_total && {
+                        auth_amount: auth_total,
                       }),
                     },
                   },
@@ -958,7 +981,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
         return onError(intent.error);
       }
 
-      await methods$1.methods(request, options).update({
+      await methods$1(request, options).update({
         billing: {
           method: 'card',
           intent: {
@@ -989,7 +1012,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
       }
 
       const currency = toLower(get(cart, 'currency', 'eur'));
-      const amount = stripeAmountByCurrency(currency, totalDue);
+      const amount = stripeAmountByCurrency(currency, capture_total);
       const intent = toSnake(
         await methods(request)
           .createIntent({
@@ -1008,8 +1031,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
       );
 
       if (intent) {
-        await methods$1
-          .methods(request, options)
+        await methods$1(request, options)
           .update({
             billing: {
               method: 'ideal',
@@ -1041,9 +1063,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
       }
       const { publishable_key } = payMethods.card;
       const stripe = window.Stripe(publishable_key);
-      const settings = toSnake(
-        await methods$2.methods(request, options).get(),
-      );
+      const settings = toSnake(await methods$2(request, options).get());
 
       const { error, source } = await createKlarnaSource(stripe, {
         ...cart,
@@ -1052,8 +1072,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
 
       return error
         ? onError(error)
-        : methods$1
-            .methods(request, options)
+        : methods$1(request, options)
             .update({
               billing: {
                 method: 'klarna',
@@ -1074,8 +1093,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
 
       return error
         ? onError(error)
-        : methods$1
-            .methods(request, options)
+        : methods$1(request, options)
             .update({
               billing: {
                 method: 'bancontact',
@@ -1093,7 +1111,7 @@ async function paymentTokenize(request, params, payMethods, cart) {
       return;
     }
 
-    await methods$1.methods(request, options).update({
+    await methods$1(request, options).update({
       billing: {
         method: 'paysafecard',
         intent: {
@@ -1181,7 +1199,7 @@ async function handleQuickpayRedirectAction(
       } else if (card.error) {
         return card;
       } else {
-        await methods$1.methods(request, options).update({
+        await methods$1(request, options).update({
           billing: {
             method: 'card',
             card,
@@ -1253,7 +1271,7 @@ async function handleDirectKlarnaRedirectAction(
     };
   }
 
-  await methods$1.methods(request, options).update({
+  await methods$1(request, options).update({
     billing: {
       method: 'klarna',
       klarna: {
@@ -1307,45 +1325,4 @@ async function authenticateStripeCard(request, payment, payMethods) {
     : { status: actionResult.status };
 }
 
-function getTotalsDueRemaining(cart) {
-  const { grand_total, account, account_credit_amount, giftcards } = cart;
-
-  let totalDue = grand_total;
-  let totalRemaining = 0;
-  let totalRemainingGiftcard = 0;
-  let totalRemainingAccount = 0;
-
-  if (giftcards && giftcards.length > 0) {
-    for (let gc of giftcards) {
-      totalDue -= gc.amount;
-    }
-    if (totalDue < 0) {
-      totalRemainingGiftcard = -totalDue;
-    }
-  }
-
-  const accountCreditAmount =
-    typeof account_credit_amount === 'number'
-      ? account_credit_amount
-      : account && account.balance;
-  if (accountCreditAmount > 0) {
-    totalDue -= accountCreditAmount;
-    if (totalDue < 0) {
-      totalRemainingAccount = -totalDue - totalRemainingGiftcard;
-    }
-  }
-
-  if (totalDue < 0) {
-    totalRemaining = -totalDue;
-    totalDue = 0;
-  }
-
-  return {
-    totalDue,
-    totalRemaining,
-    totalRemainingGiftcard,
-    totalRemainingAccount,
-  };
-}
-
-export { methods as m };
+export { methods as m, shouldUsePayPalEmail as s };

package/dist/payment.js

@@ -1,7 +1,7 @@
-export { m as default } from './payment-fc4a80bf.js';
+export { m as default, s as shouldUsePayPalEmail } from './payment-fd4a2cbe.js';
 import 'lodash/get';
 import 'lodash/toLower';
-import './cart-bdec9379.js';
+import './cart-21650912.js';
 import 'qs';
 import 'lodash/set';
 import 'lodash/uniq';
@@ -14,7 +14,7 @@ import 'lodash/cloneDeep';
 import 'lodash/isEqual';
 import 'deepmerge';
 import 'object-keys-normalizer';
-import './products-a6a43be8.js';
+import './products-baf505e7.js';
 import './index-bce8d606.js';
 import './cache-54abc38e.js';
 import './attributes-db35134e.js';

package/dist/{products-a6a43be8.js → products-baf505e7.js}

@@ -235,11 +235,10 @@ function findPurchaseOption(product, purchaseOption) {
 }
 
 async function getFilterableAttributeFilters(request, products, options) {
-  const { results: filterableAttributes } = await methods$1
-    .methods(request, OPTIONS)
-    .list({
-      filterable: true,
-    });
+  const { results: filterableAttributes } = await methods$1(
+    request).list({
+    filterable: true,
+  });
 
   return getFilters(products, { ...options, filterableAttributes });
 }

package/dist/products.js

@@ -1,4 +1,4 @@
-export { b as calculateVariation, c as cleanProductOptions, m as default, f as findVariantWithOptions, g as getProductOptionIndex, a as getVariantOptionValueIds } from './products-a6a43be8.js';
+export { b as calculateVariation, c as cleanProductOptions, m as default, f as findVariantWithOptions, g as getProductOptionIndex, a as getVariantOptionValueIds } from './products-baf505e7.js';
 import './index-bce8d606.js';
 import 'qs';
 import 'lodash/set';

package/dist/{subscriptions-eecdd4ff.js → subscriptions-0e44e99f.js}

@@ -1,4 +1,4 @@
-import { c as cleanProductOptions } from './products-a6a43be8.js';
+import { c as cleanProductOptions } from './products-baf505e7.js';
 import { d as defaultMethods } from './index-bce8d606.js';
 import { c as cacheApi } from './cache-54abc38e.js';
 

package/dist/subscriptions.js

@@ -1,5 +1,5 @@
-export { m as default } from './subscriptions-eecdd4ff.js';
-import './products-a6a43be8.js';
+export { m as default } from './subscriptions-0e44e99f.js';
+import './products-baf505e7.js';
 import './index-bce8d606.js';
 import 'qs';
 import 'lodash/set';