@chat21/chat21-ionic 3.4.13-rc3 → 3.4.13-rc5

package/src/app/services/copilot/copilot.service.ts

@@ -5,61 +5,65 @@ import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
 import { map, filter } from 'rxjs/operators';
 import * as uuid from 'uuid';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class CopilotService {
 
-  private apiUrl: string;
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
   
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
+    public appStorageService: AppStorageService
   ) {
     this.logger.log('[COPILOT-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[COPILOT-SERVICE] apiUrl ', this.apiUrl);
   }
 
-  public getAll(token: string, projectid: string, conversWith: string) {
-      const url = this.apiUrl + projectid + "/copilot?request_id=" + conversWith;
-      this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[COPILOT-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getAll(projectid: string, conversWith: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/copilot?request_id=" + conversWith;
+    this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
   
-      const httpOptions = {
-        headers: new HttpHeaders({
-          'Content-Type': 'application/json',
-          Authorization: token
-        })
-      };
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
       
-      return this.http.get(url, httpOptions).pipe(map((res: [any]) => {
-          let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
-          this.logger.log('[COPILOT-SERVICE] getCannedResponses - RES ', suggestions);
-          return suggestions
-      }))
+    return this.http.get(url, httpOptions).pipe(map((res: [any]) => {
+        let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
+        return suggestions
+    }))
   }
 
-  public getAllFromQuestion(question: string, token: string, projectid: string, conversWith: string) {
-    const url = this.apiUrl + projectid + "/copilot?request_id=" + conversWith;
+  public getAllFromQuestion(question: string, projectid: string, conversWith: string) {
+    const url = this.SERVER_BASE_URL + projectid + "/copilot?request_id=" + conversWith;
     this.logger.log('[COPILOT-SERVICE] getAllSuggestions - URL ', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
-    console.log('questionnnn', question)
     const body = {
       text: question
     };
     
     return this.http.post(url, body, httpOptions).pipe(map((res: [any]) => {
         let suggestions = res.filter(el => el !== null).map(el => ({ ...el, _id:  uuid.v4()} ));
-        this.logger.log('[COPILOT-SERVICE] getCannedResponses - RES ', suggestions);
         return suggestions
     }))
 }

package/src/app/services/projects/{projects.service.spec.ts → project.service.spec.ts}

@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ProjectsService } from './projects.service';
+import { ProjectService } from './project.service';
 
 describe('ProjectsService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: ProjectsService = TestBed.get(ProjectsService);
+    const service: ProjectService = TestBed.get(ProjectService);
     expect(service).toBeTruthy();
   });
 });

package/src/app/services/projects/project.service.ts

@@ -0,0 +1,68 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { Project } from 'src/chat21-core/models/projects';
+import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
+import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppConfigProvider } from '../app-config';
+import { Observable } from 'rxjs';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProjectService {
+
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
+  private logger: LoggerService = LoggerInstance.getInstance();
+
+  constructor(
+    public http: HttpClient,
+    public appStorageService: AppStorageService
+  ) {
+   
+    this.logger.log('[PROJECTS-SERVICE] HELLO !');
+  }
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-PROJECTS-SERV] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
+  }
+
+  public getProjects(): Observable<Project[]> {
+    const url = this.SERVER_BASE_URL  + "projects/";
+    this.logger.log('[PROJECTS-SERVICE] getProjects - URL ', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    
+    return this.http.get(url, httpOptions).pipe(map((res: Project[]) => {
+        this.logger.log('[PROJECTS-SERVICE] getProjects - RES ', res);
+        return res
+    }))
+  }
+
+  public getProjectById(id: string): Observable<Project> {
+    const url = this.SERVER_BASE_URL + 'projects/' + id;
+    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT BY ID URL', url);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: this.tiledeskToken
+      })
+    };
+    return this.http.get(url, httpOptions).pipe(map((project: Project) => {
+      this.logger.log('[TILEDESK-SERVICE] GET PROJECT BY ID URL - RES ', project);
+      return project
+    }))
+  }
+
+}

package/src/app/services/tiledesk/tiledesk.service.ts

@@ -6,6 +6,7 @@ import { map } from 'rxjs/operators';
 // Logger
 import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
 import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
+import { AppStorageService } from 'src/chat21-core/providers/abstract/app-storage.service';
 
 
 @Injectable({
@@ -13,38 +14,41 @@ import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance'
 })
 export class TiledeskService {
 
-  private apiUrl: string;
+  // private
+  private SERVER_BASE_URL: string;
+  private tiledeskToken: string;
+
   private logger: LoggerService = LoggerInstance.getInstance();
 
   constructor(
     public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
-  ) {
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    // const projectUrl = this.apiUrl + 'projects/'
-    // console.log('[TILEDESK-SERVICE] projectUrl' ,projectUrl  )
+    public appStorageService: AppStorageService
+  ) {}
+
+  initialize(serverBaseUrl: string) {
+    this.logger.log('[TILEDESK-SERVICE] - initialize serverBaseUrl', serverBaseUrl);
+    this.SERVER_BASE_URL = serverBaseUrl;
+    this.tiledeskToken = this.appStorageService.getItem('tiledeskToken')
   }
 
 
   // CLOSE SUPPORT GROUP
-  public closeSupportGroup(token: string, projectid: string, supportgroupid: string) {
+  public closeSupportGroup(projectid: string, supportgroupid: string) {
+    const url = this.SERVER_BASE_URL + projectid + '/requests/' + supportgroupid + '/close';
+    this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup URL ', url);
+    
     const httpOptions = {
       headers: new HttpHeaders({
         'Accept': 'application/json',
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
     const body = {
       force: true
     };
-    // console.log('CLOUD FUNCT CLOSE SUPPORT GROUP REQUEST BODY ', body);
-    // https://tiledesk-server-pre.herokuapp.com/
-    // const url = 'https://tiledesk-server-pre.herokuapp.com/' + this.project_id + '/requests/' + group_id + '/close';
-    const url = this.apiUrl + projectid + '/requests/' + supportgroupid + '/close';
 
-    this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup URL ', url);
     return this.http.put(url, body, httpOptions).pipe(map((res: any) => {
         this.logger.log('[TILEDESK-SERVICE] - closeSupportGroup - RES ', res);
         return res
@@ -54,14 +58,14 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ GET request by id
   // ---------------------------------------------
-  public getRequest(request_id: string, project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/requests/'+request_id
+  public getRequest(request_id: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/requests/'+request_id
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW LEAD url ', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -71,15 +75,15 @@ export class TiledeskService {
     }))
   }
 
-  public getProjectIdByConvRecipient(token: string ,conversationWith: string ) {
-    const lookupUrl = this.apiUrl + 'requests_util/lookup/id_project/' + conversationWith;
+  public getProjectIdByConvRecipient(conversationWith: string ) {
+    const lookupUrl = this.SERVER_BASE_URL + 'requests_util/lookup/id_project/' + conversationWith;
 
     this.logger.log('[TILEDESK-SERVICE] GET PROJECTID BY CONV RECIPIENT - URL ', lookupUrl);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -89,49 +93,14 @@ export class TiledeskService {
     }))
   }
 
-  public getProjects(token: string) {
-    const url = this.apiUrl + 'projects/';
-    this.logger.log('[TILEDESK-SERVICE] - GET PROJECTS URL', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-
-    return this.http.get(url, httpOptions).pipe(map((res: any) => {
-      this.logger.log('[TILEDESK-SERVICE] GET PROJECTS - RES ', res);
-      return res
-    }))
-  }
-
-
-  public getProjectById( token: string , id: string) {
-    const url = this.apiUrl + 'projects/' + id;
-    this.logger.log('[TILEDESK-SERVICE] - GET PROJECT BY ID URL', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-    return this.http.get(url, httpOptions).pipe(map((res: any) => {
-      this.logger.log('[TILEDESK-SERVICE] GET PROJECT BY ID URL - RES ', res);
-      return res
-    }))
-  }
-
-
-  public getProjectUsersByProjectId(project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/project_users/';
+  public getProjectUsersByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/';
     this.logger.log('[TILEDESK-SERVICE] - GET PROJECT-USER URL', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     return this.http.get(url, httpOptions).pipe(map((res: any) => {
@@ -140,14 +109,14 @@ export class TiledeskService {
     }))
   }
 
-  public getAllLeadsActiveWithLimit(project_id: string, token: string, limit: number) {
-    const url = this.apiUrl + project_id + '/leads?limit=' + limit + '&with_fullname=true';
+  public getAllLeadsActiveWithLimit(project_id: string, limit: number) {
+    const url = this.SERVER_BASE_URL + project_id + '/leads?limit=' + limit + '&with_fullname=true';
     this.logger.log('[TILEDESK-SERVICE] - GET ALL ACTIVE LEADS (LIMIT 10000) -  URL', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     return this.http.get(url, httpOptions).pipe(map((res: any) => {
@@ -160,13 +129,13 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ Create new project user to get new lead ID
   // ---------------------------------------------
-  public createNewProjectUserToGetNewLeadID(project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/project_users/'
+  public createNewProjectUserToGetNewLeadID(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/project_users/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW PROJECT USER TO GET NEW LEAD ID url ', url);
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     const body = {};
@@ -179,14 +148,14 @@ export class TiledeskService {
   // ---------------------------------------------
   // @ Create new lead 
   // ---------------------------------------------
-  public createNewLead(leadid: string, fullname: string, leademail: string, project_id: string, token: string) {
-    const url = this.apiUrl + project_id + '/leads/'
+  public createNewLead(leadid: string, fullname: string, leademail: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/leads/'
     this.logger.log('[TILEDESK-SERVICE] - CREATE NEW LEAD url ', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -202,15 +171,14 @@ export class TiledeskService {
   // -------------------------------------------------------------------------------------
   // @ Get all bots of the project (with all=true the response return also the identity bot) 
   // -------------------------------------------------------------------------------------
-  public getAllBotByProjectId(project_id: string, token: string) {
-   
-    const url = this.apiUrl + project_id + '/faq_kb?all=true'
+  public getAllBotByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/faq_kb?all=true'
     this.logger.log('[TILEDESK-SERVICE] - GET ALL BOTS BY PROJECT ID - URL', url);
 
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -223,15 +191,14 @@ export class TiledeskService {
   // -------------------------------------------------------------------------------------
   // @ Get all DEPTS of the project
   // -------------------------------------------------------------------------------------
-  public getDeptsByProjectId(project_id: string, token: string) {
-   
-    const url = this.apiUrl + project_id + '/departments/allstatus';
+  public getDeptsByProjectId(project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/departments/allstatus';
     this.logger.log('[TILEDESK-SERVICE] - GET DEPTS (ALL STATUS) - URL', url);
    
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
@@ -244,15 +211,14 @@ export class TiledeskService {
   // -----------------------------------------------------------------------------------------
   // @ Create ticket
   // -----------------------------------------------------------------------------------------
-  public createInternalRequest(requester_id: string, request_id: string, subject: string, message: string, departmentid: string, participantid: string, ticketpriority: string, project_id: string, token: string) {
-    
-    const url = this.apiUrl + project_id + '/requests/' + request_id + '/messages'
+  public createInternalRequest(requester_id: string, request_id: string, subject: string, message: string, departmentid: string, participantid: string, ticketpriority: string, project_id: string) {
+    const url = this.SERVER_BASE_URL + project_id + '/requests/' + request_id + '/messages'
     this.logger.log('[WS-REQUESTS-SERV] - CREATE INTERNAL REQUEST URL ', url)
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
     // this.logger.log('JOIN FUNCT OPTIONS  ', options);
@@ -275,20 +241,20 @@ export class TiledeskService {
   // -----------------------------------------------------------------------------------------
   // @ Send Email
   // -----------------------------------------------------------------------------------------
-  public sendEmail(token: string, projectid: string, request_id: string, form: { subject: string, text: string}) {
+  public sendEmail(projectid: string, request_id: string, form: { subject: string, text: string}) {
+    const url = this.SERVER_BASE_URL + projectid + '/requests/' + request_id + '/email/send';
+    this.logger.log('[TILEDESK-SERVICE] - sendEmail URL ', url);
     
     const httpOptions = {
       headers: new HttpHeaders({
         'Accept': 'application/json',
         'Content-Type': 'application/json',
-        Authorization: token
+        Authorization: this.tiledeskToken
       })
     };
 
     const body = form;
 
-    const url = this.apiUrl + projectid + '/requests/' + request_id + '/email/send';
-    this.logger.log('[TILEDESK-SERVICE] - sendEmail URL ', url);
     return this.http.post(url, body, httpOptions).pipe(map((res: any) => {
         this.logger.log('[TILEDESK-SERVICE] - sendEmail - RES ', res);
         return res

package/src/app/utils/project-utils.ts

@@ -0,0 +1,140 @@
+import { Injectable, OnInit } from "@angular/core";
+import { PLAN_NAME } from "src/chat21-core/utils/constants";
+import { LoggerService } from "src/chat21-core/providers/abstract/logger.service";
+import { LoggerInstance } from "src/chat21-core/providers/logger/loggerInstance";
+import { Project } from 'src/chat21-core/models/projects';
+import { ProjectService } from "../services/projects/project.service";
+import { AppConfigProvider } from "../services/app-config";
+
+@Injectable({
+    providedIn: 'root'
+})
+export class ProjectPlanUtils {
+    
+    project: Project
+
+    private logger: LoggerService = LoggerInstance.getInstance()
+    constructor(
+        private projectService: ProjectService
+    ){ 
+    }
+
+    checkProjectProfileFeature(project: Project, feature: string): boolean{
+        
+        this.logger.log('[PROJECT_PROFILE] checkProjectProfileFeature -->', feature, project)
+
+        // this.project = await this.projectService.getProjectById(projectId).toPromise()
+        this.project = project;
+
+        if(this.project.profile.type === 'free'){
+            this.logger.log('[PROJECT_PROFILE] USECASE: Free Plan')
+            if(this.project.trialExpired === false){
+                // ------------------------------------------------------------------------ 
+                // USECASE: Free Plan (TRIAL ACTIVE i.e. Scale trial)
+                // ------------------------------------------------------------------------
+                return true
+            }else {
+                // ------------------------------------------------------------------------
+                // USECASE: Free Plan (TRIAL EXPIRED)
+                // ------------------------------------------------------------------------
+                return false
+            }
+        }else if(this.project.profile.type === 'payment'){
+            // ------------------------------------------------------------------------ 
+            // USECASE: PAYMENT Plan (TRIAL ACTIVE i.e. Scale trial)
+            // ------------------------------------------------------------------------
+            this.logger.log('[PROJECT_PROFILE] USECASE: payment')
+            
+            /** check if the subscription is Active or NOT */
+            if(this.project.isActiveSubscription === false){
+                return false
+            }
+
+            /** get che current keyName for the current project (usefull to compare later)*/
+            /** before: MAKE A COMPARE BETWEEN OLD AND NEW PROJECT TYPE
+             * LEGEND: 
+             * - A --> D
+             * - B --> E
+             * - C --> F
+             */
+            let currentPlanNameKey: string[] = ['A']
+            switch(this.project.profile.name.toUpperCase()){
+                case PLAN_NAME.A.toUpperCase(): {
+                    this.logger.log('case A')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.D.toUpperCase());
+                    break;
+                }
+                case PLAN_NAME.B.toUpperCase(): {
+                    this.logger.log('case B')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.E.toUpperCase());
+                    break;
+                }
+                case PLAN_NAME.C.toUpperCase(): {
+                    this.logger.log('case C')
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == PLAN_NAME.F.toUpperCase());
+                    break;
+                }
+                default: {
+                    currentPlanNameKey = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == this.project.profile.name.toUpperCase());
+                    break;
+                }
+                    
+            }
+            
+            /** compare enums: current action enum plan >= current prject profile enum name (UPPERCASE)  */
+            // if(currentPlanNameKey.length>0){
+            //     let actionPlanNameKey: string[] = Object.keys(PLAN_NAME).filter(x => PLAN_NAME[x].toUpperCase() == actionPlanAvailability.toUpperCase());
+            //     this.logger.log('check plan availability: currentPlanNameKey VS actionPlanNameKey -->', currentPlanNameKey[0], actionPlanNameKey[0])
+            //     // this.logger.log('check plan availability: PLAN currentPlanNameKey VS PLAN actionPlanNameKey -->', PLAN_NAME[currentPlanNameKey[0]]> PLAN_NAME[actionPlanNameKey[0]])
+            //     return currentPlanNameKey[0] >= actionPlanNameKey[0] ? true: false; 
+            // }
+            
+            /**check only CUSTOM PLAN */
+            this.logger.log('[PROJECT_PROFILE] USECASE: currentPlanNameKey', currentPlanNameKey[0], PLAN_NAME.F)
+            if(PLAN_NAME[currentPlanNameKey[0]] === PLAN_NAME.F){
+                return this.checkIfIsEnabledInProject(feature)
+            }
+            
+            return false
+        }        
+        
+    }
+
+    public checkIfIsEnabledInProject(featureKey: string): boolean{
+        
+        this.logger.log('[PROJECT_PROFILE] checkIfIsEnabledInProject -->', featureKey, this.project)
+        if (this.project.profile['customization'] === undefined){
+            // ------------------------------------------------------------------------ 
+            // USECASE: customization obj not exist
+            // ------------------------------------------------------------------------
+            return false
+        } else if(this.project.profile['customization'] && this.project.profile['customization'][featureKey]){
+            // ------------------------------------------------------------------------ 
+            // USECASE: customization obj exist AND customization.actions obj not exist
+            // ------------------------------------------------------------------------
+            return true
+        } 
+        return false
+    }
+
+    checkPlanIsExpired(project: Project): boolean {
+        let check: boolean = false
+    
+        //case FREE plan
+        if(project && project.trialExpired && project.profile.type=== 'trial'){
+          check = true
+        }else if(project && !project.trialExpired && project.profile.type=== 'trial'){
+          check = false
+        }
+    
+        //case PAYMENT plan
+        if(project && project.isActiveSubscription && project.profile.type=== 'payment'){
+          check = true
+        }else if(project && !project.isActiveSubscription && project.profile.type=== 'payment'){
+          check = false
+        }
+    
+        return check
+    }
+
+}

package/src/chat21-core/utils/constants.ts

@@ -141,6 +141,9 @@ export enum PLAN_NAME {
     A = 'Growth',
     B = 'Scale',
     C = 'Plus',
+    D = 'Basic',
+    E = 'Premium',
+    F = 'Custom'
 }
 
 export const tranlatedLanguage = ['it', 'en', 'de', 'es', 'pt', 'fr', 'ru', 'tr', 'sr', 'ar', 'uk', 'sv', 'az', 'kk', 'uz']

package/src/app/services/projects/projects.service.ts

@@ -1,43 +0,0 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { map } from 'rxjs/operators';
-import { Project } from 'src/chat21-core/models/projects';
-import { LoggerService } from 'src/chat21-core/providers/abstract/logger.service';
-import { LoggerInstance } from 'src/chat21-core/providers/logger/loggerInstance';
-import { AppConfigProvider } from '../app-config';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ProjectsService {
-
-  private apiUrl: string;
-  private logger: LoggerService = LoggerInstance.getInstance();
-
-  constructor(
-    public http: HttpClient,
-    public appConfigProvider: AppConfigProvider
-  ) {
-   
-    this.logger.log('[PROJECTS-SERVICE] HELLO !');
-    this.apiUrl = appConfigProvider.getConfig().apiUrl;
-    this.logger.log('[PROJECTS-SERVICE] apiUrl ', this.apiUrl);
-  }
-
-  public getProjects(token: string) {
-    const url = this.apiUrl  + "projects/";
-    this.logger.log('[PROJECTS-SERVICE] getProjects - URL ', url);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json',
-        Authorization: token
-      })
-    };
-    
-    return this.http.get(url, httpOptions).pipe(map((res: Project[]) => {
-        this.logger.log('[PROJECTS-SERVICE] getProjects - RES ', res);
-        return res
-    }))
-  }
-}