@pisell/private-materials 6.3.108 → 6.3.110

package/es/components/booking/editBookingModal/locales.d.ts

@@ -17,5 +17,17 @@ declare const _default: {
         'pisell2.text.booking.time-change': string;
         'pisell2.text.booking.resource-change.detail': string;
     };
+    ja: {
+        'pisell2.text.login': string;
+        'pisell2.text.booking.confirm-changes': string;
+        'pisell2.text.booking.time-change': string;
+        'pisell2.text.booking.resource-change.detail': string;
+    };
+    pt: {
+        'pisell2.text.login': string;
+        'pisell2.text.booking.confirm-changes': string;
+        'pisell2.text.booking.time-change': string;
+        'pisell2.text.booking.resource-change.detail': string;
+    };
 };
 export default _default;

package/es/components/booking/editBookingModal/locales.js

@@ -16,5 +16,17 @@ export default {
     'pisell2.text.booking.confirm-changes': '確認預約變更',
     'pisell2.text.booking.time-change': '時間變更',
     'pisell2.text.booking.resource-change.detail': '資源變更詳情'
+  },
+  ja: {
+    'pisell2.text.login': 'ログイン',
+    'pisell2.text.booking.confirm-changes': '予約変更を確認',
+    'pisell2.text.booking.time-change': '時間変更',
+    'pisell2.text.booking.resource-change.detail': 'リソース変更の詳細'
+  },
+  pt: {
+    'pisell2.text.login': 'Login',
+    'pisell2.text.booking.confirm-changes': 'Confirmar Alterações na Reserva',
+    'pisell2.text.booking.time-change': 'Alteração de Horário',
+    'pisell2.text.booking.resource-change.detail': 'Detalhes da Alteração de Recurso'
   }
 };

package/es/components/booking/editBookingModal/mock.d.ts

@@ -299,6 +299,8 @@ export declare const mockBooking: {
                             en: string;
                             "zh-CN": string;
                             "zh-HK": string;
+                            ja: string;
+                            pt: string;
                             original: string;
                         };
                         min: number;
@@ -340,6 +342,8 @@ export declare const mockBooking: {
                         auto: string;
                         "zh-CN": null;
                         "zh-HK": null;
+                        ja: null;
+                        pt: null;
                         kitchen: null;
                         original: string;
                     };
@@ -713,7 +717,7 @@ export declare const mockProps: {
         extension_id: number;
         data_type: string;
         few_day: boolean;
-        customers: {
+        customers: ({
             customer_id: number;
             nickname: string;
             cover: string;
@@ -789,6 +793,8 @@ export declare const mockProps: {
                     auto: string;
                     "zh-CN": null;
                     "zh-HK": null;
+                    ja: null;
+                    pt: null;
                     kitchen: null;
                     original: string;
                 };
@@ -799,7 +805,185 @@ export declare const mockProps: {
             order_id: number;
             extension_id: number;
             type: string;
-        }[];
+        } | {
+            customer_id: number;
+            nickname: string;
+            cover: string;
+            phone: string;
+            country_calling_code: string;
+            display_name: string;
+            email: string;
+            note: string;
+            order: {
+                id: number;
+                customer_id: number;
+                payment_status: string;
+                is_deposit: number;
+                type: string;
+                note: string;
+                discount_amount: string;
+                expect_amount: string;
+                payment_time: null;
+                total_amount: string;
+                deposit_amount: string;
+                product_amount: string;
+                order_time: string;
+                detail: {
+                    id: number;
+                    order_id: number;
+                    product_title: string;
+                    product_quantity: number;
+                    selling_price: string;
+                    product_id: number;
+                    extension_type: string;
+                    product_sku: {
+                        code: string;
+                        name: string;
+                        unit: string;
+                        weight: number;
+                        barcode: string;
+                        sku_ids: string;
+                        variant: never[];
+                        subtitle: {
+                            en: null;
+                            auto: string;
+                            "zh-CN": null;
+                            "zh-HK": null;
+                            ja: null;
+                            pt: null;
+                            kitchen: null;
+                            original: string;
+                        };
+                        unit_price: number;
+                        variant_id: number;
+                        unit_weight: number;
+                        open_sold_weight: number;
+                        open_box_specification: number;
+                        box_specification_quantity: number;
+                    };
+                    schedule_event_id: number;
+                    product_option_string: string;
+                }[];
+                surcharge: never[];
+                deposit_status: null;
+                total_refund_amount: string;
+                has_pay: string;
+                order_paid_amount: number;
+                paid_amount: number;
+                payment: never[];
+                surcharge_fee: number;
+                tip: never[];
+                tip_fee: number;
+            };
+            order_detail: {
+                product_id: number;
+                payment_price: string;
+                product_title: {
+                    en: null;
+                    auto: string;
+                    "zh-CN": null;
+                    "zh-HK": null;
+                    ja: null;
+                    pt: null;
+                    kitchen: null;
+                    original: string;
+                };
+                refund_quantity: number;
+                product_quantity: number;
+            };
+            event_id: number;
+            order_id: number;
+            extension_id: number;
+            type: string;
+        } | {
+            customer_id: number;
+            nickname: string;
+            cover: string;
+            phone: string;
+            country_calling_code: string;
+            display_name: string;
+            email: string;
+            note: string;
+            order: {
+                id: number;
+                customer_id: number;
+                payment_status: string;
+                is_deposit: number;
+                type: string;
+                note: string;
+                discount_amount: string;
+                expect_amount: string;
+                payment_time: null;
+                total_amount: string;
+                deposit_amount: string;
+                product_amount: string;
+                order_time: string;
+                detail: {
+                    id: number;
+                    order_id: number;
+                    product_title: string;
+                    product_quantity: number;
+                    selling_price: string;
+                    product_id: number;
+                    extension_type: string;
+                    product_sku: {
+                        code: string;
+                        name: string;
+                        unit: string;
+                        weight: number;
+                        barcode: string;
+                        sku_ids: string;
+                        variant: never[];
+                        subtitle: {
+                            en: null;
+                            auto: string;
+                            "zh-CN": null;
+                            "zh-HK": null;
+                            kitchen: null;
+                            original: string;
+                        };
+                        unit_price: number;
+                        variant_id: number;
+                        unit_weight: number;
+                        open_sold_weight: number;
+                        open_box_specification: number;
+                        box_specification_quantity: number;
+                    };
+                    schedule_event_id: number;
+                    product_option_string: string;
+                }[];
+                surcharge: never[];
+                deposit_status: null;
+                total_refund_amount: string;
+                has_pay: string;
+                order_paid_amount: number;
+                paid_amount: number;
+                payment: never[];
+                surcharge_fee: number;
+                tip: never[];
+                tip_fee: number;
+            };
+            order_detail: {
+                product_id: number;
+                payment_price: string;
+                product_title: {
+                    en: null;
+                    auto: string;
+                    "zh-CN": null;
+                    "zh-HK": null;
+                    kitchen: null;
+                    original: string;
+                    ja?: undefined;
+                    pt?: undefined;
+                };
+                refund_quantity: number;
+                product_quantity: number;
+            };
+            event_id: number;
+            order_id: number;
+            extension_id: number;
+            type: string;
+        })[];
         eventEditable: boolean;
     };
     fromResourceId: string;

package/es/components/booking/editBookingModal/mock.js

@@ -381,6 +381,8 @@ export var mockBooking = {
               "en": "Guests",
               "zh-CN": "人数",
               "zh-HK": "人數",
+              "ja": "ゲスト",
+              "pt": "Convidados",
               "original": "Guests"
             },
             "min": 1,
@@ -422,6 +424,8 @@ export var mockBooking = {
             "auto": "",
             "zh-CN": null,
             "zh-HK": null,
+            "ja": null,
+            "pt": null,
             "kitchen": null,
             "original": ""
           },
@@ -2545,6 +2549,8 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
+          "ja": null,
+          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2599,6 +2605,8 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
+              "ja": null,
+              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2631,6 +2639,8 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
+          "ja": null,
+          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2685,6 +2695,8 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
+              "ja": null,
+              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2717,6 +2729,8 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
+          "ja": null,
+          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2771,6 +2785,8 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
+              "ja": null,
+              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2803,6 +2819,8 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
+          "ja": null,
+          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2943,6 +2961,8 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
+              "ja": null,
+              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2975,6 +2995,8 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
+          "ja": null,
+          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
+declare const useClearCart: (state: any, dispatch: any) => React.JSX.Element;
 export default useClearCart;

package/es/components/booking/hooks/useClearCart.js

@@ -2,29 +2,59 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useMemo } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useMemo, useState, useCallback } from 'react';
 import classNames from 'classnames';
-import { Iconfont } from '@pisell/materials';
+import { Iconfont, PisellModal } from '@pisell/materials';
 import { locales } from "@pisell/utils";
 var useClearCart = function useClearCart(state, dispatch) {
   var _state$service3;
-  var handleClear = function handleClear() {
-    // 清除购物车
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var handleOpenModal = useCallback(function () {
+    setOpen(true);
+  }, []);
+  var handleConfirm = useCallback(function () {
     dispatch({
       type: 'setService',
       payload: {
         value: []
       }
     });
-  };
+    setOpen(false);
+  }, []);
+  var handleCancel = useCallback(function () {
+    setOpen(false);
+  }, []);
   return useMemo(function () {
     var _state$service, _state$service2;
-    return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
+    var showClearBtn = !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, showClearBtn && /*#__PURE__*/React.createElement("span", {
       className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
-      onClick: handleClear
+      onClick: handleOpenModal
     }, /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
-    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
-  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit]);
+    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart'))), /*#__PURE__*/React.createElement(PisellModal, {
+      open: open,
+      platform: "pc",
+      title: locales.getText('pisell2.booking.info.text.clear-cart-modal.title'),
+      onOk: handleConfirm,
+      onCancel: handleCancel,
+      okText: locales.getText('pisell2.booking.info.text.clear-cart-modal.confirm'),
+      cancelText: locales.getText('pisell2.booking.info.text.clear-cart-modal.cancel'),
+      destroyOnClose: true
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '24px 0'
+      }
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart-modal.content')))));
+  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit, open]);
 };
 export default useClearCart;

package/es/components/booking/info/header/index.js

@@ -52,19 +52,19 @@ var header = function header(_ref) {
   var statusList = [{
     label: locales.getText('pisell2.text.status.new'),
     key: 'new',
-    color: '#079455'
+    color: '#91caff'
   }, {
     label: locales.getText('pisell2.text.status.confirmed'),
     key: 'confirmed',
-    color: '#7F56D9'
+    color: '#b7eb8f'
   }, {
     label: locales.getText('pisell2.text.status.arrived'),
     key: 'arrived',
-    color: '#088AB2'
+    color: '#d3adf7'
   }, {
     label: locales.getText('pisell2.text.status.started'),
     key: 'started',
-    color: '#155EEF'
+    color: '#fffb8f'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -72,7 +72,7 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.cancelled')),
     key: 'cancelled',
-    color: '#DC6803'
+    color: '#bfbfbf'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -80,11 +80,11 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.no_show')),
     key: 'no_show',
-    color: '#D92D20'
+    color: '#ffa39e'
   }, {
     label: locales.getText('pisell2.text.status.completed'),
     key: 'completed',
-    color: '#4A5578'
+    color: '#ffd591'
   }];
 
   // 销售渠道

package/es/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Base-White, #FFF);
+    color: var(--Gray-900, #101828);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Base-White, #FFF) !important;
+      color: var(--Gray-900, #101828) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid #fff;
+      border: 1px solid var(--Gray-900, #101828);
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Base-White, #FFF) !important;
+        color: var(--Gray-900, #101828) !important;
       }
 
       .booking-header-right-status-icon {

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/index.less

@@ -8,8 +8,10 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 4px;
-    padding: 12px 0;
+    margin-bottom: 16px !important;
+    // padding: 12px 0;
+    padding: 0 !important;
+    width: max-content;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/es/components/booking/info2/service/addService/mock.d.ts

@@ -103,6 +103,8 @@ declare const _default: {
                 en: string;
                 "zh-CN": string;
                 "zh-HK": string;
+                ja: string;
+                pt: string;
                 original: string;
             };
             id: number;

package/es/components/booking/info2/service/addService/mock.js

@@ -183,6 +183,8 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
+        "ja": "",
+        "pt": "",
         "original": "成人"
       },
       id: 1,
@@ -193,6 +195,8 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
+        "ja": "",
+        "pt": "",
         "original": "儿童"
       },
       id: 2,

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;