@etsoo/appscript 1.3.9 → 1.3.11

package/lib/cjs/erp/AddressApi.d.ts

@@ -3,6 +3,7 @@ import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
+import { IApiPayload } from '@etsoo/restclient';
 /**
  * Address Api
  */
@@ -28,7 +29,8 @@ export declare class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param payload Payload
      * @returns Result
      */
-    states(regionId: string): Promise<AddressState[] | undefined>;
+    states(regionId: string, payload?: IApiPayload<AddressState[]>): Promise<AddressState[] | undefined>;
 }

package/lib/cjs/erp/AddressApi.js

@@ -44,16 +44,18 @@ class AddressApi extends BaseApi_1.BaseApi {
             });
         }
         else {
-            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
+            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false }));
         }
     }
     /**
      * Get state list
      * @param regionId Region id
+     * @param payload Payload
      * @returns Result
      */
-    states(regionId) {
-        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
+    states(regionId, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, payload);
     }
 }
 exports.AddressApi = AddressApi;

package/lib/cjs/erp/EntityApi.d.ts

@@ -23,35 +23,35 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Delete
      * @param id Id or ids
      * @param payload Payload
      */
-    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): R;
-    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R, any>): R;
+    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * List
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Query
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id
      * @param payload Payload
      * @returns Result
      */
-    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Sort
      * @param items Items to sort
@@ -60,19 +60,19 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected sortBase<RQ extends {
         id: DataTypes.IdType;
-    }>(items: RQ[], payload?: IApiPayload<number, any>): Promise<number | undefined>;
+    }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Update
      * @param data Modal data
      * @param payload Payload
      * @returns Result
      */
-    protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Read for update
      * @param id Id
      * @param payload Payload
      * @returns Result
      */
-    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
 }

package/lib/cjs/erp/EntityApi.js

@@ -56,7 +56,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     readBase(id, payload) {
-        return this.api.get(`${this.flag}/Read/${id}`, payload);
+        return this.api.get(`${this.flag}/Read/${id}`, undefined, payload);
     }
     /**
      * Sort
@@ -85,7 +85,7 @@ class EntityApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     updateReadBase(id, payload) {
-        return this.api.get(`${this.flag}/UpdateRead/${id}`, payload);
+        return this.api.get(`${this.flag}/UpdateRead/${id}`, undefined, payload);
     }
 }
 exports.EntityApi = EntityApi;

package/lib/cjs/erp/OrgApi.d.ts

@@ -20,6 +20,7 @@ export declare class OrgApi extends EntityApi {
      * Get organization list
      * @param items Max items or request data
      * @param serviceId Service id
+     * @param payload Payload
      * @returns Result
      */
     list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
@@ -30,18 +31,19 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>): Promise<OrgQueryDto[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
+     * @param payload Payload
      */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
     /**
      * Update
      * @param data Modal data
      * @param payload Payload
      * @returns Result
      */
-    update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult, any>): Promise<IdActionResult<number> | undefined>;
+    update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult>): Promise<IdActionResult<number> | undefined>;
 }

package/lib/cjs/erp/OrgApi.js

@@ -31,6 +31,7 @@ class OrgApi extends EntityApi_1.EntityApi {
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
+     * @param payload Payload
      */
     async switch(id, serviceId, payload) {
         const result = await this.app.api.put('Organization/Switch', {

package/lib/cjs/erp/PublicApi.d.ts

@@ -1,3 +1,4 @@
+import { IApiPayload } from '@etsoo/restclient';
 import { ListType, ListType1 } from '@etsoo/shared';
 import { Currency } from '../business/Currency';
 import { ProductUnit } from '../business/ProductUnit';
@@ -19,16 +20,18 @@ export declare class PublicApi extends BaseApi {
     /**
      * Get exchange rate
      * @param currency Currency
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRate(currency: Currency | string): Promise<ExchangeRateDto | undefined>;
+    exchangeRate(currency: Currency | string, payload?: IApiPayload<ExchangeRateDto>): Promise<ExchangeRateDto | undefined>;
     /**
      * Get exchange rate history
      * @param currencies Currencies
      * @param months Max months
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRateHistory(currencies: (Currency | string)[], months?: number): Promise<ExchangeRateHistoryDto[] | undefined>;
+    exchangeRateHistory(currencies: (Currency | string)[], months?: number, payload?: IApiPayload<ExchangeRateHistoryDto[]>): Promise<ExchangeRateHistoryDto[] | undefined>;
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
@@ -42,15 +45,17 @@ export declare class PublicApi extends BaseApi {
      * Get mobile base64 QRCode
      * @param id User id
      * @param host Host URL
+     * @param payload Payload
      */
-    mobileQRCode(id?: string, host?: string): Promise<string | undefined>;
+    mobileQRCode(id?: string, host?: string, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
      * @param culture Language
+     * @param payload Payload
      * @returns Result
      */
-    product<T extends number | string>(id: T, culture?: string): T extends number ? PublicProductDto : PublicOrgProductDto;
+    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<PublicProductDto>): T extends number ? PublicProductDto : PublicOrgProductDto;
     /**
      *
      * Get all repeat options

package/lib/cjs/erp/PublicApi.js

@@ -16,7 +16,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      */
     async currencies(currencyNames) {
         if (currencyNames == null)
-            return (await this.api.get('Public/GetCurrencies'));
+            return (await this.api.get('Public/GetCurrencies', undefined, { defaultValue: [], showLoading: false }));
         else
             return currencyNames.map((name) => {
                 var _a;
@@ -29,19 +29,22 @@ class PublicApi extends BaseApi_1.BaseApi {
     /**
      * Get exchange rate
      * @param currency Currency
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRate(currency) {
-        return this.api.get(`Public/ExchangeRate/${currency}`);
+    exchangeRate(currency, payload) {
+        return this.api.get(`Public/ExchangeRate/${currency}`, undefined, payload);
     }
     /**
      * Get exchange rate history
      * @param currencies Currencies
      * @param months Max months
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRateHistory(currencies, months) {
-        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
+    exchangeRateHistory(currencies, months, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [] });
+        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, payload);
     }
     /**
      * Get product unit's label
@@ -72,19 +75,21 @@ class PublicApi extends BaseApi_1.BaseApi {
      * Get mobile base64 QRCode
      * @param id User id
      * @param host Host URL
+     * @param payload Payload
      */
-    mobileQRCode(id, host) {
-        return this.api.post('Public/MobileQRCode', { id, host });
+    mobileQRCode(id, host, payload) {
+        return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
      * @param culture Language
+     * @param payload Payload
      * @returns Result
      */
-    product(id, culture) {
+    product(id, culture, payload) {
         culture = this.app.checkLanguage(culture);
-        return this.api.post(`Public/Product/${id}/${culture}`);
+        return this.api.get(`Public/Product/${id}/${culture}`, undefined, payload);
     }
     /**
      *

package/lib/mjs/erp/AddressApi.d.ts

@@ -3,6 +3,7 @@ import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
+import { IApiPayload } from '@etsoo/restclient';
 /**
  * Address Api
  */
@@ -28,7 +29,8 @@ export declare class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param payload Payload
      * @returns Result
      */
-    states(regionId: string): Promise<AddressState[] | undefined>;
+    states(regionId: string, payload?: IApiPayload<AddressState[]>): Promise<AddressState[] | undefined>;
 }

package/lib/mjs/erp/AddressApi.js

@@ -41,15 +41,17 @@ export class AddressApi extends BaseApi {
             });
         }
         else {
-            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [] }));
+            return (await this.api.get(`Address/RegionList?language=${this.app.culture}`, undefined, { defaultValue: [], showLoading: false }));
         }
     }
     /**
      * Get state list
      * @param regionId Region id
+     * @param payload Payload
      * @returns Result
      */
-    states(regionId) {
-        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, { defaultValue: [] });
+    states(regionId, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        return this.api.get(`Address/StateList?regionId=${regionId}&language=${this.app.culture}`, undefined, payload);
     }
 }

package/lib/mjs/erp/EntityApi.d.ts

@@ -23,35 +23,35 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      * @param payload Payload
      * @returns Result
      */
-    protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected createBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Delete
      * @param id Id or ids
      * @param payload Payload
      */
-    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): R;
-    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R, any>): R;
+    protected deleteBase<R extends IActionResult>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
+    protected deleteBase<R extends IActionResult>(ids: DataTypes.IdType[], payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * List
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    protected listBase<RQ extends TiplistRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Query
      * @param rq Request data
      * @param payload Payload
      * @returns Result
      */
-    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[], any>): Promise<R[] | undefined>;
+    protected queryBase<RQ extends QueryRQ, R extends object>(rq: RQ, payload?: IApiPayload<R[]>): Promise<R[] | undefined>;
     /**
      * Read
      * @param id Id
      * @param payload Payload
      * @returns Result
      */
-    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected readBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Sort
      * @param items Items to sort
@@ -60,19 +60,19 @@ export declare class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected sortBase<RQ extends {
         id: DataTypes.IdType;
-    }>(items: RQ[], payload?: IApiPayload<number, any>): Promise<number | undefined>;
+    }>(items: RQ[], payload?: IApiPayload<number>): Promise<number | undefined>;
     /**
      * Update
      * @param data Modal data
      * @param payload Payload
      * @returns Result
      */
-    protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected updateBase<R extends IActionResult>(data: object, payload?: IApiPayload<R>): Promise<R | undefined>;
     /**
      * Read for update
      * @param id Id
      * @param payload Payload
      * @returns Result
      */
-    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R, any>): Promise<R | undefined>;
+    protected updateReadBase<R extends object>(id: DataTypes.IdType, payload?: IApiPayload<R>): Promise<R | undefined>;
 }

package/lib/mjs/erp/EntityApi.js

@@ -53,7 +53,7 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     readBase(id, payload) {
-        return this.api.get(`${this.flag}/Read/${id}`, payload);
+        return this.api.get(`${this.flag}/Read/${id}`, undefined, payload);
     }
     /**
      * Sort
@@ -82,6 +82,6 @@ export class EntityApi extends BaseApi {
      * @returns Result
      */
     updateReadBase(id, payload) {
-        return this.api.get(`${this.flag}/UpdateRead/${id}`, payload);
+        return this.api.get(`${this.flag}/UpdateRead/${id}`, undefined, payload);
     }
 }

package/lib/mjs/erp/OrgApi.d.ts

@@ -20,6 +20,7 @@ export declare class OrgApi extends EntityApi {
      * Get organization list
      * @param items Max items or request data
      * @param serviceId Service id
+     * @param payload Payload
      * @returns Result
      */
     list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
@@ -30,18 +31,19 @@ export declare class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>): Promise<OrgQueryDto[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
+     * @param payload Payload
      */
-    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean>): Promise<boolean | undefined>;
     /**
      * Update
      * @param data Modal data
      * @param payload Payload
      * @returns Result
      */
-    update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult, any>): Promise<IdActionResult<number> | undefined>;
+    update(data: DataTypes.AddOrEditType<OrgRQ, true>, payload?: IApiPayload<IdActionResult>): Promise<IdActionResult<number> | undefined>;
 }

package/lib/mjs/erp/OrgApi.js

@@ -28,6 +28,7 @@ export class OrgApi extends EntityApi {
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
+     * @param payload Payload
      */
     async switch(id, serviceId, payload) {
         const result = await this.app.api.put('Organization/Switch', {

package/lib/mjs/erp/PublicApi.d.ts

@@ -1,3 +1,4 @@
+import { IApiPayload } from '@etsoo/restclient';
 import { ListType, ListType1 } from '@etsoo/shared';
 import { Currency } from '../business/Currency';
 import { ProductUnit } from '../business/ProductUnit';
@@ -19,16 +20,18 @@ export declare class PublicApi extends BaseApi {
     /**
      * Get exchange rate
      * @param currency Currency
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRate(currency: Currency | string): Promise<ExchangeRateDto | undefined>;
+    exchangeRate(currency: Currency | string, payload?: IApiPayload<ExchangeRateDto>): Promise<ExchangeRateDto | undefined>;
     /**
      * Get exchange rate history
      * @param currencies Currencies
      * @param months Max months
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRateHistory(currencies: (Currency | string)[], months?: number): Promise<ExchangeRateHistoryDto[] | undefined>;
+    exchangeRateHistory(currencies: (Currency | string)[], months?: number, payload?: IApiPayload<ExchangeRateHistoryDto[]>): Promise<ExchangeRateHistoryDto[] | undefined>;
     /**
      * Get product unit's label
      * Please define the label in culture with key 'unitPC' for ProductUnit.PC like that
@@ -42,15 +45,17 @@ export declare class PublicApi extends BaseApi {
      * Get mobile base64 QRCode
      * @param id User id
      * @param host Host URL
+     * @param payload Payload
      */
-    mobileQRCode(id?: string, host?: string): Promise<string | undefined>;
+    mobileQRCode(id?: string, host?: string, payload?: IApiPayload<string>): Promise<string | undefined>;
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
      * @param culture Language
+     * @param payload Payload
      * @returns Result
      */
-    product<T extends number | string>(id: T, culture?: string): T extends number ? PublicProductDto : PublicOrgProductDto;
+    product<T extends number | string>(id: T, culture?: string, payload?: IApiPayload<PublicProductDto>): T extends number ? PublicProductDto : PublicOrgProductDto;
     /**
      *
      * Get all repeat options

package/lib/mjs/erp/PublicApi.js

@@ -13,7 +13,7 @@ export class PublicApi extends BaseApi {
      */
     async currencies(currencyNames) {
         if (currencyNames == null)
-            return (await this.api.get('Public/GetCurrencies'));
+            return (await this.api.get('Public/GetCurrencies', undefined, { defaultValue: [], showLoading: false }));
         else
             return currencyNames.map((name) => {
                 var _a;
@@ -26,19 +26,22 @@ export class PublicApi extends BaseApi {
     /**
      * Get exchange rate
      * @param currency Currency
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRate(currency) {
-        return this.api.get(`Public/ExchangeRate/${currency}`);
+    exchangeRate(currency, payload) {
+        return this.api.get(`Public/ExchangeRate/${currency}`, undefined, payload);
     }
     /**
      * Get exchange rate history
      * @param currencies Currencies
      * @param months Max months
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRateHistory(currencies, months) {
-        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
+    exchangeRateHistory(currencies, months, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [] });
+        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, payload);
     }
     /**
      * Get product unit's label
@@ -69,19 +72,21 @@ export class PublicApi extends BaseApi {
      * Get mobile base64 QRCode
      * @param id User id
      * @param host Host URL
+     * @param payload Payload
      */
-    mobileQRCode(id, host) {
-        return this.api.post('Public/MobileQRCode', { id, host });
+    mobileQRCode(id, host, payload) {
+        return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
      * @param culture Language
+     * @param payload Payload
      * @returns Result
      */
-    product(id, culture) {
+    product(id, culture, payload) {
         culture = this.app.checkLanguage(culture);
-        return this.api.post(`Public/Product/${id}/${culture}`);
+        return this.api.get(`Public/Product/${id}/${culture}`, undefined, payload);
     }
     /**
      *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.9",
+    "version": "1.3.11",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,8 +52,8 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.12",
-        "@etsoo/restclient": "^1.0.74",
+        "@etsoo/notificationbase": "^1.1.13",
+        "@etsoo/restclient": "^1.0.75",
         "@etsoo/shared": "^1.1.65",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
@@ -65,8 +65,8 @@
         "@babel/preset-env": "^7.19.4",
         "@babel/runtime-corejs3": "^7.19.4",
         "@types/jest": "^29.1.2",
-        "@typescript-eslint/eslint-plugin": "^5.40.0",
-        "@typescript-eslint/parser": "^5.40.0",
+        "@typescript-eslint/eslint-plugin": "^5.40.1",
+        "@typescript-eslint/parser": "^5.40.1",
         "eslint": "^8.25.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/erp/AddressApi.ts

@@ -4,6 +4,7 @@ import { AddressRegion, AddressRegionDb } from '../address/AddressRegion';
 import { AddressState } from '../address/AddressState';
 import { IdLabelConditional } from './dto/IdLabelDto';
 import { BaseApi } from './BaseApi';
+import { IApiPayload } from '@etsoo/restclient';
 
 /**
  * Address Api
@@ -57,7 +58,7 @@ export class AddressApi extends BaseApi {
             return (await this.api.get<AddressRegionDb[]>(
                 `Address/RegionList?language=${this.app.culture}`,
                 undefined,
-                { defaultValue: [] }
+                { defaultValue: [], showLoading: false }
             )) as any;
         }
     }
@@ -65,13 +66,16 @@ export class AddressApi extends BaseApi {
     /**
      * Get state list
      * @param regionId Region id
+     * @param payload Payload
      * @returns Result
      */
-    states(regionId: string) {
-        return this.api.get<AddressState[]>(
+    states(regionId: string, payload?: IApiPayload<AddressState[]>) {
+        payload ??= { defaultValue: [], showLoading: false };
+
+        return this.api.get(
             `Address/StateList?regionId=${regionId}&language=${this.app.culture}`,
             undefined,
-            { defaultValue: [] }
+            payload
         );
     }
 }

package/src/erp/EntityApi.ts

@@ -28,9 +28,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected createBase<R extends IActionResult>(
         data: object,
-        payload?: IApiPayload<R, any>
+        payload?: IApiPayload<R>
     ) {
-        return this.api.put<R>(`${this.flag}/Create`, data, payload);
+        return this.api.put(`${this.flag}/Create`, data, payload);
     }
 
     /**
@@ -40,20 +40,20 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected deleteBase<R extends IActionResult>(
         id: DataTypes.IdType,
-        payload?: IApiPayload<R, any>
-    ): R;
+        payload?: IApiPayload<R>
+    ): Promise<R | undefined>;
     protected deleteBase<R extends IActionResult>(
         ids: DataTypes.IdType[],
-        payload?: IApiPayload<R, any>
-    ): R;
+        payload?: IApiPayload<R>
+    ): Promise<R | undefined>;
     protected deleteBase<R extends IActionResult>(
         id: DataTypes.IdType | DataTypes.IdType[],
-        payload?: IApiPayload<R, any>
+        payload?: IApiPayload<R>
     ) {
         const query = Array.isArray(id)
             ? '?' + id.map((item) => `ids=${item}`).join('&')
             : id;
-        return this.api.delete<R>(
+        return this.api.delete(
             `${this.flag}/Delete/${query}`,
             undefined,
             payload
@@ -68,9 +68,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected listBase<RQ extends TiplistRQ, R extends object>(
         rq: RQ,
-        payload?: IApiPayload<R[], any>
+        payload?: IApiPayload<R[]>
     ) {
-        return this.api.post<R[]>(`${this.flag}/List`, rq, payload);
+        return this.api.post(`${this.flag}/List`, rq, payload);
     }
 
     /**
@@ -81,9 +81,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected queryBase<RQ extends QueryRQ, R extends object>(
         rq: RQ,
-        payload?: IApiPayload<R[], any>
+        payload?: IApiPayload<R[]>
     ) {
-        return this.api.post<R[]>(`${this.flag}/Query`, rq, payload);
+        return this.api.post(`${this.flag}/Query`, rq, payload);
     }
 
     /**
@@ -94,9 +94,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected readBase<R extends object>(
         id: DataTypes.IdType,
-        payload?: IApiPayload<R, any>
+        payload?: IApiPayload<R>
     ) {
-        return this.api.get<R>(`${this.flag}/Read/${id}`, payload);
+        return this.api.get(`${this.flag}/Read/${id}`, undefined, payload);
     }
 
     /**
@@ -107,11 +107,11 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected sortBase<RQ extends { id: DataTypes.IdType }>(
         items: RQ[],
-        payload?: IApiPayload<number, any>
+        payload?: IApiPayload<number>
     ) {
         const rq: Record<DataTypes.IdType, number> = {};
         items.forEach((item, index) => (rq[item.id] = index));
-        return this.api.put<number>(`${this.flag}/Sort`, rq, payload);
+        return this.api.put(`${this.flag}/Sort`, rq, payload);
     }
 
     /**
@@ -122,9 +122,9 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected updateBase<R extends IActionResult>(
         data: object,
-        payload?: IApiPayload<R, any>
+        payload?: IApiPayload<R>
     ) {
-        return this.api.put<R>(`${this.flag}/Update`, data, payload);
+        return this.api.put(`${this.flag}/Update`, data, payload);
     }
 
     /**
@@ -135,8 +135,12 @@ export class EntityApi<T extends IApp = IApp> extends BaseApi<T> {
      */
     protected updateReadBase<R extends object>(
         id: DataTypes.IdType,
-        payload?: IApiPayload<R, any>
+        payload?: IApiPayload<R>
     ) {
-        return this.api.get<R>(`${this.flag}/UpdateRead/${id}`, payload);
+        return this.api.get(
+            `${this.flag}/UpdateRead/${id}`,
+            undefined,
+            payload
+        );
     }
 }

package/src/erp/OrgApi.ts

@@ -24,6 +24,7 @@ export class OrgApi extends EntityApi {
      * Get organization list
      * @param items Max items or request data
      * @param serviceId Service id
+     * @param payload Payload
      * @returns Result
      */
     list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
@@ -31,7 +32,7 @@ export class OrgApi extends EntityApi {
     list(
         items?: number | OrgListRQ,
         serviceId?: number,
-        payload?: IApiPayload<ListType[], any>
+        payload?: IApiPayload<ListType[]>
     ) {
         payload ??= { defaultValue: [], showLoading: false };
         const rq = typeof items === 'object' ? items : { items, serviceId };
@@ -44,7 +45,7 @@ export class OrgApi extends EntityApi {
      * @param payload Payload
      * @returns Result
      */
-    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>) {
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[]>) {
         return this.queryBase(rq, payload);
     }
 
@@ -52,13 +53,14 @@ export class OrgApi extends EntityApi {
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
+     * @param payload Payload
      */
     async switch(
         id: number,
         serviceId?: number,
-        payload?: IApiPayload<boolean, any>
+        payload?: IApiPayload<boolean>
     ) {
-        const result = await this.app.api.put<boolean>(
+        const result = await this.app.api.put(
             'Organization/Switch',
             {
                 id,
@@ -79,8 +81,8 @@ export class OrgApi extends EntityApi {
      */
     update(
         data: DataTypes.AddOrEditType<OrgRQ, true>,
-        payload?: IApiPayload<IdActionResult, any>
+        payload?: IApiPayload<IdActionResult>
     ) {
-        return super.updateBase<IdActionResult>(data, payload);
+        return super.updateBase(data, payload);
     }
 }

package/src/erp/PublicApi.ts

@@ -1,3 +1,4 @@
+import { IApiPayload } from '@etsoo/restclient';
 import { DataTypes, ListType, ListType1 } from '@etsoo/shared';
 import { Currency } from '../business/Currency';
 import { ProductUnit } from '../business/ProductUnit';
@@ -22,7 +23,9 @@ export class PublicApi extends BaseApi {
     ): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]> {
         if (currencyNames == null)
             return (await this.api.get<CurrencyDto[]>(
-                'Public/GetCurrencies'
+                'Public/GetCurrencies',
+                undefined,
+                { defaultValue: [], showLoading: false }
             )) as any;
         else
             return currencyNames.map((name) => ({
@@ -34,23 +37,37 @@ export class PublicApi extends BaseApi {
     /**
      * Get exchange rate
      * @param currency Currency
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRate(currency: Currency | string) {
-        return this.api.get<ExchangeRateDto>(`Public/ExchangeRate/${currency}`);
+    exchangeRate(
+        currency: Currency | string,
+        payload?: IApiPayload<ExchangeRateDto>
+    ) {
+        return this.api.get(
+            `Public/ExchangeRate/${currency}`,
+            undefined,
+            payload
+        );
     }
 
     /**
      * Get exchange rate history
      * @param currencies Currencies
      * @param months Max months
+     * @param payload Payload
      * @returns Result
      */
-    exchangeRateHistory(currencies: (Currency | string)[], months?: number) {
-        return this.api.post<ExchangeRateHistoryDto[]>(
+    exchangeRateHistory(
+        currencies: (Currency | string)[],
+        months?: number,
+        payload?: IApiPayload<ExchangeRateHistoryDto[]>
+    ) {
+        payload ??= { defaultValue: [] };
+        return this.api.post(
             'Public/ExchangeRateHistory',
             { currencies, months },
-            { defaultValue: [] }
+            payload
         );
     }
 
@@ -83,24 +100,29 @@ export class PublicApi extends BaseApi {
      * Get mobile base64 QRCode
      * @param id User id
      * @param host Host URL
+     * @param payload Payload
      */
-    mobileQRCode(id?: string, host?: string) {
-        return this.api.post<string>('Public/MobileQRCode', { id, host });
+    mobileQRCode(id?: string, host?: string, payload?: IApiPayload<string>) {
+        return this.api.post('Public/MobileQRCode', { id, host }, payload);
     }
 
     /**
      * Get public and valid product data
      * @param id Product/Service Id or Uid
      * @param culture Language
+     * @param payload Payload
      * @returns Result
      */
     product<T extends number | string>(
         id: T,
-        culture?: string
+        culture?: string,
+        payload?: IApiPayload<PublicProductDto>
     ): T extends number ? PublicProductDto : PublicOrgProductDto {
         culture = this.app.checkLanguage(culture);
-        return this.api.post<PublicProductDto>(
-            `Public/Product/${id}/${culture}`
+        return this.api.get(
+            `Public/Product/${id}/${culture}`,
+            undefined,
+            payload
         ) as any;
     }