Commit c149c3c9 authored by ari_darmawan's avatar ari_darmawan

set config json

parent 565f5925
import { Component, OnInit,Injector, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit,Injector, Input, Output, EventEmitter } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ServiceProxyWeb, MicroService } from '../shared/serviceproxy/service-proxy.service'; import { MicroService } from '../shared/serviceproxy/service-proxy.service';
import { environment } from '../environments/environment.prod'; import { environment } from '../environments/environment.prod';
import * as $ from 'jquery'; import * as $ from 'jquery';
declare const AratakaConfig : any; declare const AratakaConfig : any;
...@@ -15,14 +15,14 @@ export class AppComponent implements OnInit{ ...@@ -15,14 +15,14 @@ export class AppComponent implements OnInit{
public UserInformationLogin = null; public UserInformationLogin = null;
public appLogo = this._ServiceProxyWeb.SITE_LOGO public appLogo = 'https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227';
public isMenu = false public isMenu = false
public route: string; public route: string;
constructor( constructor(
private router: Router, private router: Router,
private _ServiceProxyWeb : ServiceProxyWeb, // private _ServiceProxyWeb : ServiceProxyWeb,
private MicroService: MicroService private MicroService: MicroService
) { } ) { }
...@@ -30,7 +30,7 @@ export class AppComponent implements OnInit{ ...@@ -30,7 +30,7 @@ export class AppComponent implements OnInit{
ngOnInit() { ngOnInit() {
this.getEnvironment(); // this.getEnvironment();
} }
onActivateMenu(e) { onActivateMenu(e) {
......
...@@ -47,15 +47,14 @@ export const configFactory = (configService: ConfigService) => { ...@@ -47,15 +47,14 @@ export const configFactory = (configService: ConfigService) => {
], ],
//exports: [RouterModule], //exports: [RouterModule],
providers: [ providers: [
HomeService,
ServiceProxyWeb,
AuthService,
{ {
provide: APP_INITIALIZER, provide: APP_INITIALIZER,
useFactory: configFactory, useFactory: configFactory,
deps: [ConfigService], deps: [ConfigService],
multi: true multi: true
} },
AuthService,
HomeService,
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
......
...@@ -567,7 +567,6 @@ export class TicketService { ...@@ -567,7 +567,6 @@ export class TicketService {
} }
PublicReplySubmit(_data) { PublicReplySubmit(_data) {
console.log(_data)
const service = this.injector.get(ServiceProxyWeb) const service = this.injector.get(ServiceProxyWeb)
var data; var data;
...@@ -599,9 +598,6 @@ export class TicketService { ...@@ -599,9 +598,6 @@ export class TicketService {
createByID: _data.createByID createByID: _data.createByID
} }
endPoint = API_URL +'v3/ticket/reject/' + _data.TicketID endPoint = API_URL +'v3/ticket/reject/' + _data.TicketID
console.log("DataSubmit" , JSON.stringify(data))
console.log("EndPoint" ,endPoint)
}else{ }else{
data = { data = {
...@@ -717,7 +713,6 @@ export class CustomerService { ...@@ -717,7 +713,6 @@ export class CustomerService {
id_number: _data.IdentityIDNumber, id_number: _data.IdentityIDNumber,
org_id: 1 org_id: 1
} }
console.log(JSON.stringify(data))
const service = this.injector.get(ServiceProxyWeb) const service = this.injector.get(ServiceProxyWeb)
let headers = new HttpHeaders({ let headers = new HttpHeaders({
...@@ -752,7 +747,6 @@ export class ZendeskService { ...@@ -752,7 +747,6 @@ export class ZendeskService {
GetUserByEmail(_data) { GetUserByEmail(_data) {
const service = this.injector.get(ServiceProxyWeb) const service = this.injector.get(ServiceProxyWeb)
console.log(btoa(service.ZENDESK_API_USER + ':' + service.ZENDESK_API_PASS))
let data = _data; let data = _data;
let headers = new HttpHeaders({ let headers = new HttpHeaders({
'Content-Type': 'application/json', 'Content-Type': 'application/json',
...@@ -1120,6 +1114,24 @@ export class ConfigService { ...@@ -1120,6 +1114,24 @@ export class ConfigService {
this.config = this.http this.config = this.http
.get('./assets/configAPI.json') .get('./assets/configAPI.json')
.subscribe((config: any) => { .subscribe((config: any) => {
environment.APIBASEURL = config.APIBASEURL;
environment.MICROSERVICEURL = config.MICROSERVICEURL;
environment.ckeConfig = config.ckeConfig;
environment.SITE_NAME = config.SITE_NAME;
environment.SITE_LOGO = config.SITE_LOGO;
environment.COMPANY_NAME = config.COMPANY_NAME;
environment.PARAM_AGENTROLEID = config.PARAM_AGENTROLEID;
environment.PARAM_AGENTSPVROLEID = config.PARAM_AGENTSPVROLEID;
environment.PARAM_SPV = config.PARAM_SPV;
environment.PARAM_AGENT = config.PARAM_AGENT;
environment.PARAM_SERVICEDESK = config.PARAM_SERVICEDESK;
environment.PARAM_SUPPORT = config.PARAM_SUPPORT;
environment.ZENDESK_API_URL = config.ZENDESK_API_URL;
environment.ZENDESK_API_USER = config.ZENDESK_API_USER;
environment.ZENDESK_API_PASS = config.ZENDESK_API_PASS;
environment.category = config.category;
environment.Team = config.Team;
API_URL = config.APIBASEURL; API_URL = config.APIBASEURL;
API_MICROSERVICE = config.MICROSERVICEURL; API_MICROSERVICE = config.MICROSERVICEURL;
ckConfig = config.ckeConfig; ckConfig = config.ckeConfig;
...@@ -1135,7 +1147,6 @@ export class ConfigService { ...@@ -1135,7 +1147,6 @@ export class ConfigService {
ZENDESK_API_URL = config.ZENDESK_API_URL; ZENDESK_API_URL = config.ZENDESK_API_URL;
ZENDESK_API_USER = config.ZENDESK_API_USER; ZENDESK_API_USER = config.ZENDESK_API_USER;
ZENDESK_API_PASS = config.ZENDESK_API_PASS; ZENDESK_API_PASS = config.ZENDESK_API_PASS;
CATEGORY = config.category.servicesubcategory_id;
}) })
} }
} }
...@@ -1236,7 +1247,7 @@ export class ServiceProxyWeb { ...@@ -1236,7 +1247,7 @@ export class ServiceProxyWeb {
public PARAM_AGENTROLEID = PARAM_AGENTROLEID public PARAM_AGENTROLEID = PARAM_AGENTROLEID
public PARAM_AGENTSPVROLEID = PARAM_AGENTSPVROLEID public PARAM_AGENTSPVROLEID = PARAM_AGENTSPVROLEID
public PARAM_SPV = PARAM_SPV public PARAM_SPV = PARAM_SPV
public PARAM_AGENT = PARAM_AGENT public PARAM_AGENT = PARAM_AGENT
public PARAM_SERVICEDESK = PARAM_SERVICEDESK public PARAM_SERVICEDESK = PARAM_SERVICEDESK
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment