Merge branch 'update-feature-v2' into user-agent

# Conflicts:
#	src/environments/environment.ts

src/app/admin/admin-dashboard/admin-dashboard-logboook/admin-dashboard-logboook.component.ts

@@ -198,7 +198,7 @@ export class AdminDashboardLogboookComponent implements OnInit, OnChanges {
         {"name": 'team_name', "value": false, "field": "Unit Terkait (Divisi)"},
         {"name": 'ticket_status', "value": false, "field": 'Status ' + ((_RequestList.servicefamily_id[0] == 1) ? 'Inquery' : 'Permintaan')},
         {"name": 'resolve_date', "value": false, "field": "Tanggal Resolved"},
-        {"name": 'target_penyelesaian', "value": false, "field": "Target Penyelesaian"},
+        {"name": 'sla_internal', "value": false, "field": "SLA Internal"},
         {"name": 'sla_hari_kerja', "value": false, "field": "Hari SLA"},
       ] 
     } else {

src/app/admin/admin-ticket-onpic/admin-ticket-onpic-detail/admin-ticket-onpic-detail.component.html

@@ -262,7 +262,7 @@
                   class="TabsCustom"
                   *ngIf="data.Hide == false"
                   [ngClass]="{'active': data.Selected == true, '':data.Selected == false}"
-                  (click)="ClickTabsCustomConversationReplyNote(i)">{{data.Name}}</span>
+                  (click)="ClickTabsCustomConversationReplyNote(i)">{{data.Name}} <span class="text-danger" *ngIf="data.Name == 'Internal Note'">*</span></span>
               </ng-container>
             </p>
 

src/app/admin/admin-ticket-onpic/admin-ticket-onpic-detail/admin-ticket-onpic-detail.component.ts

@@ -893,7 +893,8 @@ export class AdminTicketOnpicDetailComponent implements OnInit {
         this.Env.Team.CsCabangBranchAgent,
         this.Env.Team.AgentCallCenter,
         this.Env.Team.SociomileStaff,
-        this.Env.Team.MerchantBusiness
+        this.Env.Team.MerchantBusiness,
+        this.Env.Team.DigitalLoan
       ]
     }
 
@@ -1027,7 +1028,8 @@ export class AdminTicketOnpicDetailComponent implements OnInit {
         this.Env.Team.CsCabangBranchAgent,
         this.Env.Team.AgentCallCenter,
         this.Env.Team.SociomileStaff,
-        this.Env.Team.MerchantBusiness
+        this.Env.Team.MerchantBusiness,
+        this.Env.Team.DigitalLoan
       ]
     }
 

src/app/admin/admin-ticket/admin-ticket-detail/admin-ticket-detail.component.ts

@@ -992,7 +992,8 @@ export class AdminTicketDetailComponent implements OnInit {
         this.Env.Team.CsCabangBranchAgent,
         this.Env.Team.AgentCallCenter,
         this.Env.Team.SociomileStaff,
-        this.Env.Team.MerchantBusiness
+        this.Env.Team.MerchantBusiness,
+        this.Env.Team.DigitalLoan
       ]
     }
 
@@ -1126,7 +1127,8 @@ export class AdminTicketDetailComponent implements OnInit {
         this.Env.Team.CsCabangBranchAgent,
         this.Env.Team.AgentCallCenter,
         this.Env.Team.SociomileStaff,
-        this.Env.Team.MerchantBusiness
+        this.Env.Team.MerchantBusiness,
+        this.Env.Team.DigitalLoan
       ]
     }
 

src/environments/environment.prod.ts

@@ -49,7 +49,8 @@ export const environment = {
     "ITRM" : 30393,
     "SupervisorNobu" : 42931,
     "MerchantBusiness": 66798,
-    "ServiceReport": 97408
+    "ServiceReport": 97408,
+    "DigitalLoan": 143888
   },
   "Agent" : {
     "NobuCall" : 42,

src/environments/environment.ts

@@ -4,8 +4,8 @@
 
 export const environment = {
   production: false,
-  "APIBASEURL"              : "http://localhost:9825/",
-  "MICROSERVICEURL"         : "http://innodev.vnetcloud.com/nobu-history-login/api/v1/",
+  "APIBASEURL"              : "http://crm.nobubank.com/nobucall-api-v2/",
+  "MICROSERVICEURL"         : "http://crm.nobubank.com/nobucall-api-log/api/v1/",
   "SITE_NAME"               : "Visionet Helpdesk System",
   "SITE_LOGO"               : "https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227",
   "COMPANY_NAME"            : "PT. Visionet Data Internasional",
@@ -53,7 +53,8 @@ export const environment = {
     "ITRM" : 30393,
     "SupervisorNobu" : 42931,
     "MerchantBusiness": 66798,
-    "ServiceReport": 97408
+    "ServiceReport": 97408,
+    "DigitalLoan": 143888
   },
   "Agent" : {
     "NobuCall" : 42,