@etsoo/appscript 1.3.6 → 1.3.8

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

@@ -1,20 +1,47 @@
-import { ListType } from '@etsoo/shared';
-import { BaseApi } from './BaseApi';
+import { IApiPayload } from '@etsoo/restclient';
+import { DataTypes, ListType } from '@etsoo/shared';
+import { IApp } from '../app/IApp';
+import { IdActionResult } from '../result/IActionResult';
+import { OrgQueryDto } from './dto/OrgQueryDto';
+import { EntityApi } from './EntityApi';
+import { OrgListRQ } from './rq/OrgListRQ';
+import { OrgQueryRQ } from './rq/OrgQueryRQ';
+import { OrgRQ } from './rq/OrgRQ';
 /**
  * Organization API
  */
-export declare class OrgApi extends BaseApi {
+export declare class OrgApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp);
     /**
      * Get organization list
-     * @param items Max items
+     * @param items Max items or request data
      * @param serviceId Service id
      * @returns Result
      */
     list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
+    list(rq: OrgListRQ): Promise<ListType[] | undefined>;
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>): Promise<OrgQueryDto[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
      */
-    switch(id: number, serviceId?: number): Promise<boolean | undefined>;
+    switch(id: number, serviceId?: number, payload?: IApiPayload<boolean, any>): 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>;
 }

package/lib/cjs/erp/OrgApi.js

@@ -1,37 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgApi = void 0;
-const BaseApi_1 = require("./BaseApi");
+const EntityApi_1 = require("./EntityApi");
 /**
  * Organization API
  */
-class OrgApi extends BaseApi_1.BaseApi {
+class OrgApi extends EntityApi_1.EntityApi {
     /**
-     * Get organization list
-     * @param items Max items
-     * @param serviceId Service id
+     * Constructor
+     * @param app Application
+     */
+    constructor(app) {
+        super('Organization', app);
+    }
+    list(items, serviceId, payload) {
+        payload !== null && payload !== void 0 ? payload : (payload = { defaultValue: [], showLoading: false });
+        const rq = typeof items === 'object' ? items : { items, serviceId };
+        return this.listBase(rq, payload);
+    }
+    /**
+     * Query
+     * @param rq Request data
+     * @param payload Payload
      * @returns Result
      */
-    list(items, serviceId) {
-        return this.app.api.post('Organization/List', {
-            items,
-            serviceId
-        }, { defaultValue: [], showLoading: false });
+    query(rq, payload) {
+        return this.queryBase(rq, payload);
     }
     /**
      * Switch organization
      * @param id Organization id
      * @param serviceId Service id
      */
-    async switch(id, serviceId) {
+    async switch(id, serviceId, payload) {
         const result = await this.app.api.put('Organization/Switch', {
             id,
             serviceId,
             deviceId: this.app.deviceId
-        });
+        }, payload);
         if (result)
             return await this.app.refreshToken();
         return result;
     }
+    /**
+     * Update
+     * @param data Modal data
+     * @param payload Payload
+     * @returns Result
+     */
+    update(data, payload) {
+        return super.updateBase(data, payload);
+    }
 }
 exports.OrgApi = OrgApi;

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.app.api.get('Public/GetCurrencies'));
+            return (await this.api.get('Public/GetCurrencies'));
         else
             return currencyNames.map((name) => {
                 var _a;
@@ -32,7 +32,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     exchangeRate(currency) {
-        return this.app.api.get(`Public/ExchangeRate/${currency}`);
+        return this.api.get(`Public/ExchangeRate/${currency}`);
     }
     /**
      * Get exchange rate history
@@ -41,7 +41,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies, months) {
-        return this.app.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
+        return this.api.post('Public/ExchangeRateHistory', { currencies, months }, { defaultValue: [] });
     }
     /**
      * Get product unit's label
@@ -74,7 +74,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      * @param host Host URL
      */
     mobileQRCode(id, host) {
-        return this.app.api.post('Public/MobileQRCode', { id, host });
+        return this.api.post('Public/MobileQRCode', { id, host });
     }
     /**
      * Get public and valid product data
@@ -84,7 +84,7 @@ class PublicApi extends BaseApi_1.BaseApi {
      */
     product(id, culture) {
         culture = this.app.checkLanguage(culture);
-        return this.app.api.post(`Public/Product/${id}/${culture}`);
+        return this.api.post(`Public/Product/${id}/${culture}`);
     }
     /**
      *

package/lib/cjs/erp/dto/OrgQueryDto.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Organization query data
+ */
+export declare type OrgQueryDto = {
+    /**
+     * Id
+     */
+    id: number;
+    /**
+     * Brand, like ETSOO
+     */
+    brand?: string;
+    /**
+     * Name, like ETSOO NZ LIMITED
+     */
+    name: string;
+    /**
+     * Creation
+     */
+    creation: string | Date;
+};

package/lib/cjs/erp/rq/OrgListRQ.d.ts

@@ -0,0 +1,10 @@
+import { TiplistRQ } from './TiplistRQ';
+/**
+ * Organization list request data
+ */
+export declare type OrgListRQ = TiplistRQ & {
+    /**
+     * Service id
+     */
+    serviceId?: number;
+};

package/lib/cjs/erp/rq/OrgQueryRQ.d.ts

@@ -0,0 +1,14 @@
+import { QueryRQ } from './QueryRQ';
+/**
+ * Organization query request data
+ */
+export declare type OrgQueryRQ = QueryRQ & {
+    /**
+     * Name
+     */
+    name?: string;
+    /**
+     * Parent organization id
+     */
+    parentId?: number;
+};

package/lib/cjs/erp/rq/OrgRQ.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Organization add/edit request data
+ */
+export declare type OrgRQ = {
+    /**
+     * Region id
+     */
+    regionId: string;
+    /**
+     * Name
+     */
+    name: string;
+    /**
+     * Identifier
+     */
+    identifier: string;
+    /**
+     * Brand
+     */
+    brand?: string;
+    /**
+     * Trade as
+     */
+    tradeAs?: string;
+};

package/lib/cjs/erp/rq/QueryRQ.js

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

package/lib/cjs/erp/rq/RefreshTokenRQ.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Refresh token request data
+ */
+export declare type RefreshTokenRQ = {
+    /**
+     * Device id
+     */
+    deviceId: string;
+    /**
+     * Login password
+     */
+    pwd?: string;
+    /**
+     * Service device id
+     */
+    serviceDeviceId?: string;
+    /**
+     * Service id
+     */
+    serviceId?: number;
+    /**
+     * Service Uid
+     */
+    serviceUid?: string;
+    /**
+     * Time zone
+     */
+    timezone?: string;
+};

package/lib/cjs/erp/rq/RefreshTokenRQ.js

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

package/lib/cjs/erp/rq/TiplistRQ.js

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

package/lib/cjs/i18n/en-US.json

@@ -15,6 +15,13 @@
     "confirm": "Confirm",
     "confirmAction": "Are you sure you want to {0}?",
     "completeTip": "{0} completed",
+    "continentAF": "Africa",
+    "continentAN": "Antarctica",
+    "continentAS": "Asia",
+    "continentEU": "Europe",
+    "continentNA": "North America",
+    "continentOC": "Oceania",
+    "continentSA": "South America",
     "copy": "Copy",
     "creation": "Creation",
     "currentPassword": "Current password",
@@ -106,6 +113,19 @@
     "refresh": "Refresh",
     "refreshing": "Refreshing",
     "releaseToRefresh": "Release to refresh",
+    "region": "Country or region",
+    "regionAU": "Australia",
+    "regionCA": "Canada",
+    "regionCN": "Mainland China",
+    "regionDE": "Germany",
+    "regionFR": "France",
+    "regionGB": "United Kingdom",
+    "regionHK": "Hong Kong, China",
+    "regionIE": "Ireland",
+    "regionJP": "Japan",
+    "regionNZ": "New Zealand",
+    "regionSG": "Singapore",
+    "regionUS": "United States",
     "reloginTip": "Please enter your password, resubmit the data after successful login",
     "remove": "Remove",
     "renew": "Renew",

package/lib/cjs/i18n/zh-CN.json

@@ -15,6 +15,13 @@
     "confirm": "确认",
     "confirmAction": "确定要{0}吗？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南极洲",
+    "continentAS": "亚洲",
+    "continentEU": "欧洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "复制",
     "creation": "登记时间",
     "currentPassword": "当前密码",
@@ -105,6 +112,19 @@
     "record": "记录",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "国家或地区",
+    "regionAU": "澳大利亚",
+    "regionCA": "加拿大",
+    "regionCN": "中国大陆",
+    "regionDE": "德国",
+    "regionFR": "法国",
+    "regionGB": "英国",
+    "regionHK": "中国香港",
+    "regionIE": "爱尔兰",
+    "regionJP": "日本",
+    "regionNZ": "新西兰",
+    "regionSG": "新加坡",
+    "regionUS": "美国",
     "releaseToRefresh": "释放刷新",
     "reloginTip": "请输入您的登录密码，登录成功后请重新提交数据",
     "remove": "移除",

package/lib/cjs/i18n/zh-HK.json

@@ -15,6 +15,13 @@
     "confirm": "確認",
     "confirmAction": "確定要{0}嗎？",
     "completeTip": "已完成 {0}",
+    "continentAF": "非洲",
+    "continentAN": "南極洲",
+    "continentAS": "亞洲",
+    "continentEU": "歐洲",
+    "continentNA": "北美洲",
+    "continentOC": "大洋洲",
+    "continentSA": "南美洲",
     "copy": "複製",
     "creation": "登記時間",
     "currentPassword": "當前密碼",
@@ -105,6 +112,19 @@
     "record": "記錄",
     "refresh": "刷新",
     "refreshing": "正在刷新",
+    "region": "國家或地區",
+    "regionAU": "澳大利亞",
+    "regionCA": "加拿大",
+    "regionCN": "中國大陸",
+    "regionDE": "德國",
+    "regionFR": "法國",
+    "regionGB": "英國",
+    "regionHK": "中國香港",
+    "regionIE": "愛爾蘭",
+    "regionJP": "日本",
+    "regionNZ": "新西蘭",
+    "regionSG": "新加坡",
+    "regionUS": "美國",
     "releaseToRefresh": "釋放刷新",
     "reloginTip": "請輸入您的登錄密碼，登錄成功後請重新提交數據",
     "remove": "移除",

package/lib/cjs/index.d.ts

@@ -16,15 +16,19 @@ export * from './business/EntityStatus';
 export * from './business/ProductUnit';
 export * from './business/RepeatOption';
 export * from './def/ListItem';
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
 export * from './erp/dto/CurrencyDto';
 export * from './erp/dto/ExchangeRateDto';
 export * from './erp/dto/ExchangeRateHistoryDto';
+export * from './erp/dto/IdLabelDto';
+export * from './erp/dto/IdLabelPrimaryDto';
+export * from './erp/dto/InitCallDto';
 export * from './erp/dto/PublicProductDto';
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 export * from './i18n/enUS';
@@ -36,10 +40,6 @@ export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/cjs/index.js

@@ -38,17 +38,22 @@ __exportStar(require("./business/ProductUnit"), exports);
 __exportStar(require("./business/RepeatOption"), exports);
 // def
 __exportStar(require("./def/ListItem"), exports);
-// dto
-__exportStar(require("./dto/IdLabelDto"), exports);
-__exportStar(require("./dto/IdLabelPrimaryDto"), exports);
-__exportStar(require("./dto/InitCallDto"), exports);
-// erp
+// erp dto
 __exportStar(require("./erp/dto/CurrencyDto"), exports);
 __exportStar(require("./erp/dto/ExchangeRateDto"), exports);
 __exportStar(require("./erp/dto/ExchangeRateHistoryDto"), exports);
+__exportStar(require("./erp/dto/IdLabelDto"), exports);
+__exportStar(require("./erp/dto/IdLabelPrimaryDto"), exports);
+__exportStar(require("./erp/dto/InitCallDto"), exports);
 __exportStar(require("./erp/dto/PublicProductDto"), exports);
+// erp rq
+__exportStar(require("./erp/rq/QueryRQ"), exports);
+__exportStar(require("./erp/rq/RefreshTokenRQ"), exports);
+__exportStar(require("./erp/rq/TiplistRQ"), exports);
+// erp api
 __exportStar(require("./erp/AddressApi"), exports);
 __exportStar(require("./erp/BaseApi"), exports);
+__exportStar(require("./erp/EntityApi"), exports);
 __exportStar(require("./erp/OrgApi"), exports);
 __exportStar(require("./erp/PublicApi"), exports);
 // i18n
@@ -64,11 +69,6 @@ __exportStar(require("./result/ActionResult"), exports);
 __exportStar(require("./result/ActionResultError"), exports);
 __exportStar(require("./result/IActionResult"), exports);
 __exportStar(require("./result/InitCallResult"), exports);
-// rq
-__exportStar(require("./rq/LoginIdRQ"), exports);
-__exportStar(require("./rq/LoginRQ"), exports);
-__exportStar(require("./rq/QueryRQ"), exports);
-__exportStar(require("./rq/TiplistRQ"), exports);
 // state
 __exportStar(require("./state/Culture"), exports);
 __exportStar(require("./state/State"), exports);

package/lib/mjs/address/AddressUtils.d.ts

@@ -1,15 +1,8 @@
-import { DataTypes } from '@etsoo/shared';
 import { AddressRegion } from './AddressRegion';
 /**
  * Address utils
  */
 export declare namespace AddressUtils {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    function getLabels(language: string): Promise<DataTypes.StringRecord>;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -17,17 +10,4 @@ export declare namespace AddressUtils {
      * @param detectedLanguage Detected language
      */
     function getRegion(regions: string[], detectedRegion?: string | null, detectedLanguage?: string | null): AddressRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id: string, labels: DataTypes.StringRecord): string;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    function updateRegionLabel(region: AddressRegion, culture: string): Promise<void>;
 }

package/lib/mjs/address/AddressUtils.js

@@ -1,25 +1,9 @@
 import { AddressRegion } from './AddressRegion';
-const languageLabels = {};
 /**
  * Address utils
  */
 export var AddressUtils;
 (function (AddressUtils) {
-    /**
-     * Get address labels
-     * @param language Language
-     * @returns Result
-     */
-    async function getLabels(language) {
-        let labels = languageLabels[language];
-        if (labels == null) {
-            labels = await import(`./../i18n/address.${language}.json`);
-            // Cache
-            languageLabels[language] = labels;
-        }
-        return labels;
-    }
-    AddressUtils.getLabels = getLabels;
     /**
      * Get region from regions and detected region and language
      * @param regions Supported regions
@@ -45,25 +29,4 @@ export var AddressUtils;
         return AddressRegion.getById(regions[0]);
     }
     AddressUtils.getRegion = getRegion;
-    /**
-     * Get region label
-     * @param id Region id
-     * @param labels Labels
-     * @returns Label
-     */
-    function getRegionLabel(id, labels) {
-        var _a;
-        return (_a = labels['region' + id]) !== null && _a !== void 0 ? _a : id;
-    }
-    AddressUtils.getRegionLabel = getRegionLabel;
-    /**
-     * Update region label
-     * @param region Region
-     * @param culture Culture
-     */
-    async function updateRegionLabel(region, culture) {
-        const labels = await AddressUtils.getLabels(culture);
-        region.label = getRegionLabel(region.id, labels);
-    }
-    AddressUtils.updateRegionLabel = updateRegionLabel;
 })(AddressUtils || (AddressUtils = {}));

package/lib/mjs/app/CoreApp.d.ts

@@ -2,7 +2,7 @@ import { INotifier, NotificationAlign, NotificationCallProps, NotificationConten
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
-import { InitCallDto } from '../dto/InitCallDto';
+import { InitCallDto } from '../erp/dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
@@ -216,6 +216,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Update current region label
+     */
+    protected updateRegionLabel(): void;
     /**
      * Check language is supported or not, return a valid language when supported
      * @param language Language
@@ -360,6 +364,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns List
      */
     protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): ListType1[];
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id: string): string;
     /**
      * Get all regions
      * @returns Regions

package/lib/mjs/app/CoreApp.js

@@ -3,7 +3,6 @@ import { ApiDataError } from '@etsoo/restclient';
 import { DataTypes, DateUtils, DomUtils, NumberUtils, Utils } from '@etsoo/shared';
 import { AES, algo, enc, HmacSHA512, lib, mode, pad, PBKDF2, SHA3 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
-import { AddressUtils } from '../address/AddressUtils';
 import { BridgeUtils } from '../bridges/BridgeUtils';
 import { EntityStatus } from '../business/EntityStatus';
 import { ActionResultError } from '../result/ActionResultError';
@@ -484,8 +483,8 @@ export class CoreApp {
         this._currency = regionItem.currency;
         this._region = regionId;
         // Hold the current country or region
-        AddressUtils.updateRegionLabel(regionItem, this._culture);
         this.settings.currentRegion = regionItem;
+        this.updateRegionLabel();
     }
     /**
      * Change culture
@@ -506,6 +505,14 @@ export class CoreApp {
         this._culture = name;
         // Hold the current resources
         this.settings.currentCulture = culture;
+        this.updateRegionLabel();
+    }
+    /**
+     * Update current region label
+     */
+    updateRegionLabel() {
+        const region = this.settings.currentRegion;
+        region.label = this.getRegionLabel(region.id);
     }
     /**
      * Check language is supported or not, return a valid language when supported
@@ -893,6 +900,15 @@ export class CoreApp {
         }
         return list;
     }
+    /**
+     * Get region label
+     * @param id Region id
+     * @returns Label
+     */
+    getRegionLabel(id) {
+        var _a;
+        return (_a = this.get('region' + id)) !== null && _a !== void 0 ? _a : id;
+    }
     /**
      * Get all regions
      * @returns Regions