@pisell/pisellos 2.2.291 → 2.2.293

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

@@ -22,8 +22,6 @@ const LABELS = {
     pickUpTime: 'Pick-up time',
     asap: 'ASAP',
     cash: 'Cash',
-    cashReceived: 'Cash received',
-    changeDue: 'Change due',
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
@@ -34,6 +32,7 @@ const LABELS = {
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
+    surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
     gross: 'Gross',
     tare: 'Tare'
@@ -50,8 +49,6 @@ const LABELS = {
     pickUpTime: '取餐时间',
     asap: '尽快',
     cash: '现金支付',
-    cashReceived: '收取现金',
-    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
@@ -62,6 +59,7 @@ const LABELS = {
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
+    surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -78,8 +76,6 @@ const LABELS = {
     pickUpTime: '取餐時間',
     asap: '盡快',
     cash: '現金支付',
-    cashReceived: '收取現金',
-    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
@@ -90,17 +86,10 @@ const LABELS = {
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
+    surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
-  },
-  ja: {
-    cashReceived: 'お預かり',
-    changeDue: 'お釣り'
-  },
-  pt: {
-    cashReceived: 'Dinheiro recebido',
-    changeDue: 'Troco'
   }
 };
 function buildSmallTicketData(params) {
@@ -155,6 +144,11 @@ function buildLocaleData(params) {
       locale,
       currencySymbol
     }),
+    wallets: buildWallets({
+      order,
+      locale,
+      currencySymbol
+    }),
     tickets: Array.isArray(order.tickets) ? order.tickets : [],
     source_shop: [],
     refund_data: [],
@@ -175,12 +169,15 @@ function buildBaseData(params) {
     order_number: orderNumber,
     shop_tax_number: stringify(shopInfo.tax_number || order.shop_tax_number),
     shop_phone: stringify(shopInfo.phone || order.shop_phone),
-    shop_address: stringify(shopInfo.receipt_address || shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
+    shop_address: stringify(shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
     original_payment_status: stringify(order.payment_status),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || order.metadata?.buzzer),
     order_no: orderNumber,
-    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale)
+    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale),
+    ...(isPresentId(order.updated_at) ? {
+      updated_at: formatDateTime(order.updated_at, locale)
+    } : {})
   };
 }
 function buildProducts(order, locale, productMap) {
@@ -214,6 +211,8 @@ function buildProducts(order, locale, productMap) {
       parentProduct,
       locale
     });
+    const productUid = firstPresentValue(product.metadata?.unique_identification_number, product.unique_identification_number);
+    const bookingUid = firstPresentValue(product.booking_uid, product.metadata?.booking_uid);
     const extensionList = buildProductExtensionList({
       product,
       locale,
@@ -228,6 +227,12 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList,
+      ...(isPresentId(productUid) ? {
+        product_uid: productUid
+      } : {}),
+      ...(isPresentId(bookingUid) ? {
+        booking_uid: bookingUid
+      } : {}),
       ...(options.length ? {
         options
       } : {}),
@@ -593,6 +598,9 @@ function isNonZeroId(value) {
 function isPresentId(value) {
   return value !== undefined && value !== null && value !== '';
 }
+function firstPresentValue(...values) {
+  return values.find(value => isPresentId(value));
+}
 function isSameId(left, right) {
   if (!isPresentId(left) || !isPresentId(right)) return false;
   return String(left) === String(right);
@@ -661,12 +669,13 @@ function buildFees(params) {
     });
   }
   const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
-  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  const productOriginalAmount = firstPresentValue(summary.product_original_amount, order.product_original_amount) ?? calculateProductOriginalAmount(order);
   const totalSavingsAmount = new _decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
+      original_item_amount: formatMoney(productOriginalAmount, currencySymbol),
       product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0), 0),
@@ -689,6 +698,13 @@ function buildFees(params) {
     }
   };
 }
+function calculateProductOriginalAmount(order) {
+  return normalizeArray(order.products).reduce((total, product) => {
+    const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
+    const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
+    return total.plus(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity));
+  }, new _decimal.default(0));
+}
 function buildCustomer(order, locale) {
   return [{
     item: label(locale, 'contactName'),
@@ -726,6 +742,27 @@ function buildDelivery(order, locale) {
   return items;
 }
 function buildAppointment(order, locale) {
+  const bookings = normalizeArray(order.bookings);
+  if (bookings.length) {
+    return bookings.map(booking => {
+      const snapshot = {
+        ...booking
+      };
+      delete snapshot.product_uid;
+      delete snapshot.booking_uid;
+      const productUid = firstPresentValue(booking.product_uid, booking.metadata?.product_uid);
+      const bookingUid = firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid);
+      return {
+        ...snapshot,
+        ...(isPresentId(productUid) ? {
+          product_uid: productUid
+        } : {}),
+        ...(isPresentId(bookingUid) ? {
+          booking_uid: bookingUid
+        } : {})
+      };
+    });
+  }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
   if (!tableName) return [];
   return [{
@@ -743,76 +780,81 @@ function buildResources(order, locale) {
 }
 function buildPaymentData(params) {
   const payments = normalizeArray(params.order.payments);
-  return payments.filter(payment => isPrintablePayment(payment)).map(payment => {
-    const items = [{
-      item: paymentMethodName(payment, params.locale),
-      value: formatMoney(payment.amount ?? payment.origin_amount, params.currencySymbol)
-    }];
-    items.push(...buildCashChangePaymentItems({
-      payment,
-      locale: params.locale,
-      currencySymbol: params.currencySymbol
-    }));
-    const fundRecord = getFundRecord(payment);
-    if (fundRecord) {
-      items.push(...buildFundRecordPaymentItems({
-        payment,
-        fundRecord,
-        locale: params.locale,
-        currencySymbol: params.currencySymbol
-      }));
-    } else {
-      const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
-      if (remainingAmount !== undefined && remainingAmount !== null) {
-        items.push({
-          item: label(params.locale, 'remainingAmount'),
-          value: formatMoney(remainingAmount, params.currencySymbol)
-        });
-      }
-    }
-    items.push({
-      item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), params.locale),
-      value: ''
-    });
-    return items;
-  });
+  return payments.filter(payment => isPrintablePayment(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: false
+  }));
+}
+function buildWallets(params) {
+  return normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: true
+  }));
 }
-function buildCashChangePaymentItems(params) {
+function buildPaymentItems(params) {
   const {
     payment,
     locale,
-    currencySymbol
+    currencySymbol,
+    includeFundRecordBalance
   } = params;
-  if (!shouldDisplayCashChange(payment)) return [];
-  return [{
-    item: label(locale, 'cashReceived'),
-    value: formatMoney(payment.metadata.actual_paid_amount, currencySymbol)
-  }, {
-    item: label(locale, 'changeDue'),
-    value: formatMoney(payment.metadata.change_given_amount, currencySymbol)
+  const serviceFee = getPaymentServiceFee(payment);
+  const items = [{
+    item: paymentMethodName(payment, locale),
+    value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
   }];
+  if (serviceFee.gt(0)) {
+    items.push({
+      item: label(locale, 'surchargeIncluded'),
+      value: formatMoney(serviceFee, currencySymbol)
+    });
+  }
+  const fundRecord = getFundRecord(payment);
+  if (fundRecord) {
+    items.push(...buildFundRecordPaymentItems({
+      payment,
+      fundRecord,
+      locale,
+      currencySymbol,
+      includeBalance: includeFundRecordBalance
+    }));
+  } else {
+    const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
+    if (remainingAmount !== undefined && remainingAmount !== null) {
+      items.push({
+        item: label(locale, 'remainingAmount'),
+        value: formatMoney(remainingAmount, currencySymbol)
+      });
+    }
+  }
+  items.push({
+    item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), locale),
+    value: ''
+  });
+  return items;
 }
-function shouldDisplayCashChange(payment) {
-  if (stringify(payment.status).toLowerCase() !== 'paid') return false;
-  const paymentMethod = stringify(payment.code ?? payment.payment_method).toUpperCase();
-  if (paymentMethod !== 'CASHMANUAL') return false;
-  const actualPaidAmount = payment.metadata?.actual_paid_amount;
-  const changeGivenAmount = payment.metadata?.change_given_amount;
-  if (!isNumericAmount(actualPaidAmount) || !isNumericAmount(changeGivenAmount)) return false;
-  return new _decimal.default(changeGivenAmount).toDecimalPlaces(2).gt(0);
-}
-function isNumericAmount(value) {
-  if (typeof value === 'number') return Number.isFinite(value);
-  if (typeof value !== 'string') return false;
-  const normalized = value.trim();
-  return normalized !== '' && /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(normalized);
+function getPaymentServiceFee(payment) {
+  return new _decimal.default(toMoneyNumber(payment.service_fee));
+}
+function resolveReceiptPaymentAmount(payment, serviceFee) {
+  const amount = new _decimal.default(toMoneyNumber(payment.amount ?? payment.origin_amount));
+  const hasAmount = payment.amount !== undefined && payment.amount !== null && payment.amount !== '';
+  const hasOriginAmount = payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '';
+  if (!hasAmount || !hasOriginAmount || serviceFee.lte(0)) return amount;
+  const originAmount = new _decimal.default(toMoneyNumber(payment.origin_amount));
+  return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
 }
 function buildFundRecordPaymentItems(params) {
   const {
     payment,
     fundRecord,
     locale,
-    currencySymbol
+    currencySymbol,
+    includeBalance
   } = params;
   const items = [];
   const usingBeforeValue = fundRecord.using_before_value;
@@ -823,13 +865,15 @@ function buildFundRecordPaymentItems(params) {
       item: label(locale, 'redeemPoints'),
       value: trimDecimal(usedPoints)
     });
-    items.push({
-      item: label(locale, 'remainingPoints'),
-      value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
-    });
+    if (includeBalance) {
+      items.push({
+        item: label(locale, 'remainingPoints'),
+        value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
+      });
+    }
     return items;
   }
-  if (usingAfterValue !== undefined && usingAfterValue !== null) {
+  if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
       item: label(locale, 'remainingAmount'),
       value: formatMoney(usingAfterValue, currencySymbol)

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

@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } from '../../modules/Order/types';
+import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -129,8 +129,23 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
+    private isCustomerUserPriceQuery;
+    private getPriceQueryScheduleList;
+    private buildPriceQueryPayload;
+    private getRawProductPriceSources;
+    private rememberRawProductPriceSources;
+    private getSelectedProductVariantId;
+    /**
+     * 将目录原始商品还原为本次选择的 SKU 基线。
+     *
+     * 这里绝不能复用已评估后的目录商品，否则从命中智能价切回不命中的
+     * 日期时会残留旧价格。套餐仅验证所选关系存在，最终仍由 merge 方法把
+     * 评估后的套餐价格映射回用户的选择数据。
+     */
+    private prepareRawProductForPriceQuery;
+    private resolveLocalProductForPriceQuery;
     private loadProductsForPriceQuery;
-    private loadProductForPriceQuery;
+    private resolveProductsForPriceQuery;
     private getAuthoritativeBundleItems;
     private findAuthoritativeBundleItem;
     private getAuthoritativeBundleUnitPrice;
@@ -210,12 +225,20 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
+    getSalesNotes(): SalesNote[];
+    createSalesNotesMutationSnapshot(): SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot(snapshot: SalesNotesMutationSnapshot): void;
+    setSalesNote(input: SetSalesNoteInput): Promise<SalesNote>;
+    removeSalesNote(uuid: string): Promise<void>;
+    clearSalesNotes(): Promise<void>;
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
+    setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
+    setServiceType(serviceType: ShopServiceType): ShopServiceData;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
@@ -498,7 +521,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getUnfulfilledPromotions(): OrderUnfulfilledPromotion[];
     /** 最近一次促销计算输出的赠品操作 diff。 */
     getLastGiftActions(): OrderLastGiftActions | null;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<import("../..").ProductData[] | undefined>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;