merchi_cart 1.3.3 → 1.3.4

package/esm/forms/FormNewCustomer.js

@@ -25,10 +25,12 @@ import InputError from './InputError';
 import { createNewCustomer, makeUser } from '../utilities/user';
 import { makeCart } from '../utilities/cart';
 import { getCartCookieToken } from '../utilities/cookie';
+import { getSavedCheckoutCustomer, saveCheckoutCustomer } from '../utilities/local_storage';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var emailValidation = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]/i;
 export function FormCustomerNew() {
+  var _savedCustomer$phoneN, _savedCustomer$phoneN2;
   var _useCartContext = useCartContext(),
     cart = _useCartContext.cart,
     classNameBtnPrimary = _useCartContext.classNameBtnPrimary,
@@ -50,12 +52,13 @@ export function FormCustomerNew() {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     acceptConditions = _React$useState6[0],
     setAcceptConditions = _React$useState6[1];
+  var savedCustomer = getSavedCheckoutCustomer(domainId);
   function actionCreateNewCustomer(_x) {
     return _actionCreateNewCustomer.apply(this, arguments);
   }
   function _actionCreateNewCustomer() {
     _actionCreateNewCustomer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(customerJson) {
-      var _cartJson$client, r, user, cartToken, clientEnt, cartEnt, _cart, cartJson;
+      var _cartJson$client, _customerJson$emailAd, r, user, cartToken, clientEnt, cartEnt, _cart, cartJson;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -99,37 +102,43 @@ export function FormCustomerNew() {
             }
             throw new Error('Unable to attach client to cart.');
           case 21:
+            saveCheckoutCustomer(domainId, {
+              id: user.id,
+              name: customerJson.name,
+              emailAddress: (_customerJson$emailAd = customerJson.emailAddresses) === null || _customerJson$emailAd === void 0 || (_customerJson$emailAd = _customerJson$emailAd[0]) === null || _customerJson$emailAd === void 0 ? void 0 : _customerJson$emailAd.emailAddress,
+              phoneNumbers: customerJson.phoneNumbers
+            });
             setCartClient(cartJson.client);
             setCart(cartJson);
-            _context.next = 28;
+            _context.next = 29;
             break;
-          case 25:
-            _context.prev = 25;
+          case 26:
+            _context.prev = 26;
             _context.t0 = _context["catch"](2);
             setError({
               message: _context.t0.errorMessage || _context.t0.message || 'Unable to attach client to cart.'
             });
-          case 28:
-            _context.prev = 28;
+          case 29:
+            _context.prev = 29;
             setLoading(false);
-            return _context.finish(28);
-          case 31:
+            return _context.finish(29);
+          case 32:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 25, 28, 31]]);
+      }, _callee, null, [[2, 26, 29, 32]]);
     }));
     return _actionCreateNewCustomer.apply(this, arguments);
   }
   var _useForm = useForm({
       defaultValues: {
         emailAddresses: [{
-          emailAddress: ''
+          emailAddress: (savedCustomer === null || savedCustomer === void 0 ? void 0 : savedCustomer.emailAddress) || ''
         }],
-        name: '',
+        name: (savedCustomer === null || savedCustomer === void 0 ? void 0 : savedCustomer.name) || '',
         phoneNumbers: [{
-          code: 'AU',
-          number: ''
+          code: (savedCustomer === null || savedCustomer === void 0 || (_savedCustomer$phoneN = savedCustomer.phoneNumbers) === null || _savedCustomer$phoneN === void 0 || (_savedCustomer$phoneN = _savedCustomer$phoneN[0]) === null || _savedCustomer$phoneN === void 0 ? void 0 : _savedCustomer$phoneN.code) || 'AU',
+          number: (savedCustomer === null || savedCustomer === void 0 || (_savedCustomer$phoneN2 = savedCustomer.phoneNumbers) === null || _savedCustomer$phoneN2 === void 0 || (_savedCustomer$phoneN2 = _savedCustomer$phoneN2[0]) === null || _savedCustomer$phoneN2 === void 0 ? void 0 : _savedCustomer$phoneN2.number) || ''
         }],
         registeredAsGuest: false
       }

package/esm/forms/FormReturningCustomer.js

@@ -22,6 +22,7 @@ import { makeUser, tryReturningCustomerEmail } from '../utilities/user';
 import { makeCart } from '../utilities/cart';
 import { getCartCookieToken } from '../utilities/cookie';
 import { cartEmbed } from '../utilities/helpers';
+import { getSavedCheckoutCustomer, saveCheckoutCustomer } from '../utilities/local_storage';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var emailValidation = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]/i;
@@ -44,9 +45,10 @@ function FormReturningCustomer() {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     error = _React$useState4[0],
     setError = _React$useState4[1];
+  var savedCustomer = getSavedCheckoutCustomer(domainId);
   var hookForm = useForm({
     defaultValues: {
-      emailAddress: ''
+      emailAddress: (savedCustomer === null || savedCustomer === void 0 ? void 0 : savedCustomer.emailAddress) || ''
     }
   });
   var handleSubmit = hookForm.handleSubmit,
@@ -58,7 +60,7 @@ function FormReturningCustomer() {
   }
   function _submit() {
     _submit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getValues, emailAddress, _user$user_id, _cartJson$client, user, userId, userJson, cartToken, clientEnt, cartEnt, _cart, cartJson;
+      var _getValues, emailAddress, _user$user_id, _cartJson$client, user, userId, cartToken, clientEnt, cartEnt, _cart, cartJson;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -78,33 +80,33 @@ function FormReturningCustomer() {
             }
             throw new Error('Unable to find returning customer.');
           case 10:
-            userJson = {
-              id: userId,
-              emailAddresses: [{
-                emailAddress: emailAddress
-              }],
-              name: user.name || 'Hidden for privacy'
-            }; // patch cart with returning user
-            _context.next = 13;
+            _context.next = 12;
             return getCartCookieToken(domainId);
-          case 13:
+          case 12:
             cartToken = _context.sent;
-            clientEnt = makeUser(userJson, true);
+            clientEnt = makeUser({
+              id: userId
+            }, true);
             cartEnt = makeCart(_objectSpread({}, cart), false, cartToken);
             cartEnt.client = clientEnt;
-            _context.next = 19;
+            _context.next = 18;
             return cartEnt.save({
               embed: cartEmbed
             });
-          case 19:
+          case 18:
             _cart = _context.sent;
             cartJson = _cart.toJson();
             if (cartJson !== null && cartJson !== void 0 && (_cartJson$client = cartJson.client) !== null && _cartJson$client !== void 0 && _cartJson$client.id) {
-              _context.next = 23;
+              _context.next = 22;
               break;
             }
             throw new Error('Unable to attach client to cart.');
-          case 23:
+          case 22:
+            saveCheckoutCustomer(domainId, {
+              id: userId,
+              name: user.name || (savedCustomer === null || savedCustomer === void 0 ? void 0 : savedCustomer.name),
+              emailAddress: emailAddress
+            });
             setCartClient(cartJson.client);
             setCart(cartJson);
             _context.next = 31;

package/esm/forms/FormShipmentAddressAndNotes.js

@@ -26,6 +26,7 @@ import { makeAddress } from "../utilities/address";
 import { makeCart } from "../utilities/cart";
 import { cartEmbed } from "../utilities/helpers";
 import { tabIdCheckout } from "../utilities/tabs";
+import { addressHasContent, getSavedCheckoutAddress, saveCheckoutAddress } from "../utilities/local_storage";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var AddressGeoSuggestInput = function AddressGeoSuggestInput(props) {
@@ -107,9 +108,10 @@ export function ActiveFormShipmentAddressAndNotes() {
     setCart = _useCartContext2.setCart,
     setLoadingTotals = _useCartContext2.setLoadingTotals,
     setActiveTabAndEditDisabled = _useCartContext2.setActiveTabAndEditDisabled;
-  var _cart$receiverAddress = cart.receiverAddress,
-    receiverAddress = _cart$receiverAddress === void 0 ? {} : _cart$receiverAddress,
-    receiverNotes = cart.receiverNotes;
+  var saved = getSavedCheckoutAddress(domainId);
+  var cartAddress = cart === null || cart === void 0 ? void 0 : cart.receiverAddress;
+  var receiverAddress = addressHasContent(cartAddress) ? cartAddress : saved.address || {};
+  var receiverNotes = (cart === null || cart === void 0 ? void 0 : cart.receiverNotes) || saved.receiverNotes || "";
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     addressFieldsOpen = _useState2[0],
@@ -139,27 +141,28 @@ export function ActiveFormShipmentAddressAndNotes() {
               embed: cartEmbed
             });
           case 12:
+            saveCheckoutAddress(domainId, address, receiverNotes);
             setCart(cartEnt.toJson()); // Update cart context
             setActiveTabAndEditDisabled({
               tabId: tabIdCheckout,
               tabIndexToSet: 2,
               disabled: false
             });
-            _context.next = 19;
+            _context.next = 20;
             break;
-          case 16:
-            _context.prev = 16;
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](9);
             alertError(_context.t0.errorMessage || _context.t0.message || "Unable to set shipment address.");
-          case 19:
-            _context.prev = 19;
+          case 20:
+            _context.prev = 20;
             setLoadingTotals(false);
-            return _context.finish(19);
-          case 22:
+            return _context.finish(20);
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9, 16, 19, 22]]);
+      }, _callee, null, [[9, 17, 20, 23]]);
     }));
     return _saveCartShipmentAddressAndGoToNextTab.apply(this, arguments);
   }

package/esm/panels/PanelEditCartItem.js

@@ -23,8 +23,6 @@ import { LoadingTemplateSm } from '../components/LoadingTemplate';
 import { useCartContext } from '../CartProvider';
 import { makeCartItem } from '../utilities/cart';
 import { getCartCookieToken } from '../utilities/cookie';
-import { publishedFormBundle } from '../utilities/customForm';
-import CustomCartProductForm from '../components/CustomCartProductForm';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var MerchiProductForm = /*#__PURE__*/lazy(function () {
@@ -78,10 +76,6 @@ function PanelEditCartItem(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    customFormActive = _useState4[0],
-    setCustomFormActive = _useState4[1];
   var formId = 'edit-cart-item-form';
 
   // This action patches the cart item
@@ -155,36 +149,27 @@ function PanelEditCartItem(_ref) {
     id: undefined
   });
   var showForm = activeTabIndex === tabIdItem && !!(cartItem !== null && cartItem !== void 0 && cartItem.id) && !!(cartItem !== null && cartItem !== void 0 && (_cartItem$product = cartItem.product) !== null && _cartItem$product !== void 0 && _cartItem$product.id);
-  var hasPublishedCustomForm = !!publishedFormBundle(cartItem === null || cartItem === void 0 ? void 0 : cartItem.product);
-  var defaultForm = /*#__PURE__*/_jsx(Suspense, {
-    fallback: /*#__PURE__*/_jsx(LoadingTemplateSm, {}),
-    children: /*#__PURE__*/_jsx(MerchiProductForm, _objectSpread({
-      apiUrl: apiUrl,
-      isCartItem: true,
-      initJob: _objectSpread({}, cleanCartItem),
-      initProduct: cartItem.product,
-      onSubmit: onSubmit,
-      productFormId: formId,
-      hideRequestQuotationButton: true,
-      hidePaymentUpfrontButton: true
-    }, productFormClassNames))
-  });
   return /*#__PURE__*/_jsxs(CartTabPanel, {
     tabId: tabIdItem,
     children: [/*#__PURE__*/_jsx(CartBody, {
       style: {
         padding: '2rem'
       },
-      children: showForm && (hasPublishedCustomForm ? /*#__PURE__*/_jsx(CustomCartProductForm, {
-        product: cartItem.product,
-        initialJob: cleanCartItem,
-        apiUrl: apiUrl,
-        onSave: onSubmit,
-        fallback: defaultForm,
-        onActiveChange: setCustomFormActive
-      }) : defaultForm)
+      children: showForm && /*#__PURE__*/_jsx(Suspense, {
+        fallback: /*#__PURE__*/_jsx(LoadingTemplateSm, {}),
+        children: /*#__PURE__*/_jsx(MerchiProductForm, _objectSpread({
+          apiUrl: apiUrl,
+          isCartItem: true,
+          initJob: _objectSpread({}, cleanCartItem),
+          initProduct: cartItem.product,
+          onSubmit: onSubmit,
+          productFormId: formId,
+          hideRequestQuotationButton: true,
+          hidePaymentUpfrontButton: true
+        }, productFormClassNames))
+      })
     }), /*#__PURE__*/_jsxs(CartFooter, {
-      children: [/*#__PURE__*/_jsx(ButtonBack, {}), !customFormActive && /*#__PURE__*/_jsxs(Button, {
+      children: [/*#__PURE__*/_jsx(ButtonBack, {}), /*#__PURE__*/_jsxs(Button, {
         className: classNameBtnEditCartItem,
         disabled: loading,
         form: formId,

package/esm/utilities/helpers.js

@@ -184,10 +184,6 @@ var productWithImagesEmbed = {
       linkedFile: {}
     }
   },
-  // Published custom form pointer for cart-item edit (same shape as product embed).
-  productForm: {
-    activeVersion: {}
-  },
   taxType: {}
 };
 var cartShipmentQuote = {

package/esm/utilities/index.js

@@ -6,6 +6,7 @@ export * from './currency';
 export * from './helpers';
 export * from './invoice';
 export * from './job';
+export * from './local_storage';
 export * from './product';
 export * from './shipment';
 export * from './tabs';

package/esm/utilities/local_storage.js

@@ -0,0 +1,85 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import { isBrowser } from 'browser-or-node';
+function storageKey(domainId) {
+  return "merchi-cart-checkout-".concat(domainId);
+}
+function readDraft(domainId) {
+  if (!isBrowser || domainId === undefined || domainId === null) {
+    return {};
+  }
+  try {
+    var raw = localStorage.getItem(storageKey(domainId));
+    if (!raw) return {};
+    var parsed = JSON.parse(raw);
+    return parsed && _typeof(parsed) === 'object' ? parsed : {};
+  } catch (_unused) {
+    return {};
+  }
+}
+function writeDraft(domainId, draft) {
+  if (!isBrowser || domainId === undefined || domainId === null) {
+    return;
+  }
+  try {
+    localStorage.setItem(storageKey(domainId), JSON.stringify(draft));
+  } catch (_unused2) {
+    // Ignore quota / private-mode failures.
+  }
+}
+export function getSavedCheckoutDraft(domainId) {
+  return readDraft(domainId);
+}
+export function getSavedCheckoutCustomer(domainId) {
+  return readDraft(domainId).customer;
+}
+export function getSavedCheckoutAddress(domainId) {
+  var draft = readDraft(domainId);
+  return {
+    address: draft.address,
+    receiverNotes: draft.receiverNotes
+  };
+}
+export function saveCheckoutCustomer(domainId, customer) {
+  var draft = readDraft(domainId);
+  var nextCustomer = _objectSpread(_objectSpread({}, draft.customer), customer);
+  // Drop empty phone entries.
+  if (nextCustomer.phoneNumbers) {
+    nextCustomer.phoneNumbers = nextCustomer.phoneNumbers.filter(function (phone) {
+      return phone && (phone.number || phone.code);
+    });
+    if (!nextCustomer.phoneNumbers.length) {
+      delete nextCustomer.phoneNumbers;
+    }
+  }
+  writeDraft(domainId, _objectSpread(_objectSpread({}, draft), {}, {
+    customer: nextCustomer
+  }));
+}
+export function saveCheckoutAddress(domainId, address, receiverNotes) {
+  if (!address) return;
+  var draft = readDraft(domainId);
+  var nextAddress = {
+    city: address.city || '',
+    country: address.country || '',
+    lineOne: address.lineOne || '',
+    lineTwo: address.lineTwo || '',
+    postcode: address.postcode || '',
+    state: address.state || ''
+  };
+  var next = _objectSpread(_objectSpread({}, draft), {}, {
+    address: nextAddress
+  });
+  if (receiverNotes !== undefined) {
+    next.receiverNotes = receiverNotes;
+  }
+  writeDraft(domainId, next);
+}
+export function addressHasContent(address) {
+  if (!address) return false;
+  return Boolean(address.lineOne || address.lineTwo || address.city || address.state || address.postcode || address.country);
+}