@pisell/private-materials 6.11.218 → 6.11.220
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.js +1 -1
- package/build/lowcode/view.js +1 -1
- package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Content/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Header/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts +0 -1
- package/es/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +0 -1
- package/es/components/appointmentBooking/index.d.ts +0 -1
- package/es/components/booking/addons/model.d.ts +10 -1
- package/es/components/booking/components/voucher/index.d.ts +0 -1
- package/es/components/booking/forms/model.d.ts +10 -1
- package/es/components/booking/forms/single/index.d.ts +0 -1
- package/es/components/booking/hooks/useQuotation.d.ts +0 -1
- package/es/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/es/components/booking/info/date/index.d.ts +0 -1
- package/es/components/booking/info/hooks/useInfoHolder.d.ts +0 -1
- package/es/components/booking/info/index.d.ts +0 -1
- package/es/components/booking/info/model.d.ts +10 -1
- package/es/components/booking/info/notes/index.d.ts +0 -1
- package/es/components/booking/info/service/Lists.d.ts +0 -1
- package/es/components/booking/info/service/addService/index.d.ts +0 -1
- package/es/components/booking/info/service/addService/utils.d.ts +1 -1
- package/es/components/booking/info/service/addTimeModal/index.d.ts +0 -1
- package/es/components/booking/info/service2/Lists.d.ts +0 -1
- package/es/components/booking/info2/service/addService/utils.d.ts +1 -1
- package/es/components/booking/model.d.ts +9 -1
- package/es/components/booking/notes/addNote/index.d.ts +0 -1
- package/es/components/booking/notes/model.d.ts +10 -1
- package/es/components/booking/payments/model.d.ts +10 -1
- package/es/components/booking/utils.d.ts +2 -2
- package/es/components/checkout/components/SearchAndClientModule/index.d.ts +0 -1
- package/es/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts +0 -1
- package/es/components/checkout/hooks/useWalletPass.d.ts +1 -1
- package/es/components/ecocup/cupList/index.d.ts +0 -1
- package/es/components/eftpos/hooks.d.ts +0 -1
- package/es/components/eftpos/index.d.ts +0 -1
- package/es/components/eftposPay/amount.d.ts +1 -1
- package/es/components/eftposPay/app.d.ts +0 -1
- package/es/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/es/components/eftposPay/component/manual/index.d.ts +0 -1
- package/es/components/eftposPay/device.d.ts +1 -1
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/index.d.ts +0 -1
- package/es/components/eftposPay/linkly/index.d.ts +0 -1
- package/es/components/eftposPay/pay.d.ts +0 -1
- package/es/components/eftposPay/store/index.d.ts +5 -5
- package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Content/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Information/index.d.ts +0 -1
- package/es/components/eventBooking/components/Voucher/index.d.ts +0 -1
- package/es/components/eventBooking/index.d.ts +0 -1
- package/es/components/pay/toB/components/ConfirmedPayment/index.d.ts +0 -1
- package/es/components/pay/toC/model.d.ts +9 -1
- package/es/components/pay/toC/utils.d.ts +2 -2
- package/es/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/es/components/ruleSetting/index.d.ts +0 -1
- package/es/components/schedules/model.d.ts +9 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts +0 -1
- package/es/components/shoppingCart/components/Cart/Product.d.ts +0 -1
- package/es/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/es/components/shoppingCart/hooks/useSkuModal.d.ts +0 -1
- package/es/components/ticketBooking/components/addServiceVariant/index.d.ts +0 -1
- package/es/components/ticketBooking/components/menuBar/index.d.ts +0 -1
- package/es/components/ticketBooking/utils/index.d.ts +1 -1
- package/es/components/walletList/index.d.ts +0 -1
- package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +0 -1
- package/es/plus/noteModal/AddTempModal.d.ts +0 -1
- package/es/plus/orderList/config.d.ts +0 -1
- package/es/plus/pisellReservation/PisellReservation.js +0 -2
- package/es/plus/pisellReservation/components/blockTimeModal/demo.d.ts +0 -1
- package/es/plus/pisellReservation/floorMap/floorPlanApi.d.ts +2 -2
- package/es/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.d.ts +13 -2
- package/es/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.js +46 -26
- package/es/plus/pisellReservation/floorRoomCard/views/RoomCardIcons.d.ts +0 -1
- package/es/plus/pisellReservation/hooks/useFloorMapBookingInteraction.d.ts +1 -8
- package/es/plus/pisellReservation/hooks/useFloorMapBookingInteraction.js +25 -28
- package/es/plus/pisellReservation/hooks/useReservationResourceWallPersist.d.ts +2 -3
- package/es/plus/pisellReservation/hooks/useReservationScheduleDebounced.d.ts +0 -1
- package/es/plus/pisellSalesGrid/PisellSalesGrid.js +7 -2
- package/es/plus/pisellSalesManagement/config/booking.d.ts +0 -1
- package/es/plus/pisellSalesManagement/hooks/useSalesGridData.d.ts +1 -2
- package/es/plus/pisellSalesManagement/hooks/useSalesGridData.js +18 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Action/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/CardCom/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/CardWrapper/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Cover/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Favorite/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Price/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Promotions/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/SubTitle/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Tags/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Title/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/TooltipTags/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/utils.d.ts +1 -1
- package/es/plus/skuOptionsSelection/components/NormalCard/index.d.ts +0 -1
- package/es/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts +0 -1
- package/es/plus/skuOptionsSelection/components/OptionsModal/index.d.ts +0 -1
- package/es/plus/skuOptionsSelection/components/VariantCard/index.d.ts +0 -1
- package/es/plus/walletEditor/components/ImageUpload/index.d.ts +1 -1
- package/es/plus/walletPassGallery/components/passDetail/index.d.ts +0 -1
- package/es/plus/walletPassGallery/components/passList/index.d.ts +0 -1
- package/es/plus/walletPassGallery/components/timelineSection/index.d.ts +0 -1
- package/es/plus/walletPassGallery/index.d.ts +0 -1
- package/es/pro/Selector/Selector.d.ts +1 -1
- package/es/pro/pisellPaymentList/example.d.ts +0 -1
- package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts +0 -1
- package/es/pro/skuDetailModal/components/weighing/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Content/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Header/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +0 -1
- package/lib/components/appointmentBooking/index.d.ts +0 -1
- package/lib/components/booking/addons/model.d.ts +10 -1
- package/lib/components/booking/components/voucher/index.d.ts +0 -1
- package/lib/components/booking/forms/model.d.ts +10 -1
- package/lib/components/booking/forms/single/index.d.ts +0 -1
- package/lib/components/booking/hooks/useQuotation.d.ts +0 -1
- package/lib/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/lib/components/booking/info/date/index.d.ts +0 -1
- package/lib/components/booking/info/hooks/useInfoHolder.d.ts +0 -1
- package/lib/components/booking/info/index.d.ts +0 -1
- package/lib/components/booking/info/model.d.ts +10 -1
- package/lib/components/booking/info/notes/index.d.ts +0 -1
- package/lib/components/booking/info/service/Lists.d.ts +0 -1
- package/lib/components/booking/info/service/addService/index.d.ts +0 -1
- package/lib/components/booking/info/service/addService/utils.d.ts +1 -1
- package/lib/components/booking/info/service/addTimeModal/index.d.ts +0 -1
- package/lib/components/booking/info/service2/Lists.d.ts +0 -1
- package/lib/components/booking/info2/service/addService/utils.d.ts +1 -1
- package/lib/components/booking/model.d.ts +9 -1
- package/lib/components/booking/notes/addNote/index.d.ts +0 -1
- package/lib/components/booking/notes/model.d.ts +10 -1
- package/lib/components/booking/payments/model.d.ts +10 -1
- package/lib/components/booking/utils.d.ts +2 -2
- package/lib/components/checkout/components/SearchAndClientModule/index.d.ts +0 -1
- package/lib/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts +0 -1
- package/lib/components/checkout/hooks/useWalletPass.d.ts +1 -1
- package/lib/components/ecocup/cupList/index.d.ts +0 -1
- package/lib/components/eftpos/hooks.d.ts +0 -1
- package/lib/components/eftpos/index.d.ts +0 -1
- package/lib/components/eftposPay/amount.d.ts +1 -1
- package/lib/components/eftposPay/app.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/lib/components/eftposPay/component/manual/index.d.ts +0 -1
- package/lib/components/eftposPay/device.d.ts +1 -1
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/index.d.ts +0 -1
- package/lib/components/eftposPay/linkly/index.d.ts +0 -1
- package/lib/components/eftposPay/pay.d.ts +0 -1
- package/lib/components/eftposPay/store/index.d.ts +5 -5
- package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Content/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Information/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Voucher/index.d.ts +0 -1
- package/lib/components/eventBooking/index.d.ts +0 -1
- package/lib/components/pay/toB/components/ConfirmedPayment/index.d.ts +0 -1
- package/lib/components/pay/toC/model.d.ts +9 -1
- package/lib/components/pay/toC/utils.d.ts +2 -2
- package/lib/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/lib/components/ruleSetting/index.d.ts +0 -1
- package/lib/components/schedules/model.d.ts +9 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts +0 -1
- package/lib/components/shoppingCart/components/Cart/Product.d.ts +0 -1
- package/lib/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/lib/components/shoppingCart/hooks/useSkuModal.d.ts +0 -1
- package/lib/components/ticketBooking/components/addServiceVariant/index.d.ts +0 -1
- package/lib/components/ticketBooking/components/menuBar/index.d.ts +0 -1
- package/lib/components/ticketBooking/utils/index.d.ts +1 -1
- package/lib/components/walletList/index.d.ts +0 -1
- package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +0 -1
- package/lib/plus/noteModal/AddTempModal.d.ts +0 -1
- package/lib/plus/orderList/config.d.ts +0 -1
- package/lib/plus/pisellReservation/PisellReservation.js +0 -2
- package/lib/plus/pisellReservation/components/blockTimeModal/demo.d.ts +0 -1
- package/lib/plus/pisellReservation/floorMap/floorPlanApi.d.ts +2 -2
- package/lib/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.d.ts +13 -2
- package/lib/plus/pisellReservation/floorRoomCard/mapRowToFloorRoomCardData.js +32 -26
- package/lib/plus/pisellReservation/floorRoomCard/views/RoomCardIcons.d.ts +0 -1
- package/lib/plus/pisellReservation/hooks/useFloorMapBookingInteraction.d.ts +1 -8
- package/lib/plus/pisellReservation/hooks/useFloorMapBookingInteraction.js +13 -37
- package/lib/plus/pisellReservation/hooks/useReservationResourceWallPersist.d.ts +2 -3
- package/lib/plus/pisellReservation/hooks/useReservationScheduleDebounced.d.ts +0 -1
- package/lib/plus/pisellSalesGrid/PisellSalesGrid.js +7 -2
- package/lib/plus/pisellSalesManagement/config/booking.d.ts +0 -1
- package/lib/plus/pisellSalesManagement/hooks/useSalesGridData.d.ts +1 -2
- package/lib/plus/pisellSalesManagement/hooks/useSalesGridData.js +11 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Action/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/CardCom/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/CardWrapper/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Cover/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Favorite/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Price/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Promotions/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/SubTitle/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Tags/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Title/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/TooltipTags/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/utils.d.ts +1 -1
- package/lib/plus/skuOptionsSelection/components/NormalCard/index.d.ts +0 -1
- package/lib/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts +0 -1
- package/lib/plus/skuOptionsSelection/components/OptionsModal/index.d.ts +0 -1
- package/lib/plus/skuOptionsSelection/components/VariantCard/index.d.ts +0 -1
- package/lib/plus/walletEditor/components/ImageUpload/index.d.ts +1 -1
- package/lib/plus/walletPassGallery/components/passDetail/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/components/passList/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/index.d.ts +0 -1
- package/lib/pro/Selector/Selector.d.ts +1 -1
- package/lib/pro/pisellPaymentList/example.d.ts +0 -1
- package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts +0 -1
- package/lib/pro/skuDetailModal/components/weighing/index.d.ts +0 -1
- package/package.json +3 -3
|
@@ -669,37 +669,57 @@ export function resolveBookingIdForHeader(raw) {
|
|
|
669
669
|
}
|
|
670
670
|
|
|
671
671
|
/**
|
|
672
|
-
*
|
|
673
|
-
* `
|
|
672
|
+
* 预约详情弹窗:完全基于「这一条 booking raw」(`sales.getResourceBookingItem` 返回的元素,
|
|
673
|
+
* 与平面图传入的 `floorMapSourceBookings` 子项格式同源)构造 RoomCard 数据。
|
|
674
|
+
*
|
|
675
|
+
* 设计原则:
|
|
676
|
+
* - `bookings` 始终为 `[rawToBooking(raw, 0)]`,**不**再走 `mapPisellReservationRowToFloorRoomCardData`
|
|
677
|
+
* 里基于 `tableRow.cardStatus` / `floorMapSourceBookings` status 的判定,避免「completed /
|
|
678
|
+
* canceled / no_show 等非 occupied/reserved」状态导致 `bookings` 退化为空数组。
|
|
679
|
+
* - `status` 严格按 `raw.status`:`occupied` → `occupied`,其余(含 `reserved` / 历史完成 /
|
|
680
|
+
* 取消等)→ `reserved`,让小条始终展示,且历史记录以中性预约色呈现。
|
|
681
|
+
* - `sub_status` 由 booking 自身字段(`timeoutTime` / `lateTime` / `order_payment_status`)推导,
|
|
682
|
+
* 不依赖 `tableRow` 上派生过的 host 进度状态,与「完全依赖接口数据」一致。
|
|
683
|
+
* - `main_field` / `capacity` 取自 `tableRow`(桌位属性,raw 不一定带);视觉上 Modal 透传
|
|
684
|
+
* `hideHeader` / `hideHeaderCapacity`,二者主要参与数据完整性而非 header 渲染。
|
|
674
685
|
*/
|
|
675
686
|
export function buildDetailModalRoomCardData(raw, tableRow) {
|
|
676
|
-
var
|
|
677
|
-
var
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
687
|
+
var _raw$status, _ref13;
|
|
688
|
+
var cap = (tableRow === null || tableRow === void 0 ? void 0 : tableRow.capacityLabel) != null && String(tableRow.capacityLabel).trim() !== '' ? tableRow.capacityLabel : '—';
|
|
689
|
+
var stripTitle = resolveBookingStripIdForUi(raw).trim();
|
|
690
|
+
var main_field = stripTitle || (tableRow === null || tableRow === void 0 ? void 0 : tableRow.code) || '';
|
|
691
|
+
var booking = rawToBooking(raw, 0);
|
|
692
|
+
var rawStatus = String((_raw$status = raw.status) !== null && _raw$status !== void 0 ? _raw$status : '').trim().toLowerCase();
|
|
693
|
+
var status = rawStatus === 'occupied' ? 'occupied' : 'reserved';
|
|
694
|
+
var sub_status;
|
|
695
|
+
if (status === 'occupied') {
|
|
696
|
+
if (booking.timeoutTime != null && booking.timeoutTime > 0) {
|
|
697
|
+
sub_status = 'timeout';
|
|
698
|
+
} else if (booking.order_payment_status === 'unpaid') {
|
|
699
|
+
sub_status = 'payment_required';
|
|
700
|
+
} else {
|
|
701
|
+
sub_status = 'payed';
|
|
702
|
+
}
|
|
703
|
+
} else if (booking.lateTime != null && booking.lateTime > 0) {
|
|
704
|
+
sub_status = 'late';
|
|
705
|
+
} else {
|
|
706
|
+
sub_status = 'not_arrived';
|
|
707
|
+
}
|
|
708
|
+
var order = (_ref13 = raw.order) !== null && _ref13 !== void 0 ? _ref13 : {};
|
|
693
709
|
var orderDisplayNumber = order.shop_full_order_number != null && String(order.shop_full_order_number).trim() !== '' ? String(order.shop_full_order_number).trim() : '';
|
|
694
710
|
var summary = order.summary;
|
|
695
711
|
var currencySymbol = order.currency_symbol != null && String(order.currency_symbol).trim() !== '' ? String(order.currency_symbol).trim() : '$';
|
|
696
712
|
var totalAmount = (summary === null || summary === void 0 ? void 0 : summary.total_amount) != null && String(summary.total_amount).trim() !== '' ? String(summary.total_amount).trim() : '';
|
|
697
713
|
var inlineTotal = totalAmount ? "".concat(locales.getText('pisell-reservation.booking-detail.total'), ": ").concat(totalAmount.startsWith(currencySymbol) ? totalAmount : "".concat(currencySymbol).concat(totalAmount)) : '';
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
714
|
+
var finalBooking = _objectSpread(_objectSpread({}, booking), {}, {
|
|
715
|
+
items_summary_suffix: inlineTotal || booking.items_summary_suffix,
|
|
716
|
+
order_display_number: orderDisplayNumber || booking.order_display_number
|
|
717
|
+
});
|
|
718
|
+
return {
|
|
719
|
+
main_field: main_field,
|
|
720
|
+
capacity: cap,
|
|
721
|
+
status: status,
|
|
722
|
+
sub_status: sub_status,
|
|
723
|
+
bookings: [finalBooking]
|
|
724
|
+
};
|
|
705
725
|
}
|
|
@@ -22,16 +22,9 @@ export declare function useFloorMapBookingInteraction(options: {
|
|
|
22
22
|
* 已打开的「预约详情」弹窗的 raw / 行数据。
|
|
23
23
|
*/
|
|
24
24
|
mergedTableRows: PisellReservationTableRow[];
|
|
25
|
-
/**
|
|
26
|
-
* 预约规则(fulfillment.enabled_resource_rules type=link)命中的第一个有效时长商品;
|
|
27
|
-
* 点击空桌时用它回填新建弹窗的 service.value[0]。为 null 时空桌点击不做处理。
|
|
28
|
-
*/
|
|
29
|
-
reservationRuleProduct?: any | null;
|
|
30
|
-
/** pico menu 关联餐牌 ID,传入 TicketBooking 覆盖 getProducts 的 menu_list_ids */
|
|
31
|
-
associated_menu_list_ids?: number[];
|
|
32
25
|
/**
|
|
33
26
|
* 与场控 `getPicoCodingOpenData` target 中的 BIZ 一致(如 `dine_in`)。
|
|
34
|
-
* `dine_in`
|
|
27
|
+
* 旧店铺(id=2155)非 `dine_in` 时点击有效 booking 走宿主结账抽屉。
|
|
35
28
|
*/
|
|
36
29
|
reservationBiz?: string;
|
|
37
30
|
/** 资源选择模式:点击资源时只把资源信息回传给调用方 */
|
|
@@ -11,8 +11,6 @@ import { resolveFloorMapHostCheckoutRecord } from "../floorMap/floorMapHostCheck
|
|
|
11
11
|
import { extractFloorMapSourceBookingForRow, findMergedTableRowForBookingRaw } from "../data/calendarAdapter";
|
|
12
12
|
import { extractResourceRecordIds } from "../data/bookingToReservationTables";
|
|
13
13
|
import { resolveFloorRoomCardContactTiers } from "../floorRoomCard/mapRowToFloorRoomCardData";
|
|
14
|
-
import { buildReservationTicketBookingCreateModeConfigForRow } from "../utils/reservationTicketBookingHostParams";
|
|
15
|
-
|
|
16
14
|
/**
|
|
17
15
|
* 与详情弹窗 {@link bookingDetailOrderStripFromRaw} 同源:`order.summary` 总价/应付、商品件数与顶层
|
|
18
16
|
* `products` 行数。仅改时间时不一定会触达 summary;加商品/改价会变更 summary 或 product 行。
|
|
@@ -100,8 +98,6 @@ export function useFloorMapBookingInteraction(options) {
|
|
|
100
98
|
onFloorMapBookingClick = options.onFloorMapBookingClick,
|
|
101
99
|
dataSources = options.dataSources,
|
|
102
100
|
mergedTableRows = options.mergedTableRows,
|
|
103
|
-
reservationRuleProduct = options.reservationRuleProduct,
|
|
104
|
-
associated_menu_list_ids = options.associated_menu_list_ids,
|
|
105
101
|
reservationBiz = options.reservationBiz,
|
|
106
102
|
resourceSelectMode = options.resourceSelectMode;
|
|
107
103
|
var _useState = useState(false),
|
|
@@ -182,7 +178,18 @@ export function useFloorMapBookingInteraction(options) {
|
|
|
182
178
|
var shopId = (_utils$getData = utils === null || utils === void 0 || (_utils$getData2 = utils.getData) === null || _utils$getData2 === void 0 ? void 0 : _utils$getData2.call(utils, 'shop_id')) !== null && _utils$getData !== void 0 ? _utils$getData : utils === null || utils === void 0 || (_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store$getState = _utils$store.getState) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.call(_utils$store)) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.global) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.globalConfig) === null || _utils$store$getState === void 0 ? void 0 : _utils$store$getState.id;
|
|
183
179
|
var n = Number(shopId);
|
|
184
180
|
var isLegacyCheckoutShop = Number.isFinite(n) && n === 2155;
|
|
185
|
-
|
|
181
|
+
|
|
182
|
+
/**
|
|
183
|
+
* 空桌走详情 Modal 时 rec 是占位空对象,没有 id / booking_id;
|
|
184
|
+
* 旧店铺结账抽屉强依赖具体 booking,故空 rec 时跳过此分支,
|
|
185
|
+
* 直接进内置预约详情 Modal 看历史已完成 / 未付款记录。
|
|
186
|
+
*/
|
|
187
|
+
var recHasBooking = function () {
|
|
188
|
+
var rid = rec.id;
|
|
189
|
+
var bid = rec.booking_id;
|
|
190
|
+
return rid != null && String(rid).trim() !== '' || bid != null && String(bid).trim() !== '';
|
|
191
|
+
}();
|
|
192
|
+
if (isLegacyCheckoutShop && reservationBiz !== 'dine_in' && recHasBooking) {
|
|
186
193
|
var _utils$action;
|
|
187
194
|
utils === null || utils === void 0 || (_utils$action = utils.action) === null || _utils$action === void 0 || _utils$action.call(utils, {
|
|
188
195
|
type: 'pisell1.handleOpenHostCheckoutDrawer',
|
|
@@ -234,7 +241,10 @@ export function useFloorMapBookingInteraction(options) {
|
|
|
234
241
|
|
|
235
242
|
/**
|
|
236
243
|
* 空桌判定:rec 缺失、或 rec 上 id / booking_id 都为空。
|
|
237
|
-
*
|
|
244
|
+
* 空桌时不再直接打开新建预约 Modal,而是与有 booking 的情况一致打开预约详情
|
|
245
|
+
* Modal——「当前空桌」≠「历史空桌」,详情 Modal 内 `sales.getResourceBookingItem`
|
|
246
|
+
* 仍以 `tableRow` 解出的 resourceId 拉取已完成 / 未付款等历史数据;新建入口由
|
|
247
|
+
* Modal 自身的「新建」按钮承担。
|
|
238
248
|
*/
|
|
239
249
|
var hasValidBooking = function () {
|
|
240
250
|
if (!rec || _typeof(rec) !== 'object') return false;
|
|
@@ -242,40 +252,27 @@ export function useFloorMapBookingInteraction(options) {
|
|
|
242
252
|
var bid = rec.booking_id;
|
|
243
253
|
return rid != null && String(rid).trim() !== '' || bid != null && String(bid).trim() !== '';
|
|
244
254
|
}();
|
|
245
|
-
if (!hasValidBooking) {
|
|
246
|
-
var _engineCtx$appHelper2, _engineCtx$appHelper3;
|
|
247
|
-
if (!reservationRuleProduct) return;
|
|
248
|
-
if (!rowHit) return;
|
|
249
|
-
var createModeConfig = buildReservationTicketBookingCreateModeConfigForRow({
|
|
250
|
-
reservationBiz: reservationBiz,
|
|
251
|
-
associated_menu_list_ids: associated_menu_list_ids,
|
|
252
|
-
reservationRuleProduct: reservationRuleProduct,
|
|
253
|
-
row: rowHit
|
|
254
|
-
});
|
|
255
|
-
if (!createModeConfig) return;
|
|
256
|
-
engineCtx === null || engineCtx === void 0 || (_engineCtx$appHelper2 = engineCtx.appHelper) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper2 = _engineCtx$appHelper2.utils) === null || _engineCtx$appHelper2 === void 0 || (_engineCtx$appHelper3 = _engineCtx$appHelper2.action) === null || _engineCtx$appHelper3 === void 0 || _engineCtx$appHelper3.call(_engineCtx$appHelper2, {
|
|
257
|
-
type: 'pisell1.handleOpenEditBooking',
|
|
258
|
-
data: {
|
|
259
|
-
createModeConfig: createModeConfig
|
|
260
|
-
},
|
|
261
|
-
callback: function callback() {}
|
|
262
|
-
});
|
|
263
|
-
return;
|
|
264
|
-
}
|
|
265
255
|
var rowResolved = rowHit !== null && rowHit !== void 0 ? rowHit : {
|
|
266
256
|
id: String((_args$item$_sceneElem4 = (_args$item$_sceneElem5 = args.item._sceneElement) === null || _args$item$_sceneElem5 === void 0 || (_args$item$_sceneElem5 = _args$item$_sceneElem5.dataBinding) === null || _args$item$_sceneElem5 === void 0 ? void 0 : _args$item$_sceneElem5.recordId) !== null && _args$item$_sceneElem4 !== void 0 ? _args$item$_sceneElem4 : 'unknown'),
|
|
267
257
|
code: ((_args$item$_sceneElem6 = args.item._sceneElement) === null || _args$item$_sceneElem6 === void 0 ? void 0 : _args$item$_sceneElem6.name) != null ? String(args.item._sceneElement.name) : '—',
|
|
268
258
|
cardStatus: 'available'
|
|
269
259
|
};
|
|
270
260
|
var sceneName = ((_args$item$_sceneElem7 = args.item._sceneElement) === null || _args$item$_sceneElem7 === void 0 ? void 0 : _args$item$_sceneElem7.name) != null ? String(args.item._sceneElement.name).trim() : undefined;
|
|
261
|
+
|
|
262
|
+
/**
|
|
263
|
+
* 空桌时构造一个最小占位 rec:仅为绕过详情 Modal `raw == null` 的卫兵
|
|
264
|
+
* (`ReservationBookingDetailModal#canShow`、`useResourceBookingItem`),
|
|
265
|
+
* 不参与任何展示逻辑——三段子列表均来自 `sales.getResourceBookingItem`。
|
|
266
|
+
*/
|
|
267
|
+
var recForDetail = hasValidBooking ? rec : {};
|
|
271
268
|
showBookingDetail({
|
|
272
|
-
rec:
|
|
269
|
+
rec: recForDetail,
|
|
273
270
|
rowResolved: rowResolved,
|
|
274
271
|
event: args.event,
|
|
275
272
|
sceneElementName: sceneName,
|
|
276
273
|
floorMapItemId: String(args.item.id)
|
|
277
274
|
});
|
|
278
|
-
}, [showBookingDetail,
|
|
275
|
+
}, [showBookingDetail, resourceSelectMode]);
|
|
279
276
|
var openBookingDetailFromRaw = useCallback(function (payload) {
|
|
280
277
|
var _payload$row, _ref6, _ref7, _rec$relation_form_na;
|
|
281
278
|
var rec = payload.raw;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
import type { RecordBoardResourceWallCardModel, RecordBoardResourceWallLayoutPersist, VenueWallAppearanceTheme } from '@pisell/materials';
|
|
3
2
|
export interface UseReservationResourceWallPersistParams {
|
|
4
3
|
bodyViewStorageKey: string | undefined;
|
|
@@ -14,8 +13,8 @@ export interface UseReservationResourceWallPersistParams {
|
|
|
14
13
|
export declare function useReservationResourceWallPersist({ bodyViewStorageKey, isInternalListData, searchParams, onSearch, venueWallCards, floorDayBookingLoading, }: UseReservationResourceWallPersistParams): {
|
|
15
14
|
venueWallAppearanceTheme: VenueWallAppearanceTheme;
|
|
16
15
|
setVenueWallAppearanceTheme: import("react").Dispatch<import("react").SetStateAction<VenueWallAppearanceTheme>>;
|
|
17
|
-
venueWallAppearanceMode: "
|
|
18
|
-
setVenueWallAppearanceMode: import("react").Dispatch<import("react").SetStateAction<"
|
|
16
|
+
venueWallAppearanceMode: "dark" | "light";
|
|
17
|
+
setVenueWallAppearanceMode: import("react").Dispatch<import("react").SetStateAction<"dark" | "light">>;
|
|
19
18
|
venueWallResourceLayout: RecordBoardResourceWallLayoutPersist;
|
|
20
19
|
setVenueWallResourceLayout: import("react").Dispatch<import("react").SetStateAction<RecordBoardResourceWallLayoutPersist>>;
|
|
21
20
|
};
|
|
@@ -301,16 +301,21 @@ var PisellSalesGrid = function PisellSalesGrid(props) {
|
|
|
301
301
|
});
|
|
302
302
|
}, [searchParams, pagination.pageNumber, pagination.pageSize]);
|
|
303
303
|
var initLoad = useCallback(function () {
|
|
304
|
+
if (propsOnRefresh) {
|
|
305
|
+
propsOnRefresh();
|
|
306
|
+
return;
|
|
307
|
+
}
|
|
304
308
|
if (currentPerspective === 'monitor') {
|
|
305
309
|
_getBookingList.run(_objectSpread(_objectSpread({}, requestParams), (extParams === null || extParams === void 0 ? void 0 : extParams.list) || {}));
|
|
306
310
|
return;
|
|
307
311
|
}
|
|
308
312
|
_getOrderList.run(_objectSpread(_objectSpread({}, requestParams), (extParams === null || extParams === void 0 ? void 0 : extParams.list) || {}));
|
|
309
|
-
}, [currentPerspective, requestParams, _getBookingList, _getOrderList]);
|
|
313
|
+
}, [currentPerspective, requestParams, _getBookingList, _getOrderList, propsOnRefresh]);
|
|
310
314
|
var onClearSelection = useCallback(function () {
|
|
311
315
|
setSelectedKeys([]);
|
|
312
316
|
setSelectedRows([]);
|
|
313
|
-
|
|
317
|
+
propsOnSelectionChange === null || propsOnSelectionChange === void 0 || propsOnSelectionChange([], []);
|
|
318
|
+
}, [propsOnSelectionChange]);
|
|
314
319
|
var actions = useActions({
|
|
315
320
|
onRefresh: initLoad,
|
|
316
321
|
onClearSelection: onClearSelection
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
export interface UseSalesGridDataParams {
|
|
3
2
|
perspective: 'monitor' | 'handle';
|
|
4
3
|
extParams?: {
|
|
@@ -25,7 +24,7 @@ export declare function useSalesGridData(params: UseSalesGridDataParams): {
|
|
|
25
24
|
selectedKeys: import("react").Key[];
|
|
26
25
|
selectedRows: any[];
|
|
27
26
|
onSelectionChange: (keys: React.Key[], rows: any[]) => void;
|
|
28
|
-
rowKey: "
|
|
27
|
+
rowKey: (record: any) => import("react").Key;
|
|
29
28
|
onRefresh: () => void;
|
|
30
29
|
refreshAsync: () => Promise<any>;
|
|
31
30
|
};
|
|
@@ -41,6 +41,18 @@ function getDefaultSearchParams(perspective) {
|
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
/**
|
|
45
|
+
* 按视角解析表格行主键,保证 selectedKeys 始终为原始值而非整行对象。
|
|
46
|
+
* 与 formatBookingData 的 id 映射保持一致(monitor)。
|
|
47
|
+
*/
|
|
48
|
+
function resolveSalesGridRowKey(perspective, record) {
|
|
49
|
+
var _record$id;
|
|
50
|
+
if (perspective === 'handle') {
|
|
51
|
+
return (record === null || record === void 0 ? void 0 : record.order_id) || (record === null || record === void 0 ? void 0 : record.id);
|
|
52
|
+
}
|
|
53
|
+
return (_record$id = record === null || record === void 0 ? void 0 : record.id) !== null && _record$id !== void 0 ? _record$id : '';
|
|
54
|
+
}
|
|
55
|
+
|
|
44
56
|
/**
|
|
45
57
|
* Sales Management 内使用的列表数据 hook:统一发起订单/预订列表请求,
|
|
46
58
|
* 管理分页、筛选、多选状态,并返回传给 PisellSalesGrid 的受控 props,
|
|
@@ -275,6 +287,11 @@ export function useSalesGridData(params) {
|
|
|
275
287
|
var data = perspective === 'monitor' ? (_getBookingList$data$ = (_getBookingList$data = _getBookingList.data) === null || _getBookingList$data === void 0 ? void 0 : _getBookingList$data.list) !== null && _getBookingList$data$ !== void 0 ? _getBookingList$data$ : [] : (_getOrderList$data$li = (_getOrderList$data = _getOrderList.data) === null || _getOrderList$data === void 0 ? void 0 : _getOrderList$data.list) !== null && _getOrderList$data$li !== void 0 ? _getOrderList$data$li : [];
|
|
276
288
|
var loading = perspective === 'monitor' ? _getBookingList.loading : _getOrderList.loading;
|
|
277
289
|
var total = perspective === 'monitor' ? (_getBookingList$data$2 = (_getBookingList$data2 = _getBookingList.data) === null || _getBookingList$data2 === void 0 ? void 0 : _getBookingList$data2.count) !== null && _getBookingList$data$2 !== void 0 ? _getBookingList$data$2 : 0 : (_getOrderList$data$co = (_getOrderList$data2 = _getOrderList.data) === null || _getOrderList$data2 === void 0 ? void 0 : _getOrderList$data2.count) !== null && _getOrderList$data$co !== void 0 ? _getOrderList$data$co : 0;
|
|
290
|
+
var rowKey = useMemo(function () {
|
|
291
|
+
return function (record) {
|
|
292
|
+
return resolveSalesGridRowKey(perspective, record);
|
|
293
|
+
};
|
|
294
|
+
}, [perspective]);
|
|
278
295
|
return {
|
|
279
296
|
data: data,
|
|
280
297
|
loading: loading,
|
|
@@ -287,7 +304,7 @@ export function useSalesGridData(params) {
|
|
|
287
304
|
selectedKeys: selectedKeys,
|
|
288
305
|
selectedRows: selectedRows,
|
|
289
306
|
onSelectionChange: onSelectionChange,
|
|
290
|
-
rowKey:
|
|
307
|
+
rowKey: rowKey,
|
|
291
308
|
onRefresh: onRefresh,
|
|
292
309
|
refreshAsync: refreshAsync
|
|
293
310
|
};
|
|
@@ -14,7 +14,7 @@ export declare const getSkuCardConfig: (finalConfig: ProductCardConfig) => {
|
|
|
14
14
|
paddingY: number | undefined;
|
|
15
15
|
paddingX: number | undefined;
|
|
16
16
|
isBorderVisible: boolean;
|
|
17
|
-
layoutDirection: "
|
|
17
|
+
layoutDirection: "column" | "row";
|
|
18
18
|
};
|
|
19
19
|
skuActionConfig: {
|
|
20
20
|
isOpen: boolean;
|
|
@@ -3,6 +3,6 @@ export interface ImageUploadProps {
|
|
|
3
3
|
value?: string;
|
|
4
4
|
onChange?: (val: string) => void;
|
|
5
5
|
}
|
|
6
|
-
export declare const getBaseTime: (size: number) =>
|
|
6
|
+
export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
|
|
7
7
|
declare const ImageUpload: React.FC<ImageUploadProps>;
|
|
8
8
|
export default ImageUpload;
|
|
@@ -3,7 +3,7 @@ import { ItemLayout, ItemProps, PresetConfig, SelectorProps, SelectorVariant } f
|
|
|
3
3
|
import './selector.less';
|
|
4
4
|
export declare const SelectorContext: React.Context<{
|
|
5
5
|
disabled?: boolean | undefined;
|
|
6
|
-
mode?: "
|
|
6
|
+
mode?: "single" | "multiple" | undefined;
|
|
7
7
|
itemLayout?: ItemLayout | undefined;
|
|
8
8
|
valueType?: "object" | "primitive" | undefined;
|
|
9
9
|
variant?: SelectorVariant | undefined;
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
|
|
5
5
|
* 包括如何通过 Context 访问父组件配置
|
|
6
6
|
*/
|
|
7
|
-
/// <reference types="react" />
|
|
8
7
|
export declare const BasicExample: () => JSX.Element;
|
|
9
8
|
export declare const ChildrenExample: () => JSX.Element;
|
|
10
9
|
export declare const CustomItemExample: () => JSX.Element;
|
|
@@ -1 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { FormState } from "../model";
|
|
3
|
+
export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
|
|
4
|
+
state: FormState;
|
|
5
|
+
} & {
|
|
6
|
+
dispatch: (params: {
|
|
7
|
+
type: string;
|
|
8
|
+
payload: any;
|
|
9
|
+
}) => void;
|
|
10
|
+
}>;
|
|
@@ -1 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { FormState } from "../model";
|
|
3
|
+
export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
|
|
4
|
+
state: FormState;
|
|
5
|
+
} & {
|
|
6
|
+
dispatch: (params: {
|
|
7
|
+
type: string;
|
|
8
|
+
payload: any;
|
|
9
|
+
}) => void;
|
|
10
|
+
}>;
|