@pisell/pisellos 2.3.137 → 2.3.139

package/dist/solution/OrderInvoicePreview/index.d.ts

@@ -1,5 +1,7 @@
 import type { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
+import { type CustomerInvoiceLanguageCode, type CustomerInvoiceLanguageOption } from '../../shared/receipt/customerInvoiceLanguages';
+export type { CustomerInvoiceLanguageCode, CustomerInvoiceLanguageOption, } from '../../shared/receipt/customerInvoiceLanguages';
 import type { InvoiceLayoutConfig } from '../../modules/OpenData';
 import { type SmallTicketData } from '../../shared/receipt/small-ticket';
 export interface OrderInvoicePreviewInput {
@@ -19,6 +21,9 @@ export interface OrderInvoicePreviewResult {
     sourceRevision: string;
     generatedAt: string;
     locale: string;
+    secondaryLocale?: string;
+    languageOptions: CustomerInvoiceLanguageOption[];
+    selectedLanguage: CustomerInvoiceLanguageCode;
     orderId: string | number;
     source: Record<string, any>;
     shop: Record<string, any>;
@@ -40,6 +45,7 @@ export declare class OrderInvoicePreviewImpl extends BaseModule implements Modul
     private disposed;
     private input?;
     private activeKey;
+    private languageSelection?;
     private pending?;
     private snapshotCache;
     constructor(name?: string);
@@ -51,6 +57,10 @@ export declare class OrderInvoicePreviewImpl extends BaseModule implements Modul
     private loadContext;
     private loadSource;
     prepare(input: OrderInvoicePreviewInput): Promise<OrderInvoicePreviewResult>;
+    private getSelectionScope;
+    private documentIdentity;
+    /** Switch only the ready receipt projection; no fetching or rebuilding data. */
+    selectLanguage(code: string): OrderInvoicePreviewResult;
     retry(): Promise<OrderInvoicePreviewResult>;
     destroy(): void;
 }

package/dist/solution/OrderInvoicePreview/index.js

@@ -1,4 +1,11 @@
+var _excluded = ["secondaryLocale"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 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); } }
@@ -26,7 +33,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { BaseModule } from "../../modules/BaseModule";
-import { loadCustomerInvoiceLayout } from "../../shared/receipt/loadCustomerInvoiceLayout";
+import { loadCustomerInvoiceTemplate } from "../../shared/receipt/loadCustomerInvoiceLayout";
+import { resolveCustomerInvoiceLanguages } from "../../shared/receipt/customerInvoiceLanguages";
 import { buildSmallTicketData } from "../../shared/receipt/small-ticket";
 import { loadSalesOrderSnapshot } from "../../shared/sales/loadSalesOrderSnapshot";
 import { loadPaymentMethods, withPaymentMethodNames } from "../../shared/payment/loadPaymentMethods";
@@ -53,6 +61,8 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "disposed", false);
     _defineProperty(_assertThisInitialized(_this), "input", void 0);
     _defineProperty(_assertThisInitialized(_this), "activeKey", '');
+    // Hosts retain this readonly instance while the same order modal is closed.
+    _defineProperty(_assertThisInitialized(_this), "languageSelection", void 0);
     _defineProperty(_assertThisInitialized(_this), "pending", void 0);
     _defineProperty(_assertThisInitialized(_this), "snapshotCache", new Map());
     _defineProperty(_assertThisInitialized(_this), "getState", function () {
@@ -95,7 +105,7 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
         cache = new Map();
         contextCaches.set(this.request, cache);
       }
-      var key = JSON.stringify([input.tenantId, input.shopId, input.identity, input.locale]);
+      var key = JSON.stringify([input.tenantId, input.shopId, input.identity]);
       var cached = cache.get(key);
       if (cached) return cached;
       var task = Promise.all([this.request.get('/shop/show', {}, {
@@ -154,6 +164,7 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$core$getPlugin,
         _this$core$getPlugin$,
         _this$core$getPlugin$2,
+        _this$languageSelecti,
         _this3 = this;
       if (this.disposed) return Promise.reject(new Error('Invoice preview disposed'));
       var currentShop = (_this$core$getPlugin = this.core.getPlugin('app')) === null || _this$core$getPlugin === void 0 || (_this$core$getPlugin$ = _this$core$getPlugin.getData) === null || _this$core$getPlugin$ === void 0 || (_this$core$getPlugin$2 = _this$core$getPlugin$.call(_this$core$getPlugin)) === null || _this$core$getPlugin$2 === void 0 ? void 0 : _this$core$getPlugin$2('shop_id');
@@ -166,6 +177,7 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
         if (this.state.status === 'ready' && this.state.result) return Promise.resolve(this.state.result);
       }
       if (this.input && this.getScope(this.input) !== this.getScope(input)) this.snapshotCache.clear();
+      if (((_this$languageSelecti = this.languageSelection) === null || _this$languageSelecti === void 0 ? void 0 : _this$languageSelecti.scope) !== this.getSelectionScope(input)) this.languageSelection = undefined;
       this.input = input;
       this.activeKey = key;
       var generation = ++this.generation;
@@ -175,19 +187,19 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
         error: null
       });
       var task = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this3$core$getPlugin, _this3$core$getPlugin2, _coreData$core;
-        var _yield$Promise$all, _yield$Promise$all2, snapshot, context, layout, source, getData, coreData, shop, requestedLocale, locale, result;
+        var _this3$core$getPlugin, _this3$core$getPlugin2, _coreData$core, _this3$languageSelect;
+        var _yield$Promise$all, _yield$Promise$all2, snapshot, context, template, source, getData, coreData, shop, languageOptions, remembered, selected, locale, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return Promise.all([_this3.loadSource(input), _this3.loadContext(input), loadCustomerInvoiceLayout(_this3.request, input)]);
+              return Promise.all([_this3.loadSource(input), _this3.loadContext(input), loadCustomerInvoiceTemplate(_this3.request, input)]);
             case 2:
               _yield$Promise$all = _context.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
               snapshot = _yield$Promise$all2[0];
               context = _yield$Promise$all2[1];
-              layout = _yield$Promise$all2[2];
+              template = _yield$Promise$all2[2];
               source = withPaymentMethodNames(snapshot, context.methods);
               getData = (_this3$core$getPlugin = _this3.core.getPlugin('app')) === null || _this3$core$getPlugin === void 0 || (_this3$core$getPlugin2 = _this3$core$getPlugin.getData) === null || _this3$core$getPlugin2 === void 0 ? void 0 : _this3$core$getPlugin2.call(_this3$core$getPlugin);
               if (!((getData === null || getData === void 0 ? void 0 : getData('shop_id')) != null && String(getData('shop_id')) !== String(input.shopId))) {
@@ -206,30 +218,42 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('Invoice request superseded');
             case 15:
-              requestedLocale = input.locale.toLowerCase().replace(/_/g, '-');
-              locale = requestedLocale.startsWith('zh-tw') || requestedLocale.startsWith('zh-hk') ? 'zh_HK' : requestedLocale.startsWith('zh') ? 'zh_CN' : requestedLocale.startsWith('ja') ? 'ja' : requestedLocale.startsWith('pt') ? 'pt' : 'en';
-              result = {
-                identity: key,
+              languageOptions = resolveCustomerInvoiceLanguages(template.language, input.locale);
+              remembered = (_this3$languageSelect = _this3.languageSelection) === null || _this3$languageSelect === void 0 ? void 0 : _this3$languageSelect.code;
+              selected = languageOptions.find(function (option) {
+                return option.code === remembered;
+              }) || languageOptions[0];
+              locale = selected.locales[0];
+              result = _objectSpread(_objectSpread({
+                identity: _this3.documentIdentity(key, selected.code),
+                languageOptions: languageOptions,
+                selectedLanguage: selected.code
+              }, selected.locales[1] ? {
+                secondaryLocale: selected.locales[1]
+              } : {}), {}, {
                 orderId: input.orderId,
                 sourceRevision: input.sourceRevision,
                 generatedAt: new Date().toISOString(),
                 locale: locale,
                 source: source,
                 shop: shop,
-                layout: layout,
+                layout: template.layout,
                 smallTicketData: buildSmallTicketData({
                   order: source,
                   shopInfo: shop,
-                  locales: [locale]
+                  locales: _toConsumableArray(new Set(languageOptions.flatMap(function (option) {
+                    return option.locales;
+                  }))),
+                  includeReceiptKeys: true
                 })
-              };
+              });
               _this3.publish({
                 status: 'ready',
                 result: result,
                 error: null
               });
               return _context.abrupt("return", result);
-            case 20:
+            case 22:
             case "end":
               return _context.stop();
           }
@@ -249,6 +273,52 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
       this.pending = task;
       return task;
     }
+  }, {
+    key: "getSelectionScope",
+    value: function getSelectionScope(input) {
+      return JSON.stringify([this.getScope(input), input.orderId]);
+    }
+  }, {
+    key: "documentIdentity",
+    value: function documentIdentity(key, language) {
+      return JSON.stringify([key, language]);
+    }
+
+    /** Switch only the ready receipt projection; no fetching or rebuilding data. */
+  }, {
+    key: "selectLanguage",
+    value: function selectLanguage(code) {
+      var _this$core$getPlugin2, _this$core$getPlugin3, _this$core$getPlugin4;
+      if (this.disposed) throw new Error('Invoice preview disposed');
+      var current = this.state.result;
+      if (this.state.status !== 'ready' || !current || !this.input) throw new Error('Invoice preview is not ready');
+      var currentShop = (_this$core$getPlugin2 = this.core.getPlugin('app')) === null || _this$core$getPlugin2 === void 0 || (_this$core$getPlugin3 = _this$core$getPlugin2.getData) === null || _this$core$getPlugin3 === void 0 || (_this$core$getPlugin4 = _this$core$getPlugin3.call(_this$core$getPlugin2)) === null || _this$core$getPlugin4 === void 0 ? void 0 : _this$core$getPlugin4('shop_id');
+      if (currentShop != null && String(currentShop) !== String(this.input.shopId)) throw new Error('Invoice shop changed');
+      var selected = current.languageOptions.find(function (option) {
+        return option.code === code;
+      });
+      if (!selected) throw new Error('Invoice language is unavailable');
+      this.languageSelection = {
+        scope: this.getSelectionScope(this.input),
+        code: selected.code
+      };
+      if (selected.code === current.selectedLanguage) return current;
+      var _previousSecondary = current.secondaryLocale,
+        rest = _objectWithoutProperties(current, _excluded);
+      var result = _objectSpread(_objectSpread({}, rest), {}, {
+        identity: this.documentIdentity(this.activeKey, selected.code),
+        selectedLanguage: selected.code,
+        locale: selected.locales[0]
+      }, selected.locales[1] ? {
+        secondaryLocale: selected.locales[1]
+      } : {});
+      this.publish({
+        status: 'ready',
+        result: result,
+        error: null
+      });
+      return result;
+    }
   }, {
     key: "retry",
     value: function retry() {

package/dist/solution/RegisterAndLogin/config.js

@@ -733,6 +733,16 @@ var defaultConfig = {
 /**
  * webpos 渠道配置
  */
+var webposPasswordResetOptions = {
+  prefix: false,
+  isDefaultSaasDomain: true,
+  cache: false,
+  noToast: true,
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json'
+  }
+};
 var webposConfig = {
   sendEmailVerificationCode: {
     url: '/auth/email/register-code',
@@ -885,15 +895,23 @@ var webposConfig = {
     }
   },
   checkEmailCode: {
-    url: '/auth/email/check-email-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/verify',
+    method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email,
-        code: params.code,
-        action: params.action
+        code: params.code
       };
-    }
+    },
+    // SaaS 成功时 data 为 null，统一为既有验证码校验返回结构。
+    transformResponse: function transformResponse(response) {
+      return (response === null || response === void 0 ? void 0 : response.status) === true ? _objectSpread(_objectSpread({}, response), {}, {
+        data: {
+          valid: true
+        }
+      }) : response;
+    },
+    options: webposPasswordResetOptions
   },
   checkMobileCode: {
     url: '/auth/mobile/check-mobile-code',
@@ -919,13 +937,14 @@ var webposConfig = {
     }
   },
   sendPasswordResetEmail: {
-    url: '/auth/email/reset-password-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/send',
+    method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email
       };
-    }
+    },
+    options: webposPasswordResetOptions
   },
   sendPasswordResetSms: {
     url: '/auth/mobile/sms-forget',
@@ -966,15 +985,18 @@ var webposConfig = {
     }
   },
   resetPasswordByEmail: {
-    url: '/auth/email/reset-password',
+    url: '/tenant/account/reset-password/email-code',
     method: 'POST',
     transformParams: function transformParams(params) {
       return {
         email: params.email,
         password: params.password,
-        code: params.code
+        code: params.code,
+        // 页面先校验两次输入完全一致，SDK 保持原有重置参数。
+        password_confirmation: params.password
       };
-    }
+    },
+    options: webposPasswordResetOptions
   },
   resetPasswordByPhone: {
     url: '/auth/mobile/reset-password',

package/dist/solution/RegisterAndLogin/index.d.ts

@@ -4,6 +4,8 @@ import { RegisterParams, LoginParams, OAuthLoginParams, SendVerificationCodePara
 import { ApiCaller } from './config';
 export * from './types';
 export * from './config';
+export { validatePassword } from './utils';
+export type { PasswordValidationOptions } from './utils';
 /**
  * 注册登录解决方案实现
  */

package/dist/solution/RegisterAndLogin/index.js

@@ -22,7 +22,7 @@ import { RegisterAndLoginHooks, VerificationCodeType, VerificationPurpose } from
 import { createApiCaller } from "./config";
 export * from "./types";
 export * from "./config";
-
+export { validatePassword } from "./utils";
 /**
  * 注册登录解决方案实现
  */

package/dist/solution/RegisterAndLogin/utils.d.ts

@@ -10,10 +10,18 @@ export declare function validateEmail(email: string): boolean;
  * 验证手机号格式（支持多种国际格式）
  */
 export declare function validatePhone(phone: string): boolean;
-/**
- * 验证密码强度
- */
-export declare function validatePassword(password: string): {
+export interface PasswordValidationOptions {
+    minLength?: number;
+    maxLength?: number;
+    requireLowercase?: boolean;
+    requireUppercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+    specialCharactersPattern?: RegExp;
+    messages?: Partial<Record<'minLength' | 'maxLength' | 'requireLowercase' | 'requireUppercase' | 'requireNumber' | 'requireSpecialCharacters', string>>;
+}
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+export declare function validatePassword(password: string, options?: PasswordValidationOptions): {
     isValid: boolean;
     errors: string[];
 };

package/dist/solution/RegisterAndLogin/utils.js

@@ -33,29 +33,49 @@ export function validatePhone(phone) {
   var phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
-
-/**
- * 验证密码强度
- */
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
 export function validatePassword(password) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var errors = [];
-  if (password.length < 8) {
-    errors.push('密码长度至少为8位');
+  var _options$minLength = options.minLength,
+    minLength = _options$minLength === void 0 ? 8 : _options$minLength,
+    _options$maxLength = options.maxLength,
+    maxLength = _options$maxLength === void 0 ? 128 : _options$maxLength,
+    _options$requireLower = options.requireLowercase,
+    requireLowercase = _options$requireLower === void 0 ? true : _options$requireLower,
+    _options$requireUpper = options.requireUppercase,
+    requireUppercase = _options$requireUpper === void 0 ? true : _options$requireUpper,
+    _options$requireNumbe = options.requireNumber,
+    requireNumber = _options$requireNumbe === void 0 ? true : _options$requireNumbe,
+    _options$requireSpeci = options.requireSpecialCharacters,
+    requireSpecialCharacters = _options$requireSpeci === void 0 ? true : _options$requireSpeci,
+    _options$specialChara = options.specialCharactersPattern,
+    specialCharactersPattern = _options$specialChara === void 0 ? /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/ : _options$specialChara,
+    _options$messages = options.messages,
+    messages = _options$messages === void 0 ? {} : _options$messages;
+  if (password.length < minLength) {
+    var _messages$minLength;
+    errors.push((_messages$minLength = messages.minLength) !== null && _messages$minLength !== void 0 ? _messages$minLength : "\u5BC6\u7801\u957F\u5EA6\u81F3\u5C11\u4E3A".concat(minLength, "\u4F4D"));
   }
-  if (password.length > 128) {
-    errors.push('密码长度不能超过128位');
+  if (password.length > maxLength) {
+    var _messages$maxLength;
+    errors.push((_messages$maxLength = messages.maxLength) !== null && _messages$maxLength !== void 0 ? _messages$maxLength : "\u5BC6\u7801\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7".concat(maxLength, "\u4F4D"));
   }
-  if (!/[a-z]/.test(password)) {
-    errors.push('密码必须包含至少一个小写字母');
+  if (requireLowercase && !/[a-z]/.test(password)) {
+    var _messages$requireLowe;
+    errors.push((_messages$requireLowe = messages.requireLowercase) !== null && _messages$requireLowe !== void 0 ? _messages$requireLowe : '密码必须包含至少一个小写字母');
   }
-  if (!/[A-Z]/.test(password)) {
-    errors.push('密码必须包含至少一个大写字母');
+  if (requireUppercase && !/[A-Z]/.test(password)) {
+    var _messages$requireUppe;
+    errors.push((_messages$requireUppe = messages.requireUppercase) !== null && _messages$requireUppe !== void 0 ? _messages$requireUppe : '密码必须包含至少一个大写字母');
   }
-  if (!/\d/.test(password)) {
-    errors.push('密码必须包含至少一个数字');
+  if (requireNumber && !/\d/.test(password)) {
+    var _messages$requireNumb;
+    errors.push((_messages$requireNumb = messages.requireNumber) !== null && _messages$requireNumb !== void 0 ? _messages$requireNumb : '密码必须包含至少一个数字');
   }
-  if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push('密码必须包含至少一个特殊字符');
+  if (requireSpecialCharacters && !specialCharactersPattern.test(password)) {
+    var _messages$requireSpec;
+    errors.push((_messages$requireSpec = messages.requireSpecialCharacters) !== null && _messages$requireSpec !== void 0 ? _messages$requireSpec : '密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,

package/dist/solution/Sales/index.d.ts

@@ -105,6 +105,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+    private sortCompletedBookings;
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
     private sortUnpaidBookings;
     /**

package/dist/solution/Sales/index.js

@@ -760,6 +760,20 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+  }, {
+    key: "sortCompletedBookings",
+    value: function sortCompletedBookings(bookings) {
+      var createdAt = function createdAt(booking) {
+        var _booking$order3;
+        var timestamp = dayjs(((_booking$order3 = booking.order) === null || _booking$order3 === void 0 ? void 0 : _booking$order3.created_at) || '').valueOf();
+        return Number.isFinite(timestamp) ? timestamp : 0;
+      };
+      return _toConsumableArray(bookings).sort(function (left, right) {
+        return createdAt(right) - createdAt(left);
+      });
+    }
+
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
   }, {
     key: "sortUnpaidBookings",
@@ -1260,7 +1274,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
                 includeAllFuture: true
               });
-              completedBookings = completedBookingList.map(function (booking) {
+              completedBookings = this.sortCompletedBookings(completedBookingList).map(function (booking) {
                 return _objectSpread(_objectSpread({}, booking), {}, {
                   status: 'compelete',
                   isTimeout: false,

package/dist/solution/UnifiedBookingSales/index.js

@@ -304,10 +304,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   var _product$cartDetailVa, _product$_extend;

package/lib/modules/Order/utils.js

@@ -1540,7 +1540,7 @@ function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(booking => (0, _pickupTiming.isFulfillmentTimingBooking)(booking) || Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),

package/lib/modules/ResourcePlanner/planner.js

@@ -412,7 +412,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
   };
 }
 function normalizeRequirementGroup(product, requirementGroup) {
-  const resourceType = 'single';
+  const resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   const required = requirementGroup.required !== false;
   const min = required ? 1 : 0;
   return {
@@ -457,7 +457,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(resource => ({
     ...resource,
-    resourceType: 'single',
+    resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
     capacity: Math.max(1, Number(resource.capacity || 1) || 1),
     windows: (resource.windows || []).map(window => ({
       ...window
@@ -573,7 +573,8 @@ function buildCells(projection) {
             occupancy
           }) => occupancy) : [];
           const usedCapacity = segmentOccupancies.reduce((sum, occupancy) => sum + Math.max(1, Number(occupancy.pax || 1) || 1), 0);
-          const remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          const remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           const requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           const reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(occupancy => {
             const source = occupancy.source || 'remote';
@@ -607,7 +608,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -615,7 +616,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1500,7 +1501,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: resource.raw?.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: isPast ? ['past'] : [...(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), 'outside_resource_window']
@@ -1524,7 +1525,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: resource.raw?.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status,
         remainingCapacity,
         maxCapacity,
@@ -2008,7 +2009,8 @@ function validateAvailabilitySelection(projection, params, runtimeOptions = {})
       const remainingCapacity = matchedCell?.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         const capacityPerBooking = normalizedPartySize ?? 1;
-        const availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        const availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/lib/server/test.json

@@ -132,7 +132,7 @@
     "contacts_info": null,
     "holder": null,
     "metadata": {},
-    "delivery_type": "nil",
+    "delivery_type": "shop_service",
     "small_ticket_data_flag": 1,
     "need_sync": 1,
     "payment_info": {

package/lib/shared/receipt/customerInvoiceLanguages.d.ts

@@ -0,0 +1,8 @@
+export type CustomerInvoiceLanguageCode = 'en' | 'zh_CN' | 'zh_HK' | 'ja' | 'pt' | 'cn_en';
+export interface CustomerInvoiceLanguageOption {
+    code: CustomerInvoiceLanguageCode;
+    locales: string[];
+}
+export declare function normalizeCustomerInvoiceLanguage(value: string): CustomerInvoiceLanguageCode | undefined;
+/** Preserve configured insertion order; a print count never repeats an option. */
+export declare function resolveCustomerInvoiceLanguages(language: Record<string, unknown>, pageLocale: string): CustomerInvoiceLanguageOption[];