diff --git a/src/app/dashboard/account-edit.component.html b/src/app/dashboard/account-edit.component.html
index 87937be..f46aca7 100644
--- a/src/app/dashboard/account-edit.component.html
+++ b/src/app/dashboard/account-edit.component.html
@@ -73,6 +73,37 @@
+
diff --git a/src/app/dashboard/account-edit.component.ts b/src/app/dashboard/account-edit.component.ts
index a537b3a..707b93c 100644
--- a/src/app/dashboard/account-edit.component.ts
+++ b/src/app/dashboard/account-edit.component.ts
@@ -31,6 +31,7 @@ export class AccountEditComponent implements OnInit {
name : ['', [Validators.required]],
street_name : ['', [Validators.required]],
town : ['', [Validators.required]],
+ sector : ['', [Validators.required]],
});
this.settingCustomerForm = this.formBuilder.group({
full_name : ['', [Validators.required]],
@@ -53,12 +54,13 @@ export class AccountEditComponent implements OnInit {
name: result.name,
street_name: result.street_name,
town: result.town,
+ sector: result.sector,
});
this.settingCustomerForm.patchValue({
full_name: result.full_name,
display_name: result.display_name,
});
- this.api.setUserInfo( result.email, result.display_name );
+ this.api.setUserInfo( result.email, result.display_name || result.name );
},
error => {
console.log( error._body );
@@ -95,6 +97,7 @@ export class AccountEditComponent implements OnInit {
name: settingOrganisationForm.name,
street_name: settingOrganisationForm.street_name,
town: settingOrganisationForm.town,
+ sector: settingOrganisationForm.sector,
};
// data.append('form', JSON.stringify(submitData));
diff --git a/src/app/dashboard/feedback.component.ts b/src/app/dashboard/feedback.component.ts
index e5d6502..f1f1f93 100644
--- a/src/app/dashboard/feedback.component.ts
+++ b/src/app/dashboard/feedback.component.ts
@@ -41,7 +41,7 @@ export class FeedbackComponent {
this.feedbackForm.patchValue({
email: result.email,
});
- this.api.setUserInfo( result.email, result.display_name );
+ this.api.setUserInfo( result.email, result.display_name || result.name );
},
error => {
console.log( error._body );
diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts
index 17da0c8..a171f1b 100644
--- a/src/app/providers/api-service.ts
+++ b/src/app/providers/api-service.ts
@@ -64,7 +64,7 @@ export class ApiService {
this.setSessionKey(result.session_key);
this.setUserInfo(
result.email,
- result.display_name
+ result.display_name || result.name
);
this.setUserType(result.user_type)
}