@etsoo/appscript 1.3.6 → 1.3.8

package/src/erp/OrgApi.ts

@@ -1,25 +1,51 @@
-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 class OrgApi extends BaseApi {
+export class OrgApi extends EntityApi {
+    /**
+     * Constructor
+     * @param app Application
+     */
+    constructor(app: IApp) {
+        super('Organization', app);
+    }
+
     /**
      * 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) {
-        return this.app.api.post<ListType[]>(
-            'Organization/List',
-            {
-                items,
-                serviceId
-            },
-            { defaultValue: [], showLoading: false }
-        );
+    list(items?: number, serviceId?: number): Promise<ListType[] | undefined>;
+    list(rq: OrgListRQ): Promise<ListType[] | undefined>;
+    list(
+        items?: number | OrgListRQ,
+        serviceId?: number,
+        payload?: IApiPayload<ListType[], any>
+    ) {
+        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
+     */
+    query(rq: OrgQueryRQ, payload?: IApiPayload<OrgQueryDto[], any>) {
+        return this.queryBase(rq, payload);
     }
 
     /**
@@ -27,13 +53,34 @@ export class OrgApi extends BaseApi {
      * @param id Organization id
      * @param serviceId Service id
      */
-    async switch(id: number, serviceId?: number) {
-        const result = await this.app.api.put<boolean>('Organization/Switch', {
-            id,
-            serviceId,
-            deviceId: this.app.deviceId
-        });
+    async switch(
+        id: number,
+        serviceId?: number,
+        payload?: IApiPayload<boolean, any>
+    ) {
+        const result = await this.app.api.put<boolean>(
+            '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: DataTypes.AddOrEditType<OrgRQ, true>,
+        payload?: IApiPayload<IdActionResult, any>
+    ) {
+        return super.updateBase<IdActionResult>(data, payload);
+    }
 }

package/src/erp/PublicApi.ts

@@ -21,7 +21,7 @@ export class PublicApi extends BaseApi {
         currencyNames?: T
     ): Promise<T extends undefined ? CurrencyDto[] | undefined : ListType1[]> {
         if (currencyNames == null)
-            return (await this.app.api.get<CurrencyDto[]>(
+            return (await this.api.get<CurrencyDto[]>(
                 'Public/GetCurrencies'
             )) as any;
         else
@@ -37,9 +37,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRate(currency: Currency | string) {
-        return this.app.api.get<ExchangeRateDto>(
-            `Public/ExchangeRate/${currency}`
-        );
+        return this.api.get<ExchangeRateDto>(`Public/ExchangeRate/${currency}`);
     }
 
     /**
@@ -49,7 +47,7 @@ export class PublicApi extends BaseApi {
      * @returns Result
      */
     exchangeRateHistory(currencies: (Currency | string)[], months?: number) {
-        return this.app.api.post<ExchangeRateHistoryDto[]>(
+        return this.api.post<ExchangeRateHistoryDto[]>(
             'Public/ExchangeRateHistory',
             { currencies, months },
             { defaultValue: [] }
@@ -87,7 +85,7 @@ export class PublicApi extends BaseApi {
      * @param host Host URL
      */
     mobileQRCode(id?: string, host?: string) {
-        return this.app.api.post<string>('Public/MobileQRCode', { id, host });
+        return this.api.post<string>('Public/MobileQRCode', { id, host });
     }
 
     /**
@@ -101,7 +99,7 @@ export class PublicApi extends BaseApi {
         culture?: string
     ): T extends number ? PublicProductDto : PublicOrgProductDto {
         culture = this.app.checkLanguage(culture);
-        return this.app.api.post<PublicProductDto>(
+        return this.api.post<PublicProductDto>(
             `Public/Product/${id}/${culture}`
         ) as any;
     }

package/src/erp/dto/OrgQueryDto.ts

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

package/src/erp/rq/OrgListRQ.ts

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

package/src/erp/rq/OrgQueryRQ.ts

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

package/src/erp/rq/OrgRQ.ts

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

package/src/erp/rq/RefreshTokenRQ.ts

@@ -0,0 +1,34 @@
+/**
+ * Refresh token request data
+ */
+export 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/src/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/src/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/src/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/src/index.ts

@@ -26,19 +26,24 @@ export * from './business/RepeatOption';
 // def
 export * from './def/ListItem';
 
-// dto
-export * from './dto/IdLabelDto';
-export * from './dto/IdLabelPrimaryDto';
-export * from './dto/InitCallDto';
-
-// erp
+// erp dto
 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';
 
+// erp rq
+export * from './erp/rq/QueryRQ';
+export * from './erp/rq/RefreshTokenRQ';
+export * from './erp/rq/TiplistRQ';
+
+// erp api
 export * from './erp/AddressApi';
 export * from './erp/BaseApi';
+export * from './erp/EntityApi';
 export * from './erp/OrgApi';
 export * from './erp/PublicApi';
 
@@ -57,12 +62,6 @@ export * from './result/ActionResultError';
 export * from './result/IActionResult';
 export * from './result/InitCallResult';
 
-// rq
-export * from './rq/LoginIdRQ';
-export * from './rq/LoginRQ';
-export * from './rq/QueryRQ';
-export * from './rq/TiplistRQ';
-
 // state
 export * from './state/Culture';
 export * from './state/State';

package/lib/cjs/rq/LoginIdRQ.d.ts

@@ -1,17 +0,0 @@
-/**
- * Login id request data
- */
-export declare type LoginIdRQ = {
-    /**
-     * Device id
-     */
-    deviceId: string;
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
-    /**
-     * Country or region
-     */
-    region: string;
-};

package/lib/cjs/rq/LoginRQ.d.ts

@@ -1,22 +0,0 @@
-import { LoginIdRQ } from './LoginIdRQ';
-/**
- * Login request data
- */
-export declare type LoginRQ = LoginIdRQ & {
-    /**
-     * Password
-     */
-    pwd: string;
-    /**
-     * Organization
-     */
-    org?: number;
-    /**
-     * Time zone
-     */
-    timezone?: string;
-    /**
-     * Service id or uid
-     */
-    serviceId?: string;
-};

package/lib/mjs/rq/LoginIdRQ.d.ts

@@ -1,17 +0,0 @@
-/**
- * Login id request data
- */
-export declare type LoginIdRQ = {
-    /**
-     * Device id
-     */
-    deviceId: string;
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
-    /**
-     * Country or region
-     */
-    region: string;
-};

package/lib/mjs/rq/LoginRQ.d.ts

@@ -1,22 +0,0 @@
-import { LoginIdRQ } from './LoginIdRQ';
-/**
- * Login request data
- */
-export declare type LoginRQ = LoginIdRQ & {
-    /**
-     * Password
-     */
-    pwd: string;
-    /**
-     * Organization
-     */
-    org?: number;
-    /**
-     * Time zone
-     */
-    timezone?: string;
-    /**
-     * Service id or uid
-     */
-    serviceId?: string;
-};

package/src/i18n/address.en-US.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "Africa",
-    "continentAN": "Antarctica",
-    "continentAS": "Asia",
-    "continentEU": "Europe",
-    "continentNA": "North America",
-    "continentOC": "Oceania",
-    "continentSA": "South America",
-    "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"
-}

package/src/i18n/address.zh-CN.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "非洲",
-    "continentAN": "南极洲",
-    "continentAS": "亚洲",
-    "continentEU": "欧洲",
-    "continentNA": "北美洲",
-    "continentOC": "大洋洲",
-    "continentSA": "南美洲",
-    "regionAU": "澳大利亚",
-    "regionCA": "加拿大",
-    "regionCN": "中国大陆",
-    "regionDE": "德国",
-    "regionFR": "法国",
-    "regionGB": "英国",
-    "regionHK": "中国香港",
-    "regionIE": "爱尔兰",
-    "regionJP": "日本",
-    "regionNZ": "新西兰",
-    "regionSG": "新加坡",
-    "regionUS": "美国"
-}

package/src/i18n/address.zh-HK.json

@@ -1,21 +0,0 @@
-{
-    "continentAF": "非洲",
-    "continentAN": "南極洲",
-    "continentAS": "亞洲",
-    "continentEU": "歐洲",
-    "continentNA": "北美洲",
-    "continentOC": "大洋洲",
-    "continentSA": "南美洲",
-    "regionAU": "澳大利亞",
-    "regionCA": "加拿大",
-    "regionCN": "中國大陸",
-    "regionDE": "德國",
-    "regionFR": "法國",
-    "regionGB": "英國",
-    "regionHK": "中國香港",
-    "regionIE": "愛爾蘭",
-    "regionJP": "日本",
-    "regionNZ": "新西蘭",
-    "regionSG": "新加坡",
-    "regionUS": "美國"
-}

package/src/rq/LoginIdRQ.ts

@@ -1,19 +0,0 @@
-/**
- * Login id request data
- */
-export type LoginIdRQ = {
-    /**
-     * Device id
-     */
-    deviceId: string;
-
-    /**
-     * Username, Email or mobile
-     */
-    id: string;
-
-    /**
-     * Country or region
-     */
-    region: string;
-};

package/src/rq/LoginRQ.ts

@@ -1,26 +0,0 @@
-import { LoginIdRQ } from './LoginIdRQ';
-
-/**
- * Login request data
- */
-export type LoginRQ = LoginIdRQ & {
-    /**
-     * Password
-     */
-    pwd: string;
-
-    /**
-     * Organization
-     */
-    org?: number;
-
-    /**
-     * Time zone
-     */
-    timezone?: string;
-
-    /**
-     * Service id or uid
-     */
-    serviceId?: string;
-};