@pisell/pisellos 2.2.192 → 2.2.194

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

@@ -477,6 +477,10 @@ export interface LoadSalesDetailParams {
     external_sale_number?: string;
     forceRemote?: boolean;
 }
+export interface SalesOrderLookupParams {
+    lookup: number | string;
+    forceRemote?: boolean;
+}
 export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
@@ -635,15 +639,11 @@ export interface OrderModuleAPI {
     updateVoucherOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
     saveDraft: () => Promise<void>;
-    hasLocalDatabase: () => boolean;
-    getLocalOrderByOrderId: (orderId: number | string) => Promise<Record<string, any> | null>;
-    getLocalOrderByExternalSaleNumber: (externalSaleNumber: string) => Promise<Record<string, any> | null>;
-    getLocalOrderByOrderNumber: (orderNumber: string) => Promise<Record<string, any> | null>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
-    getOrderInfoByRemote: (order_id: number) => Promise<any>;
+    getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;
     getLastOrderInfo: () => Record<string, any> | undefined;
     getOrderInfo: (order_id: number) => Promise<any>;
     /**

package/dist/modules/Order/utils/manualProductDiscount.js

@@ -179,7 +179,7 @@ export function buildManualProductDiscountItem(params) {
   var diff = origin.minus(selling);
   var quantity = resolveSafeProductNum(params.quantity);
   return {
-    amount: diff.abs().toDecimalPlaces(2).toNumber(),
+    amount: diff.toDecimalPlaces(2).toNumber(),
     type: 'product',
     discount: {
       message: (_params$message = params.message) !== null && _params$message !== void 0 ? _params$message : '',

package/dist/modules/Order/utils.js

@@ -240,18 +240,18 @@ export function resolveEffectivePerUnitDiscount(product) {
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  var promo = metadata._promotion;
+  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
   var optionSum = sumOptionUnitPrice(getProductSkuOptions(product)).toNumber();
 
   // applyPromotion 写价后、Rules 剥离 promotion discount 的兜底
-  if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
+  if (!discountList.length && metadata.source_product_price != null && metadata.main_product_selling_price != null) {
     var source = Number(metadata.source_product_price);
     var selling = Number(metadata.main_product_selling_price) - optionSum;
     if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
       return fromList + (source - selling);
     }
   }
-  var promo = metadata._promotion;
-  if ((promo === null || promo === void 0 ? void 0 : promo.inPromotion) !== true) return fromList;
   var originalPrice = Number(promo.originalPrice);
   var finalPrice = Number(promo.finalPrice);
   if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice)) return fromList;

package/dist/modules/Payment/utils.js

@@ -11,7 +11,7 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  * @param list
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
-  return (list || []).map(function (item) {
+  var formatted = (list || []).map(function (item) {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
@@ -20,6 +20,7 @@ export var formatWalletPassList2PreparePayments = function formatWalletPassList2
       wallet_pass_use_value: item.wallet_pass_use_value || undefined
     };
   });
+  return formatted;
 };
 
 /**

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

@@ -43,30 +43,5 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         rounding_amount: string;
         pay_service_charge_amount: string;
         is_price_include_tax?: number | undefined;
-    } | {
-        tax_title: string;
-        tax_rate: number | undefined;
-        product_quantity: number;
-        product_original_amount: string;
-        product_amount: string;
-        product_expect_amount: string;
-        product_tax_fee: string;
-        shipping_fee: string;
-        shipping_tax_fee: string;
-        tax_fee: string;
-        surcharge_fee: string;
-        surcharges: any;
-        discount_amount: string;
-        deposit_amount: string;
-        deposit: import("./types").DepositInfo | undefined;
-        expect_amount: string;
-        total_amount: string;
-        total_refund_amount: string;
-        customer_paid_amount: string;
-        order_paid_amount: string;
-        amount_gap: string;
-        rounding_amount: string;
-        pay_service_charge_amount: string;
-        is_price_include_tax: number;
     }>;
 }

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

@@ -1,4 +1,5 @@
 export interface SalesSummaryProduct {
+    order_detail_id?: number | string | null;
     product_id: number | null;
     product_variant_id: number;
     num: number;

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

@@ -1,4 +1,4 @@
-import type { DepositInfo, SalesSummaryData, SalesSummaryProduct } from './types';
+import type { SalesSummaryData, SalesSummaryProduct } from './types';
 export declare function createEmptySalesSummary(): SalesSummaryData;
 export declare function calculateSalesSummary(params: {
     products: SalesSummaryProduct[];
@@ -8,27 +8,4 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
-}): SalesSummaryData | {
-    product_quantity: number;
-    product_original_amount: string;
-    product_amount: string;
-    product_expect_amount: string;
-    product_tax_fee: string;
-    shipping_fee: string;
-    shipping_tax_fee: string;
-    tax_fee: string;
-    surcharge_fee: string;
-    surcharges: any;
-    discount_amount: string;
-    deposit_amount: string;
-    deposit: DepositInfo | undefined;
-    expect_amount: string;
-    total_amount: string;
-    total_refund_amount: string;
-    customer_paid_amount: string;
-    order_paid_amount: string;
-    amount_gap: string;
-    rounding_amount: string;
-    pay_service_charge_amount: string;
-    is_price_include_tax: number;
-};
+}): SalesSummaryData;