@etsoo/appscript 1.3.38 → 1.3.40

package/__tests__/app/CoreApp.ts

@@ -214,6 +214,11 @@ test('Tests for addressApi', () => {
     expect(favoredRegions.find((region) => region.id === 'US')?.label).toBe(
         '美国'
     );
+
+    const region = app.addressApi.region('US');
+    expect(region?.label).toBe('美国');
+    const regionFailed = app.addressApi.region('ABC');
+    expect(regionFailed).toBeUndefined();
 });
 
 /*
@@ -249,7 +254,7 @@ test('Tests for publicApi', async () => {
     const currencies1 = app.publicApi.currencies(true);
     expect(currencies1.length >= 10).toBeTruthy();
 
-    expect(app.publicApi.getCurrencyLabel('USD')).toBe('美元$');
+    expect(app.publicApi.getCurrencyLabel('USD')).toBe('美元');
 
     const defaultExchangeRate = await app.publicApi.exchangeRate('CNY', {
         showLoading: false

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

@@ -22,6 +22,12 @@ export declare class AddressApi extends BaseApi {
      * @returns Label
      */
     getContinentLabel(id: AddressContinent | string): string;
+    /**
+     * Get region by id
+     * @param id Region id
+     * @returns Result
+     */
+    getRegion(id?: string): Promise<AddressRegionDb | AddressRegion | undefined>;
     /**
      * Get all regions
      * @param rq Rquest data
@@ -33,6 +39,12 @@ export declare class AddressApi extends BaseApi {
      * @returns Result
      */
     regionCurrency(regionId?: string): "AUD" | "CAD" | "CNY" | "EUR" | "GBP" | "HKD" | "JPY" | "NZD" | "SGD" | "USD";
+    /**
+     * Get local region by id
+     * @param id Region id
+     * @returns Result
+     */
+    region(id?: string): AddressRegion | undefined;
     /**
      * Get all local regions
      */

package/lib/cjs/erp/AddressApi.js

@@ -35,6 +35,19 @@ class AddressApi extends BaseApi_1.BaseApi {
         var _a;
         return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
+    /**
+     * Get region by id
+     * @param id Region id
+     * @returns Result
+     */
+    async getRegion(id) {
+        if (!id)
+            return this.app.defaultRegion;
+        const regions = await this.getRegions({ id });
+        if (regions == null || regions.length === 0)
+            return undefined;
+        return regions[0];
+    }
     /**
      * Get all regions
      * @param rq Rquest data
@@ -90,6 +103,16 @@ class AddressApi extends BaseApi_1.BaseApi {
             : null)) !== null && _a !== void 0 ? _a : this.app.settings.currentRegion;
         return region.currency;
     }
+    /**
+     * Get local region by id
+     * @param id Region id
+     * @returns Result
+     */
+    region(id) {
+        if (!id)
+            return this.app.defaultRegion;
+        return this.regions().find((region) => region.id === id);
+    }
     regions(p) {
         const items = p == null || p.length === 0
             ? AddressRegion_1.AddressRegion.all

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

@@ -28,16 +28,16 @@
     "currentPassword": "Current password",
     "currentPasswordRequired": "Please enter your current password",
     "currency": "Currency",
-    "currencyAUD": "Australia Dollar $",
-    "currencyCAD": "Canada Dollar $",
-    "currencyCNY": "Renminbi(RMB) ¥",
-    "currencyEUR": "Euro €",
-    "currencyGBP": "British Pound £",
-    "currencyHKD": "Hong Kong Dollar $",
-    "currencyJPY": "Japan Yen ¥",
-    "currencyNZD": "New Zealand Dollar $",
-    "currencySGD": "Singapore Dollar $",
-    "currencyUSD": "U.S. Dollar $",
+    "currencyAUD": "Australia Dollar",
+    "currencyCAD": "Canada Dollar",
+    "currencyCNY": "Renminbi(RMB)",
+    "currencyEUR": "Euro",
+    "currencyGBP": "British Pound",
+    "currencyHKD": "Hong Kong Dollar",
+    "currencyJPY": "Japan Yen",
+    "currencyNZD": "New Zealand Dollar",
+    "currencySGD": "Singapore Dollar",
+    "currencyUSD": "U.S. Dollar",
     "data": "Data",
     "dataComparison": "Data comparison",
     "delete": "Delete",

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

@@ -28,16 +28,16 @@
     "currentPassword": "当前密码",
     "currentPasswordRequired": "请输入现在使用的密码",
     "currency": "币种",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民币¥",
-    "currencyEUR": "欧元€",
-    "currencyGBP": "英镑£",
-    "currencyHKD": "港币$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "纽币$",
-    "currencySGD": "新币$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民币",
+    "currencyEUR": "欧元",
+    "currencyGBP": "英镑",
+    "currencyHKD": "港币",
+    "currencyJPY": "日元",
+    "currencyNZD": "纽币",
+    "currencySGD": "新币",
+    "currencyUSD": "美元",
     "data": "数据",
     "dataComparison": "数据对比",
     "delete": "删除",

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

@@ -28,16 +28,16 @@
     "currentPassword": "當前密碼",
     "currentPasswordRequired": "請輸入現在使用的密碼",
     "currency": "幣種",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民幣¥",
-    "currencyEUR": "歐元€",
-    "currencyGBP": "英鎊£",
-    "currencyHKD": "港幣$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "紐幣$",
-    "currencySGD": "新幣$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民幣",
+    "currencyEUR": "歐元",
+    "currencyGBP": "英鎊",
+    "currencyHKD": "港幣",
+    "currencyJPY": "日元",
+    "currencyNZD": "紐幣",
+    "currencySGD": "新幣",
+    "currencyUSD": "美元",
     "data": "數據",
     "dataComparison": "數據對比",
     "delete": "刪除",

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

@@ -22,6 +22,12 @@ export declare class AddressApi extends BaseApi {
      * @returns Label
      */
     getContinentLabel(id: AddressContinent | string): string;
+    /**
+     * Get region by id
+     * @param id Region id
+     * @returns Result
+     */
+    getRegion(id?: string): Promise<AddressRegionDb | AddressRegion | undefined>;
     /**
      * Get all regions
      * @param rq Rquest data
@@ -33,6 +39,12 @@ export declare class AddressApi extends BaseApi {
      * @returns Result
      */
     regionCurrency(regionId?: string): "AUD" | "CAD" | "CNY" | "EUR" | "GBP" | "HKD" | "JPY" | "NZD" | "SGD" | "USD";
+    /**
+     * Get local region by id
+     * @param id Region id
+     * @returns Result
+     */
+    region(id?: string): AddressRegion | undefined;
     /**
      * Get all local regions
      */

package/lib/mjs/erp/AddressApi.js

@@ -32,6 +32,19 @@ export class AddressApi extends BaseApi {
         var _a;
         return (_a = this.app.get('continent' + id)) !== null && _a !== void 0 ? _a : id;
     }
+    /**
+     * Get region by id
+     * @param id Region id
+     * @returns Result
+     */
+    async getRegion(id) {
+        if (!id)
+            return this.app.defaultRegion;
+        const regions = await this.getRegions({ id });
+        if (regions == null || regions.length === 0)
+            return undefined;
+        return regions[0];
+    }
     /**
      * Get all regions
      * @param rq Rquest data
@@ -87,6 +100,16 @@ export class AddressApi extends BaseApi {
             : null)) !== null && _a !== void 0 ? _a : this.app.settings.currentRegion;
         return region.currency;
     }
+    /**
+     * Get local region by id
+     * @param id Region id
+     * @returns Result
+     */
+    region(id) {
+        if (!id)
+            return this.app.defaultRegion;
+        return this.regions().find((region) => region.id === id);
+    }
     regions(p) {
         const items = p == null || p.length === 0
             ? AddressRegion.all

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

@@ -28,16 +28,16 @@
     "currentPassword": "Current password",
     "currentPasswordRequired": "Please enter your current password",
     "currency": "Currency",
-    "currencyAUD": "Australia Dollar $",
-    "currencyCAD": "Canada Dollar $",
-    "currencyCNY": "Renminbi(RMB) ¥",
-    "currencyEUR": "Euro €",
-    "currencyGBP": "British Pound £",
-    "currencyHKD": "Hong Kong Dollar $",
-    "currencyJPY": "Japan Yen ¥",
-    "currencyNZD": "New Zealand Dollar $",
-    "currencySGD": "Singapore Dollar $",
-    "currencyUSD": "U.S. Dollar $",
+    "currencyAUD": "Australia Dollar",
+    "currencyCAD": "Canada Dollar",
+    "currencyCNY": "Renminbi(RMB)",
+    "currencyEUR": "Euro",
+    "currencyGBP": "British Pound",
+    "currencyHKD": "Hong Kong Dollar",
+    "currencyJPY": "Japan Yen",
+    "currencyNZD": "New Zealand Dollar",
+    "currencySGD": "Singapore Dollar",
+    "currencyUSD": "U.S. Dollar",
     "data": "Data",
     "dataComparison": "Data comparison",
     "delete": "Delete",

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

@@ -28,16 +28,16 @@
     "currentPassword": "当前密码",
     "currentPasswordRequired": "请输入现在使用的密码",
     "currency": "币种",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民币¥",
-    "currencyEUR": "欧元€",
-    "currencyGBP": "英镑£",
-    "currencyHKD": "港币$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "纽币$",
-    "currencySGD": "新币$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民币",
+    "currencyEUR": "欧元",
+    "currencyGBP": "英镑",
+    "currencyHKD": "港币",
+    "currencyJPY": "日元",
+    "currencyNZD": "纽币",
+    "currencySGD": "新币",
+    "currencyUSD": "美元",
     "data": "数据",
     "dataComparison": "数据对比",
     "delete": "删除",

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

@@ -28,16 +28,16 @@
     "currentPassword": "當前密碼",
     "currentPasswordRequired": "請輸入現在使用的密碼",
     "currency": "幣種",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民幣¥",
-    "currencyEUR": "歐元€",
-    "currencyGBP": "英鎊£",
-    "currencyHKD": "港幣$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "紐幣$",
-    "currencySGD": "新幣$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民幣",
+    "currencyEUR": "歐元",
+    "currencyGBP": "英鎊",
+    "currencyHKD": "港幣",
+    "currencyJPY": "日元",
+    "currencyNZD": "紐幣",
+    "currencySGD": "新幣",
+    "currencyUSD": "美元",
     "data": "數據",
     "dataComparison": "數據對比",
     "delete": "刪除",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.3.38",
+    "version": "1.3.40",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/erp/AddressApi.ts

@@ -42,6 +42,18 @@ export class AddressApi extends BaseApi {
         return this.app.get('continent' + id) ?? (id as string);
     }
 
+    /**
+     * Get region by id
+     * @param id Region id
+     * @returns Result
+     */
+    async getRegion(id?: string) {
+        if (!id) return this.app.defaultRegion;
+        const regions = await this.getRegions({ id });
+        if (regions == null || regions.length === 0) return undefined;
+        return regions[0];
+    }
+
     /**
      * Get all regions
      * @param rq Rquest data
@@ -105,6 +117,16 @@ export class AddressApi extends BaseApi {
         return region.currency;
     }
 
+    /**
+     * Get local region by id
+     * @param id Region id
+     * @returns Result
+     */
+    region(id?: string) {
+        if (!id) return this.app.defaultRegion;
+        return this.regions().find((region) => region.id === id);
+    }
+
     /**
      * Get all local regions
      */

package/src/i18n/en-US.json

@@ -28,16 +28,16 @@
     "currentPassword": "Current password",
     "currentPasswordRequired": "Please enter your current password",
     "currency": "Currency",
-    "currencyAUD": "Australia Dollar $",
-    "currencyCAD": "Canada Dollar $",
-    "currencyCNY": "Renminbi(RMB) ¥",
-    "currencyEUR": "Euro €",
-    "currencyGBP": "British Pound £",
-    "currencyHKD": "Hong Kong Dollar $",
-    "currencyJPY": "Japan Yen ¥",
-    "currencyNZD": "New Zealand Dollar $",
-    "currencySGD": "Singapore Dollar $",
-    "currencyUSD": "U.S. Dollar $",
+    "currencyAUD": "Australia Dollar",
+    "currencyCAD": "Canada Dollar",
+    "currencyCNY": "Renminbi(RMB)",
+    "currencyEUR": "Euro",
+    "currencyGBP": "British Pound",
+    "currencyHKD": "Hong Kong Dollar",
+    "currencyJPY": "Japan Yen",
+    "currencyNZD": "New Zealand Dollar",
+    "currencySGD": "Singapore Dollar",
+    "currencyUSD": "U.S. Dollar",
     "data": "Data",
     "dataComparison": "Data comparison",
     "delete": "Delete",

package/src/i18n/zh-CN.json

@@ -28,16 +28,16 @@
     "currentPassword": "当前密码",
     "currentPasswordRequired": "请输入现在使用的密码",
     "currency": "币种",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民币¥",
-    "currencyEUR": "欧元€",
-    "currencyGBP": "英镑£",
-    "currencyHKD": "港币$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "纽币$",
-    "currencySGD": "新币$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民币",
+    "currencyEUR": "欧元",
+    "currencyGBP": "英镑",
+    "currencyHKD": "港币",
+    "currencyJPY": "日元",
+    "currencyNZD": "纽币",
+    "currencySGD": "新币",
+    "currencyUSD": "美元",
     "data": "数据",
     "dataComparison": "数据对比",
     "delete": "删除",

package/src/i18n/zh-HK.json

@@ -28,16 +28,16 @@
     "currentPassword": "當前密碼",
     "currentPasswordRequired": "請輸入現在使用的密碼",
     "currency": "幣種",
-    "currencyAUD": "澳元$",
-    "currencyCAD": "加元$",
-    "currencyCNY": "人民幣¥",
-    "currencyEUR": "歐元€",
-    "currencyGBP": "英鎊£",
-    "currencyHKD": "港幣$",
-    "currencyJPY": "日元¥",
-    "currencyNZD": "紐幣$",
-    "currencySGD": "新幣$",
-    "currencyUSD": "美元$",
+    "currencyAUD": "澳元",
+    "currencyCAD": "加元",
+    "currencyCNY": "人民幣",
+    "currencyEUR": "歐元",
+    "currencyGBP": "英鎊",
+    "currencyHKD": "港幣",
+    "currencyJPY": "日元",
+    "currencyNZD": "紐幣",
+    "currencySGD": "新幣",
+    "currencyUSD": "美元",
     "data": "數據",
     "dataComparison": "數據對比",
     "delete": "刪除",