@pisell/private-materials 6.12.233 → 6.12.235

package/lib/plus/pisellReservation/PisellReservation.js

@@ -5,6 +5,7 @@ const require_objectWithoutProperties = require("../../_virtual/_@oxc-project_ru
 const require_useEngineContext = require("../../hooks/useEngineContext.js");
 const require_index = require("../../utils/index.js");
 const require_serve = require("../pisellSalesManagement/serve.js");
+const require_posDateLocale = require("../../utils/posDateLocale.js");
 const require_usePicoCodingOpenData = require("./hooks/usePicoCodingOpenData.js");
 const require_useReservationPhoneGridInfiniteData = require("./hooks/useReservationPhoneGridInfiniteData.js");
 const require_booking = require("../pisellSalesManagement/config/booking.js");
@@ -166,6 +167,9 @@ const PisellReservationCore = (props) => {
 	pisellosRef.current = pisellos;
 	const hasPisellosGetModule = typeof (pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule) === "function";
 	const engineLocale = (engineCtx === null || engineCtx === void 0 || (_engineCtx$engine = engineCtx.engine) === null || _engineCtx$engine === void 0 || (_engineCtx$engine = _engineCtx$engine.props) === null || _engineCtx$engine === void 0 ? void 0 : _engineCtx$engine.locale) || "zh-CN";
+	const shopCountryCode = require_posDateLocale.resolvePosCountryCode(engineCtx);
+	const weekStartsOn = require_posDateLocale.getPosWeekStartsOn(shopCountryCode);
+	const countryAdapterLocale = require_posDateLocale.getPosEnglishAdapterLocale(shopCountryCode);
 	const app = 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.getApp) === null || _engineCtx$appHelper3 === void 0 ? void 0 : _engineCtx$appHelper3.call(_engineCtx$appHelper2);
 	const router = app === null || app === void 0 || (_app$router = app.router) === null || _app$router === void 0 || (_app$router$getRoutes = _app$router.getRoutes) === null || _app$router$getRoutes === void 0 ? void 0 : _app$router$getRoutes.call(_app$router);
 	const params = app === null || app === void 0 || (_app$history = app.history) === null || _app$history === void 0 || (_app$history$useParam = _app$history.useParams) === null || _app$history$useParam === void 0 ? void 0 : _app$history$useParam.call(_app$history);
@@ -188,8 +192,8 @@ const PisellReservationCore = (props) => {
 		const loc = String(engineLocale).toLowerCase();
 		if (loc.startsWith("zh-cn")) return "zh-cn";
 		if (loc.startsWith("zh-tw") || loc.startsWith("zh-hk")) return "zh-tw";
-		return "en";
-	}, [engineLocale]);
+		return countryAdapterLocale || "en";
+	}, [countryAdapterLocale, engineLocale]);
 	const operatingDayBoundary = (0, react.useMemo)(() => {
 		try {
 			var _engineCtx$appHelper4, _engineCtx$appHelper5, _engineCtx$appHelper6, _store$getDataByModel;
@@ -634,6 +638,7 @@ const PisellReservationCore = (props) => {
 		runtimeContext,
 		onCalendarViewportFirstPatch: handleCalendarViewportFirstPatch
 	});
+	const countryAwareCalendarSlotProps = (0, react.useMemo)(() => weekStartsOn === void 0 ? reservationCalendarSlotProps : require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, reservationCalendarSlotProps), {}, { weekStartsOn }), [reservationCalendarSlotProps, weekStartsOn]);
 	const floorMapMerged = require_useReservationFloorMapMerged.useReservationFloorMapMerged({
 		floorMapProp,
 		baseFloorConfig,
@@ -833,7 +838,7 @@ const PisellReservationCore = (props) => {
 		search: bookingChildProps.search,
 		batchActionBar: bookingChildProps.batchActionBar,
 		floorMap: floorMapMerged,
-		calendar: reservationCalendarSlotProps,
+		calendar: countryAwareCalendarSlotProps,
 		resourceWall: reservationResourceWallSlotProps,
 		defaultBodyView: "floorMap",
 		bodyViewStorageKey,
@@ -849,7 +854,7 @@ const PisellReservationCore = (props) => {
 		patchSearchParams: floorDayBookingData.patchSearchParams,
 		operatingDayBoundary,
 		timelineRange: effectiveTimelineRange
-	}), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.ShellFrame, null, /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.GridLayout, null), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.FloorMap, null), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.Calendar, reservationCalendarSlotProps), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.ResourceWall, null))), /* @__PURE__ */ react.default.createElement(require_ReservationNewReservationModal.ReservationNewReservationModal, {
+	}), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.ShellFrame, null, /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.GridLayout, null), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.FloorMap, null), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.Calendar, countryAwareCalendarSlotProps), /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellRecordBoard.ResourceWall, null))), /* @__PURE__ */ react.default.createElement(require_ReservationNewReservationModal.ReservationNewReservationModal, {
 		ref: newReservationModalRef,
 		router,
 		app

package/lib/plus/pisellSalesManagement/index.js

@@ -4,6 +4,7 @@ const require_useEngineContext = require("../../hooks/useEngineContext.js");
 const require_osQuery = require("../../utils/osQuery.js");
 const require_index = require("../../utils/index.js");
 const require_serve = require("./serve.js");
+const require_posDateLocale = require("../../utils/posDateLocale.js");
 const require_index$1 = require("../pisellSalesGrid/index.js");
 const require_locales = require("./locales.js");
 const require_usePerspectives = require("./hooks/usePerspectives.js");
@@ -90,7 +91,8 @@ const PisellSalesManagement = (props) => {
 		extParams,
 		externalKeyword: keyword
 	});
-	const adapterLocale = (context === null || context === void 0 || (_context$engine3 = context.engine) === null || _context$engine3 === void 0 || (_context$engine3 = _context$engine3.props) === null || _context$engine3 === void 0 ? void 0 : _context$engine3.locale) === "zh-CN" || (context === null || context === void 0 || (_context$engine4 = context.engine) === null || _context$engine4 === void 0 || (_context$engine4 = _context$engine4.props) === null || _context$engine4 === void 0 ? void 0 : _context$engine4.locale) === "zh-HK" ? "zh-cn" : (context === null || context === void 0 || (_context$engine5 = context.engine) === null || _context$engine5 === void 0 || (_context$engine5 = _context$engine5.props) === null || _context$engine5 === void 0 ? void 0 : _context$engine5.locale) === "en" || (context === null || context === void 0 || (_context$engine6 = context.engine) === null || _context$engine6 === void 0 || (_context$engine6 = _context$engine6.props) === null || _context$engine6 === void 0 ? void 0 : _context$engine6.locale) === "en-US" ? "en" : "zh-cn";
+	const countryAdapterLocale = require_posDateLocale.getPosEnglishAdapterLocale(require_posDateLocale.resolvePosCountryCode(context));
+	const adapterLocale = (context === null || context === void 0 || (_context$engine3 = context.engine) === null || _context$engine3 === void 0 || (_context$engine3 = _context$engine3.props) === null || _context$engine3 === void 0 ? void 0 : _context$engine3.locale) === "zh-CN" || (context === null || context === void 0 || (_context$engine4 = context.engine) === null || _context$engine4 === void 0 || (_context$engine4 = _context$engine4.props) === null || _context$engine4 === void 0 ? void 0 : _context$engine4.locale) === "zh-HK" ? "zh-cn" : (context === null || context === void 0 || (_context$engine5 = context.engine) === null || _context$engine5 === void 0 || (_context$engine5 = _context$engine5.props) === null || _context$engine5 === void 0 ? void 0 : _context$engine5.locale) === "en" || (context === null || context === void 0 || (_context$engine6 = context.engine) === null || _context$engine6 === void 0 || (_context$engine6 = _context$engine6.props) === null || _context$engine6 === void 0 ? void 0 : _context$engine6.locale) === "en-US" ? countryAdapterLocale || "en" : "zh-cn";
 	const rawLocale = (context === null || context === void 0 || (_context$engine7 = context.engine) === null || _context$engine7 === void 0 || (_context$engine7 = _context$engine7.props) === null || _context$engine7 === void 0 ? void 0 : _context$engine7.locale) || (typeof localStorage !== "undefined" ? localStorage.getItem("umi_locale") : null) || "en-US";
 	const materialsLocale = rawLocale === "zh" ? "zh-CN" : rawLocale;
 	return /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellConfigProvider, { locale: materialsLocale }, /* @__PURE__ */ react.default.createElement(_pisell_date_picker.LocalizationProvider, {

package/lib/plus/saleDetail/tmpl/B/components/Invoice/ReceiptRenderer.js

@@ -126,7 +126,7 @@ function isDiscountExtension(row) {
 	return /^\s*-/.test(String(row.value || ""));
 }
 function buildProductDetailRows(product, quantity, locale, indent, scaleCombinationQuantity = true) {
-	var _product$product_note;
+	var _product$base_price, _product$product_note;
 	const options = Array.isArray(product.options) ? product.options : Array.isArray(product.combinations_options) ? product.combinations_options : [];
 	const combinations = Array.isArray(product.combinations) ? product.combinations : Array.isArray(product.product_bundle) ? product.product_bundle : [];
 	const extensionRows = Array.isArray(product.extension_list) ? product.extension_list.filter((row) => !/^\s*\d+(?:\.\d+)?\s*@\s*.+\s+EACH\s*$/i.test(String((row === null || row === void 0 ? void 0 : row.item) || ""))) : [];
@@ -135,7 +135,7 @@ function buildProductDetailRows(product, quantity, locale, indent, scaleCombinat
 	const optionRows = buildOptionRows(options, quantity, indent + 1);
 	const optionTotal = product.options_total_price ? String(product.options_total_price) : require_receipt.sumReceiptMoney(optionRows.map((row) => row.value), product.original_price || product.price);
 	const originalTotal = product.total_original_price ? String(product.total_original_price) : require_receipt.multiplyReceiptMoney(product.original_price || product.price || "", quantity);
-	const authoritativeBaseTotal = product.base_price ? require_receipt.multiplyReceiptMoney(product.base_price, quantity) : "";
+	const authoritativeBasePrice = String((_product$base_price = product.base_price) !== null && _product$base_price !== void 0 ? _product$base_price : "").trim();
 	const productTotal = productDisplayTotal(product, quantity);
 	const showBasePrice = Boolean(originalTotal && (options.length || combinations.length || discountRows.length || require_receipt.receiptMoneyValuesDiffer(originalTotal, productTotal)));
 	const combinationTotals = combinations.map((combination) => {
@@ -157,7 +157,7 @@ function buildProductDetailRows(product, quantity, locale, indent, scaleCombinat
 	});
 	if (showBasePrice) rows.push({
 		item: label("Base price", locale),
-		value: authoritativeBaseTotal || require_receipt.subtractReceiptMoney(originalTotal, optionTotal ? [optionTotal] : []),
+		value: authoritativeBasePrice || require_receipt.subtractReceiptMoney(originalTotal, optionTotal ? [optionTotal] : []),
 		indent
 	});
 	if (options.length) {

package/lib/utils/posDateLocale.js

@@ -0,0 +1,73 @@
+const require_runtime = require("../_virtual/_rolldown/runtime.js");
+let dayjs = require("dayjs");
+dayjs = require_runtime.__toESM(dayjs);
+let dayjs_locale_en_gb = require("dayjs/locale/en-gb");
+dayjs_locale_en_gb = require_runtime.__toESM(dayjs_locale_en_gb);
+//#region src/utils/posDateLocale.ts
+dayjs.default.locale(dayjs_locale_en_gb.default, void 0, true);
+const COUNTRY_WEEK_STARTS_ON = {
+	US: 0,
+	CA: 0,
+	AU: 1,
+	NZ: 1,
+	SG: 0,
+	HK: 0,
+	TW: 0,
+	CN: 1,
+	JP: 0,
+	KR: 0,
+	MY: 1,
+	GB: 1,
+	FR: 1,
+	IT: 1
+};
+const normalizeCountryCode = (value) => {
+	const countryCode = String(value !== null && value !== void 0 ? value : "").trim().toUpperCase();
+	return /^[A-Z]{2}$/.test(countryCode) ? countryCode : void 0;
+};
+/**
+* Reads the current shop country from the POS host without using tax country.
+* Invalid or unavailable host data returns an empty result so callers can keep
+* their existing locale behaviour.
+*/
+function resolvePosCountryCode(engineContext) {
+	try {
+		var _engineContext$appHel, _utils$getStore, _utils$getStore$getSt, _utils$store, _utils$store$getState, _utils$getApp, _utils$getApp$getStor, _utils$getApp$getStor2, _hostState$global, _getData, _hostState$global2, _hostState$global3, _engineContext$appHel2, _engineContext$appHel3, _engineContext$appHel4, _engineContext$engine, _engineContext$engine2;
+		const utils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.utils;
+		const getData = utils === null || utils === void 0 ? void 0 : utils.getData;
+		const hostState = (utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.call(_utils$getStore)) || (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 ? void 0 : _utils$store$getState.call(_utils$store));
+		const appCore = utils === null || utils === void 0 || (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 || (_utils$getApp = _utils$getApp.call(utils)) === null || _utils$getApp === void 0 || (_utils$getApp = _utils$getApp.data) === null || _utils$getApp === void 0 || (_utils$getApp = _utils$getApp.store) === null || _utils$getApp === void 0 || (_utils$getApp$getStor = _utils$getApp.getStore) === null || _utils$getApp$getStor === void 0 || (_utils$getApp$getStor = _utils$getApp$getStor.call(_utils$getApp)) === null || _utils$getApp$getStor === void 0 || (_utils$getApp$getStor2 = _utils$getApp$getStor.getDataByModel) === null || _utils$getApp$getStor2 === void 0 ? void 0 : _utils$getApp$getStor2.call(_utils$getApp$getStor, "core", "core");
+		const candidates = [
+			hostState === null || hostState === void 0 || (_hostState$global = hostState.global) === null || _hostState$global === void 0 || (_hostState$global = _hostState$global.shopDetail) === null || _hostState$global === void 0 ? void 0 : _hostState$global.country_code,
+			getData === null || getData === void 0 || (_getData = getData("shop_info")) === null || _getData === void 0 ? void 0 : _getData.country_code,
+			appCore === null || appCore === void 0 ? void 0 : appCore.country_code,
+			getData === null || getData === void 0 ? void 0 : getData("country_code"),
+			hostState === null || hostState === void 0 || (_hostState$global2 = hostState.global) === null || _hostState$global2 === void 0 || (_hostState$global2 = _hostState$global2.shop) === null || _hostState$global2 === void 0 ? void 0 : _hostState$global2.country_code,
+			hostState === null || hostState === void 0 || (_hostState$global3 = hostState.global) === null || _hostState$global3 === void 0 || (_hostState$global3 = _hostState$global3.globalConfig) === null || _hostState$global3 === void 0 ? void 0 : _hostState$global3.country_code,
+			engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.constants) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.countryCode,
+			engineContext === null || engineContext === void 0 || (_engineContext$appHel3 = engineContext.appHelper) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel3 = _engineContext$appHel3.constants) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.country_code,
+			engineContext === null || engineContext === void 0 || (_engineContext$appHel4 = engineContext.appHelper) === null || _engineContext$appHel4 === void 0 || (_engineContext$appHel4 = _engineContext$appHel4.constants) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.country,
+			engineContext === null || engineContext === void 0 || (_engineContext$engine = engineContext.engine) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.props) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.variables) === null || _engineContext$engine === void 0 ? void 0 : _engineContext$engine.countryCode,
+			engineContext === null || engineContext === void 0 || (_engineContext$engine2 = engineContext.engine) === null || _engineContext$engine2 === void 0 || (_engineContext$engine2 = _engineContext$engine2.props) === null || _engineContext$engine2 === void 0 || (_engineContext$engine2 = _engineContext$engine2.variables) === null || _engineContext$engine2 === void 0 ? void 0 : _engineContext$engine2.country_code
+		];
+		for (const value of candidates) {
+			const countryCode = normalizeCountryCode(value);
+			if (countryCode) return countryCode;
+		}
+	} catch (_unused) {}
+}
+/** Returns undefined for countries outside the explicitly supported POS list. */
+function getPosWeekStartsOn(countryCode) {
+	const normalized = normalizeCountryCode(countryCode);
+	return normalized ? COUNTRY_WEEK_STARTS_ON[normalized] : void 0;
+}
+/** English Dayjs locale override; undefined means preserve the caller's locale. */
+function getPosEnglishAdapterLocale(countryCode) {
+	const weekStartsOn = getPosWeekStartsOn(countryCode);
+	if (weekStartsOn === void 0) return void 0;
+	return weekStartsOn === 1 ? "en-gb" : "en";
+}
+//#endregion
+exports.getPosEnglishAdapterLocale = getPosEnglishAdapterLocale;
+exports.getPosWeekStartsOn = getPosWeekStartsOn;
+exports.resolvePosCountryCode = resolvePosCountryCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.233",
+  "version": "6.12.235",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,10 +70,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/materials": "6.12.61",
+    "@pisell/utils": "3.0.4",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.10",
-    "@pisell/utils": "3.0.4"
+    "@pisell/materials": "6.12.62"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/plus/pisellReservation/index.js

@@ -1,17 +0,0 @@
-import "./serve/formResourcePage.js";
-import "./floorRoomCard/mapRowToFloorRoomCardData.js";
-import "./floorRoomCard/ReservationFloorRoomCard.js";
-import "./floorMap/reservationMock.js";
-import "./floorMap/floorPlanApi.js";
-import "./reservationConstants.js";
-import "./data/bookingToReservationTables.js";
-import "./data/formResourceToReservationTables.js";
-import "./data/salesEmbeddedResourceToTableRows.js";
-import "./floorMap/reservationCards.js";
-import "./PisellReservation.js";
-import "./PisellReservationBookingPage.js";
-import "./PisellVenueControlPage.js";
-import "./PisellVenueWallPage.js";
-import "./PisellReservationTablePage.js";
-import "./components/SelectFloorMapResourceDialog.js";
-export {};

package/es/plus/salesSdk/index.js

@@ -1,53 +0,0 @@
-import "./hosts/createInstanceHostBridge.js";
-import "./holderConfirm/createHolderConfirmBridge.js";
-import "./giftSelect/createGiftSelectBridge.js";
-import "./context/SalesSdkHostBridgesContext.js";
-import "./utils/formatHolderOptions.js";
-import "./utils/enrichCartLineHolderDisplay.js";
-import "./context/SalesSdkHolderContext.js";
-import "../multiCurrencySettlement/index.js";
-import "./utils/appendPromotionTags.js";
-import "./context/SalesSdkUIHostsContext.js";
-import "./utils/runAddProductFlow.js";
-import "./components/showAddToCartToast.js";
-import "./utils/resolveAddProductDebounceKey.js";
-import "./utils/productSkuOptions.js";
-import "./utils/identity.js";
-import "./utils/resolveInCartQuantityForAddToast.js";
-import "./utils/addProductWithFlowDebounced.js";
-import "./utils/customerAuthGate.js";
-import "./utils/bookingDate.js";
-import "./utils/holderSubmitValidation.js";
-import "./utils/removeOrderProducts.js";
-import "./selectors.js";
-import "./utils/enrich.js";
-import "./giftSelect/createOpenGiftSelectHost.js";
-import "./utils/ensureHoldersBeforeSubmit.js";
-import "./hooks/useSalesSdk.js";
-import "./bookingEditService/BookingEditServiceDrawer.js";
-import "./hosts/BookingEditHostRenderer.js";
-import "./hosts/CustomerAuthHostRenderer.js";
-import "./hooks/useSalesSdkCart.js";
-import "./hooks/useSalesSdkCustomer.js";
-import "./normalProductDetail/NormalProductDetailHostRenderer.js";
-import "./hosts/createOpenBookingEditHost.js";
-import "./hosts/createOpenMultiDaySelectHost.js";
-import "./hosts/createOpenHolderSelectHost.js";
-import "./hosts/createOpenCustomerAuthHost.js";
-import "./demo/hosts/legacyOpenProductDetail.js";
-import "./hosts/createCompositeOpenProductDetailHost.js";
-import "./normalProductDetail/createOpenNormalProductDetailHost.js";
-import "./normalProductDetail/createOpenBookingSelectionFlowHost.js";
-import "./giftSelect/GiftSelectModal.js";
-import "./giftSelect/GiftSelectHostRenderer.js";
-import "./allergy/AllergySelectionModal.js";
-import "./context/SalesSdkProvider.js";
-import "./context/SalesSdkDishContext.js";
-import "./context/SalesSdkBookingContext.js";
-import "./hooks/useSalesSdkSummary.js";
-import "./hooks/useSalesSdkProducts.js";
-import "./demo/index.js";
-import "./hooks/useSalesSdkDish.js";
-import "./hooks/useCurrentSalesSdkDish.js";
-import "./hooks/useSyncOsModule.js";
-export {};