@pisell/pisellos 2.2.274 → 2.2.275

package/lib/modules/Order/index.js

@@ -37,6 +37,8 @@ var import_types = require("./types");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
+var import_payment_utils = require("./payment-utils");
+var import_payment_number = require("../../utils/payment-number");
 var import_cartPromotion = require("../../solution/BaseSales/utils/cartPromotion");
 var import_utils3 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
@@ -68,6 +70,24 @@ function isManualProductDiscountProduct(product) {
 }
 var ORDER_PAYMENT_STATUS_PAID = "paid";
 var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
+var CUSTOMER_PROMOTION_DISCOUNT_TAGS = /* @__PURE__ */ new Set([
+  "good_pass",
+  "product_discount_card",
+  "discount_card"
+]);
+function isCustomerPromotionDiscount(discount) {
+  return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(
+    String((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type) || "").toLowerCase()
+  );
+}
+function markScannedDiscounts(discountList, scannedDiscountList) {
+  const scannedIds = new Set(
+    scannedDiscountList.map((discount) => discount == null ? void 0 : discount.id).filter((id) => id !== void 0 && id !== null).map(String)
+  );
+  return discountList.map(
+    (discount) => scannedIds.has(String(discount == null ? void 0 : discount.id)) ? { ...discount, isScan: true } : discount
+  );
+}
 function isVoucherPaymentRecord(payment) {
   return (payment == null ? void 0 : payment.voucher_id) !== void 0 && Number(payment.voucher_id) !== 0;
 }
@@ -83,6 +103,11 @@ function isPaidPaymentRecord(payment) {
 function isCommittedVoucherPaymentRecord(payment) {
   return isVoucherPaymentRecord(payment) && (payment == null ? void 0 : payment.status) !== "voided" && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
 }
+function getVoucherPaymentLifecycleKey(payment) {
+  if (!isVoucherPaymentRecord(payment))
+    return null;
+  return `${String(payment.voucher_id)}::${String(payment.status || "")}`;
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -115,6 +140,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const type = (item == null ? void 0 : item.type) ?? (item == null ? void 0 : item.tag);
         if (!type || type === "product")
           continue;
+        const isDiscountCard = type === "discount_card" || type === "product_discount_card";
         const resourceId = ((_a = item == null ? void 0 : item.discount) == null ? void 0 : _a.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id) ?? (item == null ? void 0 : item.order_discount_id);
         if (resourceId === void 0 || resourceId === null || resourceId === "")
           continue;
@@ -137,7 +163,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         if (existed) {
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
-          existed.balance = String(Number(existed.balance || 0) + amount);
+          if (!isDiscountCard) {
+            existed.balance = String(Number(existed.balance || 0) + amount);
+          }
           const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
@@ -174,7 +202,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             filter: 0,
             exclude_product_ids: []
           },
-          balance: String((item == null ? void 0 : item.amount) ?? "0"),
+          balance: isDiscountCard ? void 0 : String((item == null ? void 0 : item.amount) ?? "0"),
           format_title: title,
           product: {
             id: (product == null ? void 0 : product.product_id) ?? 0,
@@ -313,11 +341,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    const appPlugin = this.core.getPlugin("app");
-    if (!appPlugin) {
+    this.appPlugin = this.core.getPlugin("app");
+    if (!this.appPlugin) {
       throw new Error("Order 模块需要 app 插件支持");
     }
-    const app = appPlugin.getApp();
+    const app = this.appPlugin.getApp();
     this.logger = app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
@@ -521,7 +549,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
     const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
     const rulesModule = this.store.rules;
@@ -529,6 +557,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReason: import_types2.UnavailableReason.Unknown
@@ -538,6 +567,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "server",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReasonKey
@@ -553,13 +583,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: true,
+        isAccepted: true,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList
       };
     }
     const tempOrder = this.store.tempOrder;
     const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record) || [];
-    const { isAvailable, discountList: newDiscountList, unavailableReason } = rulesModule.isDiscountListAvailable({
+    const {
+      isAvailable,
+      discountList: newDiscountList,
+      evaluatedDiscountList,
+      unavailableReason
+    } = rulesModule.isDiscountListAvailable({
       productList: (tempOrder == null ? void 0 : tempOrder.products) || [],
       oldDiscountList: this.getDiscountList(),
       newDiscountList: withScanList,
@@ -567,15 +603,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       holders,
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product)
     }) || { isAvailable: false, discountList: this.getDiscountList() };
-    if (isAvailable && newDiscountList) {
-      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
+    const shouldRetainForLater = !isAvailable && unavailableReason === import_types2.UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+    const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : void 0;
+    const retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
+    let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
+    if (isAvailable && normalizedNewDiscountList) {
+      await ((_d = this.store.discount) == null ? void 0 : _d.setDiscountList(normalizedNewDiscountList));
       this.applyDiscount();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
+    } else if (shouldRetainForLater && retainedDiscountList) {
+      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(retainedDiscountList));
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
     }
     return {
       type: "clientCalc",
       isAvailable: isAvailable || false,
-      discountList: newDiscountList || this.getDiscountList(),
+      isAccepted: Boolean(isAvailable || shouldRetainForLater),
+      discountList: resolvedDiscountList,
       scannedDiscountList: resultDiscountList,
       unavailableReason
     };
@@ -1053,17 +1099,40 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const depositPaidAmount = this.calculateDepositPaidAmount(tempOrder.payments || []);
     return depositPaidAmount.lt(depositAmount) ? "deposit" : "normal";
   }
+  getPaymentNumberAppData(key) {
+    var _a, _b, _c, _d, _e;
+    const appPlugin = this.appPlugin;
+    if (!appPlugin)
+      return void 0;
+    const getData = (_a = appPlugin.getData) == null ? void 0 : _a.call(appPlugin);
+    if (typeof getData === "function")
+      return getData(key);
+    const app = appPlugin.getApp();
+    const coreData = (_e = (_c = (_b = app == null ? void 0 : app.models) == null ? void 0 : _b.getStore) == null ? void 0 : (_d = _c.call(_b)).getDataByModel) == null ? void 0 : _e.call(_d, "core", "core");
+    return coreData == null ? void 0 : coreData[key];
+  }
+  getPaymentNumberDevicePrefixSync() {
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefixFromDeviceId)(
+      (key) => this.getPaymentNumberAppData(key)
+    );
+  }
+  getPaymentNumberDevicePrefixAsync() {
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
+      (key) => this.getPaymentNumberAppData(key)
+    );
+  }
   normalizePaymentSource(payment, options) {
     const paymentRecord = payment;
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
-    if (!metadata.unique_payment_number) {
-      metadata.unique_payment_number = (0, import_utils.createUuidV4)();
-    }
-    const normalized = {
-      ...paymentRecord,
-      metadata,
-      origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
-    };
+    const normalized = (0, import_payment_utils.ensureOrderPaymentNumber)(
+      {
+        ...paymentRecord,
+        metadata,
+        origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
+      },
+      (options == null ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(),
+      import_utils.createUuidV4
+    );
     if (paymentRecord.status !== void 0) {
       normalized.status = paymentRecord.status;
     } else if ((options == null ? void 0 : options.defaultPaid) !== false) {
@@ -2484,17 +2553,36 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 用一组支付来源覆盖当前订单支付项。
    *
    * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-   * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
+   * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
    * isSynced 等运行态字段不会进入 tempOrder.payments。
    */
   setOrderPayments(payments) {
     const tempOrder = this.ensureTempOrder();
-    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(payments);
+    tempOrder.payments = (0, import_utils.mapPaymentItemsToOrderPayments)(
+      (payments || []).map((payment) => this.normalizePaymentSource(payment, { defaultPaid: false }))
+    );
     this.persistTempOrder();
     return tempOrder.payments;
   }
-  /** 追加单个支付项，并立即持久化当前 tempOrder。 */
+  /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
   addOrderPayment(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    return this.addOrderPaymentWithDevicePrefix(
+      payment,
+      hasPaymentNumber ? "LOCAL" : this.getPaymentNumberDevicePrefixSync()
+    );
+  }
+  /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
+  async addOrderPaymentAsync(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    const devicePrefix = hasPaymentNumber ? "LOCAL" : await this.getPaymentNumberDevicePrefixAsync();
+    return this.addOrderPaymentWithDevicePrefix(payment, devicePrefix);
+  }
+  addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
     this.logInfo("addOrderPayment", {
       payment
     });
@@ -2507,7 +2595,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           type: orderPaymentType,
           order_payment_type: orderPaymentType
         },
-        { defaultPaid: true }
+        { defaultPaid: true, devicePrefix }
       )
     ]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
@@ -2520,57 +2608,55 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return tempOrder.payments;
   }
   /**
-   * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
-   *
-   * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
-   * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
+   * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
+   * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
    */
-  updateOrderPayment(paymentIdentity, updates) {
+  async updateOrderPayment(paymentIdentity, updates, options = {}) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    tempOrder.payments = (tempOrder.payments || []).map((payment) => {
-      var _a;
-      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
-      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
-      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
-      const uuid = payment == null ? void 0 : payment.uuid;
-      const matched = [
-        uniquePaymentNumber,
-        orderPaymentId,
-        customPaymentId,
-        uuid
-      ].some((value) => value !== void 0 && String(value) === identity);
-      if (!matched)
+    const matchMode = options.matchBy === "compat" || options.matchBy === "legacy" ? "compat" : "payment_number";
+    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      tempOrder.payments || [],
+      identity,
+      matchMode
+    );
+    if (!matchedPayment) {
+      throw new Error(`未找到支付项: ${identity}`);
+    }
+    let updatedPayment = null;
+    tempOrder.payments = (tempOrder.payments || []).map((payment, index) => {
+      if (index !== matchedPayment.index)
         return payment;
-      return {
-        ...payment,
+      const nextPayment = (0, import_payment_utils.mergeOrderPaymentRecord)(payment, {
         ...updates,
-        metadata: {
-          ...payment.metadata || {},
-          ...updates.metadata || {}
-        }
-      };
+        updated_at: updates.updated_at || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+      });
+      updatedPayment = nextPayment;
+      return nextPayment;
     });
     this.persistTempOrder();
-    return tempOrder.payments;
+    const summary = await this.recalculateSummary({ createIfMissing: true });
+    this.persistTempOrder();
+    const payments = tempOrder.payments;
+    return {
+      updated: true,
+      payment: payments[matchedPayment.index] || updatedPayment,
+      payments,
+      summary
+    };
   }
   /** 从当前订单支付项中移除指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
     const tempOrder = this.ensureTempOrder();
     const identity = String(paymentIdentity);
-    tempOrder.payments = (tempOrder.payments || []).filter((payment) => {
-      var _a;
-      const uniquePaymentNumber = (_a = payment == null ? void 0 : payment.metadata) == null ? void 0 : _a.unique_payment_number;
-      const orderPaymentId = payment == null ? void 0 : payment.order_payment_id;
-      const customPaymentId = payment == null ? void 0 : payment.custom_payment_id;
-      const uuid = payment == null ? void 0 : payment.uuid;
-      return ![
-        uniquePaymentNumber,
-        orderPaymentId,
-        customPaymentId,
-        uuid
-      ].some((value) => value !== void 0 && String(value) === identity);
-    });
+    const matchedPayment = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      tempOrder.payments || [],
+      identity,
+      "compat"
+    );
+    if (!matchedPayment)
+      return tempOrder.payments;
+    tempOrder.payments = (tempOrder.payments || []).filter((_, index) => index !== matchedPayment.index);
     this.persistTempOrder();
     return tempOrder.payments;
   }
@@ -2679,7 +2765,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments.map(
         (payment) => this.normalizePaymentSource(
           normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)),
-          { defaultPaid: false }
+          {
+            defaultPaid: false,
+            devicePrefix: options == null ? void 0 : options.devicePrefix
+          }
         )
       )
     ).filter((payment) => {
@@ -2701,14 +2790,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const committedVoucherPaymentIds = new Set(
       committedVoucherPayments.filter((payment) => hasSyncedOrderPaymentRecord(payment)).map((payment) => String(payment.order_payment_id))
     );
-    const committedVoucherIds = new Set(
-      committedVoucherPayments.map((payment) => String(payment.voucher_id))
+    const committedVoucherLifecycleKeys = new Set(
+      committedVoucherPayments.map((payment) => getVoucherPaymentLifecycleKey(payment)).filter((key) => key !== null)
     );
     const replaceableVouchers = mappedVouchers.filter((payment) => {
       if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
         return false;
       }
-      if (payment.voucher_id !== void 0 && committedVoucherIds.has(String(payment.voucher_id))) {
+      const lifecycleKey = getVoucherPaymentLifecycleKey(payment);
+      if (lifecycleKey && committedVoucherLifecycleKeys.has(lifecycleKey)) {
         return false;
       }
       return true;
@@ -2730,6 +2820,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return tempOrder.payments;
   }
+  async updateVoucherOrderPaymentsAsync(payments, options) {
+    const needsPaymentNumber = (payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
+    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
+    return this.updateVoucherOrderPayments(payments, {
+      ...options,
+      devicePrefix
+    });
+  }
   async shouldMergeProductToOrder(params) {
     var _a;
     const onBeforeMergeProductToOrder = (_a = this.orderHooks) == null ? void 0 : _a.onBeforeMergeProductToOrder;
@@ -2790,7 +2888,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
   async appendProductLineToTempOrder(tempOrder, product, booking, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2822,7 +2920,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
+    const isIncomingCustomItem = ((_e = (_d = productToAdd.metadata) == null ? void 0 : _d.origin) == null ? void 0 : _e.isCustomItem) === true || ((_f = productToAdd._origin) == null ? void 0 : _f.isCustomItem) === true;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -2883,7 +2982,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_d = targetProduct.metadata) == null ? void 0 : _d.unique_identification_number;
+      const targetUid = (_g = targetProduct.metadata) == null ? void 0 : _g.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3627,6 +3726,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.saveDraft();
     return tempOrder;
   }
+  async saveTempOrderAsDraft(params) {
+    var _a, _b, _c, _d, _e;
+    const tempOrder = this.ensureTempOrder();
+    this.ensureExternalSaleNumber(tempOrder);
+    this.persistTempOrder();
+    const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
+    const payload = (0, import_utils.buildSubmitPayload)({
+      tempOrder,
+      cacheId: (params == null ? void 0 : params.cacheId) ?? this.cacheId,
+      platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
+      businessCode: (params == null ? void 0 : params.businessCode) || ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code) || tempOrder.business_code,
+      channel: params == null ? void 0 : params.channel,
+      type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
+      summary: latestSummary,
+      enhance: params == null ? void 0 : params.enhancePayload
+    });
+    if (!payload.created_at) {
+      payload.created_at = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+    }
+    payload.need_sync = 0;
+    payload.is_draft_order = 1;
+    this.logInfo("saveTempOrderAsDraft calling sales draft", {
+      orderId: payload.order_id,
+      externalSaleNumber: payload.external_sale_number,
+      productsCount: ((_e = payload.products) == null ? void 0 : _e.length) || 0
+    });
+    return this.request.post("/order/sales/draft", payload, {
+      osServer: true,
+      customToast: () => {
+      }
+    });
+  }
   /**
    * 提交当前 Sales tempOrder。
    *
@@ -3827,8 +3958,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async syncPaymentsToOrder(params) {
     const tempOrder = this.ensureTempOrder();
+    const needsPaymentNumber = (params.payments || []).some((payment) => String(payment.payment_number || "").trim() === "");
+    const devicePrefix = needsPaymentNumber ? await this.getPaymentNumberDevicePrefixAsync() : "LOCAL";
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
-      params.payments || []
+      (params.payments || []).map((payment) => this.normalizePaymentSource(payment, {
+        defaultPaid: false,
+        devicePrefix
+      }))
     );
     const shouldConfirmPendingVoucherPayments = params.confirmPendingVoucherPayments ?? params.submitWhenPaid === true;
     const effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
@@ -4158,7 +4294,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       params.forceRemote = false;
     }
     const res = await this.request.get(`/order/sales/${encodeURIComponent(lookup)}`, {
-      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"],
+      with: ["products", "bookings", "payments", "customer", "summary", "contacts_info", "refunds"],
       ...params.forceRemote ? { forceRemote: true } : {}
     }, { osServer: true });
     if (res.code === 200) {
@@ -4204,6 +4340,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     }
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
+    const sourceLastOrderInfo = raw.lastOrderInfo || raw;
+    const isDraftOrder = Number(nextTempOrder.is_draft_order || 0) === 1;
+    const syntheticIdentityOptions = {
+      isDraftOrder,
+      externalSaleNumber: nextTempOrder.external_sale_number
+    };
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
@@ -4224,7 +4366,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };
-    this.store.lastOrderInfo = sourceRaw.lastOrderInfo || sourceRaw;
+    this.store.lastOrderInfo = this.withoutSyntheticDraftOrderIdForRuntime(
+      sourceLastOrderInfo,
+      syntheticIdentityOptions
+    );
+    const hadSyntheticDraftOrderId = this.isSyntheticDraftOrderIdForRuntime(raw, syntheticIdentityOptions) || this.isSyntheticDraftOrderIdForRuntime(sourceLastOrderInfo, syntheticIdentityOptions);
+    if (hadSyntheticDraftOrderId && this.store.syncState !== "submitting") {
+      this.store.syncState = "local";
+    }
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
     const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
@@ -4337,12 +4486,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   normalizeTempOrderForRuntime(raw, options) {
     var _a, _b;
+    const runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
     const nextTempOrder = {
       ...this.createDefaultTempOrderInstance(),
-      ...raw || {}
+      ...runtimeRaw || {}
     };
-    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (raw == null ? void 0 : raw.id) !== void 0 && (raw == null ? void 0 : raw.id) !== null) {
-      nextTempOrder.order_id = raw.id;
+    if ((nextTempOrder.order_id === void 0 || nextTempOrder.order_id === null) && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== void 0 && (runtimeRaw == null ? void 0 : runtimeRaw.id) !== null) {
+      nextTempOrder.order_id = runtimeRaw.id;
     }
     delete nextTempOrder.summary;
     delete nextTempOrder.lastOrderInfo;
@@ -4410,6 +4560,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  isSyntheticDraftOrderIdForRuntime(record, options) {
+    const isDraftOrder = (options == null ? void 0 : options.isDraftOrder) ?? Number((record == null ? void 0 : record.is_draft_order) || 0) === 1;
+    const externalSaleNumber = (record == null ? void 0 : record.external_sale_number) ?? (options == null ? void 0 : options.externalSaleNumber);
+    const orderId = record == null ? void 0 : record.order_id;
+    return Boolean(
+      isDraftOrder && orderId !== void 0 && orderId !== null && orderId !== "" && externalSaleNumber !== void 0 && externalSaleNumber !== null && externalSaleNumber !== "" && String(orderId) === String(externalSaleNumber)
+    );
+  }
+  withoutSyntheticDraftOrderIdForRuntime(record, options) {
+    if (!this.isSyntheticDraftOrderIdForRuntime(record, options))
+      return record;
+    return {
+      ...record,
+      order_id: null
+    };
+  }
   hydrateLinkedBookingIdentity(tempOrder) {
     const bookingUidByProductUid = /* @__PURE__ */ new Map();
     const productByUid = /* @__PURE__ */ new Map();

package/lib/modules/Order/payment-utils.d.ts

@@ -0,0 +1,26 @@
+export type OrderPaymentTransactionStatus = 'success' | 'fail';
+export interface OrderPaymentTransaction {
+    number: string;
+    status: OrderPaymentTransactionStatus;
+}
+export type OrderPaymentIdentityType = 'order_payment_id' | 'payment_number' | 'unique_payment_number';
+export interface OrderPaymentIdentityMatch<T> {
+    index: number;
+    payment: T;
+    matchedBy: OrderPaymentIdentityType;
+}
+export declare function getOrderPaymentIdentityKeys(payment: unknown): string[];
+export declare function isPendingOrderPayment(payment: unknown): boolean;
+export declare function isIdentifiedPendingOrderPayment(payment: unknown): boolean;
+export declare function hasOrderPaymentIdentityOverlap(left: unknown, right: unknown): boolean;
+export declare function resolveOrderPaymentIdentity<T extends Record<string, any>>(payments: T[] | null | undefined, identity: string | number, mode?: 'payment_number' | 'compat'): OrderPaymentIdentityMatch<T> | null;
+export declare function ensureOrderPaymentNumber<T extends Record<string, any>>(payment: T, devicePrefix: string, createPaymentNumber: () => string): T & {
+    payment_number: string;
+};
+export declare function mergeOrderPaymentTransactions(current: unknown, incoming: unknown): OrderPaymentTransaction[];
+export declare function mergeOrderPaymentRecord<T extends Record<string, any>>(payment: T, updates: Record<string, any>): T;
+export declare function mergeOrderPaymentSnapshot<T extends Record<string, any>>(current: T, incoming: T): T;
+export declare function mergeOrderPaymentListsByIdentity<T extends Record<string, any>>(existing: T[] | null | undefined, incoming: T[] | null | undefined, options?: {
+    preserveUnmatchedExisting?: boolean;
+    preserveUnmatchedExistingWhen?: (payment: T) => boolean;
+}): T[];