@merchi/cart 1.4.4 → 1.4.6

package/esm/CartProvider.js

@@ -32,6 +32,8 @@ import { makeJob } from './utilities/job';
 import { makeProduct } from './utilities/product';
 import { getSavedCheckoutCustomer, saveCheckoutAddress } from './utilities/local_storage';
 import { makeUser } from './utilities/user';
+import { persistTestCheckoutFlag, readTestCheckoutFlag } from './utilities/test_checkout';
+import { appendJobSourceToFormData, captureAndReadJobSource, cartNeedsSourceUpdate, jobSourceFieldsForApi } from './utilities/job_source';
 import { jsx as _jsx } from "react/jsx-runtime";
 var CartContext = /*#__PURE__*/createContext({
   cart: {},
@@ -497,27 +499,36 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _createCartAndCookie() {
     _createCartAndCookie = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(callback) {
-      var _cart, cartJson, _t3;
+      var isTest, jobSource, _cart, query, created, cartJson, _t3;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.p = _context2.n) {
           case 0:
             setFetchingCart(true);
             _context2.p = 1;
+            isTest = readTestCheckoutFlag();
+            jobSource = jobSourceFieldsForApi(captureAndReadJobSource());
             _cart = makeCart({
               domain: {
                 id: domainId
-              }
+              },
+              isTest: isTest
             }, true);
+            query = [['embed', JSON.stringify(cartEmbed)], ['skip_rights', 'y']];
+            if (isTest) query.push(['is_test', 'true']);
             _context2.n = 2;
-            return _cart.create({
-              embed: cartEmbed
+            return merchi.authenticatedFetch('/carts/', {
+              method: 'POST',
+              body: appendJobSourceToFormData(_cart.toFormData(), jobSource),
+              query: query
             });
           case 2:
+            created = _context2.v;
+            _cart.fromJson(created.cart);
             _context2.n = 3;
             return _cart.toJson();
           case 3:
             cartJson = _context2.v;
-            if (domainId) setCartCookie(Number(domainId), cartJson, undefined);
+            if (domainId) setCartCookie(Number(domainId), cartJson, undefined, isTest);
             _context2.n = 4;
             return attachSavedClientIfNeeded(cartJson);
           case 4:
@@ -546,7 +557,7 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _getCart() {
     _getCart = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(cartIdAndToken) {
-      var id, _cart2, cartJson, _t4;
+      var id, _cart2, cartJson, isTest, jobSource, saved, _t4;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.p = _context3.n) {
           case 0:
@@ -564,36 +575,62 @@ var CartProvider = function CartProvider(_ref) {
             return _cart2.toJson();
           case 3:
             cartJson = _context3.v;
-            if (!stripeIsValidAndActive(cartJson)) {
+            isTest = readTestCheckoutFlag();
+            if (!(Boolean(cartJson.isTest) !== isTest)) {
               _context3.n = 5;
               break;
             }
             _context3.n = 4;
-            return attachSavedClientIfNeeded(cartJson);
+            return createCartAndCookie();
           case 4:
+            return _context3.a(2);
+          case 5:
+            jobSource = jobSourceFieldsForApi(captureAndReadJobSource());
+            if (!cartNeedsSourceUpdate(cartJson, jobSource)) {
+              _context3.n = 7;
+              break;
+            }
+            _context3.n = 6;
+            return merchi.authenticatedFetch("/carts/".concat(_cart2.id, "/"), {
+              method: 'PATCH',
+              body: appendJobSourceToFormData(_cart2.toFormData(), jobSource),
+              query: [['embed', JSON.stringify(cartEmbed)], ['skip_rights', 'y']]
+            });
+          case 6:
+            saved = _context3.v;
+            _cart2.fromJson(saved.cart);
+            cartJson = _cart2.toJson();
+          case 7:
+            if (!(stripeIsValidAndActive(cartJson) || isTest)) {
+              _context3.n = 9;
+              break;
+            }
+            _context3.n = 8;
+            return attachSavedClientIfNeeded(cartJson);
+          case 8:
             cartJson = _context3.v;
             setCart(_objectSpread({}, cartJson));
-            _context3.n = 6;
+            _context3.n = 10;
             break;
-          case 5:
+          case 9:
             console.error("MErhci cart error: Stripe payment " + "options have not been correctly set up. " + "Check the company profile payment options tab " + "to set and edit stripe payment options.");
             setCartSettingsInvalid(true);
-          case 6:
-            _context3.n = 8;
+          case 10:
+            _context3.n = 12;
             break;
-          case 7:
-            _context3.p = 7;
+          case 11:
+            _context3.p = 11;
             _t4 = _context3.v;
-            _context3.n = 8;
+            _context3.n = 12;
             return createCartAndCookie();
-          case 8:
-            _context3.p = 8;
+          case 12:
+            _context3.p = 12;
             setFetchingCart(false);
-            return _context3.f(8);
-          case 9:
+            return _context3.f(12);
+          case 13:
             return _context3.a(2);
         }
-      }, _callee3, null, [[1, 7, 8, 9]]);
+      }, _callee3, null, [[1, 11, 12, 13]]);
     }));
     return _getCart.apply(this, arguments);
   }
@@ -956,6 +993,7 @@ var CartProvider = function CartProvider(_ref) {
     window.createCartAndCookie = createCartAndCookie;
   }
   useEffect(function () {
+    persistTestCheckoutFlag();
     if (domainId) actionGetMerchiCart();
     if (domainId && includeTheme) actionFetchTheme();
   }, [domainId]);

package/esm/forms/FormShipmentAddressAndNotes.js

@@ -18,10 +18,10 @@ import { useForm } from "react-hook-form";
 import InputsAddress from "./InputsAddress";
 import { CheckoutContainer, InnerContainer } from "../components/containers";
 import { Title } from "../components";
-import { shipmentFormId } from "../utilities/shipment";
+import { checkoutShipmentHydrationAction, shipmentFormId } from "../utilities/shipment";
 import { faMapMarkerAlt } from "@fortawesome/free-solid-svg-icons";
 import { useCartContext } from "../CartProvider";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { getCartCookieToken } from "../utilities/cookie";
 import { makeAddress, sanitizeAddressFields } from "../utilities/address";
 import { makeCart } from "../utilities/cart";
@@ -121,7 +121,9 @@ export function ActiveFormShipmentAddressAndNotes() {
     cart = _useCartContext2.cart,
     setCart = _useCartContext2.setCart,
     setLoadingTotals = _useCartContext2.setLoadingTotals,
-    setActiveTabAndEditDisabled = _useCartContext2.setActiveTabAndEditDisabled;
+    setActiveTabAndEditDisabled = _useCartContext2.setActiveTabAndEditDisabled,
+    updateCartShipmentAddress = _useCartContext2.updateCartShipmentAddress,
+    getCartShipmentOptions = _useCartContext2.getCartShipmentOptions;
   var saved = getSavedCheckoutAddress(domainId);
   var cartAddress = cart === null || cart === void 0 ? void 0 : cart.receiverAddress;
   var receiverAddress = addressHasContent(cartAddress) ? cartAddress : saved.address || {};
@@ -130,6 +132,25 @@ export function ActiveFormShipmentAddressAndNotes() {
     _useState2 = _slicedToArray(_useState, 2),
     addressFieldsOpen = _useState2[0],
     setAddressFieldsOpen = _useState2[1];
+  var hydratedShipmentOptionsRef = useRef(false);
+  useEffect(function () {
+    if (hydratedShipmentOptionsRef.current || !(cart !== null && cart !== void 0 && cart.id)) return;
+    var draft = getSavedCheckoutAddress(domainId);
+    var action = checkoutShipmentHydrationAction({
+      cartAddress: cart === null || cart === void 0 ? void 0 : cart.receiverAddress,
+      savedAddress: draft.address,
+      shipmentGroups: cart === null || cart === void 0 ? void 0 : cart.shipmentGroups
+    });
+    if (!action) return;
+    hydratedShipmentOptionsRef.current = true;
+    if (action === "apply-saved-address" && draft.address) {
+      updateCartShipmentAddress(draft.address);
+      return;
+    }
+    if (action === "refresh-quotes") {
+      getCartShipmentOptions === null || getCartShipmentOptions === void 0 || getCartShipmentOptions();
+    }
+  }, [cart === null || cart === void 0 ? void 0 : cart.id, cart === null || cart === void 0 ? void 0 : cart.receiverAddress, cart === null || cart === void 0 ? void 0 : cart.shipmentGroups, domainId, getCartShipmentOptions, updateCartShipmentAddress]);
   function saveCartShipmentAddressAndGoToNextTab(_x) {
     return _saveCartShipmentAddressAndGoToNextTab.apply(this, arguments);
   }

package/esm/stripe/LegacyStripeCardForm.js

@@ -12,7 +12,7 @@ import * as React from 'react';
 import { useEffect, useState } from 'react';
 import { ButtonPay } from '../buttons';
 import FormStripeCardFields from './StripeCardFields';
-import { stripeCardFormSubmit, stripeInitPromise, stripePaymentButtonSubmit } from './actions';
+import { fetchTestPublishableKey, stripeCardFormSubmit, stripeInitPromise, stripePaymentButtonSubmit } from './actions';
 import { companyStripePubKeyOrTestPubKey } from './utils';
 import { useCartContext } from '../CartProvider';
 import { tabIdPaymentSuccess } from '../utilities/tabs';
@@ -47,6 +47,7 @@ function StripeCardForm() {
     error = _useState2[0],
     setError = _useState2[1];
   var company = domain.company;
+  var isTestCheckout = Boolean(cart.isTest);
   var hasCompanyPubKey = Boolean(company.isStripeValid && companyStripePubKeyOrTestPubKey(company));
   var companyPubKey = hasCompanyPubKey ? companyStripePubKeyOrTestPubKey(company) : '';
   var canUseConnect = !!company.stripeAccountId;
@@ -133,15 +134,21 @@ function StripeCardForm() {
     }));
     return _doStripePaymentRequestForButton.apply(this, arguments);
   }
-  var _useState7 = useState(companyPubKey),
+  var _useState7 = useState(isTestCheckout ? '' : companyPubKey),
     _useState8 = _slicedToArray(_useState7, 2),
     stripePublicKey = _useState8[0],
     setStripePublicKey = _useState8[1];
   useEffect(function () {
+    if (isTestCheckout) {
+      fetchTestPublishableKey(url).then(setStripePublicKey)["catch"](function () {
+        return setStripePublicKey('');
+      });
+      return;
+    }
     if (!stripePublicKey && canUseConnect) stripeInitPromise(url).then(setStripePublicKey);
-  }, [stripePublicKey, canUseConnect]);
+  }, [stripePublicKey, canUseConnect, isTestCheckout, url]);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [company.isTesting && badgeTestMode, /*#__PURE__*/_jsx(FormStripeCardFields, {
+    children: [!isTestCheckout && company.isTesting && badgeTestMode, /*#__PURE__*/_jsx(FormStripeCardFields, {
       doStripePayment: doStripePayment,
       doStripePaymentRequestForButton: doStripePaymentRequestForButton,
       cart: cart,

package/esm/stripe/StripeCardForm.js

@@ -1,33 +1,139 @@
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import * as React from 'react';
+import { useEffect, useState } from 'react';
 import { StripePaymentForm, StripePaymentGate } from '@merchi/invoice';
 import LegacyStripeCardForm from './LegacyStripeCardForm';
+import { completeTestPayment, fetchTestPublishableKey } from './actions';
 import { useCartContext } from '../CartProvider';
 import { tabIdPaymentSuccess } from '../utilities/tabs';
-import { jsx as _jsx } from "react/jsx-runtime";
+import { TEST_CARD_NUMBER } from '../utilities/test_checkout';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+var testCheckoutHint = /*#__PURE__*/_jsxs("div", {
+  style: {
+    marginBottom: '12px'
+  },
+  children: [/*#__PURE__*/_jsx("div", {
+    style: {
+      color: 'red',
+      fontWeight: 600
+    },
+    children: "Test checkout"
+  }), /*#__PURE__*/_jsxs("p", {
+    style: {
+      margin: '4px 0 0',
+      fontSize: '13px'
+    },
+    children: ["No real charge. Use card ", TEST_CARD_NUMBER, ", any future expiry, any CVC, any ZIP."]
+  })]
+});
 export default function StripeCardForm() {
   var _useCartContext = useCartContext(),
     alertError = _useCartContext.alertError,
     apiUrl = _useCartContext.apiUrl,
     cart = _useCartContext.cart,
+    classNameBtnPay = _useCartContext.classNameBtnPay,
     setActiveTabIndex = _useCartContext.setActiveTabIndex,
     setInvoiceJson = _useCartContext.setInvoiceJson;
-  return /*#__PURE__*/_jsx(StripePaymentGate, {
-    engine: cart.stripePaymentEngine,
-    apiUrl: apiUrl || 'https://api.merchi.co/v6/',
-    resource: "cart",
-    resourceId: cart.id,
-    resourceToken: cart.token || cart.cartToken,
-    legacy: /*#__PURE__*/_jsx(LegacyStripeCardForm, {}),
-    children: /*#__PURE__*/_jsx(StripePaymentForm, {
-      apiUrl: apiUrl || 'https://api.merchi.co/v6/',
+  var isTestCheckout = Boolean(cart.isTest);
+  var url = apiUrl || 'https://api.merchi.co/v6/';
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    testKeyMissing = _useState2[0],
+    setTestKeyMissing = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loadingTestPayment = _useState4[0],
+    setLoadingTestPayment = _useState4[1];
+  useEffect(function () {
+    if (!isTestCheckout) {
+      setTestKeyMissing(false);
+      return;
+    }
+    fetchTestPublishableKey(url).then(function () {
+      return setTestKeyMissing(false);
+    })["catch"](function () {
+      return setTestKeyMissing(true);
+    });
+  }, [isTestCheckout, url]);
+  function doCompleteTestPayment() {
+    return _doCompleteTestPayment.apply(this, arguments);
+  }
+  function _doCompleteTestPayment() {
+    _doCompleteTestPayment = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+      var invoice, _t;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
+          case 0:
+            setLoadingTestPayment(true);
+            _context.p = 1;
+            _context.n = 2;
+            return completeTestPayment(url, cart);
+          case 2:
+            invoice = _context.v;
+            setInvoiceJson(invoice);
+            setActiveTabIndex(tabIdPaymentSuccess);
+            _context.n = 4;
+            break;
+          case 3:
+            _context.p = 3;
+            _t = _context.v;
+            alertError(_t.message);
+          case 4:
+            _context.p = 4;
+            setLoadingTestPayment(false);
+            return _context.f(4);
+          case 5:
+            return _context.a(2);
+        }
+      }, _callee, null, [[1, 3, 4, 5]]);
+    }));
+    return _doCompleteTestPayment.apply(this, arguments);
+  }
+  if (isTestCheckout && testKeyMissing) {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [testCheckoutHint, /*#__PURE__*/_jsx("p", {
+        style: {
+          fontSize: '13px',
+          marginBottom: '12px'
+        },
+        children: "Stripe test keys are not configured. Complete this as a test order without a card."
+      }), /*#__PURE__*/_jsx("button", {
+        type: "button",
+        className: classNameBtnPay,
+        disabled: loadingTestPayment,
+        onClick: doCompleteTestPayment,
+        children: loadingTestPayment ? 'Completing…' : 'Complete test order'
+      })]
+    });
+  }
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [isTestCheckout && testCheckoutHint, /*#__PURE__*/_jsx(StripePaymentGate, {
+      engine: isTestCheckout ? 'legacy' : cart.stripePaymentEngine,
+      apiUrl: url,
       resource: "cart",
       resourceId: cart.id,
       resourceToken: cart.token || cart.cartToken,
-      onError: alertError,
-      onSuccess: function onSuccess(invoice) {
-        setInvoiceJson(invoice);
-        setActiveTabIndex(tabIdPaymentSuccess);
-      }
-    })
+      legacy: /*#__PURE__*/_jsx(LegacyStripeCardForm, {}),
+      children: /*#__PURE__*/_jsx(StripePaymentForm, {
+        apiUrl: url,
+        resource: "cart",
+        resourceId: cart.id,
+        resourceToken: cart.token || cart.cartToken,
+        onError: alertError,
+        onSuccess: function onSuccess(invoice) {
+          setInvoiceJson(invoice);
+          setActiveTabIndex(tabIdPaymentSuccess);
+        }
+      })
+    })]
   });
 }