merchi_cart 1.3.4 → 1.3.6

package/esm/CartProvider.js

@@ -25,7 +25,7 @@ import { cartEmbed } from './utilities/helpers';
 import { initTabs, tabIdItems, tabShipment } from './utilities/tabs';
 import { Merchi } from 'merchi_sdk_ts';
 import { getCartCookie, getCartCookieToken, setCartCookie } from './utilities/cookie';
-import { makeAddress } from './utilities/address';
+import { makeAddress, sanitizeAddressFields } from './utilities/address';
 import { appendStyleSheetText } from './utilities/helpers';
 import { makeJob } from './utilities/job';
 import { makeProduct } from './utilities/product';
@@ -362,7 +362,19 @@ var CartProvider = function CartProvider(_ref) {
     var tabId = nextTab.tabId,
       tabIndexToSet = nextTab.tabIndexToSet,
       disabled = nextTab.disabled;
-    tabs[tabIndexToSet].disabled = disabled;
+    setTabs(function (prev) {
+      var index = tabIndexToSet >= 0 && tabIndexToSet < prev.length ? tabIndexToSet : prev.findIndex(function (t) {
+        return t.tabId === tabId;
+      });
+      if (index < 0 || index >= prev.length) {
+        return prev;
+      }
+      var next = _toConsumableArray(prev);
+      next[index] = _objectSpread(_objectSpread({}, next[index]), {}, {
+        disabled: disabled
+      });
+      return next;
+    });
     setActiveTabIndex(tabId);
   }
   var _useState11 = useState(false),
@@ -655,7 +667,7 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _updateCartShipmentAddress() {
     _updateCartShipmentAddress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(address) {
-      var token, receiverAddress, cartEnt, _cartJson3, query, cartWithShipmentGroups;
+      var token, addressFields, receiverAddress, cartEnt, _cartJson3, query, cartWithShipmentGroups;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -663,46 +675,47 @@ var CartProvider = function CartProvider(_ref) {
             return getCartCookieToken(domainId);
           case 2:
             token = _context6.sent;
-            receiverAddress = makeAddress(address, true);
+            addressFields = sanitizeAddressFields(address);
+            receiverAddress = makeAddress(addressFields, true);
             cartEnt = makeCart(cart, false, token);
             setFetchingShipmentGroups(true);
-            _context6.prev = 6;
+            _context6.prev = 7;
             cartEnt.receiverAddress = receiverAddress;
-            _context6.next = 10;
+            _context6.next = 11;
             return cartEnt.save({
               embed: cartEmbed
             });
-          case 10:
+          case 11:
             cartEnt = _context6.sent;
             _cartJson3 = cartEnt.toJson();
-            saveCheckoutAddress(domainId, address);
+            saveCheckoutAddress(domainId, addressFields);
             query = [];
             query.push(['cart_token', cart.token]);
-            _context6.next = 17;
+            _context6.next = 18;
             return merchi.authenticatedFetch("/generate-cart-shipment-quotes/".concat(cart.id, "/"), {
               method: 'GET',
               query: query
             });
-          case 17:
+          case 18:
             cartWithShipmentGroups = _context6.sent;
             setCart(_objectSpread(_objectSpread({}, _cartJson3), {}, {
               shipmentGroups: cartWithShipmentGroups.shipmentGroups || []
             }));
-            _context6.next = 24;
+            _context6.next = 25;
             break;
-          case 21:
-            _context6.prev = 21;
-            _context6.t0 = _context6["catch"](6);
+          case 22:
+            _context6.prev = 22;
+            _context6.t0 = _context6["catch"](7);
             alertError(_context6.t0.errorMessage || _context6.t0.message || 'Unable to set address');
-          case 24:
-            _context6.prev = 24;
+          case 25:
+            _context6.prev = 25;
             setFetchingShipmentGroups(false);
-            return _context6.finish(24);
-          case 27:
+            return _context6.finish(25);
+          case 28:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[6, 21, 24, 27]]);
+      }, _callee6, null, [[7, 22, 25, 28]]);
     }));
     return _updateCartShipmentAddress.apply(this, arguments);
   }

package/esm/forms/FormShipmentAddressAndNotes.js

@@ -1,13 +1,13 @@
 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); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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(arr) { if (Array.isArray(arr)) return arr; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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; }
@@ -22,7 +22,7 @@ import { faMapMarkerAlt } from "@fortawesome/free-solid-svg-icons";
 import { useCartContext } from "../CartProvider";
 import { useState } from "react";
 import { getCartCookieToken } from "../utilities/cookie";
-import { makeAddress } from "../utilities/address";
+import { makeAddress, sanitizeAddressFields } from "../utilities/address";
 import { makeCart } from "../utilities/cart";
 import { cartEmbed } from "../utilities/helpers";
 import { tabIdCheckout } from "../utilities/tabs";
@@ -61,7 +61,22 @@ function FormShipmentAddressAndNotes(_ref) {
     register = hookForm.register,
     reset = hookForm.reset;
   function onSubmit() {
-    setCartShipmentAddress(getValues());
+    return _onSubmit.apply(this, arguments);
+  }
+  function _onSubmit() {
+    _onSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return setCartShipmentAddress(getValues());
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _onSubmit.apply(this, arguments);
   }
   function updateAddress(addr) {
     var oldAddresses = getValues();
@@ -120,49 +135,51 @@ export function ActiveFormShipmentAddressAndNotes() {
     return _saveCartShipmentAddressAndGoToNextTab.apply(this, arguments);
   }
   function _saveCartShipmentAddressAndGoToNextTab() {
-    _saveCartShipmentAddressAndGoToNextTab = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-      var address, receiverNotes, cartToken, receiverAddress, cartEnt;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    _saveCartShipmentAddressAndGoToNextTab = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values) {
+      var address, receiverNotes, cartToken, addressFields, _receiverAddress, cartEnt;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             address = values.receiverAddress, receiverNotes = values.receiverNotes;
-            _context.next = 3;
-            return getCartCookieToken(domainId);
-          case 3:
-            cartToken = _context.sent;
             setLoadingTotals(true);
-            receiverAddress = makeAddress(address, true);
+            _context2.prev = 2;
+            _context2.next = 5;
+            return getCartCookieToken(domainId);
+          case 5:
+            cartToken = _context2.sent;
+            // Never PATCH an existing Address via cart token — create a fresh embed.
+            addressFields = sanitizeAddressFields(address);
+            _receiverAddress = makeAddress(addressFields, true);
             cartEnt = makeCart(cart, false, cartToken);
-            cartEnt.receiverAddress = receiverAddress;
+            cartEnt.receiverAddress = _receiverAddress;
             cartEnt.receiverNotes = receiverNotes;
-            _context.prev = 9;
-            _context.next = 12;
+            _context2.next = 13;
             return cartEnt.save({
               embed: cartEmbed
             });
-          case 12:
-            saveCheckoutAddress(domainId, address, receiverNotes);
-            setCart(cartEnt.toJson()); // Update cart context
+          case 13:
+            saveCheckoutAddress(domainId, addressFields, receiverNotes);
+            setCart(cartEnt.toJson());
             setActiveTabAndEditDisabled({
               tabId: tabIdCheckout,
               tabIndexToSet: 2,
               disabled: false
             });
-            _context.next = 20;
+            _context2.next = 21;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](9);
-            alertError(_context.t0.errorMessage || _context.t0.message || "Unable to set shipment address.");
-          case 20:
-            _context.prev = 20;
+          case 18:
+            _context2.prev = 18;
+            _context2.t0 = _context2["catch"](2);
+            alertError(_context2.t0.errorMessage || _context2.t0.message || "Unable to set shipment address.");
+          case 21:
+            _context2.prev = 21;
             setLoadingTotals(false);
-            return _context.finish(20);
-          case 23:
+            return _context2.finish(21);
+          case 24:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[9, 17, 20, 23]]);
+      }, _callee2, null, [[2, 18, 21, 24]]);
     }));
     return _saveCartShipmentAddressAndGoToNextTab.apply(this, arguments);
   }

package/esm/forms/InputsAddress.js

@@ -205,13 +205,13 @@ export function InputsAddress(_ref) {
         children: addressForm
       }), /*#__PURE__*/_jsxs("div", {
         className: "d-flex align-items-center",
-        children: [!!errors.length && /*#__PURE__*/_jsxs("div", {
+        children: [!!Object.keys(errors || {}).length && /*#__PURE__*/_jsxs("div", {
           className: "text-danger",
           children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
             icon: faExclamationTriangle
           }), " Invalid address!"]
         }), /*#__PURE__*/_jsxs("a", {
-          className: "ml-auto btn btn-sm btn-link ".concat(!!errors.length && 'text-danger'),
+          className: "ml-auto btn btn-sm btn-link ".concat(!!Object.keys(errors || {}).length && 'text-danger'),
           onClick: toggleAddressFieldsOpen,
           children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
             icon: addressFieldsOpen ? faTimes : faEdit

package/esm/panels/PanelEditCartItem.js

@@ -23,6 +23,8 @@ 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 () {
@@ -76,6 +78,10 @@ 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
@@ -149,27 +155,36 @@ 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 && /*#__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))
-      })
+      children: showForm && (hasPublishedCustomForm ? /*#__PURE__*/_jsx(CustomCartProductForm, {
+        product: cartItem.product,
+        initialJob: cleanCartItem,
+        apiUrl: apiUrl,
+        onSave: onSubmit,
+        fallback: defaultForm,
+        onActiveChange: setCustomFormActive
+      }) : defaultForm)
     }), /*#__PURE__*/_jsxs(CartFooter, {
-      children: [/*#__PURE__*/_jsx(ButtonBack, {}), /*#__PURE__*/_jsxs(Button, {
+      children: [/*#__PURE__*/_jsx(ButtonBack, {}), !customFormActive && /*#__PURE__*/_jsxs(Button, {
         className: classNameBtnEditCartItem,
         disabled: loading,
         form: formId,

package/esm/stripe/StripeCardFields.js

@@ -1,12 +1,6 @@
-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); }
-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); }
 import * as React from "react";
 import StripePaymentButtons from "./StripePaymentButtons";
-import { CardCvcElement, CardExpiryElement, CardNumberElement, Elements, useStripe, useElements } from "@stripe/react-stripe-js";
+import { CardElement, Elements, useStripe, useElements } from "@stripe/react-stripe-js";
 import { loadStripe } from "@stripe/stripe-js";
 import { CARD_ELEMENT_OPTIONS } from "./utils";
 import pngStripe from "../assets/stripe-payment-secure.png";
@@ -26,7 +20,7 @@ function InnerForm(_ref) {
   var stripe = useStripe();
   var elements = useElements();
   function paymentStart(e) {
-    var card = elements.getElement(CardNumberElement);
+    var card = elements.getElement(CardElement);
     setLoadingStripePayment(true);
     e.preventDefault();
     if (!stripe || !elements) {
@@ -73,13 +67,10 @@ function InnerForm(_ref) {
         onSubmit: paymentStart,
         children: /*#__PURE__*/_jsxs("div", {
           className: "merchi-cart-stripe-input-container",
-          children: [/*#__PURE__*/_jsx(CardNumberElement, _objectSpread({
-            className: inputClass
-          }, CARD_ELEMENT_OPTIONS)), /*#__PURE__*/_jsx(CardExpiryElement, _objectSpread({
-            className: inputClass
-          }, CARD_ELEMENT_OPTIONS)), /*#__PURE__*/_jsx(CardCvcElement, _objectSpread({
-            className: inputClass
-          }, CARD_ELEMENT_OPTIONS)), error.message && /*#__PURE__*/_jsx("div", {
+          children: [/*#__PURE__*/_jsx(CardElement, {
+            className: inputClass,
+            options: CARD_ELEMENT_OPTIONS
+          }), error.message && /*#__PURE__*/_jsx("div", {
             className: "merchi-cart-stripe-input-error",
             children: error.message
           }), /*#__PURE__*/_jsx(PaymentButton, {

package/esm/stripe/utils.js

@@ -2,6 +2,7 @@ export function companyStripePubKeyOrTestPubKey(company) {
   return company.isTesting ? company.stripePublishableTestKey : company.stripePublishableKey;
 }
 export var CARD_ELEMENT_OPTIONS = {
+  hidePostalCode: true,
   style: {
     base: {
       '::placeholder': {

package/esm/utilities/address.js

@@ -1,3 +1,4 @@
+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 { Merchi } from 'merchi_sdk_ts';
 var merchi = new Merchi();
 export function makeAddress(addressJson, makeDirty) {
@@ -6,6 +7,19 @@ export function makeAddress(addressJson, makeDirty) {
     makeDirty: makeDirty
   });
 }
+
+/** Plain address fields only — never reuse an existing address id (cart-token auth cannot PATCH it). */
+export function sanitizeAddressFields(address) {
+  var a = address && _typeof(address) === 'object' ? address : {};
+  return {
+    city: a.city || '',
+    country: a.country || '',
+    lineOne: a.lineOne || '',
+    lineTwo: a.lineTwo || '',
+    postcode: a.postcode || '',
+    state: a.state || ''
+  };
+}
 var isoCountries = {
   AF: "Afghanistan",
   AX: "Aland Islands",

package/esm/utilities/helpers.js

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

package/lib/CartProvider.js

@@ -369,7 +369,19 @@ var CartProvider = function CartProvider(_ref) {
     var tabId = nextTab.tabId,
       tabIndexToSet = nextTab.tabIndexToSet,
       disabled = nextTab.disabled;
-    tabs[tabIndexToSet].disabled = disabled;
+    setTabs(function (prev) {
+      var index = tabIndexToSet >= 0 && tabIndexToSet < prev.length ? tabIndexToSet : prev.findIndex(function (t) {
+        return t.tabId === tabId;
+      });
+      if (index < 0 || index >= prev.length) {
+        return prev;
+      }
+      var next = _toConsumableArray(prev);
+      next[index] = _objectSpread(_objectSpread({}, next[index]), {}, {
+        disabled: disabled
+      });
+      return next;
+    });
     setActiveTabIndex(tabId);
   }
   var _useState11 = (0, _react.useState)(false),
@@ -662,7 +674,7 @@ var CartProvider = function CartProvider(_ref) {
   }
   function _updateCartShipmentAddress() {
     _updateCartShipmentAddress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(address) {
-      var token, receiverAddress, cartEnt, _cartJson3, query, cartWithShipmentGroups;
+      var token, addressFields, receiverAddress, cartEnt, _cartJson3, query, cartWithShipmentGroups;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -670,46 +682,47 @@ var CartProvider = function CartProvider(_ref) {
             return (0, _cookie.getCartCookieToken)(domainId);
           case 2:
             token = _context6.sent;
-            receiverAddress = (0, _address.makeAddress)(address, true);
+            addressFields = (0, _address.sanitizeAddressFields)(address);
+            receiverAddress = (0, _address.makeAddress)(addressFields, true);
             cartEnt = (0, _cart3.makeCart)(cart, false, token);
             setFetchingShipmentGroups(true);
-            _context6.prev = 6;
+            _context6.prev = 7;
             cartEnt.receiverAddress = receiverAddress;
-            _context6.next = 10;
+            _context6.next = 11;
             return cartEnt.save({
               embed: _helpers.cartEmbed
             });
-          case 10:
+          case 11:
             cartEnt = _context6.sent;
             _cartJson3 = cartEnt.toJson();
-            (0, _local_storage.saveCheckoutAddress)(domainId, address);
+            (0, _local_storage.saveCheckoutAddress)(domainId, addressFields);
             query = [];
             query.push(['cart_token', cart.token]);
-            _context6.next = 17;
+            _context6.next = 18;
             return merchi.authenticatedFetch("/generate-cart-shipment-quotes/".concat(cart.id, "/"), {
               method: 'GET',
               query: query
             });
-          case 17:
+          case 18:
             cartWithShipmentGroups = _context6.sent;
             setCart(_objectSpread(_objectSpread({}, _cartJson3), {}, {
               shipmentGroups: cartWithShipmentGroups.shipmentGroups || []
             }));
-            _context6.next = 24;
+            _context6.next = 25;
             break;
-          case 21:
-            _context6.prev = 21;
-            _context6.t0 = _context6["catch"](6);
+          case 22:
+            _context6.prev = 22;
+            _context6.t0 = _context6["catch"](7);
             alertError(_context6.t0.errorMessage || _context6.t0.message || 'Unable to set address');
-          case 24:
-            _context6.prev = 24;
+          case 25:
+            _context6.prev = 25;
             setFetchingShipmentGroups(false);
-            return _context6.finish(24);
-          case 27:
+            return _context6.finish(25);
+          case 28:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[6, 21, 24, 27]]);
+      }, _callee6, null, [[7, 22, 25, 28]]);
     }));
     return _updateCartShipmentAddress.apply(this, arguments);
   }