@pisell/pisellos 2.2.295 → 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/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

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

@@ -22,6 +22,8 @@ const LABELS = {
     pickUpTime: 'Pick-up time',
     asap: 'ASAP',
     cash: 'Cash',
+    cashReceived: 'Cash received',
+    changeDue: 'Change due',
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
@@ -49,6 +51,8 @@ const LABELS = {
     pickUpTime: '取餐时间',
     asap: '尽快',
     cash: '现金支付',
+    cashReceived: '收取现金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
@@ -76,6 +80,8 @@ const LABELS = {
     pickUpTime: '取餐時間',
     asap: '盡快',
     cash: '現金支付',
+    cashReceived: '收取現金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
@@ -90,6 +96,14 @@ const LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    cashReceived: 'お預かり',
+    changeDue: 'お釣り'
+  },
+  pt: {
+    cashReceived: 'Dinheiro recebido',
+    changeDue: 'Troco'
   }
 };
 function buildSmallTicketData(params) {
@@ -169,7 +183,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?.buzzer),
@@ -807,6 +821,11 @@ function buildPaymentItems(params) {
     item: paymentMethodName(payment, locale),
     value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
   }];
+  items.push(...buildCashChangePaymentItems({
+    payment,
+    locale,
+    currencySymbol
+  }));
   if (serviceFee.gt(0)) {
     items.push({
       item: label(locale, 'surchargeIncluded'),
@@ -848,6 +867,36 @@ function resolveReceiptPaymentAmount(payment, serviceFee) {
   const originAmount = new _decimal.default(toMoneyNumber(payment.origin_amount));
   return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
 }
+function buildCashChangePaymentItems(params) {
+  const {
+    payment,
+    locale,
+    currencySymbol
+  } = 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)
+  }];
+}
+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 buildFundRecordPaymentItems(params) {
   const {
     payment,

package/package.json

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