@pisell/pisellos 0.10.17 → 0.10.19

package/dist/modules/OpenData/utils.js

@@ -6,6 +6,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }
 import dayjs from 'dayjs';
 import { getDateIsInSchedule } from "../Schedule/getDateIsInSchedule";
+import { INVOICE_MODULE_KEYS } from "./types";
 function isRecord(value) {
   return !!value && _typeof(value) === 'object' && !Array.isArray(value);
 }
@@ -22,7 +23,12 @@ function parseInvoiceRecord(value) {
 }
 export function getDefaultInvoiceLayoutConfig() {
   return {
-    module: []
+    module: INVOICE_MODULE_KEYS.map(function (key) {
+      return {
+        key: key,
+        is_show: 1
+      };
+    })
   };
 }
 export function getDefaultInvoiceTemplateSettings() {
@@ -82,8 +88,10 @@ export function normalizeInvoiceTemplateSettings(config) {
  * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
  */
 export function normalizeInvoiceLayoutConfig(config) {
+  var modules = normalizeInvoiceTemplateSettings(config).modules;
+  if (modules.length === 0) return getDefaultInvoiceLayoutConfig();
   return {
-    module: normalizeInvoiceTemplateSettings(config).modules
+    module: modules
   };
 }
 function toBoolean(value) {

package/dist/server/index.js

@@ -5751,23 +5751,18 @@ var Server = /*#__PURE__*/function () {
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
                 payload: {
                   type: params.isManualPrint ? '0' : '99',
+                  template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
                   data: params.receiptOnly ? {
                     order_id: printIdentity,
                     small_ticket_data: (_params$syncedOrder = params.syncedOrder) === null || _params$syncedOrder === void 0 || (_params$syncedOrder = _params$syncedOrder.payment_info) === null || _params$syncedOrder === void 0 ? void 0 : _params$syncedOrder.small_ticket_data,
-                    invoice: this.normalizePrintInvoiceLayoutConfig(params.invoiceLayoutConfig),
-                    template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
                     skip_wristband: true,
                     skip_voucher: true
-                  } : _objectSpread(_objectSpread({
+                  } : {
                     order_id: printIdentity,
                     machine_code_print_info: (_params$syncedOrder2 = params.syncedOrder) === null || _params$syncedOrder2 === void 0 || (_params$syncedOrder2 = _params$syncedOrder2.payment_info) === null || _params$syncedOrder2 === void 0 ? void 0 : _params$syncedOrder2.machine_code_print_info,
-                    machine_code_print_info_v2: (_params$syncedOrder3 = params.syncedOrder) === null || _params$syncedOrder3 === void 0 ? void 0 : _params$syncedOrder3.machine_code_print_info_v2
-                  }, params.invoiceLayoutConfig ? {
-                    invoice: this.normalizePrintInvoiceLayoutConfig(params.invoiceLayoutConfig)
-                  } : {}), {}, {
-                    template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
+                    machine_code_print_info_v2: (_params$syncedOrder3 = params.syncedOrder) === null || _params$syncedOrder3 === void 0 ? void 0 : _params$syncedOrder3.machine_code_print_info_v2,
                     skip_receipt: true
-                  })
+                  }
                 },
                 idempotency_key: this.buildPrintOtherReceiptIdempotencyKey(params.syncedOrder, {
                   receiptOnly: params.receiptOnly

package/dist/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 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 6 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -253,11 +253,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getBookingTicketBusinessCode",
     value: function getBookingTicketBusinessCode() {
-      var _this$otherParams$bus, _this$otherParams2, _this$otherParams3;
-      var businessCode = (_this$otherParams$bus = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code;
-      if (businessCode === undefined || businessCode === null) return null;
-      var normalized = String(businessCode).trim();
-      return normalized || null;
+      var _this$otherParams2, _this$otherParams3, _this$getOrderHeader, _this$store$order, _this$getSalesOrder;
+      var candidates = [(_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode, (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code, (_this$getOrderHeader = this.getOrderHeader()) === null || _this$getOrderHeader === void 0 ? void 0 : _this$getOrderHeader.business_code, (_this$store$order = this.store.order) === null || _this$store$order === void 0 || (_this$store$order = _this$store$order.getTempOrder()) === null || _this$store$order === void 0 ? void 0 : _this$store$order.business_code, (_this$getSalesOrder = this.getSalesOrder()) === null || _this$getSalesOrder === void 0 || (_this$getSalesOrder = _this$getSalesOrder.raw) === null || _this$getSalesOrder === void 0 ? void 0 : _this$getSalesOrder.business_code];
+      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+        var candidate = _candidates[_i];
+        if (candidate === undefined || candidate === null) continue;
+        var normalized = String(candidate).trim();
+        if (normalized) return normalized;
+      }
+      return null;
     }
   }, {
     key: "getIdGeneratorPlugin",
@@ -916,12 +920,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "setBookingStatus",
     value: (function () {
       var _setBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(status) {
-        var _this$store$order, _this$store$order$get;
+        var _this$store$order2, _this$store$order2$ge;
         var tempOrder, orderId, scheduleId, bookings, previous, _data, res;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              tempOrder = (_this$store$order = this.store.order) === null || _this$store$order === void 0 || (_this$store$order$get = _this$store$order.getTempOrder) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.call(_this$store$order);
+              tempOrder = (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || (_this$store$order2$ge = _this$store$order2.getTempOrder) === null || _this$store$order2$ge === void 0 ? void 0 : _this$store$order2$ge.call(_this$store$order2);
               if (tempOrder) {
                 _context12.next = 3;
                 break;
@@ -1000,7 +1004,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "transitionChildBooking",
     value: (function () {
       var _transitionChildBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(params) {
-        var _this$store$order2, _this$store$order2$ge;
+        var _this$store$order3, _this$store$order3$ge;
         var schedule_event_id, action, tempOrder, orderId, bookings, targetStatus, previous, _data2, res;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -1018,7 +1022,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               throw new Error('transitionChildBooking: action 不能为空');
             case 5:
-              tempOrder = (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || (_this$store$order2$ge = _this$store$order2.getTempOrder) === null || _this$store$order2$ge === void 0 ? void 0 : _this$store$order2$ge.call(_this$store$order2);
+              tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getTempOrder) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
               if (tempOrder) {
                 _context13.next = 8;
                 break;
@@ -1085,7 +1089,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "refreshSalesDetail",
     value: (function () {
       var _refreshSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this$store$order3, _this$store$order3$ge;
+        var _this$store$order4, _this$store$order4$ge;
         var params,
           tempOrder,
           orderId,
@@ -1094,7 +1098,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
               params = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-              tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getTempOrder) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
+              tempOrder = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || (_this$store$order4$ge = _this$store$order4.getTempOrder) === null || _this$store$order4$ge === void 0 ? void 0 : _this$store$order4$ge.call(_this$store$order4);
               if (tempOrder) {
                 _context14.next = 4;
                 break;
@@ -1377,8 +1381,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getCart",
     value: function getCart() {
-      var _this$store$order$get2, _this$store$order4, _salesDetail$bookings, _operatingDayBoundary, _operatingDayBoundary2, _tempOrder$_extend;
-      var tempOrder = (_this$store$order$get2 = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getTempOrder()) !== null && _this$store$order$get2 !== void 0 ? _this$store$order$get2 : null;
+      var _this$store$order$get, _this$store$order5, _salesDetail$bookings, _operatingDayBoundary, _operatingDayBoundary2, _tempOrder$_extend;
+      var tempOrder = (_this$store$order$get = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getTempOrder()) !== null && _this$store$order$get !== void 0 ? _this$store$order$get : null;
       var salesDetail = this.getSalesOrder();
       var bookings = (_salesDetail$bookings = salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) !== null && _salesDetail$bookings !== void 0 ? _salesDetail$bookings : (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.bookings) || [];
       var operatingDayBoundary;
@@ -1665,13 +1669,13 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "setOrderCustomer",
     value: function setOrderCustomer(customer, options) {
-      var _this$store$order$get3,
+      var _this$store$order$get2,
         _this3 = this;
       if (!customer) {
         this.clearOrderCustomer();
         return;
       }
-      var previousCustomerId = (_this$store$order$get3 = this.store.order.getOrderCustomer()) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.customer_id;
+      var previousCustomerId = (_this$store$order$get2 = this.store.order.getOrderCustomer()) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2.customer_id;
       var snapshotBeforeSet = this.store.order.getOrderCustomerSnapshot();
       var patch = formatOrderCustomerPatch(customer);
       var customerUnchanged = Number(previousCustomerId || 0) === Number(patch.customer_id || 0);
@@ -2428,10 +2432,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get3, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
+      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get3 = this.store.order.getTempOrder()) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
       return _objectSpread(_objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2987,7 +2991,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleRedeem",
     value: function () {
       var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
+        var _this$store$order6, _this$store$order6$ge, _this$store$order7, _ref20, _tempOrder$order_id2;
         var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -3003,8 +3007,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 }
               });
               voucherIdSet = new Set(voucherIds);
-              tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
-              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
+              tempOrder = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$ge = _this$store$order6.getTempOrder) === null || _this$store$order6$ge === void 0 ? void 0 : _this$store$order6$ge.call(_this$store$order6);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getVouchers()) || [];
               hasUpdatedVoucher = false;
               nextVouchers = vouchers.map(function (voucher) {
                 if (!voucherIdSet.has(voucher.voucher_id)) return voucher;

package/lib/modules/OpenData/utils.js

@@ -11,6 +11,7 @@ exports.normalizeInvoiceTemplateSettings = normalizeInvoiceTemplateSettings;
 exports.normalizeRawInvoiceTemplateSettings = normalizeRawInvoiceTemplateSettings;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
+var _types = require("./types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
@@ -28,7 +29,10 @@ function parseInvoiceRecord(value) {
 }
 function getDefaultInvoiceLayoutConfig() {
   return {
-    module: []
+    module: _types.INVOICE_MODULE_KEYS.map(key => ({
+      key,
+      is_show: 1
+    }))
   };
 }
 function getDefaultInvoiceTemplateSettings() {
@@ -88,8 +92,10 @@ function normalizeInvoiceTemplateSettings(config) {
  * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
  */
 function normalizeInvoiceLayoutConfig(config) {
+  const modules = normalizeInvoiceTemplateSettings(config).modules;
+  if (modules.length === 0) return getDefaultInvoiceLayoutConfig();
   return {
-    module: normalizeInvoiceTemplateSettings(config).modules
+    module: modules
   };
 }
 function toBoolean(value) {

package/lib/server/index.js

@@ -3682,21 +3682,16 @@ class Server {
         device_id: params.deviceId ?? deviceId,
         payload: {
           type: params.isManualPrint ? '0' : '99',
+          template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
           data: params.receiptOnly ? {
             order_id: printIdentity,
             small_ticket_data: params.syncedOrder?.payment_info?.small_ticket_data,
-            invoice: this.normalizePrintInvoiceLayoutConfig(params.invoiceLayoutConfig),
-            template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
             skip_wristband: true,
             skip_voucher: true
           } : {
             order_id: printIdentity,
             machine_code_print_info: params.syncedOrder?.payment_info?.machine_code_print_info,
             machine_code_print_info_v2: params.syncedOrder?.machine_code_print_info_v2,
-            ...(params.invoiceLayoutConfig ? {
-              invoice: this.normalizePrintInvoiceLayoutConfig(params.invoiceLayoutConfig)
-            } : {}),
-            template_settings: this.normalizePrintInvoiceTemplateSettings(params.invoiceTemplateSettings),
             skip_receipt: true
           }
         },

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 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 6 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -196,10 +196,13 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     await this.configureIdGeneratorFromOpenData();
   }
   getBookingTicketBusinessCode() {
-    const businessCode = this.otherParams?.businessCode ?? this.otherParams?.business_code;
-    if (businessCode === undefined || businessCode === null) return null;
-    const normalized = String(businessCode).trim();
-    return normalized || null;
+    const candidates = [this.otherParams?.businessCode, this.otherParams?.business_code, this.getOrderHeader()?.business_code, this.store.order?.getTempOrder()?.business_code, this.getSalesOrder()?.raw?.business_code];
+    for (const candidate of candidates) {
+      if (candidate === undefined || candidate === null) continue;
+      const normalized = String(candidate).trim();
+      if (normalized) return normalized;
+    }
+    return null;
   }
   getIdGeneratorPlugin() {
     const appPlugin = this.core.getPlugin('app');

package/package.json

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