@pisell/pisellos 2.1.134 → 2.1.135

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

@@ -350,7 +350,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
       "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
-      "custom_price": d === null || d === void 0 ? void 0 : d.price,
+      // "custom_price": d?.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference: product_discount_difference

package/dist/modules/Order/utils.js

@@ -334,13 +334,16 @@ function toBundleCustomPriceString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _rawBundle$bundle_sel, _rawBundle$price_type, _ref5, _rawBundle$custom_pri, _rawBundle$surcharge_, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$extension_, _rawBundle$extension_2, _rawBundle$price_type2, _ref6, _rawBundle$custom_pri2;
+    var _rawBundle$bundle_sel, _rawBundle$price_type, _rawBundle$surcharge_, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$extension_, _rawBundle$extension_2, _rawBundle$price_type2, _ref5, _rawBundle$custom_pri;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
     var sellingPriceNum = toBundleNumber((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price, 0);
     var priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
     var priceType = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : '';
-    var customPriceStr = toBundleCustomPriceString((_ref5 = (_rawBundle$custom_pri = rawBundle.custom_price) !== null && _rawBundle$custom_pri !== void 0 ? _rawBundle$custom_pri : rawBundle.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : rawBundle.price);
+    // const customPriceStr = toBundleCustomPriceString(
+    //   rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price,
+    // );
+
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toBundleNumber((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee, 0);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -354,8 +357,8 @@ function formatSubmitBundleItems(bundle) {
       price: priceNum,
       price_type: priceType,
       price_type_ext: (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : '',
-      custom_price: customPriceStr,
-      custom_price_type: (_ref6 = (_rawBundle$custom_pri2 = rawBundle.custom_price_type) !== null && _rawBundle$custom_pri2 !== void 0 ? _rawBundle$custom_pri2 : priceType) !== null && _ref6 !== void 0 ? _ref6 : '',
+      // custom_price: customPriceStr,
+      custom_price_type: (_ref5 = (_rawBundle$custom_pri = rawBundle.custom_price_type) !== null && _rawBundle$custom_pri !== void 0 ? _rawBundle$custom_pri : priceType) !== null && _ref5 !== void 0 ? _ref5 : '',
       bundle_selling_price: sellingPriceNum,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
@@ -517,7 +520,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref7, _ref8, _ref9, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref6, _ref7, _ref8, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -565,10 +568,10 @@ export function buildSubmitPayload(params) {
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(platform !== null && platform !== void 0 ? platform : tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: (_ref7 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref7 !== void 0 ? _ref7 : 'table-order',
-    business_code: (_ref8 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref8 !== void 0 ? _ref8 : 'table-order',
+    type: (_ref6 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref6 !== void 0 ? _ref6 : 'table-order',
+    business_code: (_ref7 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref7 !== void 0 ? _ref7 : 'table-order',
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref9 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref9 !== void 0 ? _ref9 : 'online_store',
+    order_sales_channel: (_ref8 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref8 !== void 0 ? _ref8 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -592,10 +595,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     // summary,
     metadata: function () {
-      var _ref10 = tempOrder.metadata || {},
-        _collectPax = _ref10.collect_pax,
-        _tableOccupancyDuration = _ref10.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref10, _excluded3);
+      var _ref9 = tempOrder.metadata || {},
+        _collectPax = _ref9.collect_pax,
+        _tableOccupancyDuration = _ref9.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref9, _excluded3);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {

package/dist/solution/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/ScanOrder/utils.js

@@ -483,10 +483,10 @@ export function normalizeOrderProduct(product) {
     metadata.unique_identification_number = resolvedIdentityKey;
   }
   var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$custom_price;
+    var _ref2, _item$bundle_selling_;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
-      custom_price: (_ref3 = (_ref4 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00'
+      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
+      // custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? '0.00',
     });
   });
   var normalizedOptions = product.product_option_item || [];
@@ -506,7 +506,7 @@ export function normalizeOrderProduct(product) {
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
-  var resolvedSource = function (_product$_origin, _product$_origin2, _ref5, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref3, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -524,7 +524,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return (_ref5 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00';
+    return (_ref3 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）

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

@@ -313,7 +313,7 @@ var formatBundleToOrigin = (bundle) => {
       option: formatOptionsToOrigin(getBundleValueByKey("option")),
       discount_list: d.discount_list,
       "bundle_selling_price": d == null ? void 0 : d.price,
-      "custom_price": d == null ? void 0 : d.price,
+      // "custom_price": d?.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference

package/lib/modules/Order/utils.js

@@ -246,14 +246,6 @@ function toBundleNumber(value, fallback = 0) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
-function toBundleCustomPriceString(value) {
-  const parsed = Number(value);
-  if (Number.isFinite(parsed))
-    return parsed.toFixed(2);
-  if (value === null || value === void 0 || value === "")
-    return "0.00";
-  return String(value);
-}
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle))
     return [];
@@ -266,9 +258,6 @@ function formatSubmitBundleItems(bundle) {
     );
     const priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
     const priceType = rawBundle.price_type ?? "";
-    const customPriceStr = toBundleCustomPriceString(
-      rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price
-    );
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toBundleNumber(
       rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee,
@@ -289,7 +278,7 @@ function formatSubmitBundleItems(bundle) {
       price: priceNum,
       price_type: priceType,
       price_type_ext: rawBundle.price_type_ext ?? "",
-      custom_price: customPriceStr,
+      // custom_price: customPriceStr,
       custom_price_type: rawBundle.custom_price_type ?? priceType ?? "",
       bundle_selling_price: sellingPriceNum,
       option: formatSubmitOptionItems(rawBundle.option),

package/lib/solution/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/ScanOrder/utils.js

@@ -408,8 +408,8 @@ function normalizeOrderProduct(product) {
   }
   const normalizedBundle = (product.product_bundle || []).map((item) => ({
     ...item,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? "0.00"
+    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00"
+    // custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? '0.00',
   }));
   const normalizedOptions = product.product_option_item || [];
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);

package/package.json

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