Merge branch 'development' into ben/update-readme
This commit is contained in:
commit
bab6b9f354
5 changed files with 10 additions and 8 deletions
|
@ -70,7 +70,7 @@ export class RegisterComponent {
|
|||
password: signupForm.password,
|
||||
display_name: customerForm.display_name,
|
||||
full_name: customerForm.full_name,
|
||||
postcode: customerForm.postcode,
|
||||
postcode: customerForm.postcode.toUpperCase(),
|
||||
year_of_birth: customerForm.year_of_birth,
|
||||
};
|
||||
console.log(data);
|
||||
|
@ -114,7 +114,7 @@ export class RegisterComponent {
|
|||
sector: organisationForm.sector,
|
||||
street_name: organisationForm.street_name,
|
||||
town: organisationForm.town,
|
||||
postcode: organisationForm.postcode,
|
||||
postcode: organisationForm.postcode.toUpperCase(),
|
||||
};
|
||||
this.api
|
||||
.register(data)
|
||||
|
|
|
@ -89,7 +89,7 @@ export class AccountEditComponent implements OnInit {
|
|||
|
||||
const submitData = {
|
||||
email: settingForm.email,
|
||||
postcode: settingForm.postcode,
|
||||
postcode: settingForm.postcode.toUpperCase(),
|
||||
password: settingForm.password,
|
||||
new_password: settingForm.new_password,
|
||||
name: settingOrganisationForm.name,
|
||||
|
@ -142,7 +142,7 @@ export class AccountEditComponent implements OnInit {
|
|||
|
||||
const submitData = {
|
||||
email: settingForm.email,
|
||||
postcode: settingForm.postcode,
|
||||
postcode: settingForm.postcode.toUpperCase(),
|
||||
password: settingForm.password,
|
||||
new_password: settingForm.new_password,
|
||||
full_name: settingCustomerForm.full_name,
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
<div class="card-header">
|
||||
<strong>Log of Outgoing Transactions</strong>
|
||||
<small>This lists all purchases that have been submitted.</small>
|
||||
<button class="btn pull-right btn-sm" (click)="toggleShowMeta()">
|
||||
<button *ngIf="accountType == 'organisation'" class="btn pull-right btn-sm" (click)="toggleShowMeta()">
|
||||
<span *ngIf="!showMeta">Show</span><span *ngIf="showMeta">Hide</span> Details
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
@ -29,6 +29,7 @@ export class TransactionLogComponent implements OnInit {
|
|||
transactionFormStatusSuccess: string;
|
||||
transactionFormStatusError = 'Error received, please try again.';
|
||||
updatedTime: string;
|
||||
accountType: any;
|
||||
showMeta = false;
|
||||
|
||||
public paginateConfig: PaginationInstance = {
|
||||
|
@ -58,6 +59,7 @@ export class TransactionLogComponent implements OnInit {
|
|||
|
||||
ngOnInit(): void {
|
||||
this.loadTransactions(1);
|
||||
this.accountType = localStorage.getItem('usertype');
|
||||
}
|
||||
|
||||
loadTransactions(logPage: number) {
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<li *ngIf="accountType == 'organisation'" class="nav-item">
|
||||
<a class="nav-link" routerLinkActive="active" [routerLink]="['/more-graphs-and-tables']">
|
||||
<div class="row no-gutters align-items-center">
|
||||
<div class="col-2"><i class="icon-map"></i></div>
|
||||
|
@ -94,7 +94,7 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<li *ngIf="accountType == 'customer'" class="nav-item">
|
||||
<a class="nav-link" routerLinkActive="active" [routerLink]="['/category-month']">
|
||||
<div class="row no-gutters align-items-center">
|
||||
<div class="col-2"><i class="icon-basket"></i></div>
|
||||
|
@ -102,7 +102,7 @@
|
|||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<li *ngIf="accountType == 'organisation'" class="nav-item">
|
||||
<a class="nav-link" routerLinkActive="active" [routerLink]="['/suppliers']">
|
||||
<div class="row no-gutters align-items-center">
|
||||
<div class="col-2"><i class="icon-speedometer"></i></div>
|
||||
|
|
Reference in a new issue