@pisell/pisellos 2.3.5 → 2.3.7

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

@@ -540,6 +540,11 @@ export interface SyncPaymentsToOrderParams {
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
+    isOrderFullyPaid: boolean;
+    isDepositFullyPaid: boolean;
+    paymentStage: 'deposit' | 'normal';
+    depositAmount: string;
+    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {

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

@@ -254,6 +254,10 @@ export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrde
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
+export declare function getRuntimeProductOrigin(tempOrder: OrderTempOrder | null | undefined, product: any): Record<string, any> | null;
+export declare function isHolderConfigRequired(holderConfig: any): boolean;
+export declare function productRequiresFormSubject(tempOrder: OrderTempOrder | null | undefined, product: any): boolean;
+export declare function resolveIsFormSubject(tempOrder: OrderTempOrder | null | undefined, product?: any): boolean;
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。
  *

package/dist/modules/Order/utils.js

@@ -1287,6 +1287,37 @@ export function getOrderProductLineUid(product) {
   if (uid === undefined || uid === null || uid === '') return null;
   return String(uid);
 }
+export function getRuntimeProductOrigin(tempOrder, product) {
+  var _tempOrder$_extend2, _tempOrder$_extend3;
+  var uid = getOrderProductLineUid(product);
+  if (uid && tempOrder !== null && tempOrder !== void 0 && (_tempOrder$_extend2 = tempOrder._extend) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2.productsByUid) !== null && _tempOrder$_extend2 !== void 0 && (_tempOrder$_extend2 = _tempOrder$_extend2[uid]) !== null && _tempOrder$_extend2 !== void 0 && _tempOrder$_extend2.origin) {
+    return tempOrder._extend.productsByUid[uid].origin;
+  }
+  var matchedProduct = ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).find(function (item) {
+    var _ref32, _item$product_id, _ref33, _product$product_id;
+    return item === product || getOrderProductLineUid(item) === uid || String((_ref32 = (_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref32 !== void 0 ? _ref32 : '') === String((_ref33 = (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product === null || product === void 0 ? void 0 : product.id) !== null && _ref33 !== void 0 ? _ref33 : '');
+  });
+  var matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : '';
+  return matchedUid ? (tempOrder === null || tempOrder === void 0 || (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[matchedUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin) || null : null;
+}
+export function isHolderConfigRequired(holderConfig) {
+  if (!holderConfig || _typeof(holderConfig) !== 'object') return false;
+  if (holderConfig.status === 'disable') return false;
+  return Number(holderConfig.required) === 1;
+}
+export function productRequiresFormSubject(tempOrder, product) {
+  var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
+}
+export function resolveIsFormSubject(tempOrder, product) {
+  var _tempOrder$holder;
+  // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
+  if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
+  if (product) return productRequiresFormSubject(tempOrder, product);
+  return ((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || []).some(function (item) {
+    return productRequiresFormSubject(tempOrder, item);
+  });
+}
 
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -24,7 +24,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;

package/dist/modules/Rules/index.js

@@ -118,7 +118,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
+      // 旧版 holders[0].form_record_id 新版 holders[0]
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
       // 商品不需要选holder，则不对比holder，直接返回true，
       if (!product.isNeedHolder) return true;
@@ -323,6 +324,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject,
         orderTotalAmount = _ref2.orderTotalAmount;
+      var resolveIsFormSubject = function resolveIsFormSubject(product) {
+        return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
+      };
+
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -885,7 +890,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
@@ -1088,7 +1093,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用

package/dist/modules/Rules/types.d.ts

@@ -22,6 +22,7 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
+export type RulesFormSubject = boolean | ((product: any) => boolean);
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -31,7 +32,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }) => DiscountResult;
 }

package/dist/server/index.js

@@ -1205,7 +1205,7 @@ var Server = /*#__PURE__*/function () {
               _context17.prev = 41;
               _context17.t0 = _context17["catch"](21);
               errorMessage = _context17.t0 instanceof Error ? _context17.t0.message : String(_context17.t0);
-              _this.logError('handleOrderSalesDetail: 请求失败', {
+              _this.logInfo('handleOrderSalesDetail: 请求失败', {
                 lookup: lookup,
                 backendPath: backendPath,
                 error: errorMessage
@@ -4038,6 +4038,7 @@ var Server = /*#__PURE__*/function () {
                 shop_order_number: next.shop_order_number,
                 shop_full_order_number: next.shop_full_order_number
               });
+              // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
               return _context42.abrupt("return", next);
             case 28:
               _context42.prev = 28;
@@ -4684,9 +4685,9 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "shouldBuildSmallTicketData",
     value: function shouldBuildSmallTicketData(order) {
-      var _order$payment_info, _ref54, _order$small_ticket_d;
+      var _ref54, _order$small_ticket_d;
       if (!order || _typeof(order) !== 'object') return false;
-      if (hasSmallTicketData((_order$payment_info = order.payment_info) === null || _order$payment_info === void 0 ? void 0 : _order$payment_info.small_ticket_data)) return false;
+      // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
       return Number((_ref54 = (_order$small_ticket_d = order.small_ticket_data_flag) !== null && _order$small_ticket_d !== void 0 ? _order$small_ticket_d : order.smallTicketDataFlag) !== null && _ref54 !== void 0 ? _ref54 : 0) === 1;
     }
   }, {

package/dist/server/modules/order/index.d.ts

@@ -31,10 +31,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

package/dist/server/modules/order/index.js

@@ -177,10 +177,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-    * 记录信息日志
-    * @param title 日志标题
-    * @param metadata 日志元数据
-    */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {

package/dist/solution/BaseSales/index.js

@@ -36,7 +36,7 @@ import { OrderModule } from "../../modules/Order";
 import Decimal from 'decimal.js';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
-import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, resolveIsFormSubject, sumOptionUnitPrice } from "../../modules/Order/utils";
 import dayjs from 'dayjs';
 export * from "./types";
 import { QuotationModule } from "../../modules/Quotation";
@@ -1489,7 +1489,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _orderStore$summary, holders, orderTotalAmount, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1583,18 +1583,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 40:
               if (!rulesModule) {
-                _context15.next = 76;
+                _context15.next = 78;
                 break;
               }
-              holders = (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
+              orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
+              console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
                 holders: holders,
-                isFormSubject: !!((_tempOrder$holder2 = tempOrder.holder) !== null && _tempOrder$holder2 !== void 0 && _tempOrder$holder2.type) && tempOrder.holder.type === 'form',
-                orderTotalAmount: Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0)
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                },
+                orderTotalAmount: orderTotalAmount
               }) || {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
@@ -1603,22 +1605,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
-              _context15.prev = 45;
+              _context15.prev = 47;
               _iterator.s();
-            case 47:
+            case 49:
               if ((_step = _iterator.n()).done) {
-                _context15.next = 62;
+                _context15.next = 64;
                 break;
               }
               product = _step.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context15.next = 53;
+                _context15.next = 55;
                 break;
               }
-              return _context15.abrupt("continue", 60);
-            case 53:
+              return _context15.abrupt("continue", 62);
+            case 55:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -1634,58 +1636,58 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 60:
-              _context15.next = 47;
-              break;
             case 62:
-              _context15.next = 67;
+              _context15.next = 49;
               break;
             case 64:
-              _context15.prev = 64;
-              _context15.t0 = _context15["catch"](45);
+              _context15.next = 69;
+              break;
+            case 66:
+              _context15.prev = 66;
+              _context15.t0 = _context15["catch"](47);
               _iterator.e(_context15.t0);
-            case 67:
-              _context15.prev = 67;
+            case 69:
+              _context15.prev = 69;
               _iterator.f();
-              return _context15.finish(67);
-            case 70:
+              return _context15.finish(69);
+            case 72:
               if (!result.discountList) {
-                _context15.next = 76;
+                _context15.next = 78;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 75;
+              _context15.next = 77;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 75:
+            case 77:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 76:
-              _context15.next = 78;
+            case 78:
+              _context15.next = 80;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 78:
+            case 80:
               summary = _context15.sent;
               this.store.order.persistTempOrder();
-              _context15.next = 82;
+              _context15.next = 84;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 82:
+            case 84:
               return _context15.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               });
-            case 83:
+            case 85:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[45, 64, 67, 70]]);
+        }, _callee15, this, [[47, 66, 69, 72]]);
       }));
       function loadDiscountConfig(_x10) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -1697,7 +1699,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(cb) {
         var _discountModule$getOr2, _discountModule$getDi3;
-        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder3, _tempOrder$holder4, _orderStore$summary2, holders;
+        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder2, _orderStore$summary2, holders, orderTotalAmount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1722,31 +1724,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
-              holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
+              orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
+              console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
                 holders: holders,
-                isFormSubject: !!((_tempOrder$holder4 = tempOrder.holder) !== null && _tempOrder$holder4 !== void 0 && _tempOrder$holder4.type) && tempOrder.holder.type === 'form',
-                orderTotalAmount: Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0)
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                },
+                orderTotalAmount: orderTotalAmount
               }) || result;
               if (result.productList) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context16.next = 21;
+              _context16.next = 23;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 21:
+            case 23:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -1754,16 +1758,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 23:
-              _context16.next = 25;
+            case 25:
+              _context16.next = 27;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 25:
+            case 27:
               this.store.order.persistTempOrder();
               cb === null || cb === void 0 || cb(result);
               return _context16.abrupt("return", result);
-            case 28:
+            case 30:
             case "end":
               return _context16.stop();
           }
@@ -1834,7 +1838,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var _tempOrder$holder3, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1857,19 +1861,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               rulesModule = orderStore.rules;
-              holders = (_tempOrder$holder5 = tempOrder.holder) !== null && _tempOrder$holder5 !== void 0 && _tempOrder$holder5.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_record) || [];
               nextDiscountList = updated;
               _context18.next = 14;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
             case 14:
               if (rulesModule) {
+                orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
+                console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,
                   holders: holders,
-                  isFormSubject: !!((_tempOrder$holder6 = tempOrder.holder) !== null && _tempOrder$holder6 !== void 0 && _tempOrder$holder6.type) && tempOrder.holder.type === 'form'
+                  isFormSubject: function isFormSubject(product) {
+                    return resolveIsFormSubject(tempOrder, product);
+                  },
+                  orderTotalAmount: orderTotalAmount
                 }, {
                   discountId: params.discountId,
                   isSelected: params.isSelected
@@ -2261,7 +2268,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var _ref18, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
-        var businessCode, channel, syncParams, syncState, payments, syncResult;
+        var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2299,21 +2306,38 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.order.syncPaymentsToOrder(syncParams);
             case 14:
               syncResult = _context24.sent;
-              _context24.next = 17;
-              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
+              latestPayments = this.store.order.getOrderPayments();
+              amountSnapshot = this.store.order.getOrderAmountSnapshot();
+              orderSnapshot = this.store.order.getOrderSnapshot();
+              syncPayload = {
                 ok: true,
                 syncResult: syncResult,
-                payments: this.store.order.getOrderPayments(),
+                payments: latestPayments,
                 params: syncParams,
-                amountSnapshot: this.store.order.getOrderAmountSnapshot(),
-                orderSnapshot: this.store.order.getOrderSnapshot()
-              });
-            case 17:
+                amountSnapshot: amountSnapshot,
+                orderSnapshot: orderSnapshot,
+                isFullyPaid: syncResult.isFullyPaid,
+                isOrderFullyPaid: syncResult.isOrderFullyPaid,
+                isDepositFullyPaid: syncResult.isDepositFullyPaid,
+                paymentStage: syncResult.paymentStage,
+                depositAmount: syncResult.depositAmount,
+                orderExpectedAmount: syncResult.orderExpectedAmount
+              };
+              _context24.next = 21;
+              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
+            case 21:
+              if (!(syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid)) {
+                _context24.next = 24;
+                break;
+              }
+              _context24.next = 24;
+              return this.effectsEmit(BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
+            case 24:
               return _context24.abrupt("return", syncResult);
-            case 20:
-              _context24.prev = 20;
+            case 27:
+              _context24.prev = 27;
               _context24.t0 = _context24["catch"](11);
-              _context24.next = 24;
+              _context24.next = 31;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: false,
                 error: _context24.t0,
@@ -2322,13 +2346,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 24:
+            case 31:
               throw _context24.t0;
-            case 25:
+            case 32:
             case "end":
               return _context24.stop();
           }
-        }, _callee24, this, [[11, 20]]);
+        }, _callee24, this, [[11, 27]]);
       }));
       function syncPaymentsToOrder(_x20) {
         return _syncPaymentsToOrder.apply(this, arguments);
@@ -2393,7 +2417,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var amountSnapshot = this.store.order.getOrderAmountSnapshot();
       var syncState = this.store.order.getOrderSyncState();
       if (amountSnapshot && syncState !== 'submitting') {
-        var paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? 'paid' : 'partially_paid';
+        var completion = this.store.order.getPaymentCompletion(payments);
+        var paymentStatus = completion.isOrderFullyPaid ? 'paid' : 'partially_paid';
         void this.syncPaymentsToOrder({
           payments: payments,
           paymentStatus: paymentStatus,

package/dist/solution/BaseSales/types.d.ts

@@ -14,6 +14,7 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
+    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/dist/solution/BaseSales/types.js

@@ -9,7 +9,8 @@ export var BaseSalesHookNames = {
   onRefresh: 'onRefresh',
   onCartValidationChanged: 'onCartValidationChanged',
   onPaymentSyncStart: 'onPaymentSyncStart',
-  onPaymentSyncEnd: 'onPaymentSyncEnd'
+  onPaymentSyncEnd: 'onPaymentSyncEnd',
+  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -105,7 +105,9 @@ export function transformBaseProductToOrderProduct(params) {
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
   var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
+  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
+  var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
@@ -148,7 +150,7 @@ export function transformBaseProductToOrderProduct(params) {
     mainPrice: 0,
     bundle: productBundle
   });
-  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,

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 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/core/index.js

@@ -50,7 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor12");
+    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {