Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'development' into ben/update-readme

Browse source
This commit is contained in:
Ben Goldsworthy 2020-10-19 20:27:50 +01:00
commit bab6b9f354
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/auth/register.component.ts
View file

@ -70,7 +70,7 @@ export class RegisterComponent {
password: signupForm.password, password: signupForm.password,
display_name: customerForm.display_name, display_name: customerForm.display_name,
full_name: customerForm.full_name, full_name: customerForm.full_name,
postcode: customerForm.postcode, postcode: customerForm.postcode.toUpperCase(),
year_of_birth: customerForm.year_of_birth, year_of_birth: customerForm.year_of_birth,
}; };
console.log(data); console.log(data);
@ -114,7 +114,7 @@ export class RegisterComponent {
sector: organisationForm.sector, sector: organisationForm.sector,
street_name: organisationForm.street_name, street_name: organisationForm.street_name,
town: organisationForm.town, town: organisationForm.town,
postcode: organisationForm.postcode, postcode: organisationForm.postcode.toUpperCase(),
}; };
this.api this.api
.register(data) .register(data)

4
src/app/dashboard/account-edit.component.ts
View file

@ -89,7 +89,7 @@ export class AccountEditComponent implements OnInit {
const submitData = { const submitData = {
email: settingForm.email, email: settingForm.email,
postcode: settingForm.postcode, postcode: settingForm.postcode.toUpperCase(),
password: settingForm.password, password: settingForm.password,
new_password: settingForm.new_password, new_password: settingForm.new_password,
name: settingOrganisationForm.name, name: settingOrganisationForm.name,
@ -142,7 +142,7 @@ export class AccountEditComponent implements OnInit {
const submitData = { const submitData = {
email: settingForm.email, email: settingForm.email,
postcode: settingForm.postcode, postcode: settingForm.postcode.toUpperCase(),
password: settingForm.password, password: settingForm.password,
new_password: settingForm.new_password, new_password: settingForm.new_password,
full_name: settingCustomerForm.full_name, full_name: settingCustomerForm.full_name,

2
src/app/dashboard/transaction-log.component.html
View file

@ -101,7 +101,7 @@
<div class="card-header"> <div class="card-header">
<strong>Log of Outgoing Transactions</strong> <strong>Log of Outgoing Transactions</strong>
<small>This lists all purchases that have been submitted.</small> <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 <span *ngIf="!showMeta">Show</span><span *ngIf="showMeta">Hide</span> Details
</button> </button>
</div> </div>

2
src/app/dashboard/transaction-log.component.ts
View file

@ -29,6 +29,7 @@ export class TransactionLogComponent implements OnInit {
transactionFormStatusSuccess: string; transactionFormStatusSuccess: string;
transactionFormStatusError = 'Error received, please try again.'; transactionFormStatusError = 'Error received, please try again.';
updatedTime: string; updatedTime: string;
accountType: any;
showMeta = false; showMeta = false;
public paginateConfig: PaginationInstance = { public paginateConfig: PaginationInstance = {
@ -58,6 +59,7 @@ export class TransactionLogComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.loadTransactions(1); this.loadTransactions(1);
this.accountType = localStorage.getItem('usertype');
} }
loadTransactions(logPage: number) { loadTransactions(logPage: number) {

6
src/app/layouts/full-layout.component.html
View file

@ -38,7 +38,7 @@
</div> </div>
</a> </a>
</li> </li>
<li class="nav-item"> <li *ngIf="accountType == 'organisation'" class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/more-graphs-and-tables']"> <a class="nav-link" routerLinkActive="active" [routerLink]="['/more-graphs-and-tables']">
<div class="row no-gutters align-items-center"> <div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-map"></i></div> <div class="col-2"><i class="icon-map"></i></div>
@ -94,7 +94,7 @@
</div> </div>
</a> </a>
</li> </li>
<li class="nav-item"> <li *ngIf="accountType == 'customer'" class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/category-month']"> <a class="nav-link" routerLinkActive="active" [routerLink]="['/category-month']">
<div class="row no-gutters align-items-center"> <div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-basket"></i></div> <div class="col-2"><i class="icon-basket"></i></div>
@ -102,7 +102,7 @@
</div> </div>
</a> </a>
</li> </li>
<li class="nav-item"> <li *ngIf="accountType == 'organisation'" class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/suppliers']"> <a class="nav-link" routerLinkActive="active" [routerLink]="['/suppliers']">
<div class="row no-gutters align-items-center"> <div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-speedometer"></i></div> <div class="col-2"><i class="icon-speedometer"></i></div>