@pisell/pisellos 2.2.294 → 2.2.296

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

@@ -30,6 +30,8 @@ var LABELS = {
     pickUpTime: 'Pick-up time',
     asap: 'ASAP',
     cash: 'Cash',
+    cashReceived: 'Cash received',
+    changeDue: 'Change due',
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
@@ -57,6 +59,8 @@ var LABELS = {
     pickUpTime: '取餐时间',
     asap: '尽快',
     cash: '现金支付',
+    cashReceived: '收取现金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
@@ -84,6 +88,8 @@ var LABELS = {
     pickUpTime: '取餐時間',
     asap: '盡快',
     cash: '現金支付',
+    cashReceived: '收取現金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
@@ -98,6 +104,14 @@ var LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    cashReceived: 'お預かり',
+    changeDue: 'お釣り'
+  },
+  pt: {
+    cashReceived: 'Dinheiro recebido',
+    changeDue: 'Troco'
   }
 };
 export function buildSmallTicketData(params) {
@@ -174,7 +188,7 @@ 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.address || buildShopAddress(shopInfo) || order.shop_address),
+    shop_address: stringify(shopInfo.receipt_address || 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 = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata.buzzer)),
@@ -839,6 +853,11 @@ function buildPaymentItems(params) {
     item: paymentMethodName(payment, locale),
     value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
   }];
+  items.push.apply(items, _toConsumableArray(buildCashChangePaymentItems({
+    payment: payment,
+    locale: locale,
+    currencySymbol: currencySymbol
+  })));
   if (serviceFee.gt(0)) {
     items.push({
       item: label(locale, 'surchargeIncluded'),
@@ -882,6 +901,35 @@ function resolveReceiptPaymentAmount(payment, serviceFee) {
   var originAmount = new Decimal(toMoneyNumber(payment.origin_amount));
   return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
 }
+function buildCashChangePaymentItems(params) {
+  var payment = params.payment,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  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)
+  }];
+}
+function shouldDisplayCashChange(payment) {
+  var _payment$code, _payment$metadata2, _payment$metadata3;
+  if (stringify(payment.status).toLowerCase() !== 'paid') return false;
+  var paymentMethod = stringify((_payment$code = payment.code) !== null && _payment$code !== void 0 ? _payment$code : payment.payment_method).toUpperCase();
+  if (paymentMethod !== 'CASHMANUAL') return false;
+  var actualPaidAmount = (_payment$metadata2 = payment.metadata) === null || _payment$metadata2 === void 0 ? void 0 : _payment$metadata2.actual_paid_amount;
+  var changeGivenAmount = (_payment$metadata3 = payment.metadata) === null || _payment$metadata3 === void 0 ? void 0 : _payment$metadata3.change_given_amount;
+  if (!isNumericAmount(actualPaidAmount) || !isNumericAmount(changeGivenAmount)) return false;
+  return new Decimal(changeGivenAmount).toDecimalPlaces(2).gt(0);
+}
+function isNumericAmount(value) {
+  if (typeof value === 'number') return Number.isFinite(value);
+  if (typeof value !== 'string') return false;
+  var normalized = value.trim();
+  return normalized !== '' && /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(normalized);
+}
 function buildFundRecordPaymentItems(params) {
   var payment = params.payment,
     fundRecord = params.fundRecord,

package/dist/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, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } 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 } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -225,20 +225,12 @@ 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;