@pisell/pisellos 3.0.56 → 3.0.57

package/lib/modules/ProductList/index.js

@@ -24,7 +24,6 @@ __export(ProductList_exports, {
 });
 module.exports = __toCommonJS(ProductList_exports);
 var import_BaseModule = require("../BaseModule");
-var import_Product = require("../Product");
 var import_types = require("./types");
 var import_lodash_es = require("lodash-es");
 __reExport(ProductList_exports, require("./types"), module.exports);
@@ -41,43 +40,33 @@ var ProductList = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
-      this.storeChange();
     } else {
       this.store.list = [];
-      this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
     this.request = core.getPlugin("request");
   }
   async storeChange(path, value) {
-    var _a;
-    (_a = this.store.list) == null ? void 0 : _a.forEach((product) => {
-      const productModule = this.store.productMap.get(`product-${product.id}`);
-      if (!productModule) {
-        const newProductModule = new import_Product.Product(
-          `product_${product.id.toString()}`
-        );
-        this.core.registerModule(newProductModule, { initialState: product });
-        this.store.productMap.set(product.id.toString(), newProductModule);
-      } else {
-        productModule.updateData(product);
-      }
-    });
   }
   async loadProducts({
     category_ids = [],
     product_ids = [],
     collection = [],
+    menu_list_ids = [],
+    customer_id: paramsCustomerId,
+    with_count = [],
+    schedule_datetime,
     schedule_date,
-    cacheId
+    cacheId,
+    with_schedule
   }) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
-      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
     } catch (error) {
       console.error(error);
     }
@@ -103,14 +92,19 @@ var ProductList = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: cacheId,
+        menu_list_ids,
+        with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
+        with_schedule,
+        schedule_datetime,
         application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
       { useCache: true }
     );
-    this.addProduct(productsData.data.list);
-    return productsData.data.list;
+    const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.addProduct(sortedList);
+    return sortedList;
   }
   async loadProductsPrice({
     ids = [],
@@ -142,10 +136,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
       import_types.ProductListHooks.onGetProduct,
       this.store.list
     );
-    const product = this.store.productMap.get(`${id}`);
-    if (product)
-      return product;
-    return void 0;
+    const product = this.store.list.find((product2) => product2.id === id);
+    return product ? (0, import_lodash_es.cloneDeep)(product) : void 0;
   }
   async addProduct(products) {
     if (!this.store.list) {
@@ -159,11 +151,30 @@ var ProductList = class extends import_BaseModule.BaseModule {
         this.store.list[index] = n;
       }
     });
-    this.storeChange();
+    this.store.list.sort((a, b) => Number(b.sort) - Number(a.sort));
+    this.core.effects.emit(`${this.name}:changed`, this.store.list);
   }
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
+  /**
+   * 根据商品编码或条码搜索商品
+   * @param code 商品编码或条码
+   * @returns 匹配的商品列表，如果没有匹配则返回空数组
+   */
+  findProductsByCodeOrBarcode(code) {
+    if (!code || typeof code !== "string") {
+      return [];
+    }
+    const trimmedCode = code.trim();
+    if (!trimmedCode) {
+      return [];
+    }
+    const matchingProducts = this.store.list.filter((product) => {
+      return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
+    });
+    return (0, import_lodash_es.cloneDeep)(matchingProducts);
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/ProductList/types.d.ts

@@ -1,7 +1,6 @@
 import { ProductData } from '../Product/types';
 export interface ProductListData {
     list: ProductData[];
-    productMap: Map<string, any>;
     selectProducts: ProductData[];
 }
 export declare enum ProductListHooks {

package/lib/modules/Rules/index.js

@@ -37,6 +37,7 @@ var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
+var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -188,19 +189,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          applicableProducts.push({
+          const discountType = discount.tag || discount.type;
+          const productData = {
             amount: product.price,
-            type: discount.tag || discount.type,
-            tag: discount.tag || discount.type,
+            type: discountType,
+            tag: discountType,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            },
-            num: product.num || 1
-          });
+            }
+          };
+          if (discountType !== "good_pass") {
+            productData.num = product.num || 1;
+          }
+          applicableProducts.push(productData);
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -215,9 +220,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a2;
-        if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
+        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+        if ((Number(product.total) <= 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -242,7 +247,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount) {
+      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
@@ -309,18 +314,21 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
+        const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          type: discountType,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          },
-          num: product.num || 1
+          }
         };
+        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
+          discountDetail.num = product.num || 1;
+        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

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

@@ -39,6 +39,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
+    vouchersApplicable?: boolean;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/modules/index.d.ts

@@ -3,6 +3,7 @@ export * from './ProductList';
 export * from './Cart';
 export * from './Account';
 export * from './AccountList';
+export * from './Customer';
 export * from './Date';
 export * from './Guests';
 export * from './Order';

package/lib/modules/index.js

@@ -21,6 +21,7 @@ __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
 __reExport(modules_exports, require("./Account"), module.exports);
 __reExport(modules_exports, require("./AccountList"), module.exports);
+__reExport(modules_exports, require("./Customer"), module.exports);
 __reExport(modules_exports, require("./Date"), module.exports);
 __reExport(modules_exports, require("./Guests"), module.exports);
 __reExport(modules_exports, require("./Order"), module.exports);
@@ -36,6 +37,7 @@ __reExport(modules_exports, require("./Schedule"), module.exports);
   ...require("./Cart"),
   ...require("./Account"),
   ...require("./AccountList"),
+  ...require("./Customer"),
   ...require("./Date"),
   ...require("./Guests"),
   ...require("./Order"),

package/lib/plugins/app-types/app/app.d.ts

@@ -0,0 +1,83 @@
+import { RouterManager } from '../routes';
+import { ApplicationManager } from '../applicationManager';
+import { History, HistoryOptions } from '../history';
+import { Data } from '../data';
+import { Locales, LocalesOptions } from '../locales';
+import { Storage, StorageOptions } from '../storage';
+import { MenuManager } from '../menuManager';
+import LoggerManager, { LoggerOptions } from '../logger';
+import { TasksManager } from '../tasks';
+import IndexDBManager, { DBOptions } from '../indexDB';
+declare global {
+    interface Window {
+        app: App;
+    }
+}
+export interface AppOptions {
+    logger?: LoggerOptions;
+    db?: DBOptions;
+    constants?: any;
+    history?: HistoryOptions;
+    storage?: StorageOptions;
+    locales?: LocalesOptions;
+}
+declare class App {
+    private static instance;
+    private plugins;
+    globalData: any;
+    router: RouterManager;
+    applicationManager: ApplicationManager;
+    history: History;
+    data: Data;
+    hooks: import("../hooks").HooksExport;
+    locales: Locales;
+    models: {
+        getStore: () => import("../models").Store;
+        StoreProvider: typeof import("react-redux").Provider;
+        setConfig: (models: any[]) => void;
+    };
+    request: {
+        get: (url: import("../request").RequestWrapperProps["url"], data: import("../request").RequestWrapperProps["data"], config: import("../request").RequestWrapperProps["config"]) => Promise<any>;
+        post: (url: import("../request").RequestWrapperProps["url"], data: import("../request").RequestWrapperProps["data"], config: import("../request").RequestWrapperProps["config"]) => Promise<any>;
+        put: (url: import("../request").RequestWrapperProps["url"], data: import("../request").RequestWrapperProps["data"], config: import("../request").RequestWrapperProps["config"]) => Promise<any>;
+        remove: (url: import("../request").RequestWrapperProps["url"], data: import("../request").RequestWrapperProps["data"], config: import("../request").RequestWrapperProps["config"]) => Promise<any>;
+        custom: (url: import("../request").RequestWrapperProps["url"], config: import("../request").RequestWrapperProps["config"]) => Promise<any>;
+        setConfig: (newConfig: Partial<import("../request").RequestConfig>) => void;
+        getConfig: () => import("../request").RequestConfig;
+    };
+    storage: Storage;
+    menuManager: MenuManager;
+    cookie: {
+        setCookie: (name: string, value: string, domain?: string) => void;
+        getCookie: (name: string) => string | null;
+        deleteCookie: (name: string, domain?: string) => void;
+        checkCookie: (name: string) => boolean;
+        updateCookie: (name: string, value: string, domain?: string) => void;
+    };
+    website: {
+        setTitle: (title: string) => void;
+        setIcon: (paramsIcon: string) => void;
+        setAppleWebAppTitle: (title: string) => void;
+    };
+    logger: LoggerManager;
+    pubsub: import("../pubsub").PubSub;
+    tasksManager: TasksManager;
+    dbManager: IndexDBManager | null;
+    constants: {
+        channel: string;
+        [key: string]: string;
+    };
+    private constructor();
+    static getInstance(options?: AppOptions): App;
+    setGlobalData(globalData: any): void;
+    usePlugin(name: string, plugin: any): void;
+    usePlugins(plugins: {
+        name: string;
+        plugin: any;
+    }[]): void;
+    getPlugin(name: string): any;
+    getGlobalData(): any;
+    install(): void;
+    unInstall(): void;
+}
+export default App;

package/lib/plugins/app-types/app/const.d.ts

@@ -0,0 +1,4 @@
+export declare enum APPEvent {
+    APP_INSTALL = "app.install",
+    APP_UNINSTALL = "app.uninstall"
+}

package/lib/plugins/app-types/app/index.d.ts

@@ -0,0 +1,14 @@
+import React from "react";
+import App, { AppOptions } from "./app";
+type AppContextType = {
+    globalData: any;
+    setGlobalData: React.Dispatch<React.SetStateAction<any>>;
+    app: App;
+};
+export declare const AppProvider: React.FC<{
+    children: React.ReactNode;
+    options: AppOptions;
+}>;
+export declare const useApp: () => AppContextType;
+export declare const getApp: typeof App.getInstance;
+export default App;

package/lib/plugins/app-types/applicationManager/application.d.ts

@@ -0,0 +1,50 @@
+import App from "../app";
+import { LoadLibraryByUrlParams } from "../locales/type";
+import { MenuItem } from "../menuManager/index";
+export type ApplicationInterface = {
+    page_type: "low_code" | "code";
+    page_id: number | string;
+    page_code: string;
+    page_version?: string;
+    page_name: string;
+    router: string;
+    category: "page" | "component" | "function";
+    Component?: any;
+    children?: any;
+    layout?: string;
+    originalUrl?: string;
+};
+export type ApplicationData = {
+    app_id: number;
+    app_name: string;
+    app_type: "system" | "custom";
+    interfaces: ApplicationInterface[];
+    functions?: any[];
+    menu?: {
+        [key: string]: MenuItem[];
+    };
+    locales?: LoadLibraryByUrlParams;
+    [key: string]: any;
+};
+export declare class Application {
+    options: ApplicationData;
+    name: ApplicationData["app_name"];
+    interfaces: Map<ApplicationInterface["page_name"], ApplicationInterface>;
+    components: Map<string, any>;
+    functions: Map<string, any>;
+    app: App;
+    constructor(options: ApplicationData, app: App);
+    afterAdd(application: Application): Promise<void>;
+    beforeLoad(): Promise<void>;
+    load(): Promise<void>;
+    initInterfaces(interfaces: ApplicationData["interfaces"]): void;
+    initFunctions(functions: ApplicationData["functions"]): void;
+    loadInterface(interfaceItem: ApplicationInterface): Promise<ApplicationInterface>;
+    setInterface(code: string, interfaceItem: ApplicationInterface): void;
+    setComponent(code: string, component: ApplicationInterface): void;
+    setFunction(code: string, functionItem: ApplicationInterface): void;
+    getInterface(code: string): ApplicationInterface | undefined;
+    getComponent(code: string): any;
+    getFunction(code: string): any;
+    runFunction(code: string, params?: any, ...args: any): any;
+}

package/lib/plugins/app-types/applicationManager/index.d.ts

@@ -0,0 +1,13 @@
+import APP from "../app";
+import { Application, ApplicationData } from "./application";
+export declare class ApplicationManager {
+    applicationList: Application[];
+    protected app: APP;
+    applications: Map<string, Application>;
+    constructor(applicationList: Application[] | undefined, app: APP);
+    init(applicationList: Application[] | ApplicationData[]): Promise<unknown>;
+    add(application: Application): Promise<void>;
+    get(appName: Application["name"]): Application | undefined;
+    remove(appName: Application["name"]): void;
+    load(): Promise<void>;
+}

package/lib/plugins/app-types/config.d.ts

@@ -0,0 +1,3 @@
+import { CoreConfig } from './type';
+export declare const setConfig: (newConfig: Partial<CoreConfig>) => void;
+export declare const getConfig: () => CoreConfig;

package/lib/plugins/app-types/cookie/index.d.ts

@@ -0,0 +1,13 @@
+declare function setCookie(name: string, value: string, domain?: string): void;
+declare function getCookie(name: string): string | null;
+declare function deleteCookie(name: string, domain?: string): void;
+declare function checkCookie(name: string): boolean;
+declare function updateCookie(name: string, value: string, domain?: string): void;
+declare const _default: {
+    setCookie: typeof setCookie;
+    getCookie: typeof getCookie;
+    deleteCookie: typeof deleteCookie;
+    checkCookie: typeof checkCookie;
+    updateCookie: typeof updateCookie;
+};
+export default _default;

package/lib/plugins/app-types/data/index.d.ts

@@ -0,0 +1,8 @@
+import { Storage } from '../storage';
+import App from '../app';
+export declare class Data {
+    private app;
+    storage: Storage;
+    store: any;
+    constructor(app: App);
+}

package/lib/plugins/app-types/history/config.d.ts

@@ -0,0 +1,24 @@
+import { HistoryConfig } from './type';
+/**
+ * @title: 默认配置
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const defaultConfig: HistoryConfig;
+/**
+ * @title: 设置配置
+ * @description:
+ * @param {Partial} newConfig
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const setConfig: (newConfig: Partial<HistoryConfig>) => HistoryConfig;
+/**
+ * @title: 获取配置
+ * @description:
+ * @param {*} HistoryConfig
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const getConfig: () => HistoryConfig;

package/lib/plugins/app-types/history/index.d.ts

@@ -0,0 +1,20 @@
+import type { History as HistoryType } from "history";
+import { useHistory, useLocation, useParams } from "react-router-dom";
+import App from "../app";
+export interface HistoryOptions {
+    basename?: string;
+}
+export declare class History {
+    instance: HistoryType<unknown>;
+    useHistory: typeof useHistory;
+    useLocation: typeof useLocation;
+    useParams: typeof useParams;
+    app: App;
+    constructor(app: App, options?: HistoryOptions);
+    push: HistoryType["push"];
+    replace: HistoryType["replace"];
+    reload: () => void;
+    reloadTo: (path: string) => void;
+    externalPage: (path: string) => void;
+    goLogin: () => any;
+}

package/lib/plugins/app-types/history/type.d.ts

@@ -0,0 +1,2 @@
+export interface HistoryConfig {
+}

package/lib/plugins/app-types/hooks/index.d.ts

@@ -0,0 +1,12 @@
+import useLowCode from './useLowCode';
+import useDelayedValue from './useDelayedValue';
+import useStore from './useStore';
+import useDispatch from './useDispatch';
+export interface HooksExport {
+    useLowCode: typeof useLowCode;
+    useDelayedValue: typeof useDelayedValue;
+    useStore: typeof useStore;
+    useDispatch: typeof useDispatch;
+}
+declare const _default: HooksExport;
+export default _default;

package/lib/plugins/app-types/hooks/useDelayedValue/index.d.ts

@@ -0,0 +1,2 @@
+declare function useDelayedValue<T>(value: T, timeout?: number): T;
+export default useDelayedValue;

package/lib/plugins/app-types/hooks/useDispatch/index.d.ts

@@ -0,0 +1,2 @@
+import { useDispatch } from "react-redux";
+export default useDispatch;

package/lib/plugins/app-types/hooks/useLowCode/index.d.ts

@@ -0,0 +1,13 @@
+export interface useLowCodeProps {
+    onChange: (e: any) => void;
+    onReady: (e: any) => void;
+}
+export interface useLowCodeResult {
+    lowcodeRef: {
+        onReady: (e: any) => void;
+        onChange: (e: any) => void;
+    };
+    setState: (values: any, callback?: any) => any;
+}
+declare const useLowCode: (props: Partial<useLowCodeProps>) => useLowCodeResult;
+export default useLowCode;

package/lib/plugins/app-types/hooks/useStore/index.d.ts

@@ -0,0 +1,6 @@
+import { ModelsState } from "../../models";
+declare const useStore: <T extends keyof ModelsState, D extends keyof ModelsState[T]>(props: {
+    models: T;
+    key?: D;
+}) => D extends undefined ? ModelsState[T] : ModelsState[T][D];
+export default useStore;

package/lib/plugins/app-types/index.d.ts

@@ -0,0 +1,6 @@
+export { default as request } from './request';
+export { default as hooks } from './hooks';
+export { default as models } from './models';
+export { default as pubsub } from './pubsub';
+export { default as socket } from './socket';
+export * from './app';