@merchi/cart 1.4.5 → 1.4.6

package/lib/CartProvider.js

@@ -19,6 +19,7 @@ var _product = require("./utilities/product");
 var _local_storage = require("./utilities/local_storage");
 var _user = require("./utilities/user");
 var _test_checkout = require("./utilities/test_checkout");
+var _job_source = require("./utilities/job_source");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t9 in e) "default" !== _t9 && {}.hasOwnProperty.call(e, _t9) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t9)) && (i.get || i.set) ? o(f, _t9, i) : f[_t9] = e[_t9]); return f; })(e, t); }
 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 }; })(); }
@@ -504,65 +505,56 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _createCartAndCookie() {
     _createCartAndCookie = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(callback) {
-      var isTest, _cart, created, 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 = (0, _test_checkout.readTestCheckoutFlag)();
+            jobSource = (0, _job_source.jobSourceFieldsForApi)((0, _job_source.captureAndReadJobSource)());
             _cart = (0, _cart3.makeCart)({
               domain: {
                 id: domainId
               },
               isTest: isTest
             }, true);
-            if (!isTest) {
-              _context2.n = 3;
-              break;
-            }
+            query = [['embed', JSON.stringify(_helpers.cartEmbed)], ['skip_rights', 'y']];
+            if (isTest) query.push(['is_test', 'true']);
             _context2.n = 2;
             return merchi.authenticatedFetch('/carts/', {
               method: 'POST',
-              body: _cart.toFormData(),
-              query: [['embed', JSON.stringify(_helpers.cartEmbed)], ['skip_rights', 'y'], ['is_test', 'true']]
+              body: (0, _job_source.appendJobSourceToFormData)(_cart.toFormData(), jobSource),
+              query: query
             });
           case 2:
             created = _context2.v;
             _cart.fromJson(created.cart);
-            _context2.n = 4;
-            break;
-          case 3:
-            _context2.n = 4;
-            return _cart.create({
-              embed: _helpers.cartEmbed
-            });
-          case 4:
-            _context2.n = 5;
+            _context2.n = 3;
             return _cart.toJson();
-          case 5:
+          case 3:
             cartJson = _context2.v;
             if (domainId) (0, _cookie.setCartCookie)(Number(domainId), cartJson, undefined, isTest);
-            _context2.n = 6;
+            _context2.n = 4;
             return attachSavedClientIfNeeded(cartJson);
-          case 6:
+          case 4:
             cartJson = _context2.v;
             setCart(_objectSpread({}, cartJson));
             if (callback) callback();
-            _context2.n = 8;
+            _context2.n = 6;
             break;
-          case 7:
-            _context2.p = 7;
+          case 5:
+            _context2.p = 5;
             _t3 = _context2.v;
             alertError(_t3.errorMessage || _t3.message || 'Unable to fetch cart.');
-          case 8:
-            _context2.p = 8;
+          case 6:
+            _context2.p = 6;
             setFetchingCart(false);
-            return _context2.f(8);
-          case 9:
+            return _context2.f(6);
+          case 7:
             return _context2.a(2);
         }
-      }, _callee2, null, [[1, 7, 8, 9]]);
+      }, _callee2, null, [[1, 5, 6, 7]]);
     }));
     return _createCartAndCookie.apply(this, arguments);
   }
@@ -571,7 +563,7 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _getCart() {
     _getCart = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(cartIdAndToken) {
-      var id, _cart2, cartJson, isTest, _t4;
+      var id, _cart2, cartJson, isTest, jobSource, saved, _t4;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.p = _context3.n) {
           case 0:
@@ -599,36 +591,52 @@ var CartProvider = function CartProvider(_ref) {
           case 4:
             return _context3.a(2);
           case 5:
-            if (!((0, _cart3.stripeIsValidAndActive)(cartJson) || isTest)) {
+            jobSource = (0, _job_source.jobSourceFieldsForApi)((0, _job_source.captureAndReadJobSource)());
+            if (!(0, _job_source.cartNeedsSourceUpdate)(cartJson, jobSource)) {
               _context3.n = 7;
               break;
             }
             _context3.n = 6;
-            return attachSavedClientIfNeeded(cartJson);
+            return merchi.authenticatedFetch("/carts/".concat(_cart2.id, "/"), {
+              method: 'PATCH',
+              body: (0, _job_source.appendJobSourceToFormData)(_cart2.toFormData(), jobSource),
+              query: [['embed', JSON.stringify(_helpers.cartEmbed)], ['skip_rights', 'y']]
+            });
           case 6:
+            saved = _context3.v;
+            _cart2.fromJson(saved.cart);
+            cartJson = _cart2.toJson();
+          case 7:
+            if (!((0, _cart3.stripeIsValidAndActive)(cartJson) || isTest)) {
+              _context3.n = 9;
+              break;
+            }
+            _context3.n = 8;
+            return attachSavedClientIfNeeded(cartJson);
+          case 8:
             cartJson = _context3.v;
             setCart(_objectSpread({}, cartJson));
-            _context3.n = 8;
+            _context3.n = 10;
             break;
-          case 7:
+          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 8:
-            _context3.n = 10;
+          case 10:
+            _context3.n = 12;
             break;
-          case 9:
-            _context3.p = 9;
+          case 11:
+            _context3.p = 11;
             _t4 = _context3.v;
-            _context3.n = 10;
+            _context3.n = 12;
             return createCartAndCookie();
-          case 10:
-            _context3.p = 10;
+          case 12:
+            _context3.p = 12;
             setFetchingCart(false);
-            return _context3.f(10);
-          case 11:
+            return _context3.f(12);
+          case 13:
             return _context3.a(2);
         }
-      }, _callee3, null, [[1, 9, 10, 11]]);
+      }, _callee3, null, [[1, 11, 12, 13]]);
     }));
     return _getCart.apply(this, arguments);
   }

package/lib/forms/FormShipmentAddressAndNotes.js

@@ -129,7 +129,9 @@ 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 = (0, _local_storage.getSavedCheckoutAddress)(domainId);
   var cartAddress = cart === null || cart === void 0 ? void 0 : cart.receiverAddress;
   var receiverAddress = (0, _local_storage.addressHasContent)(cartAddress) ? cartAddress : saved.address || {};
@@ -138,6 +140,25 @@ function ActiveFormShipmentAddressAndNotes() {
     _useState2 = _slicedToArray(_useState, 2),
     addressFieldsOpen = _useState2[0],
     setAddressFieldsOpen = _useState2[1];
+  var hydratedShipmentOptionsRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(function () {
+    if (hydratedShipmentOptionsRef.current || !(cart !== null && cart !== void 0 && cart.id)) return;
+    var draft = (0, _local_storage.getSavedCheckoutAddress)(domainId);
+    var action = (0, _shipment.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/lib/utilities/index.d.ts

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

package/lib/utilities/index.js

@@ -91,6 +91,17 @@ Object.keys(_job).forEach(function (key) {
     }
   });
 });
+var _job_source = require("./job_source");
+Object.keys(_job_source).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _job_source[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _job_source[key];
+    }
+  });
+});
 var _local_storage = require("./local_storage");
 Object.keys(_local_storage).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/utilities/job_source.d.ts

@@ -0,0 +1,23 @@
+export declare const JOB_SOURCE_STORAGE_KEY = "merchi_job_source";
+export interface JobSourceFields {
+    utmSource?: string;
+    utmMedium?: string;
+    utmCampaign?: string;
+    utmContent?: string;
+    utmTerm?: string;
+    sourceClickId?: string;
+    sourceLanding?: string;
+    sourceReferrer?: string;
+}
+export declare function sourceFromLocation(): JobSourceFields;
+export declare function hasPaidClick(source: JobSourceFields | null | undefined): boolean;
+export declare function hasSourceData(source: JobSourceFields | null | undefined): boolean;
+export declare function captureAndReadJobSource(): JobSourceFields;
+export declare function jobSourceFieldsForApi(source?: JobSourceFields | null): JobSourceFields;
+export declare function cartNeedsSourceUpdate(cart: {
+    utmSource?: string;
+    sourceClickId?: string;
+    sourceChannel?: string;
+} | null | undefined, source: JobSourceFields): boolean;
+export declare const JOB_SOURCE_URL_KEYS: ("gclid" | "gbraid" | "wbraid" | "fbclid" | "msclkid" | "utm_source" | "utm_medium" | "utm_campaign" | "utm_content" | "utm_term")[];
+export declare function appendJobSourceToFormData(data: FormData, source?: JobSourceFields | null): FormData;

package/lib/utilities/job_source.js

@@ -0,0 +1,152 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.JOB_SOURCE_URL_KEYS = exports.JOB_SOURCE_STORAGE_KEY = void 0;
+exports.appendJobSourceToFormData = appendJobSourceToFormData;
+exports.captureAndReadJobSource = captureAndReadJobSource;
+exports.cartNeedsSourceUpdate = cartNeedsSourceUpdate;
+exports.hasPaidClick = hasPaidClick;
+exports.hasSourceData = hasSourceData;
+exports.jobSourceFieldsForApi = jobSourceFieldsForApi;
+exports.sourceFromLocation = sourceFromLocation;
+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 _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; }
+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(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+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 _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); }
+var JOB_SOURCE_STORAGE_KEY = exports.JOB_SOURCE_STORAGE_KEY = 'merchi_job_source';
+var CLICK_ID_PARAMS = ['gclid', 'gbraid', 'wbraid', 'fbclid', 'msclkid'];
+var UTM_PARAMS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term'];
+function trimTo(value, limit) {
+  if (!value) return undefined;
+  var text = value.trim().slice(0, limit);
+  return text || undefined;
+}
+function readSearchParams() {
+  if (typeof window === 'undefined') return new URLSearchParams();
+  try {
+    return new URLSearchParams(window.location.search);
+  } catch (_unused) {
+    return new URLSearchParams();
+  }
+}
+function readStoredSource() {
+  if (typeof window === 'undefined') return null;
+  try {
+    var raw = window.localStorage.getItem(JOB_SOURCE_STORAGE_KEY);
+    if (!raw) return null;
+    var parsed = JSON.parse(raw);
+    if (!parsed || _typeof(parsed) !== 'object') return null;
+    return parsed;
+  } catch (_unused2) {
+    return null;
+  }
+}
+function writeStoredSource(source) {
+  if (typeof window === 'undefined') return;
+  try {
+    window.localStorage.setItem(JOB_SOURCE_STORAGE_KEY, JSON.stringify(source));
+  } catch (_unused3) {
+    // Ignore quota / private-mode failures.
+  }
+}
+function currentLanding() {
+  if (typeof window === 'undefined') return undefined;
+  try {
+    var path = "".concat(window.location.pathname || '/').concat(window.location.search || '');
+    return trimTo(path, 512);
+  } catch (_unused4) {
+    return undefined;
+  }
+}
+function currentReferrer() {
+  if (typeof document === 'undefined') return undefined;
+  try {
+    return trimTo(document.referrer, 512);
+  } catch (_unused5) {
+    return undefined;
+  }
+}
+function sourceFromLocation() {
+  var params = readSearchParams();
+  var source = {
+    utmSource: trimTo(params.get('utm_source'), 256),
+    utmMedium: trimTo(params.get('utm_medium'), 256),
+    utmCampaign: trimTo(params.get('utm_campaign'), 256),
+    utmContent: trimTo(params.get('utm_content'), 256),
+    utmTerm: trimTo(params.get('utm_term'), 256),
+    sourceLanding: currentLanding(),
+    sourceReferrer: currentReferrer()
+  };
+  var _iterator = _createForOfIteratorHelper(CLICK_ID_PARAMS),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      var value = trimTo(params.get(key), 256);
+      if (value) {
+        source.sourceClickId = value;
+        break;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return source;
+}
+function hasPaidClick(source) {
+  return Boolean(source === null || source === void 0 ? void 0 : source.sourceClickId);
+}
+function hasSourceData(source) {
+  if (!source) return false;
+  return Boolean(source.utmSource || source.utmMedium || source.utmCampaign || source.utmContent || source.utmTerm || source.sourceClickId || source.sourceLanding || source.sourceReferrer);
+}
+function captureAndReadJobSource() {
+  var incoming = sourceFromLocation();
+  var stored = readStoredSource();
+  if (hasPaidClick(incoming) || !hasSourceData(stored)) {
+    var next = _objectSpread(_objectSpread({}, stored || {}), Object.fromEntries(Object.entries(incoming).filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        value = _ref2[1];
+      return Boolean(value);
+    })));
+    if (hasSourceData(next)) writeStoredSource(next);
+    return next;
+  }
+  return stored || incoming;
+}
+function jobSourceFieldsForApi(source) {
+  var resolved = source || captureAndReadJobSource();
+  var out = {};
+  Object.keys(resolved).forEach(function (key) {
+    var value = resolved[key];
+    if (value) out[key] = value;
+  });
+  return out;
+}
+function cartNeedsSourceUpdate(cart, source) {
+  if (!hasSourceData(source)) return false;
+  if (!(cart !== null && cart !== void 0 && cart.utmSource) && !(cart !== null && cart !== void 0 && cart.sourceClickId) && !(cart !== null && cart !== void 0 && cart.sourceChannel)) return true;
+  return Boolean(source.sourceClickId && !(cart !== null && cart !== void 0 && cart.sourceClickId));
+}
+var JOB_SOURCE_URL_KEYS = exports.JOB_SOURCE_URL_KEYS = [].concat(UTM_PARAMS, CLICK_ID_PARAMS);
+function appendJobSourceToFormData(data, source) {
+  var fields = jobSourceFieldsForApi(source);
+  Object.keys(fields).forEach(function (key) {
+    var value = fields[key];
+    if (value) data.append(key, value);
+  });
+  return data;
+}

package/lib/utilities/job_source.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utilities/shipment.d.ts

@@ -1,2 +1,17 @@
+import { SavedCheckoutAddress } from './local_storage';
 export declare const shipmentFormId = "_shipment-address-form-id";
 export declare function cartItemsNeedShipment(cart: any): boolean;
+export declare function shipmentGroupsHaveQuotes(groups?: any[] | null): boolean;
+export type CheckoutShipmentHydrationAction = 'apply-saved-address' | 'refresh-quotes' | null;
+/**
+ * When checkout hydrates a saved address (localStorage) the form shows it,
+ * but quotes are only fetched after the user edits the field. Returning
+ * `apply-saved-address` means the cart still needs that address applied so
+ * quotes can be generated; `refresh-quotes` means the cart already has an
+ * address but no usable shipment options.
+ */
+export declare function checkoutShipmentHydrationAction(options: {
+    cartAddress?: SavedCheckoutAddress | null;
+    savedAddress?: SavedCheckoutAddress | null;
+    shipmentGroups?: any[] | null;
+}): CheckoutShipmentHydrationAction;

package/lib/utilities/shipment.js

@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cartItemsNeedShipment = cartItemsNeedShipment;
+exports.checkoutShipmentHydrationAction = checkoutShipmentHydrationAction;
 exports.shipmentFormId = void 0;
+exports.shipmentGroupsHaveQuotes = shipmentGroupsHaveQuotes;
+var _local_storage = require("./local_storage");
 var shipmentFormId = exports.shipmentFormId = '_shipment-address-form-id';
 function cartItemsNeedShipment(cart) {
   var _cart$cartItems = cart.cartItems,
@@ -15,4 +18,25 @@ function cartItemsNeedShipment(cart) {
     }
   }
   return false;
+}
+function shipmentGroupsHaveQuotes(groups) {
+  if (!(groups !== null && groups !== void 0 && groups.length)) return false;
+  return groups.some(function (group) {
+    return Array.isArray(group === null || group === void 0 ? void 0 : group.quotes) && group.quotes.length > 0;
+  });
+}
+/**
+ * When checkout hydrates a saved address (localStorage) the form shows it,
+ * but quotes are only fetched after the user edits the field. Returning
+ * `apply-saved-address` means the cart still needs that address applied so
+ * quotes can be generated; `refresh-quotes` means the cart already has an
+ * address but no usable shipment options.
+ */
+function checkoutShipmentHydrationAction(options) {
+  var hasCartAddress = (0, _local_storage.addressHasContent)(options.cartAddress);
+  var hasSavedAddress = (0, _local_storage.addressHasContent)(options.savedAddress);
+  var hasQuotes = shipmentGroupsHaveQuotes(options.shipmentGroups);
+  if (!hasCartAddress && hasSavedAddress) return 'apply-saved-address';
+  if (hasCartAddress && !hasQuotes) return 'refresh-quotes';
+  return null;
 }

package/lib/utilities/shipment.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merchi/cart",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Merchi's cart",
   "source": "src/index.ts",
   "main": "lib/index.js",
@@ -98,9 +98,9 @@
     "browser-or-node": "^3.0.0-pre.0",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
-    "@merchi/product-form": "^1.19.13",
-    "@merchi/product-form-sdk": "^1.0.10",
-    "@merchi/sdk": "^1.42.0",
+    "@merchi/product-form": "^1.19.14",
+    "@merchi/product-form-sdk": "^1.0.11",
+    "@merchi/sdk": "^1.42.1",
     "react-country-region-selector": "^3.6.1",
     "react-hook-form": "7.45.4",
     "react-icons": "^4.10.1",

package/src/CartProvider.tsx

@@ -21,6 +21,12 @@ import {
 } 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';
 
 export interface PropsCart {
   cart: any;
@@ -622,21 +628,19 @@ const CartProvider = ({
     setFetchingCart(true);
     try {
       const isTest = readTestCheckoutFlag();
+      const jobSource = jobSourceFieldsForApi(captureAndReadJobSource());
       const cart = makeCart({domain: {id: domainId}, isTest}, true);
-      if (isTest) {
-        const created = await merchi.authenticatedFetch('/carts/', {
-          method: 'POST',
-          body: cart.toFormData(),
-          query: [
-            ['embed', JSON.stringify(cartEmbed)],
-            ['skip_rights', 'y'],
-            ['is_test', 'true'],
-          ],
-        });
-        cart.fromJson(created.cart);
-      } else {
-        await cart.create({embed: cartEmbed});
-      }
+      const query: Array<[string, string]> = [
+        ['embed', JSON.stringify(cartEmbed)],
+        ['skip_rights', 'y'],
+      ];
+      if (isTest) query.push(['is_test', 'true']);
+      const created = await merchi.authenticatedFetch('/carts/', {
+        method: 'POST',
+        body: appendJobSourceToFormData(cart.toFormData() as FormData, jobSource),
+        query,
+      });
+      cart.fromJson(created.cart);
       let cartJson = await cart.toJson();
       if (domainId) setCartCookie(Number(domainId), cartJson, undefined, isTest);
       cartJson = await attachSavedClientIfNeeded(cartJson);
@@ -663,6 +667,19 @@ const CartProvider = ({
         await createCartAndCookie();
         return;
       }
+      const jobSource = jobSourceFieldsForApi(captureAndReadJobSource());
+      if (cartNeedsSourceUpdate(cartJson, jobSource)) {
+        const saved = await merchi.authenticatedFetch(`/carts/${cart.id}/`, {
+          method: 'PATCH',
+          body: appendJobSourceToFormData(cart.toFormData() as FormData, jobSource),
+          query: [
+            ['embed', JSON.stringify(cartEmbed)],
+            ['skip_rights', 'y'],
+          ],
+        });
+        cart.fromJson(saved.cart);
+        cartJson = cart.toJson();
+      }
       if (stripeIsValidAndActive(cartJson) || isTest) {
         cartJson = await attachSavedClientIfNeeded(cartJson);
         setCart({...cartJson});

package/src/forms/FormShipmentAddressAndNotes.tsx

@@ -2,10 +2,13 @@ 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";
@@ -114,6 +117,8 @@ export function ActiveFormShipmentAddressAndNotes() {
     setCart,
     setLoadingTotals,
     setActiveTabAndEditDisabled,
+    updateCartShipmentAddress,
+    getCartShipmentOptions,
   } = useCartContext();
   const saved = getSavedCheckoutAddress(domainId);
   const cartAddress = cart?.receiverAddress;
@@ -122,6 +127,33 @@ export function ActiveFormShipmentAddressAndNotes() {
     : saved.address || {};
   const receiverNotes = cart?.receiverNotes || saved.receiverNotes || "";
   const [addressFieldsOpen, setAddressFieldsOpen] = useState(false);
+  const hydratedShipmentOptionsRef = useRef(false);
+
+  useEffect(() => {
+    if (hydratedShipmentOptionsRef.current || !cart?.id) return;
+    const draft = getSavedCheckoutAddress(domainId);
+    const action = checkoutShipmentHydrationAction({
+      cartAddress: cart?.receiverAddress,
+      savedAddress: draft.address,
+      shipmentGroups: cart?.shipmentGroups,
+    });
+    if (!action) return;
+    hydratedShipmentOptionsRef.current = true;
+    if (action === "apply-saved-address" && draft.address) {
+      updateCartShipmentAddress(draft.address);
+      return;
+    }
+    if (action === "refresh-quotes") {
+      getCartShipmentOptions?.();
+    }
+  }, [
+    cart?.id,
+    cart?.receiverAddress,
+    cart?.shipmentGroups,
+    domainId,
+    getCartShipmentOptions,
+    updateCartShipmentAddress,
+  ]);
 
   async function saveCartShipmentAddressAndGoToNextTab(values: any) {
     const { receiverAddress: address, receiverNotes } = values;

package/src/utilities/index.ts

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