@pisell/private-materials 3.3.46 → 3.3.48

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -18,21 +18,23 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { getUniqueId, locales } from '@pisell/utils';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import { PisellToast } from '@pisell/materials';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { appointmentTypes } from "../../../booking/info/service2/status";
-import { holderId, isDaysBooking } from "../../../booking/info/service2/utils";
+import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
 import { getProductDetail } from "../../../booking/info/service/serve";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductSelect from "../../../productSelect";
 import "./index.less";
+import { addService } from "../../utils";
+import NotAvailable from "../notAvailable";
 var AddSerivce = function AddSerivce(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _state$client2, _state$service2, _state$service3;
+  var _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig2, _state$client2, _state$service5, _state$service6;
   var onEdit = props.onEdit,
     state = props.state,
     dispatch = props.dispatch,
@@ -43,6 +45,8 @@ var AddSerivce = function AddSerivce(props) {
     loading = _useState2[0],
     setLoading = _useState2[1];
   var context = useEngineContext();
+  var notAvailableRef = useRef(null);
+  var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
   var _useService = useService({
       renderMode: renderMode,
@@ -57,6 +61,10 @@ var AddSerivce = function AddSerivce(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentProduct = _useState4[0],
     setCurrentProduct = _useState4[1];
+  var menuList = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.menu_list_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.menu_list) || [];
+  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.config]);
   var customerId = useMemo(function () {
     var _state$client;
     return ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || undefined;
@@ -154,10 +162,28 @@ var AddSerivce = function AddSerivce(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var removeNotAvailableService = function removeNotAvailableService(list) {
+    var _state$service, _state$service2;
+    if (!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) return;
+    var listMap = list.reduce(function (acc, cur) {
+      acc[cur.id] = cur;
+      return acc;
+    }, {});
+    var newValue = (((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []).filter(function (item) {
+      return listMap[item.product_id];
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        value: newValue,
+        edit: true
+      }
+    });
+  };
   var getServices = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-      var _state$eventOtherPara;
-      var data;
+      var _state$eventOtherPara, _data$data2, _data$data3;
+      var data, _state$service3, _notAvailableRef$curr, _data$data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -180,7 +206,8 @@ var AddSerivce = function AddSerivce(props) {
             return state.apis.getServices({
               skip: 1,
               num: 500,
-              extension_type: state.productExtensionType,
+              // extension_type: state.productExtensionType,
+              exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
               with: ['category'],
               open_quotation: 1,
               with_schedule: 1,
@@ -188,23 +215,37 @@ var AddSerivce = function AddSerivce(props) {
               order_by_string: 'sort:desc',
               status: 'published',
               schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
-              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
+              schedule_datetime: params === null || params === void 0 ? void 0 : params.schedule_datetime,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
+              menu_list_ids: params === null || params === void 0 ? void 0 : params.menu_list_ids,
+              _config: {
+                fullResult: true,
+                customResponse: true
+              }
             });
           case 7:
             data = _context2.sent;
             setLoading(false);
+            if ((data === null || data === void 0 ? void 0 : data.code) === 607100) {
+              // 第一次加载时，或者之前有数据
+              if (!isLoadedServiceRef.current || (_state$service3 = state.service) !== null && _state$service3 !== void 0 && (_state$service3 = _state$service3.services) !== null && _state$service3 !== void 0 && _state$service3.length) {
+                (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
+              }
+            }
 
             // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
             if (!state.service.addModal) {
-              setDefaultService(data === null || data === void 0 ? void 0 : data.list);
+              setDefaultService(data === null || data === void 0 || (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list);
             }
+            removeNotAvailableService(data === null || data === void 0 || (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.list);
+            isLoadedServiceRef.current = true;
             dispatch({
               type: 'setService',
               payload: {
-                services: (data === null || data === void 0 ? void 0 : data.list) || []
+                services: (data === null || data === void 0 || (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.list) || []
               }
             });
-          case 11:
+          case 14:
           case "end":
             return _context2.stop();
         }
@@ -218,7 +259,7 @@ var AddSerivce = function AddSerivce(props) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'select';
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
+    var isEject = getIsEject(item, type);
     var lock = false;
     if (isEject) {
       setCurrentProduct(item);
@@ -231,10 +272,11 @@ var AddSerivce = function AddSerivce(props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: isNormalProductByDurationSchedule(item)
         },
         is_eject: isEject ? 1 : 0,
         customer_id: customerId,
@@ -291,7 +333,7 @@ var AddSerivce = function AddSerivce(props) {
                   _key: e.key,
                   _extend: {
                     start_date: state.date.value,
-                    quantity: 1,
+                    quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
                     price: _detail.price,
                     product_name: item.title,
                     other: other
@@ -321,7 +363,7 @@ var AddSerivce = function AddSerivce(props) {
                 }
                 if (cacheItem.autoClose) {
                   cacheItem.autoClose = false;
-                  _list = [].concat(_toConsumableArray(state.service.value), [cacheItem]);
+                  _list = addService(state.service.value, cacheItem);
                   PisellToast({
                     content: locales.getText('pisell2.ticket-booking.add-to-cart')
                   });
@@ -360,8 +402,8 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   var renderList = useMemo(function () {
-    var _state$service;
-    var _list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.services) || [];
+    var _state$service4;
+    var _list = ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.services) || [];
 
     // 跨日预约
     if (isDaysBooking(state)) {
@@ -373,21 +415,26 @@ var AddSerivce = function AddSerivce(props) {
       }
     }
     return _list;
-  }, [(_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services, state === null || state === void 0 ? void 0 : state.activeCartId]);
+  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.services, state === null || state === void 0 ? void 0 : state.activeCartId]);
   var currentDate = useMemo(function () {
     return state.date.value.format('YYYY-MM-DD');
   }, [state.date.value]);
+  var currentDatetime = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD HH:mm:ss');
+  }, [state.date.value]);
   useEffect(function () {
-    if (renderMode === 'current') {
+    if (renderMode === 'current' && state.bookingConfig) {
       getServices({
         schedule_date: currentDate,
-        customer_id: customerId
+        customer_id: customerId,
+        menu_list_ids: menuList,
+        schedule_datetime: currentDatetime
       });
     }
-  }, [renderMode, currentDate, customerId]);
+  }, [renderMode, currentDate, customerId, menuList, currentDatetime]);
   return useMemo(function () {
     if (renderMode === 'current') {
-      return /*#__PURE__*/React.createElement(ProductSelect, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductSelect, {
         dataSource: renderList,
         layout: {
           grid: true,
@@ -404,9 +451,11 @@ var AddSerivce = function AddSerivce(props) {
           isOriginPrice: 1,
           isStock: 1
         }
-      });
+      }), /*#__PURE__*/React.createElement(NotAvailable, {
+        ref: notAvailableRef
+      }));
     }
     return null;
-  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.cacheItem) === null || _state$service3 === void 0 ? void 0 : _state$service3.autoClose, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [(_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6.autoClose, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
 };
 export default AddSerivce;

package/es/components/ticketBooking/components/notAvailable/index.js

@@ -0,0 +1,39 @@
+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, { forwardRef, useImperativeHandle, useState } from 'react';
+import { PisellModal } from '@pisell/materials';
+import { locales } from "@pisell/utils";
+var NotAvailable = function NotAvailable(props, ref) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setOpen(true);
+      }
+    };
+  });
+  return /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: open,
+    platform: "pc",
+    title: locales.getText('pisell2.ticket-booking.not-available-title'),
+    describe: "",
+    cancelText: locales.getText('pisell2.text.cancel'),
+    okText: locales.getText('pisell2.ticket-booking.not-available-ok'),
+    cancelVisible: false,
+    closable: true,
+    onOk: function onOk() {
+      return setOpen(false);
+    },
+    onCancel: function onCancel() {
+      return setOpen(false);
+    }
+  });
+};
+export default /*#__PURE__*/forwardRef(NotAvailable);

package/es/components/ticketBooking/index.js

@@ -128,7 +128,7 @@ var initialState = {
   bookingConfigParams: {
     item_type: 'appointment_booking'
   },
-  productExtensionType: ['appointment_ticket', 'session_ticket']
+  productExtensionType: ['appointment_ticket', 'session_ticket', "product_appointment", "service_product", "session_product", "normal", 'product_appointment']
 };
 export default (function (props) {
   var _context$appHelper$ut;

package/es/components/ticketBooking/locales.d.ts

@@ -45,6 +45,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
     "zh-CN": {
         "pisell2.ticket-booking.info": string;
@@ -92,6 +94,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
     "zh-HK": {
         "pisell2.ticket-booking.info": string;
@@ -139,6 +143,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -44,7 +44,9 @@ export default {
     "pisell2.ticket-booking.appointment-not-found": "Appointment not found",
     "pisell2.ticket-booking.scan": "Scan",
     "pisell2.ticket-booking.create-new": "Create new",
-    "pisell2.ticket-booking.add-to-cart": "Added to Cart"
+    "pisell2.ticket-booking.add-to-cart": "Added to Cart",
+    "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
+    "pisell2.ticket-booking.not-available-ok": "OK"
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -91,7 +93,9 @@ export default {
     "pisell2.ticket-booking.appointment-not-found": "没有发现此预约",
     "pisell2.ticket-booking.scan": "",
     "pisell2.ticket-booking.create-new": "新建",
-    "pisell2.ticket-booking.add-to-cart": "已加入购物车"
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
+    "pisell2.ticket-booking.not-available-ok": "好的"
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -138,6 +142,8 @@ export default {
     "pisell2.ticket-booking.appointment-not-found": "没有發現此預約",
     "pisell2.ticket-booking.scan": "扫码",
     "pisell2.ticket-booking.create-new": "新建",
-    "pisell2.ticket-booking.add-to-cart": "已加入购物车"
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
+    "pisell2.ticket-booking.not-available-ok": "好的"
   }
 };