@pisell/private-materials 6.11.28 → 6.11.30

package/lib/plus/pisellSalesManagement/hooks/useBookingPerspective.js

@@ -107,7 +107,6 @@ var useBookingPerspective = (params) => {
           title: bookingLabels.bookingBrief,
           key: "booking_brief",
           width: 225,
-          // fixed: 'left',
           render: (_, record) => {
             var _a2, _b, _c;
             const startAt = (0, import_perspectiveUtils.buildDateTime)(record == null ? void 0 : record.start_date, record == null ? void 0 : record.start_time) || (record == null ? void 0 : record.start_at);
@@ -183,16 +182,49 @@ var useBookingPerspective = (params) => {
               return null;
             }
             return /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center" } }, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellTimeRangeDisplay, { startAt, endAt }));
+          },
+          uniformCompare: (_, record) => {
+            const {
+              start_date = "",
+              start_time = "",
+              end_date = "",
+              end_time = ""
+            } = record;
+            return `${start_date}${start_time}${end_date}${end_time}`;
           }
         },
         {
           title: bookingLabels.customer,
-          dataIndex: "order",
           key: "customer",
           align: "center",
           width: 150,
-          render: (value, record) => {
+          uniformCompare: (_, record) => {
+            const value = record.order;
+            const customer = value == null ? void 0 : value.customer;
+            if (!customer) return "-";
+            const guestCode = customer == null ? void 0 : customer.guest_code;
+            if (guestCode) return `${guestCode}`;
+            if (customer.user_id === 1) return "walk-in";
+            return customer;
+          },
+          render: (_, record) => {
+            const value = record.order;
             const customer = value == null ? void 0 : value.customer;
+            const guestCode = customer == null ? void 0 : customer.guest_code;
+            if (guestCode) {
+              return /* @__PURE__ */ import_react.default.createElement(
+                "div",
+                {
+                  style: {
+                    display: "flex",
+                    flexDirection: "column",
+                    alignItems: "center",
+                    textAlign: "center"
+                  }
+                },
+                /* @__PURE__ */ import_react.default.createElement("div", { style: { fontWeight: "bold" } }, bookingLabels.guest)
+              );
+            }
             const phone = (0, import_perspectiveUtils.formatPhone)(
               (customer == null ? void 0 : customer.phone) || (record == null ? void 0 : record.phone),
               (customer == null ? void 0 : customer.country_calling_code) || (record == null ? void 0 : record.country_calling_code)
@@ -216,12 +248,19 @@ var useBookingPerspective = (params) => {
         },
         {
           title: bookingLabels.contact,
-          dataIndex: "order",
           key: "contact",
           align: "center",
           width: 150,
-          render: (value, record) => {
-            const contactValue = (value == null ? void 0 : value.contacts_info) || {};
+          uniformCompare: (_, record) => {
+            const value = record.order;
+            const contactValue = value == null ? void 0 : value.contacts_info;
+            if (!contactValue) return "-";
+            return contactValue;
+          },
+          render: (_, record) => {
+            const value = record.order;
+            const contactValue = value == null ? void 0 : value.contacts_info;
+            if (!contactValue) return "-";
             const phone = (0, import_perspectiveUtils.formatPhone)(contactValue == null ? void 0 : contactValue.phone);
             const lines = (0, import_perspectiveUtils.getDisplayLines)([phone, contactValue == null ? void 0 : contactValue.email]);
             return /* @__PURE__ */ import_react.default.createElement(
@@ -251,6 +290,10 @@ var useBookingPerspective = (params) => {
           key: "holder_data",
           align: "center",
           width: 110,
+          uniformCompare: (value, record) => {
+            if (!value) return "-";
+            return value;
+          },
           render: (value, record) => {
             var _a2;
             if (!value) return "-";
@@ -314,16 +357,19 @@ var useBookingPerspective = (params) => {
               },
               lines.map((line, index) => /* @__PURE__ */ import_react.default.createElement("div", { key: `${line}-${index}`, style: import_perspectiveUtils.textStyles.text }, line))
             );
+          },
+          uniformCompare: (_value, record) => {
+            return (record == null ? void 0 : record.order_detail) || "";
           }
         },
         {
           title: bookingLabels.pax,
           dataIndex: "number",
-          key: "pax",
+          key: "number",
           align: "center",
           width: 110,
-          render: (value, record) => {
-            const count = value ?? (record == null ? void 0 : record.pax) ?? (record == null ? void 0 : record.people_count);
+          render: (_, record) => {
+            const count = record == null ? void 0 : record.number;
             return /* @__PURE__ */ import_react.default.createElement("span", { style: { ...import_perspectiveUtils.textStyles.text, textAlign: "center" } }, count ?? "-");
           }
         },
@@ -333,34 +379,22 @@ var useBookingPerspective = (params) => {
           key: "relation_form_name",
           align: "center",
           width: 100,
-          render: (value, record) => {
+          render: (value) => {
             if (!value) return "-";
-            return /* @__PURE__ */ import_react.default.createElement(
-              "div",
-              {
-                style: {
-                  display: "flex",
-                  flexDirection: "column",
-                  alignItems: "center",
-                  textAlign: "center"
-                }
-              },
-              /* @__PURE__ */ import_react.default.createElement("div", { style: import_perspectiveUtils.textStyles.text }, value)
-            );
+            return /* @__PURE__ */ import_react.default.createElement("div", { style: import_perspectiveUtils.textStyles.text }, value);
           }
         },
         {
           title: bookingLabels.forms,
-          dataIndex: "appointment_form",
           key: "appointment_form",
           // width: 128,
           align: "center",
-          render: (_value, record) => {
+          render: (_, record) => {
             var _a2;
             return /* @__PURE__ */ import_react.default.createElement(
               import_BookingFormsPreview.default,
               {
-                value: _value,
+                value: record == null ? void 0 : record.appointment_form,
                 uniqueTables,
                 bookingLabels,
                 textStyles: import_perspectiveUtils.textStyles,
@@ -569,6 +603,7 @@ var useBookingPerspective = (params) => {
       getChildComponentProps: (ctx) => ({
         grid: {
           bordered: true,
+          collapseUniformColumns: true,
           columns: buildColumns(ctx),
           defaultHiddenColumnKeys: ["order_origin", "updated"],
           scroll: {
@@ -636,12 +671,13 @@ var useBookingPerspective = (params) => {
             filterList: [
               {
                 type: "rangePicker",
-                name: "es_start_date",
-                key: "esStartDate",
+                name: "booking_time_start_between",
+                key: "bookingTimeStartBetween",
                 props: {
                   placeholder: import_utils.locales.getText(
-                    "pisell2.orderList.quickFilter.orderDate.label"
-                  )
+                    "pisell2.salesManagement.booking.filter.bookingDate.label"
+                  ),
+                  showTime: true
                 }
               }
             ]

package/lib/plus/pisellSalesManagement/hooks/useOrderPerspective.js

@@ -165,14 +165,21 @@ var useOrderPerspective = () => {
         },
         {
           title: orderLabels.customer,
-          dataIndex: "customer",
           key: "customer",
           align: "center",
           width: 150,
-          render: (value, record) => {
-            if (!value) return "-";
-            const customer = value || {};
-            const guestCode = (customer == null ? void 0 : customer.guest_code) || (record == null ? void 0 : record.guest_code);
+          uniformCompare: (value, record) => {
+            const customer = record == null ? void 0 : record.customer;
+            if (!customer) return "-";
+            const guestCode = customer == null ? void 0 : customer.guest_code;
+            if (guestCode) return `${guestCode}`;
+            if (customer.user_id === 1) return "walk-in";
+            return customer;
+          },
+          render: (_, record) => {
+            const customer = record == null ? void 0 : record.customer;
+            if (!customer) return "-";
+            const guestCode = customer == null ? void 0 : customer.guest_code;
             if (guestCode) {
               return /* @__PURE__ */ import_react.default.createElement(
                 "div",
@@ -213,6 +220,10 @@ var useOrderPerspective = () => {
           key: "contacts_info",
           align: "center",
           width: 150,
+          uniformCompare: (value, record) => {
+            if (!value) return "-";
+            return value;
+          },
           render: (value) => {
             if (!value) return "-";
             const info = (value == null ? void 0 : value.value) || {};
@@ -235,11 +246,11 @@ var useOrderPerspective = () => {
         },
         {
           title: orderLabels.paymentInfo,
-          dataIndex: "payment_status",
           key: "payment_info",
           width: 124,
           align: "center",
-          render: (value, record) => {
+          render: (_, record) => {
+            const value = record == null ? void 0 : record.payment_status;
             const currencySymbol = record == null ? void 0 : record.currency_symbol;
             const totalAmount = Number((record == null ? void 0 : record.total_amount) || 0);
             const paidAmount = Number((record == null ? void 0 : record.paid_amount) || 0);
@@ -358,12 +369,11 @@ var useOrderPerspective = () => {
         },
         {
           title: orderLabels.items,
-          dataIndex: "product_quantity",
           key: "product_quantity",
           align: "center",
           width: 120,
-          render: (value, record) => {
-            const count = Number(value ?? (record == null ? void 0 : record.items_count) ?? (record == null ? void 0 : record.item_count) ?? 0) || 0;
+          render: (_, record) => {
+            const count = (record == null ? void 0 : record.product_quantity) || 0;
             return /* @__PURE__ */ import_react.default.createElement("span", { style: { ...import_perspectiveUtils.textStyles.text, textAlign: "center" } }, count, amountLabels.items);
           }
         },
@@ -468,18 +478,19 @@ var useOrderPerspective = () => {
         },
         {
           title: orderLabels.shippingMethod,
-          dataIndex: "delivery_type",
           key: "delivery_type",
           align: "center",
           width: 160,
-          render: (value, record) => {
+          render: (_, record) => {
             var _a2, _b2;
+            const deliveryType = record == null ? void 0 : record.delivery_type;
             const serverType = (_b2 = (_a2 = record == null ? void 0 : record.metadata) == null ? void 0 : _a2.shop_service_type) == null ? void 0 : _b2.server_type;
-            if (!value && !serverType) return "-";
-            const isShopService = value === "shop_service";
-            const label = isShopService ? SHOP_SERVICE_TYPE_LABEL_MAP[serverType] : DELIVERY_TYPE_LABEL_MAP[value];
-            if (!label || !isShopService && value === "nil") return "-";
-            const color = isShopService ? import_order.SHOP_SERVICE_TYPE_COLOR_MAP[serverType] : import_order.DELIVERY_TYPE_COLOR_MAP[value];
+            if (!deliveryType && !serverType) return "-";
+            const isShopService = deliveryType === "shop_service";
+            const label = isShopService ? SHOP_SERVICE_TYPE_LABEL_MAP[serverType] : DELIVERY_TYPE_LABEL_MAP[deliveryType];
+            if (!label || !isShopService && deliveryType === "nil")
+              return "-";
+            const color = isShopService ? import_order.SHOP_SERVICE_TYPE_COLOR_MAP[serverType] : import_order.DELIVERY_TYPE_COLOR_MAP[deliveryType];
             return /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center" } }, /* @__PURE__ */ import_react.default.createElement(
               import_perspectiveUtils.Tag,
               {
@@ -488,6 +499,12 @@ var useOrderPerspective = () => {
               },
               label
             ));
+          },
+          uniformCompare: (_, record) => {
+            var _a2, _b2;
+            const deliveryType = (record == null ? void 0 : record.delivery_type) || "";
+            const serverType = ((_b2 = (_a2 = record == null ? void 0 : record.metadata) == null ? void 0 : _a2.shop_service_type) == null ? void 0 : _b2.server_type) || "";
+            return `${deliveryType}|${serverType}`;
           }
         },
         {
@@ -536,12 +553,12 @@ var useOrderPerspective = () => {
         },
         {
           title: orderLabels.updated,
-          dataIndex: "last_edit_account",
           key: "last_edit_account",
           width: 132,
           align: "center",
-          render: (value, record) => {
-            const time = (value == null ? void 0 : value.created_at) || (record == null ? void 0 : record.updated_at);
+          render: (_, record) => {
+            const editor = record == null ? void 0 : record.last_edit_account;
+            const time = (editor == null ? void 0 : editor.created_at) || (record == null ? void 0 : record.updated_at);
             const channel = PLATFORM_LABEL_MAP[record == null ? void 0 : record.order_platform] || (record == null ? void 0 : record.order_platform);
             const lines = (0, import_perspectiveUtils.getDisplayLines)([channel]);
             return /* @__PURE__ */ import_react.default.createElement(
@@ -556,7 +573,7 @@ var useOrderPerspective = () => {
               /* @__PURE__ */ import_react.default.createElement(
                 import_clientName.default,
                 {
-                  dataSource: value || record.create_account,
+                  dataSource: editor || record.create_account,
                   style: { fontSize: 14 }
                 }
               ),
@@ -605,6 +622,7 @@ var useOrderPerspective = () => {
       getChildComponentProps: (ctx) => ({
         grid: {
           bordered: true,
+          collapseUniformColumns: true,
           columns: buildColumns(ctx),
           defaultHiddenColumnKeys: [
             "order_origin",

package/lib/plus/pisellSalesManagement/index.js

@@ -99,7 +99,7 @@ var PisellSalesManagement = (props) => {
       dateAdapter: import_AdapterDayjs.AdapterDayjs,
       adapterLocale
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { style: props == null ? void 0 : props.style }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { style: Object.assign({}, { height: 0 }, props == null ? void 0 : props.style) }, /* @__PURE__ */ import_react.default.createElement(
       import_pisellSalesGrid.default,
       {
         perspectives,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.28",
+  "version": "6.11.30",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,9 +68,9 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.11.10",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/materials": "6.11.11",
+    "@pisell/date-picker": "3.0.8",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",