@pisell/private-materials 6.3.138 → 6.3.140

package/es/components/scanOrder/locales.js

@@ -17,6 +17,30 @@ export default {
     'pisell2.scan.order.store.status.exception': 'The store is currently closed or in an abnormal state. Please contact staff.',
     'pisell2.scan.order.note.title': 'Order notes',
     'pisell2.scan.order.note.placeholder': 'Add order notes',
+    'pisell2.scan.order.fulfillment.title': 'Fulfillment',
+    'pisell2.scan.order.fulfillment.table_service': 'Table service',
+    'pisell2.scan.order.fulfillment.pickup': 'Pickup',
+    'pisell2.scan.order.current.table': 'Current table',
+    'pisell2.scan.order.pickup.ref.title': 'Table Service',
+    'pisell2.scan.order.pickup.ref.heading': 'Use any name you like',
+    'pisell2.scan.order.pickup.ref.description': 'Enter your nickname, or anything fun!',
+    'pisell2.scan.order.pickup.ref.placeholder': 'e.g. John',
+    'pisell2.scan.order.products.title': 'Products',
+    'pisell2.scan.order.products.empty.tip': 'Please select products',
+    'pisell2.scan.order.check.cart.empty.tip': 'Please go back to add products',
+    'pisell2.scan.order.submit.disabled.default': 'Order submission is currently disabled.',
+    'pisell2.text.goodpass': 'Promotion',
+    'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
+    'pisell2.text.goodpass.view-more': 'View More',
+    'pisell2.text.goodpass.code': 'Code',
+    'pisell2.text.goodpass.enter-code': 'Enter Code',
+    'pisell2.text.goodpass.code-invalid': 'Current code is invalid',
+    'pisell2.text.goodpass.code-invalid-cart': 'No eligible items in the cart',
+    'pisell2.text.goodpass.code-invalid-expired': 'Current coupon is not valid in use',
+    'pisell2.text.goodpass.login': 'Login',
+    'pisell2.text.goodpass.login-tip': 'to access your promotions',
+    'pisell2.text.apply': 'Apply',
+    'pisell2.text.details': 'Details',
     'pisell2.appointment.booking.empty.data': 'No data',
     'pisell2.appointment.deposit.close': 'Close',
     'pisell2.appointment.policy': 'You have read and agreed to this policy',
@@ -41,6 +65,30 @@ export default {
     'pisell2.scan.order.store.status.exception': '当前店铺不在营业中或者状态异常，请联系工作人员',
     'pisell2.scan.order.note.title': '备注',
     'pisell2.scan.order.note.placeholder': '请输入备注',
+    'pisell2.scan.order.fulfillment.title': '取餐方式',
+    'pisell2.scan.order.fulfillment.table_service': '送餐到桌',
+    'pisell2.scan.order.fulfillment.pickup': '到店自取',
+    'pisell2.scan.order.current.table': '当前桌台',
+    'pisell2.scan.order.pickup.ref.title': '桌边服务',
+    'pisell2.scan.order.pickup.ref.heading': '随便起个名字吧',
+    'pisell2.scan.order.pickup.ref.description': '输入你的昵称，或任何有趣的名字！',
+    'pisell2.scan.order.pickup.ref.placeholder': '例如：小明',
+    'pisell2.scan.order.products.title': '商品',
+    'pisell2.scan.order.products.empty.tip': '请选择商品',
+    'pisell2.scan.order.check.cart.empty.tip': '请返回添加商品',
+    'pisell2.scan.order.submit.disabled.default': '当前暂不可下单',
+    'pisell2.text.goodpass': '促销',
+    'pisell2.text.goodpass.product-vouchers': '商品兑换券',
+    'pisell2.text.goodpass.view-more': '查看更多',
+    'pisell2.text.goodpass.code': '券码',
+    'pisell2.text.goodpass.enter-code': '请输入券码',
+    'pisell2.text.goodpass.code-invalid': '当前券码不可用',
+    'pisell2.text.goodpass.code-invalid-cart': '当前购物车中无可用商品',
+    'pisell2.text.goodpass.code-invalid-expired': '当前优惠券不在使用期限内',
+    'pisell2.text.goodpass.login': '登录',
+    'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分',
+    'pisell2.text.apply': '应用',
+    'pisell2.text.details': '详情',
     'pisell2.appointment.booking.empty.data': '暂无数据',
     'pisell2.appointment.deposit.close': '关闭',
     'pisell2.appointment.policy': '您已仔细阅读并同意此协议',
@@ -65,6 +113,30 @@ export default {
     'pisell2.scan.order.store.status.exception': '當前店鋪不在營業中或者狀態異常，請聯繫工作人員',
     'pisell2.scan.order.note.title': '備註',
     'pisell2.scan.order.note.placeholder': '請輸入備註',
+    'pisell2.scan.order.fulfillment.title': '取餐方式',
+    'pisell2.scan.order.fulfillment.table_service': '送餐到桌',
+    'pisell2.scan.order.fulfillment.pickup': '到店自取',
+    'pisell2.scan.order.current.table': '當前桌台',
+    'pisell2.scan.order.pickup.ref.title': '桌邊服務',
+    'pisell2.scan.order.pickup.ref.heading': '隨便起個名字吧',
+    'pisell2.scan.order.pickup.ref.description': '輸入你的暱稱，或任何有趣的名字！',
+    'pisell2.scan.order.pickup.ref.placeholder': '例如：小明',
+    'pisell2.scan.order.products.title': '商品',
+    'pisell2.scan.order.products.empty.tip': '請選擇商品',
+    'pisell2.scan.order.check.cart.empty.tip': '請返回添加商品',
+    'pisell2.scan.order.submit.disabled.default': '當前暫不可下單',
+    'pisell2.text.goodpass': '促銷',
+    'pisell2.text.goodpass.product-vouchers': '商品兌換券',
+    'pisell2.text.goodpass.view-more': '查看更多',
+    'pisell2.text.goodpass.code': '券碼',
+    'pisell2.text.goodpass.enter-code': '請輸入券碼',
+    'pisell2.text.goodpass.code-invalid': '當前券碼不可用',
+    'pisell2.text.goodpass.code-invalid-cart': '當前購物車中無可用商品',
+    'pisell2.text.goodpass.code-invalid-expired': '當前優惠券不在使用期限內',
+    'pisell2.text.goodpass.login': '登錄',
+    'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分',
+    'pisell2.text.apply': '應用',
+    'pisell2.text.details': '詳情',
     'pisell2.appointment.booking.empty.data': '暫無數據',
     'pisell2.appointment.deposit.close': '关闭',
     'pisell2.appointment.policy': '您已仔細閱讀並同意此協議',
@@ -89,6 +161,30 @@ export default {
     'pisell2.scan.order.store.status.exception': '現在、店舗は営業時間外または状態が異常です。スタッフまでお問い合わせください。',
     'pisell2.scan.order.note.title': '備考',
     'pisell2.scan.order.note.placeholder': '備考を入力してください',
+    'pisell2.scan.order.fulfillment.title': '受け取り方法',
+    'pisell2.scan.order.fulfillment.table_service': 'テーブルサービス',
+    'pisell2.scan.order.fulfillment.pickup': 'ピックアップ',
+    'pisell2.scan.order.current.table': '現在のテーブル',
+    'pisell2.scan.order.pickup.ref.title': 'テーブルサービス',
+    'pisell2.scan.order.pickup.ref.heading': '好きな名前をどうぞ',
+    'pisell2.scan.order.pickup.ref.description': 'ニックネームや楽しい名前を入力してね！',
+    'pisell2.scan.order.pickup.ref.placeholder': '例: ジョン',
+    'pisell2.scan.order.products.title': '商品',
+    'pisell2.scan.order.products.empty.tip': '商品を選択してください',
+    'pisell2.scan.order.check.cart.empty.tip': '商品を追加するには、前の画面に戻ってください',
+    'pisell2.scan.order.submit.disabled.default': '現在、注文を送信できません。',
+    'pisell2.text.goodpass': 'プロモーション',
+    'pisell2.text.goodpass.product-vouchers': '商品バウチャー',
+    'pisell2.text.goodpass.view-more': 'もっと見る',
+    'pisell2.text.goodpass.code': 'コード',
+    'pisell2.text.goodpass.enter-code': 'コードを入力',
+    'pisell2.text.goodpass.code-invalid': '現在のコードは無効です',
+    'pisell2.text.goodpass.code-invalid-cart': 'カートに適格な項目がありません',
+    'pisell2.text.goodpass.code-invalid-expired': '現在のクーポンは使用期限外です',
+    'pisell2.text.goodpass.login': 'ログイン',
+    'pisell2.text.goodpass.login-tip': 'プロモーションにアクセスするため',
+    'pisell2.text.apply': '適用',
+    'pisell2.text.details': '詳細',
     'pisell2.appointment.booking.empty.data': 'データなし',
     'pisell2.appointment.deposit.close': '閉じる',
     'pisell2.appointment.policy': 'このポリシーを読み、同意しました',
@@ -113,6 +209,30 @@ export default {
     'pisell2.scan.order.store.status.exception': 'A loja está fechada no momento ou em estado anormal. Entre em contato com a equipe.',
     'pisell2.scan.order.note.title': 'Observações do pedido',
     'pisell2.scan.order.note.placeholder': 'Adicione observações do pedido',
+    'pisell2.scan.order.fulfillment.title': 'Forma de retirada',
+    'pisell2.scan.order.fulfillment.table_service': 'Serviço à mesa',
+    'pisell2.scan.order.fulfillment.pickup': 'Retirada',
+    'pisell2.scan.order.current.table': 'Mesa atual',
+    'pisell2.scan.order.pickup.ref.title': 'Serviço à mesa',
+    'pisell2.scan.order.pickup.ref.heading': 'Use o nome que quiser',
+    'pisell2.scan.order.pickup.ref.description': 'Digite seu apelido ou algo divertido!',
+    'pisell2.scan.order.pickup.ref.placeholder': 'Ex.: João',
+    'pisell2.scan.order.products.title': 'Produtos',
+    'pisell2.scan.order.products.empty.tip': 'Selecione produtos',
+    'pisell2.scan.order.check.cart.empty.tip': 'Volte para adicionar produtos',
+    'pisell2.scan.order.submit.disabled.default': 'No momento, não é possível enviar pedidos.',
+    'pisell2.text.goodpass': 'Promoção',
+    'pisell2.text.goodpass.product-vouchers': 'Vales de Produto',
+    'pisell2.text.goodpass.view-more': 'Ver Mais',
+    'pisell2.text.goodpass.code': 'Código',
+    'pisell2.text.goodpass.enter-code': 'Digite o Código',
+    'pisell2.text.goodpass.code-invalid': 'Código atual é inválido',
+    'pisell2.text.goodpass.code-invalid-cart': 'Nenhum item elegível no carrinho',
+    'pisell2.text.goodpass.code-invalid-expired': 'Cupom atual não está no período de uso',
+    'pisell2.text.goodpass.login': 'Entrar',
+    'pisell2.text.goodpass.login-tip': 'para acessar suas promoções',
+    'pisell2.text.apply': 'Aplicar',
+    'pisell2.text.details': 'Detalhes',
     'pisell2.appointment.booking.empty.data': 'Sem dados',
     'pisell2.appointment.deposit.close': 'Fechar',
     'pisell2.appointment.policy': 'Você leu e concordou com esta política',

package/es/components/scanOrder/types.d.ts

@@ -11,6 +11,15 @@ export interface ScanOrderProps {
     entryContext?: ScanOrderEntryContext;
 }
 export declare type ScanOrderStepKey = 'init' | 'product' | 'check' | 'error';
+export declare type ScanOrderEntryMode = 'default' | 'additional_order';
+/** 步骤缓存中记录的 gate 标记（对应协议 / 表单 / 人数 modal 是否已走过） */
+export declare type ScanOrderGateKey = 'policyAccepted' | 'formSubmitted' | 'paxEntered';
+/** 存入 sessionStorage 桶内的 entryContext 快照（用于校验是否同一扫码场景） */
+export interface ScanOrderCachedEntryContext {
+    resourceId?: string;
+    hasOrderId?: boolean;
+    biz?: string;
+}
 export interface ScanOrderViewModel {
     menuItems: any[];
     cartItems: any[];
@@ -30,8 +39,16 @@ export interface ScanOrderContextValue {
     stepList: ScanOrderStepKey[];
     viewModel: ScanOrderViewModel;
     footerActionText: string;
+    tableName: string;
+    entryMode: ScanOrderEntryMode;
+    submitDisabledTips: string;
+    /** 折扣/优惠券列表（来自 scanOrder 模块 getDiscountList） */
+    discountList: any[];
     isReady: boolean;
     setCurrentStep: (step: ScanOrderStepKey) => void;
+    setTableName: (name: string) => void;
+    setEntryMode: (mode: ScanOrderEntryMode) => void;
+    setSubmitDisabledTips: (tips: string) => void;
     goToStep: (step: ScanOrderStepKey) => void;
     nextStep: () => void;
     prevStep: () => void;
@@ -39,6 +56,22 @@ export interface ScanOrderContextValue {
     runModuleAction: (actionName: string, ...args: any[]) => Promise<any>;
     setFooterActionText: (text: string) => void;
     updateOrderNote: (note: string) => Promise<void>;
+    /** 步骤缓存 hydrate 是否已完成（未完成时不建议写入 step，避免覆盖缓存） */
+    isCacheHydrated: boolean;
+    /** 将 gate 标记为已完成（写入 sessionStorage 桶） */
+    markGate: (flag: ScanOrderGateKey) => void;
+    /** 查询某个 gate 是否已完成 */
+    isGatePassed: (flag: ScanOrderGateKey) => boolean;
+    /** 整桶清空（提交成功 / restoreOrder 等场景） */
+    clearStepCache: () => void;
+    /**
+     * bootstrap 结束后要恢复到的目标 step（仅记录 `'product' | 'check'`）。
+     * hydrate 阶段不直接 `setCurrentStep`，避免在 checkResourceAvailable 之前让
+     * `<Menu>` / `<Check>` mount、提前发出缺 menu_list_ids 的请求。
+     */
+    resumeStep: ScanOrderStepKey | null;
+    /** 消费并清空 resumeStep；建议在完成 goToStep 后立刻调用 */
+    consumeResumeStep: () => void;
 }
 export interface ScanOrderProviderProps {
     entryContext: ScanOrderEntryContext;

package/es/components/scanOrder/utils/toShoppingCartProducts.d.ts

@@ -9,6 +9,7 @@ interface ScanOrderOrderProduct {
     product_option_item?: any[];
     product_bundle?: any[];
     identity_key?: string;
+    note?: string;
     metadata?: Record<string, any>;
     _origin?: Record<string, any>;
     [key: string]: any;

package/es/components/scanOrder/utils/toShoppingCartProducts.js

@@ -1,3 +1,12 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parsedValue = Number(value);
@@ -52,13 +61,117 @@ function normalizeOptions(product) {
     };
   });
 }
+
+/** 与 getDisplayName 一致：优先 metadata 上的完整商品快照 */
+function getProductOriginRich(product) {
+  var _product$metadata2, _product$_origin4;
+  return (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.origin) || (product === null || product === void 0 || (_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 || (_product$_origin4 = _product$_origin4.callbackData) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.origin) || {};
+}
+function findVariantGroupById(groups, groupId) {
+  return groups.find(function (g) {
+    return Number(g === null || g === void 0 ? void 0 : g.id) === Number(groupId);
+  });
+}
+function findVariantItemDisplayName(variantGroup, variantItemId) {
+  var _ref, _found$name;
+  var items = Array.isArray(variantGroup === null || variantGroup === void 0 ? void 0 : variantGroup.variant_item) ? variantGroup.variant_item : [];
+  var found = items.find(function (it) {
+    return Number(it === null || it === void 0 ? void 0 : it.id) === Number(variantItemId);
+  });
+  var raw = (_ref = (_found$name = found === null || found === void 0 ? void 0 : found.name) !== null && _found$name !== void 0 ? _found$name : typeof (found === null || found === void 0 ? void 0 : found.title) === 'string' ? found.title : found === null || found === void 0 ? void 0 : found.title) !== null && _ref !== void 0 ? _ref : '';
+  return String(raw !== null && raw !== void 0 ? raw : '').trim();
+}
+
+/**
+ * 按 sku_ids（如 "7006:19533" 或 "g1:i1_g2:i2"）与 variant_group 拼「组名: 选项名」，与选品器 transformSelectorValueToValue 风格一致（", " 连接）。
+ */
+function buildVariantStringFromSkuIds(origin, skuIdsRaw) {
+  var groups = Array.isArray(origin === null || origin === void 0 ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  var parts = [];
+  var segments = String(skuIdsRaw || '').split('_').map(function (s) {
+    return s.trim();
+  }).filter(Boolean);
+  var _iterator = _createForOfIteratorHelper(segments),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _vg$name;
+      var seg = _step.value;
+      var colonIdx = seg.indexOf(':');
+      if (colonIdx <= 0) continue;
+      var groupId = Number(seg.slice(0, colonIdx));
+      var itemId = Number(seg.slice(colonIdx + 1));
+      if (Number.isNaN(groupId) || Number.isNaN(itemId)) continue;
+      var vg = findVariantGroupById(groups, groupId);
+      if (!vg) continue;
+      var groupName = String((_vg$name = vg === null || vg === void 0 ? void 0 : vg.name) !== null && _vg$name !== void 0 ? _vg$name : '').trim();
+      var itemName = findVariantItemDisplayName(vg, itemId);
+      if (groupName && itemName) parts.push("".concat(groupName, ": ").concat(itemName));else if (itemName) parts.push(itemName);else if (groupName) parts.push(groupName);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return parts.join(', ');
+}
+
+/** sku_ids 解析失败时用 variant 的 name/title 与 variant_group.position_id 对齐 */
+function fallbackVariantLabelFromTitles(origin, variantRow) {
+  var groups = Array.isArray(origin === null || origin === void 0 ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  var nameObj = (variantRow === null || variantRow === void 0 ? void 0 : variantRow.name) || (variantRow === null || variantRow === void 0 ? void 0 : variantRow.title);
+  if (!nameObj || _typeof(nameObj) !== 'object') return '';
+  var parts = [];
+  var _iterator2 = _createForOfIteratorHelper(groups),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _String, _g$name;
+      var g = _step2.value;
+      var pid = g === null || g === void 0 ? void 0 : g.position_id;
+      if (pid == null) continue;
+      var val = (_String = nameObj[String(pid)]) !== null && _String !== void 0 ? _String : nameObj[pid];
+      if (val == null || val === '') continue;
+      var groupName = String((_g$name = g === null || g === void 0 ? void 0 : g.name) !== null && _g$name !== void 0 ? _g$name : '').trim();
+      var itemLabel = String(val).trim();
+      if (groupName && itemLabel) parts.push("".concat(groupName, ": ").concat(itemLabel));else if (itemLabel) parts.push(itemLabel);
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  if (parts.length) return parts.join(', ');
+  var vals = Object.values(nameObj).filter(function (v) {
+    return v != null && String(v).trim() !== '';
+  });
+  return vals.map(function (v) {
+    return String(v).trim();
+  }).join(' / ');
+}
+function getVariantProductOptionString(product) {
+  var variantId = product === null || product === void 0 ? void 0 : product.product_variant_id;
+  if (variantId == null || variantId === '' || Number(variantId) <= 0) return '';
+  var origin = getProductOriginRich(product);
+  var variants = Array.isArray(origin === null || origin === void 0 ? void 0 : origin.variant) ? origin.variant : [];
+  var matched = variants.find(function (v) {
+    return Number(v === null || v === void 0 ? void 0 : v.id) === Number(variantId);
+  });
+  if (!matched) return '';
+  var skuIds = matched === null || matched === void 0 ? void 0 : matched.sku_ids;
+  if (skuIds != null && String(skuIds).trim() !== '') {
+    var fromSku = buildVariantStringFromSkuIds(origin, String(skuIds));
+    if (fromSku) return fromSku;
+  }
+  return fallbackVariantLabelFromTitles(origin, matched);
+}
 function normalizeBundles(product) {
-  var _product$_origin4;
-  var callbackData = (product === null || product === void 0 || (_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.callbackData) || {};
+  var _product$_origin5;
+  var callbackData = (product === null || product === void 0 || (_product$_origin5 = product._origin) === null || _product$_origin5 === void 0 ? void 0 : _product$_origin5.callbackData) || {};
   var sourceBundles = Array.isArray(callbackData === null || callbackData === void 0 ? void 0 : callbackData.bundle) ? callbackData.bundle : (product === null || product === void 0 ? void 0 : product.product_bundle) || [];
   return sourceBundles.map(function (bundleItem, bundleIndex) {
-    var _ref, _bundleItem$price, _bundleItem$id;
-    var bundlePrice = toNumber((_ref = (_bundleItem$price = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.product_price) !== null && _ref !== void 0 ? _ref : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.custom_price, 0);
+    var _ref2, _bundleItem$price, _bundleItem$id;
+    var bundlePrice = toNumber((_ref2 = (_bundleItem$price = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.product_price) !== null && _ref2 !== void 0 ? _ref2 : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.custom_price, 0);
     var bundleNum = toSafeNum(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.num);
     var bundleOptions = Array.isArray(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option) ? bundleItem.option : [];
     return {
@@ -90,17 +203,24 @@ export function toShoppingCartProducts(params) {
     amountSymbol = _params$amountSymbol === void 0 ? '$' : _params$amountSymbol;
   if (!Array.isArray(orderProducts)) return [];
   return orderProducts.map(function (productItem, index) {
-    var _productItem$_origin, _productItem$_origin2, _productItem$_origin3, _productItem$product_, _productItem$metadata;
+    var _productItem$_origin, _productItem$product_, _productItem$metadata;
     var productNum = toSafeNum(productItem === null || productItem === void 0 ? void 0 : productItem.num);
     var unitPrice = getUnitPrice(productItem);
-    var rowKey = (productItem === null || productItem === void 0 || (_productItem$_origin = productItem._origin) === null || _productItem$_origin === void 0 || (_productItem$_origin = _productItem$_origin.callbackData) === null || _productItem$_origin === void 0 ? void 0 : _productItem$_origin.rowKey) || (productItem === null || productItem === void 0 || (_productItem$_origin2 = productItem._origin) === null || _productItem$_origin2 === void 0 || (_productItem$_origin2 = _productItem$_origin2.callbackData) === null || _productItem$_origin2 === void 0 ? void 0 : _productItem$_origin2.key) || (productItem === null || productItem === void 0 || (_productItem$_origin3 = productItem._origin) === null || _productItem$_origin3 === void 0 || (_productItem$_origin3 = _productItem$_origin3.callbackData) === null || _productItem$_origin3 === void 0 ? void 0 : _productItem$_origin3.unique) || (productItem === null || productItem === void 0 ? void 0 : productItem.identity_key) || "".concat((_productItem$product_ = productItem.product_id) !== null && _productItem$product_ !== void 0 ? _productItem$product_ : 'p', "_").concat(productItem.product_variant_id, "_").concat(index);
-    var base = {
+    var callbackData = (productItem === null || productItem === void 0 || (_productItem$_origin = productItem._origin) === null || _productItem$_origin === void 0 ? void 0 : _productItem$_origin.callbackData) || {};
+    // 不透明 identity 契约：rowKey / _id 直接复用 SDK 回灌的 identity_key；
+    // 仅当（升级路径或非常规调用）identity_key 缺失时退到 SKU + index 兜底。
+    var identityKey = typeof (productItem === null || productItem === void 0 ? void 0 : productItem.identity_key) === 'string' && productItem.identity_key.length > 0 ? productItem.identity_key : undefined;
+    var rowKey = identityKey !== null && identityKey !== void 0 ? identityKey : "".concat((_productItem$product_ = productItem.product_id) !== null && _productItem$product_ !== void 0 ? _productItem$product_ : 'p', "_").concat(productItem.product_variant_id, "_").concat(index);
+    var fromCallbackOptionString = typeof (callbackData === null || callbackData === void 0 ? void 0 : callbackData.product_option_string) === 'string' ? callbackData.product_option_string.trim() : '';
+    var productOptionString = fromCallbackOptionString || getVariantProductOptionString(productItem) || undefined;
+    var base = _objectSpread({
       _id: rowKey,
       rowKey: rowKey,
-      identity_key: (productItem === null || productItem === void 0 ? void 0 : productItem.identity_key) || undefined,
+      identity_key: identityKey,
       id: productItem.product_id,
       product_id: productItem.product_id,
       product_variant_id: productItem.product_variant_id,
+      note: (productItem === null || productItem === void 0 ? void 0 : productItem.note) != null ? String(productItem.note) : '',
       name: getDisplayName(productItem),
       image: getDisplayImage(productItem),
       num: productNum,
@@ -112,7 +232,15 @@ export function toShoppingCartProducts(params) {
       bundle: normalizeBundles(productItem),
       _origin: productItem === null || productItem === void 0 ? void 0 : productItem._origin,
       isNormalProduct: true
-    };
+    }, productOptionString ? {
+      product_option_string: productOptionString
+    } : {});
+    if (Array.isArray(productItem.product_option_item) && productItem.product_option_item.length) {
+      base.product_option_item = productItem.product_option_item;
+    }
+    if (Array.isArray(productItem.product_bundle) && productItem.product_bundle.length) {
+      base.product_bundle = productItem.product_bundle;
+    }
     if (productItem !== null && productItem !== void 0 && (_productItem$metadata = productItem.metadata) !== null && _productItem$metadata !== void 0 && _productItem$metadata.venue_booking) {
       var _origin$resources2;
       var origin = productItem._origin || {};

package/es/components/scanOrder/utils/transformProductDetail.js

@@ -49,8 +49,21 @@ function normalizeBundleItems(bundleItems) {
     });
   });
 }
+
+/**
+ * 在商品 origin 数据中按 variant_id 命中对应的规格行，用于取「规格级」字段（price / base_price / is_charge_tax 等）。
+ * 主商品字段仅作为无规格或无法命中时的兜底，避免把主商品价误当成规格价写入订单行。
+ */
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0) return null;
+  var variants = Array.isArray(origin === null || origin === void 0 ? void 0 : origin.variant) ? origin.variant : [];
+  var matched = variants.find(function (v) {
+    return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
+  });
+  return matched || null;
+}
 export function transformProductDetailToOrderProduct(params) {
-  var _ref, _ref2, _payload$product_id, _ref3, _payload$product_vari, _payload$_origin, _ref4, _ref5, _ref6, _ref7, _payload$price, _ref8, _payload$tax_fee, _ref9, _payload$is_charge_ta, _payload$quantity, _payload$option, _payload$bundle;
+  var _ref, _ref2, _payload$product_id, _ref3, _payload$product_vari, _payload$_origin, _findVariantById, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9, _payload$price, _ref10, _ref11, _payload$tax_fee, _ref12, _ref13, _payload$is_charge_ta, _payload$quantity, _payload$option, _payload$bundle;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu,
@@ -61,13 +74,17 @@ export function transformProductDetailToOrderProduct(params) {
   if (productId === null) return null;
   var productVariantId = toNumber((_ref3 = (_payload$product_vari = payload.product_variant_id) !== null && _payload$product_vari !== void 0 ? _payload$product_vari : payload.variant_id) !== null && _ref3 !== void 0 ? _ref3 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.product_variant_id, 0);
   var callbackOrigin = (payload === null || payload === void 0 ? void 0 : payload.origin) || (payload === null || payload === void 0 || (_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceItem) || (payload === null || payload === void 0 ? void 0 : payload._origin) || {};
-  var sellingPrice = toPriceString((_ref4 = (_ref5 = (_ref6 = (_ref7 = (_payload$price = payload === null || payload === void 0 ? void 0 : payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload === null || payload === void 0 ? void 0 : payload.selling_price) !== null && _ref7 !== void 0 ? _ref7 : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.price) !== null && _ref6 !== void 0 ? _ref6 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref5 !== void 0 ? _ref5 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price) !== null && _ref4 !== void 0 ? _ref4 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.base_price, '0.00');
+  // 规格商品的价格、税率等字段必须以 variant 行为准；主商品上的 price 只是「起售价/默认价」。
+  // productDetail 弹窗回调 payload 里通常不会带 price，如果不做 variant 查找，
+  // 就会退到 callbackOrigin.price（主商品价），导致加购价格错位。
+  var matchedVariant = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceItem, productVariantId);
+  var sellingPrice = toPriceString((_ref4 = (_ref5 = (_ref6 = (_ref7 = (_ref8 = (_ref9 = (_payload$price = payload === null || payload === void 0 ? void 0 : payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload === null || payload === void 0 ? void 0 : payload.selling_price) !== null && _ref9 !== void 0 ? _ref9 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref8 !== void 0 ? _ref8 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref7 !== void 0 ? _ref7 : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.price) !== null && _ref6 !== void 0 ? _ref6 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref5 !== void 0 ? _ref5 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price) !== null && _ref4 !== void 0 ? _ref4 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.base_price, '0.00');
   // 入口不引入后台划线价（payload/source.original_price 可能承载 UI 划线展示用的原价）。
   // 订单域 original_price 语义为「券前店铺售价」，初次加购恒等于 selling_price；
   // 券应用后由 SDK Rules 引擎维护差异。
   var originalPrice = sellingPrice;
-  var taxFee = toPriceString((_ref8 = (_payload$tax_fee = payload === null || payload === void 0 ? void 0 : payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.tax_fee) !== null && _ref8 !== void 0 ? _ref8 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.tax_fee, '0.00');
-  var isChargeTax = toNumber((_ref9 = (_payload$is_charge_ta = payload === null || payload === void 0 ? void 0 : payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.is_charge_tax) !== null && _ref9 !== void 0 ? _ref9 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.is_charge_tax, 0);
+  var taxFee = toPriceString((_ref10 = (_ref11 = (_payload$tax_fee = payload === null || payload === void 0 ? void 0 : payload.tax_fee) !== null && _payload$tax_fee !== void 0 ? _payload$tax_fee : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.tax_fee) !== null && _ref11 !== void 0 ? _ref11 : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.tax_fee) !== null && _ref10 !== void 0 ? _ref10 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.tax_fee, '0.00');
+  var isChargeTax = toNumber((_ref12 = (_ref13 = (_payload$is_charge_ta = payload === null || payload === void 0 ? void 0 : payload.is_charge_tax) !== null && _payload$is_charge_ta !== void 0 ? _payload$is_charge_ta : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.is_charge_tax) !== null && _ref13 !== void 0 ? _ref13 : callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.is_charge_tax) !== null && _ref12 !== void 0 ? _ref12 : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.is_charge_tax, 0);
   return {
     product_id: productId,
     product_variant_id: productVariantId,

package/es/components/schedules/calendar/calendarItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;

package/es/components/schedules/calendar/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Calendar: () => JSX.Element;
 export default Calendar;

package/es/components/schedules/components/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/es/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/es/components/schedules/components/ScheduleList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps } from 'antd';
 import { ScheduleItem } from '../../type';
 import './index.less';

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const MaxParticipantsModule: ({ form, value, onChange, useSchedule, isAutoChange, onData, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetail: ({ form, currentProduct, }: {
     form: any;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetailByDate: () => JSX.Element;
 export default ProductDetailByDate;

package/es/components/schedules/products/ProductDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetailDrawer: () => JSX.Element;
 export default ProductDetailDrawer;

package/es/components/schedules/products/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Products: () => JSX.Element;
 export default Products;

package/es/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/es/components/schedules/products/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/es/components/schedules/resources/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Resources: () => JSX.Element;
 export default Resources;

package/es/components/schedules/resources/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/es/components/schedules/resources/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

package/es/components/schedules/schedules/AllSchedules/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

package/es/components/schedules/schedules/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SchedulesConnect: () => JSX.Element;
 export default SchedulesConnect;

package/es/components/systemSettings/registry/components/GroupModal.js

@@ -43,7 +43,8 @@ var GroupModal = function GroupModal(_ref) {
       if (type === 'edit' && data) {
         form.setFieldsValue({
           title: data.title,
-          code: data.code
+          code: data.code,
+          description: data === null || data === void 0 ? void 0 : data.description
         });
       } else {
         form.resetFields();
@@ -155,6 +156,12 @@ var GroupModal = function GroupModal(_ref) {
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: locales.getText('registry.form.code.placeholder')
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "description",
+    label: locales.getText('registry.form.description')
+  }, /*#__PURE__*/React.createElement(BaseTranslation, {
+    placeholder: locales.getText('registry.form.description.placeholder'),
+    renderMode: "edit"
   }))));
 };
 export default GroupModal;

package/es/components/systemSettings/registry/components/ItemModal.js

@@ -102,6 +102,9 @@ var interfaceTypeOptions = {
   }, {
     value: 'RecordListWrapper',
     label: '记录列表包装器'
+  }, {
+    value: 'Translation',
+    label: '多语言输入框'
   }]
 };
 var ItemModal = function ItemModal(_ref) {