@pisell/pisellos 2.3.138 → 2.3.139

package/dist/modules/Order/utils.js

@@ -1516,7 +1516,7 @@ export 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(function (booking) {

package/dist/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/dist/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[];

package/dist/shared/receipt/customerInvoiceLanguages.js

@@ -0,0 +1,60 @@
+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; }
+var aliases = {
+  en: 'en',
+  en_us: 'en',
+  en_gb: 'en',
+  en_au: 'en',
+  cn: 'zh_CN',
+  zh: 'zh_CN',
+  zh_cn: 'zh_CN',
+  zh_hans: 'zh_CN',
+  zh_sg: 'zh_CN',
+  hk: 'zh_HK',
+  zh_hk: 'zh_HK',
+  zh_tw: 'zh_HK',
+  zh_hant: 'zh_HK',
+  ja: 'ja',
+  ja_jp: 'ja',
+  jp: 'ja',
+  pt: 'pt',
+  pt_br: 'pt',
+  pt_pt: 'pt',
+  cn_en: 'cn_en',
+  en_cn: 'cn_en'
+};
+export function normalizeCustomerInvoiceLanguage(value) {
+  return aliases[value.trim().toLowerCase().replace(/-/g, '_')];
+}
+function option(code) {
+  return {
+    code: code,
+    locales: code === 'cn_en' ? ['en', 'zh_CN'] : [code]
+  };
+}
+
+/** Preserve configured insertion order; a print count never repeats an option. */
+export function resolveCustomerInvoiceLanguages(language, pageLocale) {
+  var options = [];
+  var seen = new Set();
+  Object.entries(language).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      count = _ref2[1];
+    if (typeof count !== 'number' || !Number.isFinite(count) || count <= 0) return;
+    var code = normalizeCustomerInvoiceLanguage(key);
+    if (!code || seen.has(code)) return;
+    seen.add(code);
+    options.push(option(code));
+  });
+  if (options.length) return options;
+  var normalized = normalizeCustomerInvoiceLanguage(pageLocale);
+  // A page locale is a single language, never a bilingual printer mode.
+  var requested = pageLocale.toLowerCase().replace(/_/g, '-');
+  var fallback = normalized && normalized !== 'cn_en' ? normalized : requested.startsWith('zh-tw') || requested.startsWith('zh-hk') ? 'zh_HK' : requested.startsWith('zh') ? 'zh_CN' : requested.startsWith('ja') ? 'ja' : requested.startsWith('pt') ? 'pt' : 'en';
+  return [option(fallback)];
+}

package/dist/shared/receipt/loadCustomerInvoiceLayout.d.ts

@@ -11,6 +11,10 @@ export interface PublicInvoiceDocumentResponse {
         } | null;
     } | null;
 }
+export interface CustomerInvoiceTemplate {
+    layout: InvoiceLayoutConfig;
+    language: Record<string, unknown>;
+}
 interface TemplateScope {
     tenantId: string | number;
     shopId: string | number;
@@ -18,5 +22,6 @@ interface TemplateScope {
     businessCode: string;
     channel: string;
 }
+export declare function loadCustomerInvoiceTemplate(request: RequestPlugin, scope: TemplateScope): Promise<CustomerInvoiceTemplate>;
 export declare function loadCustomerInvoiceLayout(request: RequestPlugin, scope: TemplateScope): Promise<InvoiceLayoutConfig>;
 export {};

package/dist/shared/receipt/loadCustomerInvoiceLayout.js

@@ -1,3 +1,8 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _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); }); }; }
@@ -15,7 +20,7 @@ function documentId(value) {
   var id = Number(text);
   return Number.isSafeInteger(id) && id > 0 ? String(id) : null;
 }
-export function loadCustomerInvoiceLayout(request, scope) {
+export function loadCustomerInvoiceTemplate(request, scope) {
   var cache = caches.get(request);
   if (!cache) {
     cache = {
@@ -66,7 +71,10 @@ export function loadCustomerInvoiceLayout(request, scope) {
           }
           // Preserve the existing non-numeric legacy template / invoice_edit contract.
           numericLike = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
-          return _context2.abrupt("return", typeof raw === 'string' && raw.trim() && !numericLike.test(raw.trim()) ? normalizeInvoiceLayoutFromTemplateSettings(normalizeInvoiceTemplateSettings(config)) : getDefaultInvoiceLayoutConfig());
+          return _context2.abrupt("return", typeof raw === 'string' && raw.trim() && !numericLike.test(raw.trim()) ? {
+            layout: normalizeInvoiceLayoutFromTemplateSettings(normalizeInvoiceTemplateSettings(config)),
+            language: readLanguage(config['documents.invoice_edit'])
+          } : defaultTemplate());
         case 11:
           docKey = JSON.stringify([key, id]);
           pending = cache.documents.get(docKey);
@@ -109,7 +117,10 @@ export function loadCustomerInvoiceLayout(request, scope) {
                     }
                     throw new Error('Invoice Document has no usable template modules');
                   case 13:
-                    return _context.abrupt("return", normalizeInvoiceLayoutFromTemplateSettings(settings));
+                    return _context.abrupt("return", {
+                      layout: normalizeInvoiceLayoutFromTemplateSettings(settings),
+                      language: readLanguage(doc.data.template_settings)
+                    });
                   case 14:
                   case "end":
                     return _context.stop();
@@ -138,5 +149,36 @@ function fallback(error, target, id) {
     documentId: id,
     message: error instanceof Error ? error.message : 'Template request failed'
   });
-  return getDefaultInvoiceLayoutConfig();
+  return defaultTemplate();
+}
+
+// Keep the existing layout-only API and its in-flight promise identity intact.
+var layoutPromises = new WeakMap();
+export function loadCustomerInvoiceLayout(request, scope) {
+  var template = loadCustomerInvoiceTemplate(request, scope);
+  var layout = layoutPromises.get(template);
+  if (!layout) {
+    layout = template.then(function (value) {
+      return value.layout;
+    });
+    layoutPromises.set(template, layout);
+  }
+  return layout;
+}
+function defaultTemplate() {
+  return {
+    layout: getDefaultInvoiceLayoutConfig(),
+    language: {}
+  };
+}
+function readLanguage(value) {
+  var settings = value;
+  if (typeof settings === 'string') {
+    try {
+      settings = JSON.parse(settings);
+    } catch (_unused) {
+      return {};
+    }
+  }
+  return isRecord(settings) && isRecord(settings.language) ? _objectSpread({}, settings.language) : {};
 }

package/dist/shared/receipt/small-ticket.d.ts

@@ -22,8 +22,13 @@ export interface BuildSmallTicketDataParams {
     shopInfo?: SmallTicketShopInfo | null;
     locales?: string[];
     productMap?: Record<string | number, Record<string, any>>;
+    /** Customer preview only: stable source identities for bilingual rows. */
+    includeReceiptKeys?: boolean;
 }
 export interface SmallTicketItem {
+    receipt_key?: string;
+    receipt_value_kind?: 'shared' | 'text';
+    receipt_item_kind?: 'shared';
     item: string;
     value: string;
     size?: number;
@@ -32,6 +37,8 @@ export interface SmallTicketItem {
     booking_uid?: string | number;
 }
 export interface SmallTicketProduct {
+    receipt_key?: string;
+    receipt_source_index?: number;
     product_title: string;
     product_quantity: number;
     selling_price: string;
@@ -47,6 +54,8 @@ export interface SmallTicketProduct {
     product_note?: string;
     allergy?: string;
     options?: Array<{
+        receipt_key?: string;
+        receipt_source_index?: number;
         name: string;
         num?: number;
         price?: string;