@pisell/pisellos 2.2.177 → 2.2.178

package/dist/modules/Order/index.d.ts

@@ -129,6 +129,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentServiceFee;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
+    private calculateSummaryPaymentBalance;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/dist/modules/Order/index.js

@@ -1173,6 +1173,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             hasMetadataPatch = true;
           }
           if (hasMetadataPatch) productRecord.metadata = metadata;
+          if (!Array.isArray(productRecord.product_bundle)) continue;
+          var _iterator7 = _createForOfIteratorHelper(productRecord.product_bundle),
+            _step7;
+          try {
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var bundle = _step7.value;
+              var bundleRecord = bundle;
+              var bundleMetadata = bundleRecord.metadata && _typeof(bundleRecord.metadata) === 'object' ? _objectSpread({}, bundleRecord.metadata) : {};
+              var hasBundleMetadataPatch = false;
+              var bundleSurchargeFee = this.formatSummaryMetadataMoney(bundleRecord.surcharge_fee);
+              if (bundleSurchargeFee !== undefined) {
+                bundleMetadata.surcharge_fee = bundleSurchargeFee;
+                hasBundleMetadataPatch = true;
+              }
+              if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
+                bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
+                hasBundleMetadataPatch = true;
+              }
+              if (hasBundleMetadataPatch) bundleRecord.metadata = bundleMetadata;
+            }
+          } catch (err) {
+            _iterator7.e(err);
+          } finally {
+            _iterator7.f();
+          }
         }
       } catch (err) {
         _iterator5.e(err);
@@ -1180,6 +1205,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _iterator5.f();
       }
     }
+  }, {
+    key: "calculateSummaryPaymentBalance",
+    value: function calculateSummaryPaymentBalance(params) {
+      var tempOrder = params.tempOrder,
+        summary = params.summary,
+        orderPaidAmount = params.orderPaidAmount;
+      var depositAmount = summary.deposit_amount || tempOrder.deposit_amount || '0.00';
+      var isDeposit = tempOrder.is_deposit === 1 || new Decimal(depositAmount || 0).gt(0);
+      var targetAmount = isDeposit ? new Decimal(depositAmount || 0) : new Decimal(summary.total_amount || summary.expect_amount || 0);
+      return {
+        amountGap: Decimal.max(0, targetAmount.minus(orderPaidAmount)).toFixed(2),
+        totalRefundAmount: Decimal.max(0, orderPaidAmount.minus(targetAmount)).toFixed(2)
+      };
+    }
   }, {
     key: "getPaymentTargetAmount",
     value: function getPaymentTargetAmount() {
@@ -1496,7 +1535,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
-        var tempOrder, salesSummary, existedSummary, paidPaymentSummary, emptySummary, salesSummaryResult, summary;
+        var tempOrder, salesSummary, paidPaymentSummary, _paymentBalance, emptySummary, salesSummaryResult, paymentBalance, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1508,16 +1547,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context14.abrupt("return", null);
             case 3:
               salesSummary = this.getSalesSummary();
-              existedSummary = this.store.summary || createEmptySummary();
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
                 _context14.next = 11;
                 break;
               }
+              _paymentBalance = this.calculateSummaryPaymentBalance({
+                tempOrder: tempOrder,
+                summary: createEmptySummary(),
+                orderPaidAmount: paidPaymentSummary.orderPaidAmount
+              });
               emptySummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+                total_refund_amount: _paymentBalance.totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+                amount_gap: _paymentBalance.amountGap,
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
               this.store.summary = emptySummary;
@@ -1533,10 +1577,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 13:
               salesSummaryResult = _context14.sent;
               this.syncSummaryProductMetadata(tempOrder.products || []);
+              paymentBalance = this.calculateSummaryPaymentBalance({
+                tempOrder: tempOrder,
+                summary: salesSummaryResult,
+                orderPaidAmount: paidPaymentSummary.orderPaidAmount
+              });
               summary = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+                total_refund_amount: paymentBalance.totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+                amount_gap: paymentBalance.amountGap,
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
               this.store.summary = summary;
@@ -1551,7 +1601,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.deposit_amount = summary.deposit_amount || '0.00';
               tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
               return _context14.abrupt("return", this.store.summary);
-            case 24:
+            case 25:
             case "end":
               return _context14.stop();
           }
@@ -3249,46 +3299,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      */
     function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var _iterator7 = _createForOfIteratorHelper(productList),
-        _step7;
+      var _iterator8 = _createForOfIteratorHelper(productList),
+        _step8;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var product = _step7.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var product = _step8.value;
           var qty = product.num || 1;
-          var _iterator9 = _createForOfIteratorHelper(product.discount_list || []),
-            _step9;
+          var _iterator10 = _createForOfIteratorHelper(product.discount_list || []),
+            _step10;
           try {
-            for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
               var _pd$discount, _pd$metadata;
-              var pd = _step9.value;
+              var pd = _step10.value;
               var discountKey = ((_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) || pd.id;
               if (discountKey == null) continue;
               var amount = new Decimal(pd.amount || 0).times(qty).plus(((_pd$metadata = pd.metadata) === null || _pd$metadata === void 0 ? void 0 : _pd$metadata.product_discount_difference) || 0);
               savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
             }
           } catch (err) {
-            _iterator9.e(err);
+            _iterator10.e(err);
           } finally {
-            _iterator9.f();
+            _iterator10.f();
           }
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
-      var _iterator8 = _createForOfIteratorHelper(discountList),
-        _step8;
+      var _iterator9 = _createForOfIteratorHelper(discountList),
+        _step9;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var d = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var d = _step9.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
     }
   }]);

package/dist/modules/SalesSummary/utils.js

@@ -314,15 +314,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
           var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
           var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
           var bundleTaxPrecise = calculateSingleItemTax({
-            price: bundlePrice,
+            price: bundlePrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
-            price: bundleOriginalPrice,
+            price: bundleOriginalPrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -0,0 +1,49 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Order/index.d.ts

@@ -129,6 +129,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentServiceFee;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
+    private calculateSummaryPaymentBalance;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/lib/modules/Order/index.js

@@ -727,8 +727,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
       if (hasMetadataPatch)
         productRecord.metadata = metadata;
+      if (!Array.isArray(productRecord.product_bundle))
+        continue;
+      for (const bundle of productRecord.product_bundle) {
+        const bundleRecord = bundle;
+        const bundleMetadata = bundleRecord.metadata && typeof bundleRecord.metadata === "object" ? { ...bundleRecord.metadata } : {};
+        let hasBundleMetadataPatch = false;
+        const bundleSurchargeFee = this.formatSummaryMetadataMoney(
+          bundleRecord.surcharge_fee
+        );
+        if (bundleSurchargeFee !== void 0) {
+          bundleMetadata.surcharge_fee = bundleSurchargeFee;
+          hasBundleMetadataPatch = true;
+        }
+        if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
+          bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
+          hasBundleMetadataPatch = true;
+        }
+        if (hasBundleMetadataPatch)
+          bundleRecord.metadata = bundleMetadata;
+      }
     }
   }
+  calculateSummaryPaymentBalance(params) {
+    const { tempOrder, summary, orderPaidAmount } = params;
+    const depositAmount = summary.deposit_amount || tempOrder.deposit_amount || "0.00";
+    const isDeposit = tempOrder.is_deposit === 1 || new import_decimal.default(depositAmount || 0).gt(0);
+    const targetAmount = isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
+    return {
+      amountGap: import_decimal.default.max(0, targetAmount.minus(orderPaidAmount)).toFixed(2),
+      totalRefundAmount: import_decimal.default.max(0, orderPaidAmount.minus(targetAmount)).toFixed(2)
+    };
+  }
   getPaymentTargetAmount() {
     const tempOrder = this.ensureTempOrder();
     const summary = this.store.summary || (0, import_utils.createEmptySummary)();
@@ -974,16 +1004,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder)
       return null;
     const salesSummary = this.getSalesSummary();
-    const existedSummary = this.store.summary || (0, import_utils.createEmptySummary)();
     const paidPaymentSummary = this.calculatePaidPaymentSummary(
       tempOrder.payments || []
     );
     if (!salesSummary) {
+      const paymentBalance2 = this.calculateSummaryPaymentBalance({
+        tempOrder,
+        summary: (0, import_utils.createEmptySummary)(),
+        orderPaidAmount: paidPaymentSummary.orderPaidAmount
+      });
       const emptySummary = {
         ...(0, import_utils.createEmptySummary)(),
-        total_refund_amount: existedSummary.total_refund_amount || "0.00",
+        total_refund_amount: paymentBalance2.totalRefundAmount,
         customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
         order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+        amount_gap: paymentBalance2.amountGap,
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
       this.store.summary = emptySummary;
@@ -996,11 +1031,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       shopDiscount: tempOrder.shop_discount
     });
     this.syncSummaryProductMetadata(tempOrder.products || []);
+    const paymentBalance = this.calculateSummaryPaymentBalance({
+      tempOrder,
+      summary: salesSummaryResult,
+      orderPaidAmount: paidPaymentSummary.orderPaidAmount
+    });
     const summary = {
       ...salesSummaryResult,
-      total_refund_amount: existedSummary.total_refund_amount || "0.00",
+      total_refund_amount: paymentBalance.totalRefundAmount,
       customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
       order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+      amount_gap: paymentBalance.amountGap,
       pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
     };
     this.store.summary = summary;

package/lib/modules/SalesSummary/utils.js

@@ -259,15 +259,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       const bundleQuantity = new import_decimal.default(getSafeNum(bundleItem.num ?? bundleItem.quantity));
       const bundlePrice = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       const bundleOriginalPrice = toDecimal(bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? 0);
+      const bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
       const bundleTaxPrecise = calculateSingleItemTax({
-        price: bundlePrice,
+        price: bundlePrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
       });
       const bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
       const bundleOrigTaxPrecise = calculateSingleItemTax({
-        price: bundleOriginalPrice,
+        price: bundleOriginalPrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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