@pisell/pisellos 0.10.48 → 0.10.49

package/dist/server/utils/small-ticket.js

@@ -1738,9 +1738,9 @@ function getProductEntitlementBalance(asset) {
     _step6;
   try {
     for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var _record$discount10;
+      var _record$metadata, _record$discount10, _record$discount11;
       var record = _step6.value;
-      var balance = getEntitlementBalance(record.balance, (_record$discount10 = record.discount) === null || _record$discount10 === void 0 ? void 0 : _record$discount10.balance);
+      var balance = getEntitlementBalance((_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.balance, record.balance, (_record$discount10 = record.discount) === null || _record$discount10 === void 0 || (_record$discount10 = _record$discount10.metadata) === null || _record$discount10 === void 0 ? void 0 : _record$discount10.balance, (_record$discount11 = record.discount) === null || _record$discount11 === void 0 ? void 0 : _record$discount11.balance);
       if (balance) return balance;
     }
   } catch (err) {
@@ -1784,14 +1784,14 @@ function getProductWalletDiscountPercent(asset) {
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _record$metadata, _record$discount11, _record$discount12, _record$discount13;
+      var _record$metadata2, _record$discount12, _record$discount13, _record$discount14;
       var record = _step7.value;
-      var discountType = stringify(firstPresentValue(record.discount_card_type, (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.discount_card_type, (_record$discount11 = record.discount) === null || _record$discount11 === void 0 ? void 0 : _record$discount11.discount_card_type, (_record$discount12 = record.discount) === null || _record$discount12 === void 0 || (_record$discount12 = _record$discount12.metadata) === null || _record$discount12 === void 0 ? void 0 : _record$discount12.discount_card_type)).trim().toLowerCase();
+      var discountType = stringify(firstPresentValue(record.discount_card_type, (_record$metadata2 = record.metadata) === null || _record$metadata2 === void 0 ? void 0 : _record$metadata2.discount_card_type, (_record$discount12 = record.discount) === null || _record$discount12 === void 0 ? void 0 : _record$discount12.discount_card_type, (_record$discount13 = record.discount) === null || _record$discount13 === void 0 || (_record$discount13 = _record$discount13.metadata) === null || _record$discount13 === void 0 ? void 0 : _record$discount13.discount_card_type)).trim().toLowerCase();
       if (discountType && discountType !== 'percent' && discountType !== 'percentage') continue;
-      var candidates = [record.percent, (_record$discount13 = record.discount) === null || _record$discount13 === void 0 ? void 0 : _record$discount13.percent];
+      var candidates = [record.percent, (_record$discount14 = record.discount) === null || _record$discount14 === void 0 ? void 0 : _record$discount14.percent];
       if (discountType === 'percent' || discountType === 'percentage') {
-        var _record$discount14;
-        candidates.push(record.par_value, (_record$discount14 = record.discount) === null || _record$discount14 === void 0 ? void 0 : _record$discount14.par_value);
+        var _record$discount15;
+        candidates.push(record.par_value, (_record$discount15 = record.discount) === null || _record$discount15 === void 0 ? void 0 : _record$discount15.par_value);
       }
       for (var _i12 = 0, _candidates = candidates; _i12 < _candidates.length; _i12++) {
         var value = _candidates[_i12];
@@ -1815,8 +1815,8 @@ function getProductWalletMoneyBalance(asset) {
   try {
     for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var record = _step8.value;
-      for (var _i13 = 0, _arr7 = [record.balance, (_record$discount15 = record.discount) === null || _record$discount15 === void 0 ? void 0 : _record$discount15.balance]; _i13 < _arr7.length; _i13++) {
-        var _record$discount15;
+      for (var _i13 = 0, _arr7 = [(_record$metadata3 = record.metadata) === null || _record$metadata3 === void 0 ? void 0 : _record$metadata3.balance, record.balance, (_record$discount16 = record.discount) === null || _record$discount16 === void 0 || (_record$discount16 = _record$discount16.metadata) === null || _record$discount16 === void 0 ? void 0 : _record$discount16.balance, (_record$discount17 = record.discount) === null || _record$discount17 === void 0 ? void 0 : _record$discount17.balance]; _i13 < _arr7.length; _i13++) {
+        var _record$metadata3, _record$discount16, _record$discount17;
         var value = _arr7[_i13];
         if (!isNumericAmount(value)) continue;
         return Decimal.max(new Decimal(value), 0);
@@ -1831,10 +1831,10 @@ function getProductWalletMoneyBalance(asset) {
     _step9;
   try {
     for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var _record$discount16, _record$discount17;
+      var _record$discount18, _record$discount19;
       var _record = _step9.value;
-      var parValue = firstPresentValue(_record.par_value, (_record$discount16 = _record.discount) === null || _record$discount16 === void 0 ? void 0 : _record$discount16.par_value);
-      var usedParValue = firstPresentValue(_record.used_par_value, (_record$discount17 = _record.discount) === null || _record$discount17 === void 0 ? void 0 : _record$discount17.used_par_value);
+      var parValue = firstPresentValue(_record.par_value, (_record$discount18 = _record.discount) === null || _record$discount18 === void 0 ? void 0 : _record$discount18.par_value);
+      var usedParValue = firstPresentValue(_record.used_par_value, (_record$discount19 = _record.discount) === null || _record$discount19 === void 0 ? void 0 : _record$discount19.used_par_value);
       if (!isNumericAmount(parValue) || !isNumericAmount(usedParValue)) continue;
       return Decimal.max(new Decimal(parValue).minus(new Decimal(usedParValue)), 0);
     }
@@ -2051,7 +2051,7 @@ function buildVoucherAssets(params) {
     } : null;
     if (isEntitlementVoucher(voucher)) {
       var _voucher$metadata;
-      var remaining = getEntitlementBalance(voucher.balance, (_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.balance);
+      var remaining = getEntitlementBalance((_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.balance, voucher.balance);
       return [[{
         item: name,
         value: ''
@@ -2202,6 +2202,12 @@ function formatVoucherDiscount(percent, locale) {
   return normalizedLocale === 'en' ? "Discount ".concat(trimDecimal(percent), "% OFF") : "".concat(trimDecimal(percent), "% OFF");
 }
 function getVoucherBalance(voucher) {
+  for (var _i17 = 0, _arr10 = [(_voucher$metadata15 = voucher.metadata) === null || _voucher$metadata15 === void 0 ? void 0 : _voucher$metadata15.balance, voucher.balance]; _i17 < _arr10.length; _i17++) {
+    var _voucher$metadata15;
+    var value = _arr10[_i17];
+    if (!isNumericAmount(value)) continue;
+    return Decimal.max(new Decimal(value), 0);
+  }
   var parValue = new Decimal(toMoneyNumber(voucher.par_value));
   var usedParValue = new Decimal(toMoneyNumber(voucher.used_par_value));
   return Decimal.max(parValue.minus(usedParValue), 0);

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/server/utils/small-ticket.js

@@ -1591,7 +1591,7 @@ function getProductWalletDiscountTime(asset) {
 }
 function getProductEntitlementBalance(asset) {
   for (const record of asset.records) {
-    const balance = getEntitlementBalance(record.balance, record.discount?.balance);
+    const balance = getEntitlementBalance(record.metadata?.balance, record.balance, record.discount?.metadata?.balance, record.discount?.balance);
     if (balance) return balance;
   }
   return null;
@@ -1641,7 +1641,7 @@ function getProductWalletDiscountPercent(asset) {
 }
 function getProductWalletMoneyBalance(asset) {
   for (const record of asset.records) {
-    for (const value of [record.balance, record.discount?.balance]) {
+    for (const value of [record.metadata?.balance, record.balance, record.discount?.metadata?.balance, record.discount?.balance]) {
       if (!isNumericAmount(value)) continue;
       return _decimal.default.max(new _decimal.default(value), 0);
     }
@@ -1838,7 +1838,7 @@ function buildVoucherAssets(params) {
       value: ''
     } : null;
     if (isEntitlementVoucher(voucher)) {
-      const remaining = getEntitlementBalance(voucher.balance, voucher.metadata?.balance);
+      const remaining = getEntitlementBalance(voucher.metadata?.balance, voucher.balance);
       return [[{
         item: name,
         value: ''
@@ -1982,6 +1982,10 @@ function formatVoucherDiscount(percent, locale) {
   return normalizedLocale === 'en' ? `Discount ${trimDecimal(percent)}% OFF` : `${trimDecimal(percent)}% OFF`;
 }
 function getVoucherBalance(voucher) {
+  for (const value of [voucher.metadata?.balance, voucher.balance]) {
+    if (!isNumericAmount(value)) continue;
+    return _decimal.default.max(new _decimal.default(value), 0);
+  }
   const parValue = new _decimal.default(toMoneyNumber(voucher.par_value));
   const usedParValue = new _decimal.default(toMoneyNumber(voucher.used_par_value));
   return _decimal.default.max(parValue.minus(usedParValue), 0);

package/package.json

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