From 3aa2667c0fc19309119d049bdddfd252696dc64a Mon Sep 17 00:00:00 2001
From: Xziy <xziy88@gmail.com>
Date: Sat, 27 Apr 2024 17:05:52 +0300
Subject: [PATCH] use set

---
 models/Order.d.ts | 8 ++++----
 models/Order.js   | 7 ++-----
 models/Order.ts   | 4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/models/Order.d.ts b/models/Order.d.ts
index baededde..8023d802 100644
--- a/models/Order.d.ts
+++ b/models/Order.d.ts
@@ -38,7 +38,7 @@ declare let attributes: {
     /**
      * @deprecated will be rename to `Items` in **v2**
      */
-    dishes: number[] | OrderDish[];
+    dishes: OrderDish[] | number[];
     paymentMethod: any;
     /** */
     paymentMethodTitle: string;
@@ -175,7 +175,7 @@ declare let Model: {
     beforeCreate(orderInit: Order, cb: (err?: string) => void): void;
     afterCreate(order: Order, cb: (err?: string) => void): Promise<void>;
     /** Add a dish into order */
-    addDish(criteria: CriteriaQuery<Order>, dish: string | Dish, amount: number, modifiers: OrderModifier[], comment: string, addedBy: "user" | "promotion" | "core" | "custom", replace?: boolean, orderDishId?: number): Promise<void>;
+    addDish(criteria: CriteriaQuery<Order>, dish: Dish | string, amount: number, modifiers: OrderModifier[], comment: string, addedBy: "user" | "promotion" | "core" | "custom", 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>;
@@ -221,7 +221,7 @@ declare let Model: {
         state?: string;
         concept?: string[];
         isMixedConcept?: boolean;
-        dishes?: number[] | OrderDish[];
+        dishes?: OrderDish[] | number[];
         paymentMethod?: any;
         paymentMethodTitle?: string;
         paid?: boolean;
@@ -282,7 +282,7 @@ declare let Model: {
      */
     countCart(criteria: CriteriaQuery<Order>, isPromoting?: boolean): Promise<Order>;
     doPaid(criteria: CriteriaQuery<Order>, paymentDocument: PaymentDocument): Promise<void>;
-    applyPromotionCode(criteria: CriteriaQuery<Order>, promotionCodeString: string): Promise<Order>;
+    applyPromotionCode(criteria: CriteriaQuery<Order>, promotionCodeString: string | null): Promise<Order>;
 };
 declare global {
     const Order: typeof Model & ORMModel<Order, null> & StateFlowModel;
diff --git a/models/Order.js b/models/Order.js
index 3d461088..0969d45d 100644
--- a/models/Order.js
+++ b/models/Order.js
@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
-const decimal_js_1 = __importDefault(require("decimal.js"));
+const decimal_js_1 = require("decimal.js");
 const phoneValidByMask_1 = require("../libs/phoneValidByMask");
 let attributes = {
     /** Id  */
@@ -1150,7 +1147,7 @@ let Model = {
                 if (concepts.length > 1) {
                     order.isMixedConcept === true;
                 }
-                order.concept = concepts;
+                order.concept = [...new Set(concepts)];
             }
             order.dishesCount = dishesCount;
             order.uniqueDishes = uniqueDishes;
diff --git a/models/Order.ts b/models/Order.ts
index 3538b2fa..27030274 100644
--- a/models/Order.ts
+++ b/models/Order.ts
@@ -1399,8 +1399,8 @@ let Model = {
         if(concepts.length > 1) {
           order.isMixedConcept === true
         }
-        
-        order.concept = concepts;
+
+        order.concept = [...new Set(concepts)];
       }