@pisell/pisellos 2.3.163 → 2.3.164

package/dist/modules/Order/index.d.ts

@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/shared/receipt/small-ticket.js

@@ -357,7 +357,7 @@ function buildLocaleData(params) {
       financials: financials
     }),
     customer: buildCustomer(order, locale, visibility.customer),
-    appointment: buildAppointment(order, locale)
+    appointment: buildAppointment(order, locale, visibility.lineGroups.resourceTitle)
   }, delivery.length ? {
     delivery: delivery
   } : {}), {}, {
@@ -1383,7 +1383,7 @@ function formatPickupBookingStart(bookings, locale) {
   var dateText = locale === 'en' ? "".concat(day, "/").concat(month, "/").concat(year) : "".concat(year, "/").concat(month, "/").concat(day);
   return "".concat(time.slice(0, 5), " ").concat(dateText);
 }
-function buildAppointment(order, locale) {
+function buildAppointment(order, locale, showResourceTitle) {
   var _order$metadata13, _order$metadata14, _order$metadata15, _order$form_data;
   var parentScheduleId = (_order$metadata13 = order.metadata) === null || _order$metadata13 === void 0 ? void 0 : _order$metadata13.appointment_booking_parent_schedule_id;
   var bookings = sortBookings(normalizeArray(order.bookings).filter(function (booking) {
@@ -1396,7 +1396,8 @@ function buildAppointment(order, locale) {
         booking: booking,
         allResources: allResources,
         bookingCount: bookings.length,
-        locale: locale
+        locale: locale,
+        showResourceTitle: showResourceTitle
       });
     });
   }
@@ -1434,7 +1435,7 @@ function buildAppointmentRows(params) {
   };
   var bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
   var bookingTime = formatBookingRange(booking, locale);
-  var resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  var resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale, params.showResourceTitle);
   var holder = getLocalizedValue((_booking$holder$name = (_booking$holder = booking.holder) === null || _booking$holder === void 0 ? void 0 : _booking$holder.name) !== null && _booking$holder$name !== void 0 ? _booking$holder$name : (_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 || (_booking$metadata3 = _booking$metadata3.holder) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.name, locale).trim();
   return [_objectSpread(_objectSpread({}, receiptKey(booking, 'booking-id')), {}, {
     item: label(locale, 'bookingId'),
@@ -1512,10 +1513,10 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
   if (bookingCount === 1 && allResources.length) return allResources;
   return [];
 }
-function formatBookingResources(resources, locale) {
+function formatBookingResources(resources, locale, showResourceTitle) {
   return resources.map(function (resource) {
     var _resource$metadata, _resource$metadata2, _resource$metadata3, _resource$metadata4;
-    return [getLocalizedValue(resource.form_title || ((_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.form_name) || resource.relation_form_name || ((_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.relation_form_name), locale), getLocalizedValue(resource.title || resource.name || resource.main_field || ((_resource$metadata3 = resource.metadata) === null || _resource$metadata3 === void 0 ? void 0 : _resource$metadata3.main_field) || ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.resource_name), locale)].filter(Boolean).join(' ');
+    return [showResourceTitle ? getLocalizedValue(resource.form_title || ((_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.form_name) || resource.relation_form_name || ((_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.relation_form_name), locale) : '', getLocalizedValue(resource.title || resource.name || resource.main_field || ((_resource$metadata3 = resource.metadata) === null || _resource$metadata3 === void 0 ? void 0 : _resource$metadata3.main_field) || ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.resource_name), locale)].filter(Boolean).join(' ');
   }).filter(Boolean).join(', ');
 }
 function sortBookings(bookings) {

package/dist/shared/receipt/templateVisibility.d.ts

@@ -1,5 +1,8 @@
 /** Template children are direct module members; legacy missing values stay visible. */
 export interface InvoiceDataVisibility {
+    lineGroups: {
+        resourceTitle: boolean;
+    };
     handover: {
         show: boolean;
         method: boolean;

package/dist/shared/receipt/templateVisibility.js

@@ -36,6 +36,9 @@ export function resolveInvoiceDataVisibility(settings) {
     return typeof tag === 'string' && tag.length > 0;
   })) : null;
   return {
+    lineGroups: {
+      resourceTitle: field(module('line_groups'), 'resource_title')
+    },
     handover: {
       show: invoiceSettingIsVisible(handover === null || handover === void 0 ? void 0 : handover.is_show),
       method: field(handover, 'method'),
@@ -59,6 +62,7 @@ export function requiresInvoiceDataFiltering(settings) {
   var _resolveInvoiceDataVi = resolveInvoiceDataVisibility(settings),
     handover = _resolveInvoiceDataVi.handover,
     customer = _resolveInvoiceDataVi.customer,
-    card = _resolveInvoiceDataVi.card;
-  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+    card = _resolveInvoiceDataVi.card,
+    lineGroups = _resolveInvoiceDataVi.lineGroups;
+  return !lineGroups.resourceTitle || !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
 }

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

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

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/modules/Order/index.d.ts

@@ -595,7 +595,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/shared/receipt/small-ticket.js

@@ -341,7 +341,7 @@ function buildLocaleData(params) {
       financials
     }),
     customer: buildCustomer(order, locale, visibility.customer),
-    appointment: buildAppointment(order, locale),
+    appointment: buildAppointment(order, locale, visibility.lineGroups.resourceTitle),
     ...(delivery.length ? {
       delivery
     } : {}),
@@ -1322,7 +1322,7 @@ function formatPickupBookingStart(bookings, locale) {
   const dateText = locale === 'en' ? `${day}/${month}/${year}` : `${year}/${month}/${day}`;
   return `${time.slice(0, 5)} ${dateText}`;
 }
-function buildAppointment(order, locale) {
+function buildAppointment(order, locale, showResourceTitle) {
   const parentScheduleId = order.metadata?.appointment_booking_parent_schedule_id;
   const bookings = sortBookings(normalizeArray(order.bookings).filter(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking) && isReceiptAppointmentBooking(booking, parentScheduleId)));
   if (bookings.length) {
@@ -1331,7 +1331,8 @@ function buildAppointment(order, locale) {
       booking,
       allResources,
       bookingCount: bookings.length,
-      locale
+      locale,
+      showResourceTitle
     }));
   }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
@@ -1370,7 +1371,7 @@ function buildAppointmentRows(params) {
   };
   const bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
   const bookingTime = formatBookingRange(booking, locale);
-  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale, params.showResourceTitle);
   const holder = getLocalizedValue(booking.holder?.name ?? booking.metadata?.holder?.name, locale).trim();
   return [{
     ...receiptKey(booking, 'booking-id'),
@@ -1432,8 +1433,8 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
   if (bookingCount === 1 && allResources.length) return allResources;
   return [];
 }
-function formatBookingResources(resources, locale) {
-  return resources.map(resource => [getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale), getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
+function formatBookingResources(resources, locale, showResourceTitle) {
+  return resources.map(resource => [showResourceTitle ? getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale) : '', getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
 }
 function sortBookings(bookings) {
   return bookings.map((booking, index) => ({

package/lib/shared/receipt/templateVisibility.d.ts

@@ -1,5 +1,8 @@
 /** Template children are direct module members; legacy missing values stay visible. */
 export interface InvoiceDataVisibility {
+    lineGroups: {
+        resourceTitle: boolean;
+    };
     handover: {
         show: boolean;
         method: boolean;

package/lib/shared/receipt/templateVisibility.js

@@ -34,6 +34,9 @@ function resolveInvoiceDataVisibility(settings) {
   const field = (config, key) => invoiceSettingIsVisible(config?.[key]?.is_show);
   const passTypes = Array.isArray(card?.pass_type) && card.pass_type.length > 0 ? new Set(card.pass_type.filter(tag => typeof tag === 'string' && tag.length > 0)) : null;
   return {
+    lineGroups: {
+      resourceTitle: field(module('line_groups'), 'resource_title')
+    },
     handover: {
       show: invoiceSettingIsVisible(handover?.is_show),
       method: field(handover, 'method'),
@@ -57,7 +60,8 @@ function requiresInvoiceDataFiltering(settings) {
   const {
     handover,
     customer,
-    card
+    card,
+    lineGroups
   } = resolveInvoiceDataVisibility(settings);
-  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+  return !lineGroups.resourceTitle || !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
 }

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

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

package/package.json

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