Commit b63330bc authored by ari_darmawan's avatar ari_darmawan

Merge branch 'master' into create-ticket-localstorage

# Conflicts:
#	src/app/admin/admin-ticket/admin-ticket-customer-md/admin-ticket-customer-md.component.html
parents 5d3e7748 eb6381be
# VERSION 2.1.2 [16-01-2024]
- mandatory field email
# VERSION 2.1.1 [15-09-2023] # VERSION 2.1.1 [15-09-2023]
- add tooltip dropdown search - add tooltip dropdown search
......
{ {
"name": "smart-city", "name": "smart-city",
"version": "2.1.1", "version": "2.1.2",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
......
...@@ -85,8 +85,7 @@ ...@@ -85,8 +85,7 @@
<div class="form-group"> <div class="form-group">
<label> <label>
<small>E-mail <small>E-mail
<span *ngIf="((CustomerType == '0' || CustomerType == '1') && TeamID || (CustomerType == '2' && TeamID != Env.Team.AgentCallCenter && TeamID != Env.Team.SociomileStaff))" class="text-muted">(optional)</span> <span class="text-danger">*</span>
<span *ngIf="(CustomerType == '2' && (TeamID == Env.Team.AgentCallCenter || TeamID == Env.Team.SociomileStaff))" class="text-danger">*</span>
</small> </small>
</label> </label>
<input <input
...@@ -105,6 +104,7 @@ ...@@ -105,6 +104,7 @@
#inputRequired #inputRequired
[disabled]="IsFormDisabled" [disabled]="IsFormDisabled"
[(ngModel)]="Email" [(ngModel)]="Email"
#inputRequired
(blur)="EmailOnBlur()" (blur)="EmailOnBlur()"
maxlength="100"> maxlength="100">
</div> </div>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
"APIBASEURL" : "http://innodev.vnetcloud.com/nobucall-api-v2/", "APIBASEURL" : "http://crm.nobubank.com/nobucall-api-v2/",
"MICROSERVICEURL" : "http://crm.nobubank.com/nobucall-api-log/api/v1/", "MICROSERVICEURL" : "http://crm.nobubank.com/nobucall-api-log/api/v1/",
"SITE_NAME" : "Visionet Helpdesk System", "SITE_NAME" : "Visionet Helpdesk System",
"SITE_LOGO" : "https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227", "SITE_LOGO" : "https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227",
......
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