@pisell/pisellos 0.0.211 → 0.0.213

package/dist/modules/Cart/utils/cartDate.js

@@ -39,6 +39,7 @@ export var formatDateToCartItemOrigin = function formatDateToCartItemOrigin(para
  * @returns 删除后的购物车
  */
 export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
+  var _cartItem$osWarnTips;
   // 删除UI层的数据
   cartItem.start_date = undefined;
   cartItem.start_time = undefined;
@@ -51,5 +52,10 @@ export var deleteTimeFromCartItem = function deleteTimeFromCartItem(cartItem) {
   cartItem._origin.start_time = null;
   cartItem._origin.end_date = null;
   cartItem._origin.end_time = null;
+
+  // 同时清空 osWarnTips 中的关于时间的提示
+  cartItem.osWarnTips = (_cartItem$osWarnTips = cartItem.osWarnTips) === null || _cartItem$osWarnTips === void 0 ? void 0 : _cartItem$osWarnTips.filter(function (item) {
+    return !item.includes('pisell2.product.card.closing-soon.warning');
+  });
   return cartItem;
 };

package/dist/modules/Payment/index.js

@@ -1219,7 +1219,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               _context15.prev = 0;
               paymentData = {
                 payments: order.payment.map(function (payment) {
-                  return payment;
+                  return {
+                    uuid: payment.uuid,
+                    amount: payment.amount,
+                    code: payment.code,
+                    id: payment.id,
+                    name: payment.name,
+                    type: payment.type,
+                    voucher_id: payment.voucher_id,
+                    metadata: payment.metadata,
+                    rounding_amount: payment.rounding_amount,
+                    service_charge: payment.service_charge
+                  };
                 }),
                 payment_status: 'pending'
               }; // 计算总支付金额
@@ -1984,7 +1995,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 构造支付数据
               paymentData = {
                 payments: order.payment.map(function (payment) {
-                  return payment;
+                  return {
+                    uuid: payment.uuid,
+                    amount: payment.amount,
+                    code: payment.code,
+                    id: payment.id,
+                    name: payment.name,
+                    type: payment.type,
+                    voucher_id: payment.voucher_id,
+                    metadata: payment.metadata,
+                    rounding_amount: payment.rounding_amount,
+                    service_charge: payment.service_charge
+                  };
                 }),
                 payment_status: order.payment_status === PaymentStatus.Finished ? 'paid' : 'partially_paid'
               }; // 检查是否已经在队列中，避免重复添加

package/dist/solution/BookingByStep/index.js

@@ -2201,7 +2201,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var _item$_productOrigin17;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
             if (((_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) === 'flexible') {
-              var _allResources$find, _item$_productOrigin18;
+              var _allResources$find, _item$_productOrigin18, _item$_productOrigin19;
               item.duration = {
                 type: 'minutes',
                 value: 10
@@ -2231,15 +2231,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
               // 如果是动态时长商品，并且当前选择的时间的结束时间小于了最低提示时长（warningThreshold），则追加一个提示
               // 如果currentStartTime + warningThreshold 大于 currentEndTime,且 osWarnTips 没有pisell2.product.card.closing-soon.warning 这一项，则加入这一项
-              if (dayjs(currentStartTime).add(((_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.duration) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.flexible_config) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
+              if ((_item$_productOrigin18 = item._productOrigin) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.duration) !== null && _item$_productOrigin18 !== void 0 && (_item$_productOrigin18 = _item$_productOrigin18.flexible_config) !== null && _item$_productOrigin18 !== void 0 && _item$_productOrigin18.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.flexible_config) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
                 if (!osWarnTips.includes('pisell2.product.card.closing-soon.warning')) {
                   osWarnTips.push('pisell2.product.card.closing-soon.warning');
                 }
               }
             } else {
-              var _item$_productOrigin19;
+              var _item$_productOrigin20;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 || (_item$_productOrigin19 = _item$_productOrigin19.duration) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 || (_item$_productOrigin20 = _item$_productOrigin20.duration) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });

package/lib/modules/Cart/utils/cartDate.js

@@ -56,6 +56,7 @@ var formatDateToCartItemOrigin = (params) => {
   return origin;
 };
 var deleteTimeFromCartItem = (cartItem) => {
+  var _a;
   cartItem.start_date = void 0;
   cartItem.start_time = void 0;
   cartItem.end_date = void 0;
@@ -65,6 +66,7 @@ var deleteTimeFromCartItem = (cartItem) => {
   cartItem._origin.start_time = null;
   cartItem._origin.end_date = null;
   cartItem._origin.end_time = null;
+  cartItem.osWarnTips = (_a = cartItem.osWarnTips) == null ? void 0 : _a.filter((item) => !item.includes("pisell2.product.card.closing-soon.warning"));
   return cartItem;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/modules/Payment/index.js

@@ -567,7 +567,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async submitSingleOrderPayment(order) {
     try {
       const paymentData = {
-        payments: order.payment.map((payment) => payment),
+        payments: order.payment.map((payment) => ({
+          uuid: payment.uuid,
+          amount: payment.amount,
+          code: payment.code,
+          id: payment.id,
+          name: payment.name,
+          type: payment.type,
+          voucher_id: payment.voucher_id,
+          metadata: payment.metadata,
+          rounding_amount: payment.rounding_amount,
+          service_charge: payment.service_charge
+        })),
         payment_status: "pending"
       };
       const totalPaidAmount = paymentData.payments.reduce(
@@ -1116,7 +1127,18 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   async reAddOrderToSyncQueue(order) {
     try {
       const paymentData = {
-        payments: order.payment.map((payment) => payment),
+        payments: order.payment.map((payment) => ({
+          uuid: payment.uuid,
+          amount: payment.amount,
+          code: payment.code,
+          id: payment.id,
+          name: payment.name,
+          type: payment.type,
+          voucher_id: payment.voucher_id,
+          metadata: payment.metadata,
+          rounding_amount: payment.rounding_amount,
+          service_charge: payment.service_charge
+        })),
         payment_status: order.payment_status === import_types.PaymentStatus.Finished ? "paid" : "partially_paid"
       };
       const existingQueue = this.app.tasksManager.getTaskQueue({

package/lib/solution/BookingByStep/index.js

@@ -1521,7 +1521,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const osWarnTips = [];
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a3, _b2, _c, _d, _e, _f, _g, _h;
+          var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
             item.duration = {
               type: "minutes",
@@ -1552,14 +1552,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               formattedEndTime = (0, import_dayjs.default)(endTime);
             }
             resource.endTime = formattedEndTime.format("YYYY-MM-DD HH:mm");
-            if ((0, import_dayjs.default)(currentStartTime).add(((_f = (_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.flexible_config) == null ? void 0 : _f.warning_threshold) || 0, "minutes").isAfter((0, import_dayjs.default)(formattedEndTime))) {
+            if (((_f = (_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.flexible_config) == null ? void 0 : _f.is_enable_minimum_duration) && (0, import_dayjs.default)(currentStartTime).add(((_i = (_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.flexible_config) == null ? void 0 : _i.warning_threshold) || 0, "minutes").isAfter((0, import_dayjs.default)(formattedEndTime))) {
               if (!osWarnTips.includes("pisell2.product.card.closing-soon.warning")) {
                 osWarnTips.push("pisell2.product.card.closing-soon.warning");
               }
             }
           } else {
             resource.startTime = currentStartTime;
-            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_h = (_g = item._productOrigin) == null ? void 0 : _g.duration) == null ? void 0 : _h.value) || 10, "minutes").format("YYYY-MM-DD HH:mm");
+            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(((_k = (_j = item._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.value) || 10, "minutes").format("YYYY-MM-DD HH:mm");
           }
         });
         this.store.cart.updateItem({

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.211",
+  "version": "0.0.213",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",