fix setting key

webresto · Jul 23, 2023 · 0074cc8 · 0074cc8
1 parent c5f489b
commit 0074cc8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/adapters/index.js b/adapters/index.js
@@ -197,7 +197,7 @@ class Adapter {
             }
         }
         if (!adapterName) {
-            adapterName = await Settings.get("DEFAULT_RMS_ADAPTER");
+            adapterName = await Settings.get("RMS_ADAPTER");
             if (!adapterName)
                 throw 'RMS adapter is not installed';
         }

diff --git a/adapters/index.ts b/adapters/index.ts
@@ -230,7 +230,7 @@ export class Adapter {
     }
 
     if(!adapterName) {
-      adapterName = await Settings.get("DEFAULT_RMS_ADAPTER") as string;
+      adapterName = await Settings.get("RMS_ADAPTER") as string;
       if (!adapterName) throw 'RMS adapter is not installed';
     }
 

diff --git a/models/Dish.d.ts b/models/Dish.d.ts
@@ -71,7 +71,7 @@ declare let attributes: {
     /** Balance for sale, if -1, then as much as you like */
     balance: number;
     /**List of images of the dish*/
-    images: MediaFile[] | string[];
+    images: string[] | MediaFile[];
     /** Слаг */
     slug: string;
     /** The concept to which the dish belongs */

diff --git a/models/Group.d.ts b/models/Group.d.ts
@@ -33,7 +33,7 @@ declare let attributes: {
         allowNull: boolean;
     };
     /** Images */
-    images: MediaFile[] | string[];
+    images: string[] | MediaFile[];
     /** PlaySholder for group dishes */
     dishesPlaceholder: MediaFile[];
     /** The person readable isii*/

diff --git a/models/Order.d.ts b/models/Order.d.ts
@@ -88,7 +88,7 @@ export default Order;
 declare let Model: {
     beforeCreate(orderInit: any, cb: (err?: string) => void): void;
     /** Add dish into order */
-    addDish(criteria: CriteriaQuery<Order>, dish: Dish | string, amount: number, modifiers: OrderModifier[], comment: string, addedBy: string, replace?: boolean, orderDishId?: number): Promise<void>;
+    addDish(criteria: CriteriaQuery<Order>, dish: string | Dish, amount: number, modifiers: OrderModifier[], comment: string, addedBy: string, replace?: boolean, orderDishId?: number): Promise<void>;
     removeDish(criteria: CriteriaQuery<Order>, dish: OrderDish, amount: number, stack?: boolean): Promise<void>;
     setCount(criteria: CriteriaQuery<Order>, dish: OrderDish, amount: number): Promise<void>;
     setComment(criteria: CriteriaQuery<Order>, dish: OrderDish, comment: string): Promise<void>;

diff --git a/models/User.d.ts b/models/User.d.ts
@@ -87,7 +87,7 @@ declare let Model: {
      * @param {WaterlineCriteria} criteria
      * @returns String
      */
-    getPhoneString(phone: Phone, target?: "login" | "print" | "string"): Promise<string>;
+    getPhoneString(phone: Phone, target?: "string" | "login" | "print"): Promise<string>;
     /**
      * Update user password
      *

diff --git a/models/UserBonusProgram.d.ts b/models/UserBonusProgram.d.ts
@@ -22,13 +22,13 @@ interface UserBonusProgram extends attributes, ORM {
 export default UserBonusProgram;
 declare let Model: {
     beforeCreate(init: UserBonusProgram, cb: (err?: string) => void): void;
-    registration(user: User | string, adapterOrId: string): Promise<UserBonusProgram>;
-    delete(user: User | string, adapterOrId: string): Promise<void>;
-    syncAll(user: User | string): Promise<void>;
+    registration(user: string | User, adapterOrId: string): Promise<UserBonusProgram>;
+    delete(user: string | User, adapterOrId: string): Promise<void>;
+    syncAll(user: string | User): Promise<void>;
     /** Full sync all transaction with external system */
-    sync(user: User | string, bonusProgram: BonusProgram | string, force?: boolean): Promise<void>;
-    checkEnoughToSpend(user: User | string, bonusProgram: BonusProgram | string, amount: number): Promise<boolean>;
-    sumCurrentBalance(user: User | string, bonusProgram: BonusProgram | string): Promise<number>;
+    sync(user: string | User, bonusProgram: string | BonusProgram, force?: boolean): Promise<void>;
+    checkEnoughToSpend(user: string | User, bonusProgram: string | BonusProgram, amount: number): Promise<boolean>;
+    sumCurrentBalance(user: string | User, bonusProgram: string | BonusProgram): Promise<number>;
 };
 declare global {
     const UserBonusProgram: typeof Model & ORMModel<UserBonusProgram, "user" | "bonusProgram">;