@pisell/pisellos 0.10.19 → 0.10.21

package/lib/server/utils/small-ticket.js

@@ -87,6 +87,58 @@ const LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    contactName: '連絡先名',
+    contactMobile: '連絡先電話',
+    email: 'メール',
+    dineIn: '店内飲食',
+    takeAway: 'テイクアウト',
+    delivery: '配達',
+    pickUp: '受け取り',
+    shopService: '店内飲食',
+    pickUpTime: '受取時間',
+    asap: 'できるだけ早く',
+    cash: '現金',
+    eftpos: 'カード',
+    wallet: 'ウォレット',
+    giftCard: 'ギフトカード',
+    remainingAmount: '残高',
+    redeemPoints: '利用ポイント',
+    remainingPoints: '残りポイント',
+    table: 'テーブル',
+    orderDiscount: '注文割引',
+    manualDiscount: '手動割引',
+    payProcessingFee: '決済手数料',
+    rounding: '端数調整',
+    gross: '総重量',
+    tare: '風袋'
+  },
+  pt: {
+    contactName: 'Nome de contato',
+    contactMobile: 'Celular de contato',
+    email: 'e-mail',
+    dineIn: 'Consumo no local',
+    takeAway: 'Para levar',
+    delivery: 'Entrega',
+    pickUp: 'Recolha',
+    shopService: 'Consumo no local',
+    pickUpTime: 'Hora de recolha',
+    asap: 'Assim que possível',
+    cash: 'Dinheiro',
+    eftpos: 'Cartão',
+    wallet: 'Carteira',
+    giftCard: 'Cartão-presente',
+    remainingAmount: 'Saldo restante',
+    redeemPoints: 'Pontos utilizados',
+    remainingPoints: 'Pontos restantes',
+    table: 'Mesa',
+    orderDiscount: 'Desconto do pedido',
+    manualDiscount: 'Desconto manual',
+    payProcessingFee: 'Taxa de processamento',
+    rounding: 'Arredondamento',
+    gross: 'Peso bruto',
+    tare: 'Tara'
   }
 };
 function buildSmallTicketData(params) {

package/lib/solution/BaseSales/index.js

@@ -257,6 +257,22 @@ function normalizeBaseSalesRecordCollections(sourceRecord, options) {
   }
   return normalizedRecord;
 }
+function isValidBaseSalesSmallTicketDataSnapshot(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  const localeSnapshots = Object.values(value);
+  return localeSnapshots.length > 0 && localeSnapshots.some(localeSnapshot => localeSnapshot !== null && typeof localeSnapshot === 'object' && !Array.isArray(localeSnapshot));
+}
+function mergeBaseSalesSmallTicketDataSnapshot(currentValue, loadedValue) {
+  if (isValidBaseSalesSmallTicketDataSnapshot(loadedValue)) {
+    return (0, _lodashEs.cloneDeep)(loadedValue);
+  }
+  if (isValidBaseSalesSmallTicketDataSnapshot(currentValue)) {
+    return (0, _lodashEs.cloneDeep)(currentValue);
+  }
+  if (loadedValue !== undefined) return (0, _lodashEs.cloneDeep)(loadedValue);
+  if (currentValue !== undefined) return (0, _lodashEs.cloneDeep)(currentValue);
+  return undefined;
+}
 function getBaseSalesMetadataUid(item, metadataKey) {
   const uid = item?.metadata?.[metadataKey] ?? item?.[metadataKey];
   if (uid === undefined || uid === null || uid === '') return null;
@@ -296,6 +312,11 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    // small_ticket_data 是由 Server 一次性生成的完整展示快照，不能递归进入
+    // locale 内部继续套用订单集合或普通数组的合并规则。
+    if (key === 'small_ticket_data') {
+      return mergeBaseSalesSmallTicketDataSnapshot(currentValue, loadedValue);
+    }
     const collectionKind = getBaseSalesOrderCollectionKind(key);
     if (collectionKind && Array.isArray(loadedValue)) {
       return mergeBaseSalesOrderCollection(collectionKind, Array.isArray(currentValue) ? currentValue : [], loadedValue, strategy, uidRemaps);

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 6 | 5;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -458,7 +458,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -221,6 +221,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     const cachedData = this.store.openData.getOpenData();
     if (cachedData && this.openDataTarget === target && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+      if (typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        await this.store.openData.ensureInvoiceTemplateSettings(target);
+      }
       this.otherParams.openData = cachedData;
       return cachedData;
     }

package/lib/solution/Sales/index.js

@@ -182,6 +182,9 @@ class SalesImpl extends _BaseModule.BaseModule {
     const cachedData = this.invoiceOpenDataModule.getOpenData();
     const lastFetchedAt = this.invoiceOpenDataModule.getLastFetchedAt();
     if (cachedData && this.invoiceOpenDataTarget === target && typeof lastFetchedAt === 'number' && Date.now() - lastFetchedAt < INVOICE_OPEN_DATA_CACHE_TTL) {
+      if (typeof this.invoiceOpenDataModule.ensureInvoiceTemplateSettings === 'function') {
+        await this.invoiceOpenDataModule.ensureInvoiceTemplateSettings(target);
+      }
       return cachedData;
     }
     if (this.invoiceOpenDataInFlight) {

package/lib/solution/UnifiedBookingSales/index.js

@@ -1479,6 +1479,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const cachedData = this.store.openData.getOpenData();
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     if (!params.force && this.openDataTarget === target && cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+      if (typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        await this.store.openData.ensureInvoiceTemplateSettings(target);
+      }
       return cachedData;
     }
     if (this.loadOpenDataInFlight) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.19",
+  "version": "0.10.21",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",