asv-hlps 1.3.64 → 1.3.66

package/lib/cjs/products/models/IProductParams.d.ts

@@ -0,0 +1,18 @@
+import { IParam } from "../../shared/models/IParam";
+export interface IProductParams extends IParam {
+    pdtId?: number;
+    agcyId?: number;
+    pvdId?: number;
+    laboId?: number;
+    catCode?: string;
+    isActive?: boolean;
+    isAvailable?: boolean;
+    isPublished?: boolean;
+    withLabo?: boolean;
+    inEqeer?: boolean;
+    dciId?: number;
+    fgId?: number;
+    sofId?: number;
+    dosId?: number;
+    grpByPdt?: boolean;
+}

package/lib/cjs/products/models/IProductParams.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/products/product.d.ts

@@ -1,4 +1,5 @@
 import User from "../users/models/User";
 import Product from "./models/Product";
 export declare const unitPriceByClientCat: (product: Product, client: User, speUnitPrice?: number, addDiscount?: boolean) => number;
+export declare const unitPriceByClientCatInPhcy: (product: Product, client: User, speUnitPrice?: number, addDiscount?: boolean) => number;
 export declare const productCatCode: (product: Product, catCodes: string[]) => boolean;

package/lib/cjs/products/product.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.productCatCode = exports.unitPriceByClientCat = void 0;
+exports.productCatCode = exports.unitPriceByClientCatInPhcy = exports.unitPriceByClientCat = void 0;
 const user_1 = require("../users/user");
 const utils_1 = require("../utils");
 const unitPriceByClientCat = (product, client, speUnitPrice = 0, addDiscount = false) => {
@@ -17,6 +17,20 @@ const unitPriceByClientCat = (product, client, speUnitPrice = 0, addDiscount = f
         : Math.ceil(product.stores[0].salePrice * clientCoef);
 };
 exports.unitPriceByClientCat = unitPriceByClientCat;
+const unitPriceByClientCatInPhcy = (product, client, speUnitPrice = 0, addDiscount = false) => {
+    if (speUnitPrice > 0) {
+        return speUnitPrice;
+    }
+    // const store = await getCustomRepository(ProductStoreRepository).getOneStoreByParams({storeName: 'cpa', productId: product.id})
+    if (product.store.discountRate && addDiscount) {
+        return Math.ceil(product.store.publicPrice) - Math.ceil((0, utils_1.calculPercent)(product.store.publicPrice, product.store.discountRate));
+    }
+    const clientCoef = !client ? 1 : (0, user_1.userCoef)(client);
+    return (0, exports.productCatCode)(product, ["spe", "para"])
+        ? Math.ceil(product.store.publicPrice)
+        : Math.ceil(product.store.publicPrice * clientCoef);
+};
+exports.unitPriceByClientCatInPhcy = unitPriceByClientCatInPhcy;
 const productCatCode = (product, catCodes) => {
     return catCodes.includes(product.cat.code && product.cat.code.toLowerCase());
 };

package/lib/cjs/query-builder/hlpQbuilder.d.ts

@@ -1,5 +1,5 @@
 import { SelectQueryBuilder } from "typeorm";
-import IParam from "../shared/models/IParam";
+import { IParam } from "../shared/models/IParam";
 declare class HlpQBuilder {
     userWhereParams(qb: SelectQueryBuilder<any>, prms: IParam): void;
 }

package/lib/cjs/shared/models/IParam.d.ts

@@ -1,11 +1,18 @@
 import EDate from "./EDate";
-export default interface IInOrNot {
+export interface IInOrNot {
     ins?: string[];
     notIns?: string[];
+    orIns?: string[];
     steId?: number;
     steName?: string;
 }
-export default interface IParam {
+export interface InOrNotStaff {
+    orInSteNames?: string[];
+    orNotInSteNames?: string[];
+    inSteNames?: string[];
+    notInSteNames?: string[];
+}
+export interface IParam {
     steId?: number;
     userId?: number;
     clientId?: number;
@@ -13,9 +20,12 @@ export default interface IParam {
     role?: string;
     steName?: string;
     steNames?: string[];
+    staffSteNames?: string[];
+    isActive?: boolean;
     steGrpCodes?: IInOrNot;
     grpCodes?: IInOrNot;
     roleCodes?: IInOrNot;
+    staff?: InOrNotStaff;
     roleCode?: string;
     opDate?: EDate;
     store?: string;

package/lib/cjs/shared/models/index.d.ts

@@ -1,7 +1,8 @@
+import { IParam } from "./IParam";
 export { default as EInOutMotive } from "./EInOutMotive";
-export { default as IParam } from "./IParam";
 export { default as IPath } from "./IPath";
 export { default as NaAc } from "./NaAc";
 export { default as NaCoAc } from "./NaCoAc";
 export { default as NaCoShortAc } from "./NaCoShortAc";
 export { default as OpDate } from "./OpDate";
+export { IParam };

package/lib/esm/products/models/IProductParams.d.ts

@@ -0,0 +1,18 @@
+import { IParam } from "../../shared/models/IParam";
+export interface IProductParams extends IParam {
+    pdtId?: number;
+    agcyId?: number;
+    pvdId?: number;
+    laboId?: number;
+    catCode?: string;
+    isActive?: boolean;
+    isAvailable?: boolean;
+    isPublished?: boolean;
+    withLabo?: boolean;
+    inEqeer?: boolean;
+    dciId?: number;
+    fgId?: number;
+    sofId?: number;
+    dosId?: number;
+    grpByPdt?: boolean;
+}

package/lib/esm/products/models/IProductParams.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/products/product.d.ts

@@ -1,4 +1,5 @@
 import User from "../users/models/User";
 import Product from "./models/Product";
 export declare const unitPriceByClientCat: (product: Product, client: User, speUnitPrice?: number, addDiscount?: boolean) => number;
+export declare const unitPriceByClientCatInPhcy: (product: Product, client: User, speUnitPrice?: number, addDiscount?: boolean) => number;
 export declare const productCatCode: (product: Product, catCodes: string[]) => boolean;

package/lib/esm/products/product.js

@@ -13,6 +13,19 @@ export const unitPriceByClientCat = (product, client, speUnitPrice = 0, addDisco
         ? Math.ceil(product.stores[0].salePrice)
         : Math.ceil(product.stores[0].salePrice * clientCoef);
 };
+export const unitPriceByClientCatInPhcy = (product, client, speUnitPrice = 0, addDiscount = false) => {
+    if (speUnitPrice > 0) {
+        return speUnitPrice;
+    }
+    // const store = await getCustomRepository(ProductStoreRepository).getOneStoreByParams({storeName: 'cpa', productId: product.id})
+    if (product.store.discountRate && addDiscount) {
+        return Math.ceil(product.store.publicPrice) - Math.ceil(calculPercent(product.store.publicPrice, product.store.discountRate));
+    }
+    const clientCoef = !client ? 1 : userCoef(client);
+    return productCatCode(product, ["spe", "para"])
+        ? Math.ceil(product.store.publicPrice)
+        : Math.ceil(product.store.publicPrice * clientCoef);
+};
 export const productCatCode = (product, catCodes) => {
     return catCodes.includes(product.cat.code && product.cat.code.toLowerCase());
 };

package/lib/esm/query-builder/hlpQbuilder.d.ts

@@ -1,5 +1,5 @@
 import { SelectQueryBuilder } from "typeorm";
-import IParam from "../shared/models/IParam";
+import { IParam } from "../shared/models/IParam";
 declare class HlpQBuilder {
     userWhereParams(qb: SelectQueryBuilder<any>, prms: IParam): void;
 }

package/lib/esm/shared/models/IParam.d.ts

@@ -1,11 +1,18 @@
 import EDate from "./EDate";
-export default interface IInOrNot {
+export interface IInOrNot {
     ins?: string[];
     notIns?: string[];
+    orIns?: string[];
     steId?: number;
     steName?: string;
 }
-export default interface IParam {
+export interface InOrNotStaff {
+    orInSteNames?: string[];
+    orNotInSteNames?: string[];
+    inSteNames?: string[];
+    notInSteNames?: string[];
+}
+export interface IParam {
     steId?: number;
     userId?: number;
     clientId?: number;
@@ -13,9 +20,12 @@ export default interface IParam {
     role?: string;
     steName?: string;
     steNames?: string[];
+    staffSteNames?: string[];
+    isActive?: boolean;
     steGrpCodes?: IInOrNot;
     grpCodes?: IInOrNot;
     roleCodes?: IInOrNot;
+    staff?: InOrNotStaff;
     roleCode?: string;
     opDate?: EDate;
     store?: string;

package/lib/esm/shared/models/index.d.ts

@@ -1,7 +1,8 @@
+import { IParam } from "./IParam";
 export { default as EInOutMotive } from "./EInOutMotive";
-export { default as IParam } from "./IParam";
 export { default as IPath } from "./IPath";
 export { default as NaAc } from "./NaAc";
 export { default as NaCoAc } from "./NaCoAc";
 export { default as NaCoShortAc } from "./NaCoShortAc";
 export { default as OpDate } from "./OpDate";
+export { IParam };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.3.64",
+  "version": "1.3.66",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",