@pisell/pisellos 0.0.159 → 0.0.161

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

@@ -10,6 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import Decimal from "decimal.js";
 export function updateAllCartItemPrice(_x, _x2, _x3, _x4) {
   return _updateAllCartItemPrice.apply(this, arguments);
 }
@@ -49,6 +50,9 @@ function _updateAllCartItemPrice() {
                       var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                         return m.id === n.id;
                       });
+                      if (targetBundleItem.price_type === 'markdown') {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
+                      }
                       if (targetBundleItem) {
                         return _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,

package/dist/modules/Schedule/index.js

@@ -232,7 +232,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: store,
-          cacheKey: ['scheduleList', 'availabilityDateList']
+          cacheKey: ['scheduleList', 'availabilityDateList', 'otherProductsIds']
         });
       }
     }

package/dist/solution/ShopDiscount/index.js

@@ -497,19 +497,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         }) : [];
       }).flat();
       newDiscountList.forEach(function (item) {
-        var _item$applicableProdu, _item$applicableProdu2;
-        var isAllProductUsed = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
-          return allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id);
-        });
-        var isAllProductFree = (_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.every(function (id) {
+        var _item$applicableProdu;
+        var isProductFree = function isProductFree(id) {
           var _this3$hooks2;
           var targetProduct = productList.find(function (n) {
             return n.id === id;
           });
           var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
           return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
+        };
+        var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
+          return (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
         });
-        if (!item.isSelected && (isAllProductUsed || isAllProductFree)) {
+        if (!item.isSelected && isAllProductUsedOrFree) {
           item.isDisabledForProductUsed = true;
         } else {
           item.isDisabledForProductUsed = false;

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Cart/utils/changePrice.ts
@@ -22,6 +32,7 @@ __export(changePrice_exports, {
   updateAllCartItemPrice: () => updateAllCartItemPrice
 });
 module.exports = __toCommonJS(changePrice_exports);
+var import_decimal = __toESM(require("decimal.js"));
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart) {
   for (const item of cartItems) {
     const targetProduct = priceData.find((n) => n.id === item.id);
@@ -41,6 +52,9 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         const targetBundleItem = targetBundle.bundle_item.find(
           (m) => m.id === n.id
         );
+        if (targetBundleItem.price_type === "markdown") {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
+        }
         if (targetBundleItem) {
           return {
             ...n,

package/lib/modules/Schedule/index.js

@@ -154,7 +154,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["scheduleList", "availabilityDateList"]
+        cacheKey: ["scheduleList", "availabilityDateList", "otherProductsIds"]
       });
     }
   }

package/lib/solution/ShopDiscount/index.js

@@ -341,17 +341,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }) : [];
     }).flat();
     newDiscountList.forEach((item) => {
-      var _a2, _b;
-      const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
-        return allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id);
-      });
-      const isAllProductFree = (_b = item.applicableProductIds) == null ? void 0 : _b.every((id) => {
+      var _a2;
+      const isProductFree = (id) => {
         var _a3;
         const targetProduct = productList.find((n) => n.id === id);
         const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
         return Number(product == null ? void 0 : product.price) === 0;
+      };
+      const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
+        return (allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
       });
-      if (!item.isSelected && (isAllProductUsed || isAllProductFree)) {
+      if (!item.isSelected && isAllProductUsedOrFree) {
         item.isDisabledForProductUsed = true;
       } else {
         item.isDisabledForProductUsed = false;

package/package.json

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