52 changed files with 12634 additions and 4736 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,51 +3,6 @@ All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [2.3.1] - 2023-06-26
-
-### Fixed
-
- Broken wallet link for invoices
-
-## [2.3.0] - 2023-06-26
-
-### Changed
-
- Modified order to handle new `token` field.
- Modified order service to query API using `token`.
- Modified receipt component to use the new `token`.
- Modified invoice component to use the new `token`.
- Modified payment service component to remove order-creation logic.
-
-### Fixed
-
- Receipt prompt textarea is now read-only.
- Invoice prompt textarea is now read-only.
- Button text color is now correct for Invoice and Receipt.
-
-## [2.2.0] - 2023-05-15
-
-### Added
-
- New API calls for requesting language data for login page
-
-### Changed
-
- Owner model modified to remove unnecessary fields
- Fullnode service uses `session` for API calls.
- User service uses `session` for API calls.
- Auth-guard service uses new `checkUser` function to confirm session exists and is validated.
-
-### Fixed
-
- Business sign-up stepper skipping is corrected
-
-## [2.1.0] - 2023-05-02
-
-### Added
-
- New dialog to purchase sessions ahead of expiration.
-
 ## [2.0.0] - 2023-03-16

 ### Added
--- a/README.md
+++ b/README.md
@ -1,7 +1,5 @@
 # ZGo - The Zcash Register

-[![Please don't upload to GitHub](https://nogithub.codeberg.page/badge.svg)](https://nogithub.codeberg.page)
-
 A Point-of-Sale application for accepting payments in [Zcash](https://z.cash/)

 Visit our [ZGo Homepage](https://zgo.cash/) for more details.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "zgo",
-  "version": "2.3.1",
+  "version": "2.0.0-beta",
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
@ -10,22 +10,23 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^16.0.0",
-    "@angular/cdk": "^16.0.0",
-    "@angular/common": "^16.0.0",
-    "@angular/compiler": "^16.0.0",
-    "@angular/core": "^16.0.0",
-    "@angular/forms": "^16.0.0",
-    "@angular/material": "^16.0.0",
-    "@angular/platform-browser": "^16.0.0",
-    "@angular/platform-browser-dynamic": "^16.0.0",
-    "@angular/router": "^16.0.0",
-    "@fortawesome/angular-fontawesome": "^0.13.0",
-    "@fortawesome/fontawesome-free": "^6.4.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-brands-svg-icons": "^6.4.0",
-    "@fortawesome/free-regular-svg-icons": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@angular-material-components/datetime-picker": "^9.0.0",
+    "@angular/animations": "^15.1.2",
+    "@angular/cdk": "^15.1.2",
+    "@angular/common": "^15.1.2",
+    "@angular/compiler": "^15.1.2",
+    "@angular/core": "^15.1.2",
+    "@angular/forms": "^15.1.2",
+    "@angular/material": "^15.1.2",
+    "@angular/platform-browser": "^15.1.2",
+    "@angular/platform-browser-dynamic": "^15.1.2",
+    "@angular/router": "^15.1.2",
+    "@fortawesome/angular-fontawesome": "^0.12.1",
+    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@fortawesome/fontawesome-svg-core": "^6.2.1",
+    "@fortawesome/free-brands-svg-icons": "^6.2.1",
+    "@fortawesome/free-regular-svg-icons": "^6.2.1",
+    "@fortawesome/free-solid-svg-icons": "^6.2.1",
    "@supercharge/request-ip": "^1.2.0",
    "angular-local-storage": "^0.7.1",
    "angular-material-datepicker": "^1.0.2",
@ -38,23 +39,23 @@
    "tslib": "^2.5.0",
    "urlsafe-base64": "^1.0.0",
    "uuid": "^9.0.0",
-    "zone.js": "~0.13.0"
+    "zone.js": "~0.12.0"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "^16.0.0",
-    "@angular/cli": "^16.0.0",
-    "@angular/compiler-cli": "^16.0.0",
+    "@angular-devkit/build-angular": "^15.1.3",
+    "@angular/cli": "^15.1.3",
+    "@angular/compiler-cli": "^15.1.2",
    "@types/jasmine": "~4.3.1",
-    "@types/node": "^18.16.6",
+    "@types/node": "^18.11.18",
    "@types/request": "^2.48.8",
    "@types/urlsafe-base64": "^1.0.28",
-    "@types/uuid": "^9.0.1",
+    "@types/uuid": "^9.0.0",
    "jasmine-core": "~4.5.0",
-    "karma": "~6.4.2",
+    "karma": "~6.4.1",
    "karma-chrome-launcher": "~3.1.1",
    "karma-coverage": "~2.2.0",
    "karma-jasmine": "~5.1.0",
    "karma-jasmine-html-reporter": "~2.0.0",
-    "typescript": "~4.9.5"
+    "typescript": "~4.9.4"
  }
 }
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@ -45,7 +45,7 @@
     style="margin-top: 10px;
            margin-bottom: 20px;">
  <div >&copy; 2023 Vergara Technologies LLC</div>
-  <div class="tiny">Version 2.3.1</div>
+  <div class="tiny">Version 2.0.0</div>
  <div class="tiny">{{ vE.mainPriceData }}</div>
 </div>
 <div></div>
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { LanguageService } from './language.service';
+import { LanguageData } from './language.model';

+//import { Post} from './posts/post.model';

@Component({
  selector: 'app-root',
@ -22,21 +24,21 @@ export class AppComponent {
  }  
  
  ngOnInit(){
-    //console.log('chgUILanguage() called on ngOnInit ');
+    console.log('chgUILanguage() called on ngOnInit ');
    this.chgUILanguage();
  }

  chgUILanguage() {
-    //console.log('MAIN.chgUILanguage Called ');
-    this.languageService.getViewElements('main').subscribe({
-		next: response => { 
-            //console.log('response >> ', response );
-            //console.log('main_price_data -> ',response.data.main_price_data);
+    console.log('MAIN.chgUILanguage Called ');
+    this.languageService.getViewElements('main').subscribe(
+          response => { 
+            console.log('response >> ', response );
+            console.log('main_price_data -> ',response.data.main_price_data);
            this.vE.mainPriceData = response.data.main_price_data;
            this.zgoLanguage = response.language;
          },
-		error: error  => { console.log('Error --> ',error); }
-	});
+          error  => { console.log('Error --> ',error); }
+        );
  }

  usFlagClicked() {
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -51,7 +51,6 @@ import { NotifierComponent } from './notifier/notifier.component';
 import { PmtserviceComponent } from './pmtservice/pmtservice.component';
 import { XeroRegComponent } from './xeroreg/xeroreg.component';
 import { DbExportComponent } from './db-export/db-export.component';
-import { SessionpayComponent } from './sessionpay/sessionpay.component';

@NgModule({
    declarations: [
@ -82,7 +81,6 @@ import { SessionpayComponent } from './sessionpay/sessionpay.component';
        PmtserviceComponent,
        XeroRegComponent,
        DbExportComponent,
-        SessionpayComponent,
    ],
    imports: [
        BrowserModule,
--- a/src/app/auth-guard.service.ts
+++ b/src/app/auth-guard.service.ts
@ -1,51 +1,57 @@
 import { Injectable } from '@angular/core';
-import { Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router';
+import { CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router';
 import {HttpClient, HttpParams} from '@angular/common/http';
 import { UserService } from './user.service';
-import { Observable } from 'rxjs';
-
+import { Subscription, Observable } from 'rxjs';
+import { Owner } from './owner.model';

@Injectable()

-export class AuthGuardService  {
+export class AuthGuardService implements CanActivate {
+	private UserSub: Subscription = new Subscription();
 	private addr = '';
 	private paid = false;
 	private paidUpdate: Observable<boolean>;
 	constructor(
 		private router: Router,
+		private http: HttpClient,
 		public userService: UserService
 	){
-		this.userService.findUser();
 		this.paidUpdate = this.userService.paidUpdate;
 		this.paidUpdate.subscribe((indicator) => {
 			this.paid = indicator;
 		});
 	}

-	canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+	canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
 		const token = localStorage.getItem('s4z_token');
 		
 		var path = route.url[0].path;

 		if(token != null){
+			this.userService.uZaddrUpdate.
+				subscribe((addr) => {
+				if (addr != null) {
+					console.log(addr);
+					this.addr = addr;
+				} else {
+					console.log("No record for that token");
+				}
+			});
 			if (path === 'biz') {
-				this.userService.checkUser()?.subscribe( response => {
-					if (response.status == 200 && response.body?.validated) {
-						return true;
-					} else {
-						this.router.navigate(['/login']);
-						return false;
-					}
-				});
+				if (this.addr.length > 0) {
+					return true;
+				} else {
+					this.router.navigate(['/login']);
+					return false;
+				}
 			} else {
-				this.userService.checkUser()?.subscribe( response => {
-					if (response.status == 200 && response.body?.validated && this.paid) {
-						return true;
-					} else {
-						this.router.navigate(['/login']);
-						return false;
-					}
-				});
+				if (this.addr != null && this.paid) {
+					return true;
+				} else {
+					this.router.navigate(['/login']);
+					return false;
+				}
 			}
 		} else {
 			console.log("Not logged in");
--- a/src/app/business/business.component.css
+++ b/src/app/business/business.component.css
@ -13,11 +13,6 @@ mat-card.centercard{
 	font-family: 'Spartan', sans-serif;
 	font-size: 11px;
 }
-
-::ng-deep .mat-vertical-stepper-header{
-	pointer-events: none;
-}
-
 a.link{
 	text-decoration: underline;
 }
--- a/src/app/business/business.component.html
+++ b/src/app/business/business.component.html
@ -2,7 +2,7 @@
 <div align="center">
 	<mat-card class="centercard">
 		<h3>{{ vE.businessSignupTitle }}</h3>
-		<mat-vertical-stepper #stepper [linear]="true">
+		<mat-vertical-stepper #stepper linear>
 			<mat-step label="{{ vE.businessBizInfo }}" editable="false">
 				<p>{{ vE.businessAddrsNobiz }}</p>
 				<mat-card [formGroup]="bizForm">
--- a/src/app/business/business.component.ts
+++ b/src/app/business/business.component.ts
@ -15,6 +15,7 @@ import { ScanComponent } from '../scan/scan.component';
 import { TermsComponent } from '../terms/terms.component';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

@Component({
  selector: 'app-business',
@ -50,20 +51,29 @@ export class BusinessComponent implements OnInit {
 	countries: Country[] = [];
 	owner: Owner = {
 			address: '',
-			name: '',
 			currency: 'usd',
 			tax: false,
 			taxValue: 0,
 			vat: false,
 			vatValue: 0,
+			phone: '',
 			paid: false,
+			first: '',
+			last: '',
+			name: '',
+			street: '',
+			city: '',
+			state: '',
+			postal: '',
+			country: '',
+			email: '',
+			website: '',
 			zats: false,
 			invoices: false,
 			expiration: new Date(Date.now()).toISOString(),
 			payconf: false,
-			crmToken: '',
 			viewkey: '',
-			tips: false
+			crmToken: ''
 		}
 	public countriesUpdate: Observable<Country[]>;
 	public ownerUpdate: Observable<Owner>;
@ -73,59 +83,45 @@ export class BusinessComponent implements OnInit {
 	sessionId = '';
 	ownerKnown = false;
 	termsChecked = false;
-	ownerdata = {
-			first: '',
-			last: '',
-			phone: '',
-			name: '',
-			street: '',
-			city: '',
-			state: '',
-			postal: '',
-			country: '',
-			email: '',
-			website: '',
-			payconf: false
-	};
 	// -------------------------------------
  //
  // Language Support
  //
-	vE = {
-		businessSignupTitle : '',
-		businessBizInfo : '',
-		businessAddrsNobiz : '',
-		businessBizNamelbl : '',
-		businessBizNameholder : '',
-		businessContactFnamelbl : '',
-		businessContactFnholder : '',
-		businessContactLnamelbl : '',
-		businessContactLnholder : '',
-		businessBizAddresslbl : '',
-		businessBizAddressholder : '',
-		businessBizCitylbl : '',
-		businessBizCityholder : '',
-		businessBizStatelbl : '',
-		businessBizStateholder : '',
-		businessBizPcodelbl : '',
-		businessBizPcodeholder : '',
-		businessBizCountrylbl : '',
-		businessBizCountryholder : '',
-		businessBizMaillbl : '',
-		businessBizMailholder : '',
-		businessBizWebsitelbl : '',
-		businessBizWebsiteholder : '',
-		businessAcceptTerms : '',
-		businessTermsOfuse : '',
-		businessSaveBtn : '',
-		businessSessionLengthlbl : '',
-		businessSelectSession : '',
-		businessSessionLabel : '',
-		businessSessionPaylbl : '',
-		businessZGoConfirmlbl : ''
+  vE = {
+  	businessSignupTitle : '',
+  	businessBizInfo : '',
+  	businessAddrsNobiz : '',
+  	businessBizNamelbl : '',
+  	businessBizNameholder : '',
+  	businessContactFnamelbl : '',
+  	businessContactFnholder : '',
+  	businessContactLnamelbl : '',
+  	businessContactLnholder : '',
+  	businessBizAddresslbl : '',
+  	businessBizAddressholder : '',
+  	businessBizCitylbl : '',
+  	businessBizCityholder : '',
+  	businessBizStatelbl : '',
+  	businessBizStateholder : '',
+  	businessBizPcodelbl : '',
+  	businessBizPcodeholder : '',
+  	businessBizCountrylbl : '',
+  	businessBizCountryholder : '',
+  	businessBizMaillbl : '',
+  	businessBizMailholder : '',
+  	businessBizWebsitelbl : '',
+  	businessBizWebsiteholder : '',
+  	businessAcceptTerms : '',
+  	businessTermsOfuse : '',
+  	businessSaveBtn : '',
+  	businessSessionLengthlbl : '',
+  	businessSelectSession : '',
+  	businessSessionLabel : '',
+  	businessSessionPaylbl : '',
+  	businessZGoConfirmlbl : ''

-	};
-	//
+  };
+  //
  //
 	constructor(
 		private languageService : LanguageService,
@ -191,7 +187,7 @@ export class BusinessComponent implements OnInit {
 	}

 	onChange(ob: MatSlideToggleChange){
-		//console.log(ob.checked);
+		console.log(ob.checked);
 		this.termsChecked = ob.checked;
 	}

@ -200,17 +196,25 @@ export class BusinessComponent implements OnInit {
 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;

-		this.dialog.open(TermsComponent, dialogConfig);
-		//dialogRef.afterClosed().subscribe(val => {
-			//console.log('Terms read');
-		//});
+		const dialogRef = this.dialog.open(TermsComponent, dialogConfig);
+		dialogRef.afterClosed().subscribe(val => {
+			console.log('Terms read');
+		});
 	}

 	save() {
-		this.ownerdata = {
+		this.owner = {
+			_id: '',
+			address: '',
+			currency: 'usd',
+			tax: false,
+			taxValue: 0,
+			vat: false,
+			vatValue: 0,
 			first: this.bizForm.get('first')!.value,
 			last: this.bizForm.get('last')!.value,
 			phone: '',
+			paid: false,
 			name: this.bizForm.get('name')!.value,
 			street: this.bizForm.get('street')!.value,
 			city: this.bizForm.get('city')!.value,
@ -219,9 +223,14 @@ export class BusinessComponent implements OnInit {
 			country: this.bizForm.get('country')!.value,
 			email: this.bizForm.get('email')!.value,
 			website: this.bizForm.get('website')!.value,
-			payconf: false
+			zats: false,
+			invoices: false,
+			expiration: new Date(Date.now()).toISOString(),
+			payconf: false,
+			viewkey: '',
+			crmToken: ''
 		};
-		this.userService.addOwner(this.ownerdata);
+		this.userService.addOwner(this.owner);
 		this.stepper!.next();
 	}

@ -239,7 +248,7 @@ export class BusinessComponent implements OnInit {

 		const dialogRef = this.dialog.open(ScanComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe(val => {
-			//console.log('Awaiting payment');
+			console.log('Awaiting payment');
 			if(val){
 				this.stepper!.next();
 			}
@ -257,46 +266,46 @@ export class BusinessComponent implements OnInit {
 	}

 	chgUILanguage(){
-		//console.log('BUSINESS.chgUILanguage Called ');
-		this.languageService.getViewElements('business').subscribe(
-			response => { 
-				//console.log('Received >> ', response );
-				//console.log('Language Code : ', response.language);
-				//console.log('Component Name : ',response.component);
-				//console.log('Language data : ',response.data);
+    console.log('BUSINESS.chgUILanguage Called ');
+ 		this.languageService.getViewElements('business').subscribe(
+				response => { 
+						console.log('Received >> ', response );
+						console.log('Language Code : ', response.language);
+						console.log('Component Name : ',response.component);
+						console.log('Language data : ',response.data);

-				this.vE.businessSignupTitle = response.data.business_signup_title;
-				this.vE.businessBizInfo = response.data.business_biz_info;
-				this.vE.businessAddrsNobiz = response.data.business_addrs_nobiz;
-				this.vE.businessBizNamelbl = response.data.business_biz_namelbl;
-				this.vE.businessBizNameholder = response.data.business_biz_nameholder;
-				this.vE.businessContactFnamelbl = response.data.business_contact_fnamelbl;
-				this.vE.businessContactFnholder = response.data.business_contact_fnholder;
-				this.vE.businessContactLnamelbl = response.data.business_contact_lnamelbl;
-				this.vE.businessBizAddresslbl = response.data.business_biz_addresslbl;
-				this.vE.businessBizAddressholder = response.data.business_biz_addressholder;
-				this.vE.businessBizCitylbl = response.data.business_biz_citylbl;
-				this.vE.businessBizCityholder = response.data.business_biz_cityholder;
-				this.vE.businessBizStatelbl = response.data.business_biz_statelbl;
-				this.vE.businessBizStateholder = response.data.business_biz_stateholder;
-				this.vE.businessBizPcodelbl = response.data.business_biz_pcodelbl;
-				this.vE.businessBizPcodeholder = response.data.business_biz_pcodeholder;
-				this.vE.businessBizCitylbl = response.data.business_biz_citylbl;
-				this.vE.businessBizCityholder = response.data.business_biz_cityholder;
-				this.vE.businessBizCountrylbl = response.data.business_biz_countrylbl;
-				this.vE.businessBizCountryholder = response.data.business_biz_countryholder;
-				this.vE.businessBizMaillbl = response.data.business_biz_maillbl;
-				this.vE.businessBizMailholder = response.data.business_biz_mailholder;
-				this.vE.businessBizWebsitelbl = response.data.business_biz_websitelbl;
-				this.vE.businessBizWebsiteholder = response.data.business_biz_websiteholder;
-				this.vE.businessAcceptTerms = response.data.business_accept_terms;
-				this.vE.businessTermsOfuse = response.data.business_terms_ofuse;
-				this.vE.businessSaveBtn = response.data.business_save_btn;
-				this.vE.businessSessionLengthlbl = response.data.business_session_lengthlbl;
-				this.vE.businessSelectSession = response.data.business_select_session;
-				this.vE.businessSessionLabel = response.data.business_session_label;
-				this.vE.businessSessionPaylbl = response.data.business_session_paylbl;
-				this.vE.businessZGoConfirmlbl = response.data.business_zgo_confirmlbl;
+						this.vE.businessSignupTitle = response.data.business_signup_title;
+						this.vE.businessBizInfo = response.data.business_biz_info;
+						this.vE.businessAddrsNobiz = response.data.business_addrs_nobiz;
+						this.vE.businessBizNamelbl = response.data.business_biz_namelbl;
+						this.vE.businessBizNameholder = response.data.business_biz_nameholder;
+						this.vE.businessContactFnamelbl = response.data.business_contact_fnamelbl;
+						this.vE.businessContactFnholder = response.data.business_contact_fnholder;
+						this.vE.businessContactLnamelbl = response.data.business_contact_lnamelbl;
+            this.vE.businessBizAddresslbl = response.data.business_biz_addresslbl;
+            this.vE.businessBizAddressholder = response.data.business_biz_addressholder;
+						this.vE.businessBizCitylbl = response.data.business_biz_citylbl;
+						this.vE.businessBizCityholder = response.data.business_biz_cityholder;
+						this.vE.businessBizStatelbl = response.data.business_biz_statelbl;
+						this.vE.businessBizStateholder = response.data.business_biz_stateholder;
+						this.vE.businessBizPcodelbl = response.data.business_biz_pcodelbl;
+						this.vE.businessBizPcodeholder = response.data.business_biz_pcodeholder;
+						this.vE.businessBizCitylbl = response.data.business_biz_citylbl;
+						this.vE.businessBizCityholder = response.data.business_biz_cityholder;
+						this.vE.businessBizCountrylbl = response.data.business_biz_countrylbl;
+						this.vE.businessBizCountryholder = response.data.business_biz_countryholder;
+						this.vE.businessBizMaillbl = response.data.business_biz_maillbl;
+						this.vE.businessBizMailholder = response.data.business_biz_mailholder;
+						this.vE.businessBizWebsitelbl = response.data.business_biz_websitelbl;
+						this.vE.businessBizWebsiteholder = response.data.business_biz_websiteholder;
+						this.vE.businessAcceptTerms = response.data.business_accept_terms;
+						this.vE.businessTermsOfuse = response.data.business_terms_ofuse;
+				  	this.vE.businessSaveBtn = response.data.business_save_btn;
+				  	this.vE.businessSessionLengthlbl = response.data.business_session_lengthlbl;
+				  	this.vE.businessSelectSession = response.data.business_select_session;
+				  	this.vE.businessSessionLabel = response.data.business_session_label;
+				  	this.vE.businessSessionPaylbl = response.data.business_session_paylbl;
+				  	this.vE.businessZGoConfirmlbl = response.data.business_zgo_confirmlbl;

 			    },
 					error  => { console.log('Error >> ',error); }
--- a/src/app/db-export/db-export.component.ts
+++ b/src/app/db-export/db-export.component.ts
@ -33,14 +33,23 @@ export class DbExportComponent implements OnInit {
      taxValue: 0,
      vat: false,
      vatValue: 0,
+      first: '',
+      last: '',
+      email: '',
+      street: '',
+      city: '',
+      state: '',
+      postal: '',
+      phone: '',
      paid: false,
+      website: '',
+      country: '',
      zats: false,
      invoices: false,
      expiration: new Date(Date.now()).toISOString(),
      payconf: false,
-      crmToken: '',
-	  viewkey: '',
-	  tips: false
+      viewkey: '',
+      crmToken: ''
    };

  _ordersOk = false;
--- a/src/app/fullnode.service.ts
+++ b/src/app/fullnode.service.ts
@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {BehaviorSubject, Observable} from 'rxjs';
+import {Subject, Subscription, BehaviorSubject, Observable} from 'rxjs';
 import {HttpClient, HttpParams, HttpHeaders} from '@angular/common/http';
 import {UserService} from './user.service';
 import { Owner } from './owner.model';
@ -12,7 +12,6 @@ var Buffer = require('buffer/').Buffer;
@Injectable({providedIn: 'root'})
 export class FullnodeService{
 	beUrl = ConfigData.Be_URL;
-	private session: null|string = '';
 	private dataStore: { height: number, memoList: string[], addr: string, price: number } = { height: 0, memoList: [], addr: '', price:0 };
 	private _heightUpdated: BehaviorSubject<number> = new BehaviorSubject(this.dataStore.height);
 	private _memoUpdated: BehaviorSubject<string[]> = new BehaviorSubject(this.dataStore.memoList);
@ -23,8 +22,8 @@ export class FullnodeService{
 	public readonly memoUpdate: Observable<string[]> = this._memoUpdated.asObservable();
 	public readonly priceUpdate: Observable<number> = this._priceUpdated.asObservable();
 	public readonly ownerUpdate: Observable<Owner>;
+	private UserSub: Subscription = new Subscription();
 	private reqHeaders: HttpHeaders;
-	private params : HttpParams;
 	private owner: Owner = {
 		_id: '',
 		name: '',
@ -34,19 +33,26 @@ export class FullnodeService{
 		taxValue: 0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration: new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};

 	constructor(private http: HttpClient, public userService: UserService){
-		this.session = localStorage.getItem('s4z_token');
-		this.params = new HttpParams().append('session', this.session!);
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
 		this.ownerUpdate = userService.ownerUpdate;
@ -59,7 +65,7 @@ export class FullnodeService{
 	}

 	getHeight(){
-		let obs = this.http.get<{message: string, height: number}>(this.beUrl+'blockheight', { headers: this.reqHeaders, params: this.params });
+		let obs = this.http.get<{message: string, height: number}>(this.beUrl+'api/blockheight', { headers: this.reqHeaders });
 		obs.subscribe((BlockData) => {
 			this.dataStore.height = BlockData.height;
 			this._heightUpdated.next(Object.assign({}, this.dataStore).height);
@ -70,8 +76,8 @@ export class FullnodeService{

 	getPrice(currency: string){
 		//var currency = 'usd';
-		const params = this.params.append('currency', currency);
-		let obs = this.http.get<{message: string, price: any}>(this.beUrl+'price', { headers:this.reqHeaders, params: params, observe: 'response'});
+		const params = new HttpParams().append('currency', currency);
+		let obs = this.http.get<{message: string, price: any}>(this.beUrl+'api/price', { headers:this.reqHeaders, params: params, observe: 'response'});
 		obs.subscribe((PriceData) => {
 			if (PriceData.status == 200) {
 				this.dataStore.price = PriceData.body!.price.price;
@ -86,7 +92,7 @@ export class FullnodeService{
 	}

 	getAddr() {
-		let obs = this.http.get<{message: string, addr: string}>(this.beUrl+'getaddr', { headers: this.reqHeaders, params: this.params });
+		let obs = this.http.get<{message: string, addr: string}>(this.beUrl+'api/getaddr', { headers: this.reqHeaders });

 		obs.subscribe((AddrData) => {
 			this.dataStore.addr = AddrData.addr;
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@ -4,11 +4,12 @@ import { FullnodeService } from '../fullnode.service';
 import { Router } from '@angular/router';
 import { UserService } from '../user.service';
 import { CancelComponent } from '../cancel/cancel.component';
-import { Observable } from 'rxjs';
+import { Subscription, Observable } from 'rxjs';

 import {Owner} from '../owner.model';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

@Component({
 	selector: 'app-header',
@ -28,15 +29,25 @@ export class HeaderComponent implements OnInit, OnDestroy {
 		taxValue: 0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration: new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};
+	private session: string | null = '';
 	public heightUpdate: Observable<number>;
 	public ownerUpdate: Observable<Owner>;
 	public uZaddrUpdate: Observable<string>;
@ -88,14 +99,14 @@ export class HeaderComponent implements OnInit, OnDestroy {
 		                      msg1: this.vE.headerLogoutMsg1, 
 		                      msg2: this.vE.headerLogoutMsg2 };

-		//console.log(dialogConfig.data);		                      
+		console.log(dialogConfig.data);		                      

 		const dialogRef = this.dialog.open(CancelComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe(val => {
 			if(val){
 //				console.log('Logout!');
 				this.userService.deleteUser().subscribe(UserResponse => {
-					//console.log('Rerouting');
+					console.log('Rerouting');
 					this.userService.findUser();
 					this.router.navigate(['/login']);
 				});
@ -104,13 +115,13 @@ export class HeaderComponent implements OnInit, OnDestroy {
 	}

 	chgUILanguage(){
-        //console.log('HEADER.chgUILanguage Called ');
- 		this.languageService.getViewElements('header').subscribe({
-			next: response => { 
-					//console.log('Received >> ', response );
-					//console.log('Language Code : ', response.language);
-					//console.log('Component Name : ',response.component);
-					//console.log('Language data : ',response.data);
+        console.log('HEADER.chgUILanguage Called ');
+ 		this.languageService.getViewElements('header').subscribe(
+				response => { 
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

 			        this.vE.headerLastBlock = response.data.header_last_block;
 			        this.vE.headerGetCurrency = response.data.header_get_currency;
@ -119,8 +130,8 @@ export class HeaderComponent implements OnInit, OnDestroy {
 			        this.vE.headerLogoutMsg2 = response.data.header_logout_msg2;

 			    },
-			error: error  => { console.log('Error >> ',error); }
-		});
+				error  => { console.log('Error >> ',error); }
+			);
 	}

 }
--- a/src/app/invoice/invoice.component.html
+++ b/src/app/invoice/invoice.component.html
@ -89,14 +89,14 @@
 				</tr>
 			</table>	
 			<div style="height: 15px;"></div>
-			<div *ngIf="!order.paid" width="100%"
+			<div width="100%"
 					    style="font-size: 14px;
 							   font-weight: 700;
 							   font-style: italic;
 							   text-align: center;">		
 						{{ vE.invoiceScanQrcode }}
 			</div>	
-			<div *ngIf="!order.paid" style="text-align: center;
+			<div style="text-align: center;
 						margin-top: 10px;
 						line-height: 30px;">
 				<div style="font-family: 'Spartan';
@ -172,4 +172,4 @@
 		</mat-card-actions>
 	</div>
 </div>
-</div>
+</div>
--- a/src/app/invoice/invoice.component.ts
+++ b/src/app/invoice/invoice.component.ts
@ -9,6 +9,7 @@ import { faCheck, faHourglass, faArrowUpRightFromSquare } from '@fortawesome/fre
 import { NotifierService } from '../notifier.service';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

 var QRCode = require('easyqrcodejs');
 var URLSafeBase64 = require('urlsafe-base64');
@ -25,12 +26,11 @@ export class InvoiceComponent implements OnInit {
 	faHourglass = faHourglass;
 	faArrowUpRightFromSquare = faArrowUpRightFromSquare;
 	orderId;
-	orderToken: string = '';
 	public orderUpdate: Observable<Order>;
 	public nameUpdate: Observable<string>;
 	name: string = '';
 	error: boolean = false;
-	codeString: string = '';
+	codeString: string = 'Test';
 	invString: string = '';
 	public isWCOrder : boolean = false;
 	zcashUrl: SafeUrl = '';
@ -48,7 +48,6 @@ export class InvoiceComponent implements OnInit {
 		paid: false,
 		externalInvoice: '',
 		shortCode: '',
-		token: '',
 		lines: [
 			{
 				qty: 1,
@ -99,42 +98,39 @@ export class InvoiceComponent implements OnInit {
 		private languageService : LanguageService
 	) {
 		this.orderId = this._ActiveRoute.snapshot.paramMap.get("orderId");
-		this._ActiveRoute.queryParams.subscribe((params) => {
-			this.orderToken = params["token"];
-			receiptService.getOrderById(this.orderId!, this.orderToken!).subscribe(response => {
-				if (response.status == 200){
-					this.error = false;
-					if( response.body!.order.session.substring(0,1) == 'X') {
-						this.invString = response.body!.order.externalInvoice;
-						this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!).concat(" Invoice: ").concat(this.invString)))}`; 
-					} else {
-						this.codeString = `zcash:${response.body!.order.address}?amount=${response.body!.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!)))}`; 
-					}
-					var qrcode = new QRCode(document.getElementById("payment-qr"), {
-						text: this.codeString,
-						logo: "/assets/zcash.png",
-						width: 180,
-						height: 180,
-						logoWidth: 50,
-						logoHeight: 50,
-						correctLevel: QRCode.CorrectLevel.H
-					});
-					this.error = false;
-					this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
-				} else {
-					this.error = true;
-					this.codeString = 'Test';
-				}
-			});
-		});
-		//console.log('constructor - orderId -> ' + this.orderId);
+		console.log('constructor - orderId -> ' + this.orderId);
 		this.orderUpdate = receiptService.orderUpdate;
 		this.nameUpdate = receiptService.nameUpdate;
+		receiptService.getOrderById(this.orderId!).subscribe(response => {
+			if (response.status == 200){
+				this.error = false;
+				if( response.body!.order.session.substring(0,1) == 'X') {
+					this.invString = response.body!.order.externalInvoice;
+					this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!).concat(" Invoice: ").concat(this.invString)))}`; 
+				} else {
+					this.codeString = `zcash:${response.body!.order.address}?amount=${response.body!.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!)))}`; 
+				}
+				var qrcode = new QRCode(document.getElementById("payment-qr"), {
+					text: this.codeString,
+					logo: "/assets/zcash.png",
+					width: 180,
+					height: 180,
+					logoWidth: 50,
+					logoHeight: 50,
+					correctLevel: QRCode.CorrectLevel.H
+				});
+				this.error = false;
+			} else {
+				this.error = true;
+				this.codeString = 'Test';
+			}
+		});
 		this.orderUpdate.subscribe(order => {
 			this.order = order;
 			if ( order.session.substring(0,1) == 'W') {
 				this.isWCOrder = true;
 			}
+			this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
 		});
 		this.nameUpdate.subscribe(name => {
 			this.name = name;
--- a/src/app/items/item-list/item-list.component.html
+++ b/src/app/items/item-list/item-list.component.html
@ -47,7 +47,7 @@
 							</div>
 							<p class="rv_price" 
 							   *ngIf="owner.zats"> 
-							&#x24e9; {{ ((item.cost/zecPrice)*100000000).toString().substring(							0, ((item.cost/zecPrice)*100000000 ).toString().indexOf('.')) }} [{{item.cost | number: '1.02' | currency: getCurrency() }}] 
+							   &#x24e9;{{(item.cost/zecPrice)*100000000 | number: '1.0-0'}}
 							</p>
 						</td>
 					</tr>
--- a/src/app/items/item-list/item-list.component.ts
+++ b/src/app/items/item-list/item-list.component.ts
@ -1,4 +1,4 @@
-import { Input, Component, OnInit } from '@angular/core';
+import { Input, Inject, Component, OnInit } from '@angular/core';
 import { MatDialog, MatDialogConfig} from '@angular/material/dialog';

 import { faCartShopping } from '@fortawesome/free-solid-svg-icons';
@ -17,6 +17,7 @@ import { ItemAddComponent } from '../item-add/item-add.component';
 import { NotifierService } from '../../notifier.service';

 import { LanguageService } from '../../language.service';
+import { LanguageData } from '../../language.model';

@Component({
 	selector: 'app-item-list',
@ -41,14 +42,23 @@ export class ItemListComponent implements OnInit{
 		taxValue: 0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration: new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};

 	public ownerUpdate: Observable<Owner>;
@ -66,7 +76,6 @@ export class ItemListComponent implements OnInit{
    	itemlistNotifClose : '',
    	itemlistNotifSuccess : ''
    }
-
    //
    // ------------------------------------------------------------
 	constructor(
@ -110,7 +119,7 @@ export class ItemListComponent implements OnInit{
 			if(val != null) {
 				var item:Item = {_id: '', name: val.name, description: val.description, cost: val.cost, owner: this.owner.address};
 				this.itemService.addItem(item);
-				//console.log('creando item y llamando a notifier >>>');
+				console.log('creando item y llamando a notifier >>>');
 				this.notifierService
 				    .showNotification(this.vE.itemlistItemAdded ,
 		    	              		  this.vE.itemlistNotifClose,
@ -133,7 +142,7 @@ export class ItemListComponent implements OnInit{
 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;
 		dialogConfig.data = item;
-		//console.log('Entrando a dialogo de edicion')
+		console.log('Entrando a dialogo de edicion')
 		const dialogRef = this.dialog.open(ItemEditComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe((val) => {
 			if (val != null) {
@ -144,8 +153,8 @@ export class ItemListComponent implements OnInit{
 					cost: val.cost,
 					owner: this.owner.address
 				};
-				//console.log('Edit:', editItem);
-				//console.log('itemlistItemUpdated = ' + this.vE.itemlistItemUpdated);
+				console.log('Edit:', editItem);
+				console.log('itemlistItemUpdated = ' + this.vE.itemlistItemUpdated);
 				this.itemService.addItem(editItem).subscribe((response) => {
 					this.itemService.getItems(this.owner.address);
 				});
@ -204,7 +213,7 @@ export class ItemListComponent implements OnInit{
 		const dialogRef = this.dialog.open(ItemAddComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe((val) => {
 			if (val != null) {
-				//console.log('Adding to order', val);
+				console.log('Adding to order', val);
 				this.orderService.addToOrder(val);
 			}
 			this.itemService.getItems(this.owner.address);
@ -216,13 +225,13 @@ export class ItemListComponent implements OnInit{
 	}

 	chgUILanguage(){
-        //console.log('ITEMLIST.chgUILanguage Called ');
- 		this.languageService.getViewElements('itemlist').subscribe({next:
+        console.log('ITEMLIST.chgUILanguage Called ');
+ 		this.languageService.getViewElements('itemlist').subscribe(
 				response => { 
-					//console.log('Received >> ', response );
-					//console.log('Language Code : ', response.language);
-					//console.log('Component Name : ',response.component);
-					//console.log('Language data : ',response.data);
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

 			        this.vE.itemlistListEmpty = response.data.itemlist_list_empty;
 			        this.vE.itemlistAvailItems = response.data.itemlist_avail_items;
@ -232,9 +241,8 @@ export class ItemListComponent implements OnInit{
 			        this.vE.itemlistNotifClose = response.data.itemlist_notif_close;
 			        this.vE.itemlistNotifSuccess = response.data.itemlist_notif_success;
 			    },
-				error: 
 				error  => { console.log('Error >> ',error); }
-		});
+			);
 	}

 }
--- a/src/app/items/items.service.ts
+++ b/src/app/items/items.service.ts
@ -1,6 +1,6 @@
 import { Item } from './item.model';
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Subject, BehaviorSubject, Observable } from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';

 import { ConfigData } from '../configdata';
@ -10,29 +10,27 @@ var Buffer = require('buffer/').Buffer;
@Injectable({providedIn: 'root'})

 export class ItemService{
+//	beUrl = 'https://test.zgo.cash/';

 	beUrl = ConfigData.Be_URL;
 	
+//	console.log(ConfigData.Be_URL);

 	private dataStore: { items: Item[] } = { items: [] } ;
 	private _itemsUpdated: BehaviorSubject<Item[]> = new BehaviorSubject(this.dataStore.items);
 	public readonly itemsUpdated: Observable<Item[]> = this._itemsUpdated.asObservable();
 	private address:string = '';
 	private reqHeaders: HttpHeaders;
-	private session: null|string;
-	private params: HttpParams;

 	constructor(private http: HttpClient){
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		this.session = localStorage.getItem('s4z_token');
-		this.params = new HttpParams().append('session', this.session!);
 	}

 	getItems(addr: string){
 		this.address = addr;
-		const newParams = this.params.append('address', addr);
-		let obs = this.http.get<{message: string, items: any}>(this.beUrl+'api/items', { headers:this.reqHeaders, params: newParams, observe: 'response'});
+		const params = new HttpParams().append('address', addr);
+		let obs = this.http.get<{message: string, items: any}>(this.beUrl+'api/items', { headers:this.reqHeaders, params: params, observe: 'response'});

 		obs.subscribe((ItemDataResponse) => {
 			if (ItemDataResponse.status == 200 ) {
@ -41,6 +39,7 @@ export class ItemService{
 			} else {
 				this.dataStore.items = [];
 				this._itemsUpdated.next(Object.assign({},this.dataStore).items);
+//				console.log('No items found');
 			}
 		});

@ -48,9 +47,11 @@ export class ItemService{
 	}

 	addItem(item: Item) {
-		let obs = this.http.post<{message: string}>(this.beUrl+'api/item', { payload: item }, { headers: this.reqHeaders, params: this.params });
+		//const params = new HttpParams().append('item', JSON.stringify(item));
+		let obs = this.http.post<{message: string}>(this.beUrl+'api/item', { payload: item }, { headers: this.reqHeaders });

-		obs.subscribe(() => {
+		obs.subscribe((ItemResponse) => {
+//			console.log('Item added');
 			this.getItems(this.address);
 		});

@ -58,9 +59,10 @@ export class ItemService{
 	}

 	deleteItem(id: string) {
-		let obs = this.http.delete<{message: string}>(this.beUrl+'api/item/'+id, { headers: this.reqHeaders, params: this.params });
+		let obs = this.http.delete<{message: string}>(this.beUrl+'api/item/'+id, { headers: this.reqHeaders });

-		obs.subscribe(() => {
+		obs.subscribe((ItemResponse) => {
+//			console.log('Item deleted');
 			this.getItems(this.address);
 		});

--- a/src/app/language.service.ts
+++ b/src/app/language.service.ts
@ -19,18 +19,10 @@ export class LanguageService {
 //
 // URL for access MongoDB database from remote server 
  private baseURL = ConfigData.Be_URL + 'api/getlang';
-  private loginURL = ConfigData.Be_URL + 'getloginlang';
-  private mainURL = ConfigData.Be_URL + 'getmainlang';
-  private scanURL = ConfigData.Be_URL + 'getscanlang';
-  private invoiceURL = ConfigData.Be_URL + 'getinvoicelang';
-  private pmtservURL = ConfigData.Be_URL + 'getpmtservicelang';

  public zgoLanguage: string = '';

-  private session: string|null = '';
-
  constructor(private http:HttpClient) { 
-	  this.session = localStorage.getItem('s4z_token');
  }

  getViewElements ( viewName:string )  {
@ -53,25 +45,10 @@ export class LanguageService {
    //
    // Get component's text data from language database
    //
-	const params = new HttpParams().append('session', this.session!);
-	if (viewName === 'login') {
-		return this.http.get<LanguageData>(this.loginURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
-	} else if (viewName === 'main') {
-		return this.http.get<LanguageData>(this.mainURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
-	} else if (viewName === 'scan') {
-		return this.http.get<LanguageData>(this.scanURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
-	} else if (viewName === 'invoice') {
-		return this.http.get<LanguageData>(this.invoiceURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
-	} else if (viewName === 'pmtservice') {
-		return this.http.get<LanguageData>(this.pmtservURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params});
-	} else {
-		return this.http.get<LanguageData>(this.baseURL + 
-										   '/?lang=' + this.zgoLanguage +
-										   '&component=' + viewName
-						,{ headers : reqHeaders
-						  , params: params
-						}
-										  );
-	}
+    return this.http.get<LanguageData>(this.baseURL + 
+                        '/?lang=' + this.zgoLanguage +
+                        '&component=' + viewName
+                        ,{ headers : reqHeaders }
+                      );
  }  
 }
--- a/src/app/listorders/listorders.component.css
+++ b/src/app/listorders/listorders.component.css
@ -129,8 +129,8 @@ img.icon{
 .minibutton {
 	font-family: 'Spartan', sans-serif;
 	font-size: 14px;
-	/*background:  #ff5722;*/
-	/*color: white;*/
+	background:  #ff5722;
+	color: white;
 	height: 24px;
 	line-height: 20px;
 	padding: 10px;
--- a/src/app/listorders/listorders.component.html
+++ b/src/app/listorders/listorders.component.html
@ -8,7 +8,7 @@
 			{{ vE.listordersEndDate }}{{(ownerUpdate | async)!.expiration | date: 'YYYY-MM-dd'}}
 			</td>
 			<td>
-				<button mat-icon-button color="primary" (click)="paySession()">
+				<button mat-icon-button color="primary">
 					<mat-icon class="icon">queue</mat-icon>
 				</button>
 			</td>
@ -162,10 +162,10 @@
 							  padding-right: 20%;
 							  margin-top: 10px;">
 			<span>
-				<button mat-raised-button class="minibutton" color="primary" (click)="invoice(order)">{{ vE.listordersInvoiceBtn }}</button>
+				<button mat-stroked-button class="minibutton" color="primary" (click)="invoice(order)">{{ vE.listordersInvoiceBtn }}</button>
 			</span>
 			<span>
-				<button mat-raised-button class="minibutton" color="primary" (click)="receipt(order)">{{ vE.listordersReceiptBtn }}</button>
+				<button mat-stroked-button class="minibutton" color="primary" (click)="receipt(order)">{{ vE.listordersReceiptBtn }}</button>
 			</span>
 		</div>
 	</mat-expansion-panel>
--- a/src/app/listorders/listorders.component.ts
+++ b/src/app/listorders/listorders.component.ts
@ -4,7 +4,6 @@ import { Order } from '../order/order.model';
 import { FullnodeService } from '../fullnode.service';
 import { UserService } from '../user.service';
 import { Owner } from '../owner.model';
-import { User } from '../user.model';
 import { OrderService } from '../order/order.service';

 import { MatDialog, MatDialogConfig} from '@angular/material/dialog';
@ -20,7 +19,7 @@ import { faHourglass } from '@fortawesome/free-solid-svg-icons';
 import { faTrash } from '@fortawesome/free-solid-svg-icons';

 import { LanguageService } from '../language.service';
-import {SessionpayComponent} from '../sessionpay/sessionpay.component';
+import { LanguageData } from '../language.model';

@Component({
 	selector: 'app-list-orders',
@ -54,21 +53,24 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 			taxValue: 0,
 			vat: false,
 			vatValue: 0,
+			first: '',
+			last: '',
+			email: '',
+			street: '',
+			city: '',
+			state: '',
+			postal: '',
+			phone: '',
 			paid: false,
+			website: '',
+			country: '',
 			zats: false,
 			invoices: false,
 			expiration: new Date(Date.now()).toISOString(),
 			payconf: false,
-			crmToken: '',
 			viewkey: '',
-			tips: false
+			crmToken: ''
 		};
-	zecPrice: number = 1;
-	nodeAddress: string = '';
-	session: string = '';
-	addrUpdate: Observable<string>;
-	priceUpdate: Observable<number>;
-	userUpdate: Observable<User>;
 	// -------------------------------------
 	// -------------------------------------
 	//
@ -95,24 +97,11 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 		private languageService : LanguageService,
 		public orderService: OrderService,
 		public userService: UserService,
-		public fullnodeService: FullnodeService,
 		private dialog: MatDialog)
 	{
 		this.ownerUpdate = userService.ownerUpdate;
-		this.userUpdate = userService.userUpdate;
 		this.orderService.getAllOrders();
 		this.ordersUpdate = orderService.allOrdersUpdate;
-		this.addrUpdate = fullnodeService.addrUpdate;
-		this.priceUpdate = fullnodeService.priceUpdate;
-		this.priceUpdate.subscribe(price => {
-			this.zecPrice = price;
-		});
-		this.addrUpdate.subscribe(nAddress => {
-			this.nodeAddress = nAddress;
-		});
-		this.userUpdate.subscribe(user => {
-			this.session = user.session;
-		});
 	}

 	ngOnInit(){
@ -130,7 +119,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 			var today = new Date();
 			this.orders = orders;
 	
-			//console.log(this.ownerUpdate);
+			console.log(this.ownerUpdate);
 			for (let i=0; i < this.orders.length; i++){
 				this.total += this.orders[i].totalZec;
 			//
@ -174,8 +163,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;
 		dialogConfig.data = {
-			orderId: order._id,
-			orderToken: order.token
+			orderId: order._id
 		};

 		const dialogRef = this.dialog.open(PromptInvoiceComponent, dialogConfig);
@ -196,8 +184,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;
 		dialogConfig.data = {
-			orderId: order._id,
-			orderToken: order.token
+			orderId: order._id
 		};

 		const dialogRef = this.dialog.open(PromptReceiptComponent, dialogConfig);
@ -209,7 +196,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 	openDbExport(){
 		const dialogConfig = new MatDialogConfig();

-		//console.log('openDbExport ---');
+		console.log('openDbExport ---');

 		dialogConfig.disableClose = false;
 		dialogConfig.autoFocus = true;
@ -222,45 +209,32 @@ export class ListOrdersComponent implements OnInit, OnDestroy{

 	}

-	chgUILanguage(){
-		//console.log('LISTORDERS.chgUILanguage Called ');
-		this.languageService.getViewElements('listorders').subscribe({
-			next: response => { 
-				//console.log('Received >> ', response );
-				//console.log('Language Code : ', response.language);
-				//console.log('Component Name : ',response.component);
-				//console.log('Language data : ',response.data);
+  chgUILanguage(){
+    console.log('LISTORDERS.chgUILanguage Called ');
+    this.languageService.getViewElements('listorders').subscribe(
+      response => { 
+	        console.log('Received >> ', response );
+	        console.log('Language Code : ', response.language);
+	        console.log('Component Name : ',response.component);
+	        console.log('Language data : ',response.data);

-				this.vE.listordersBacktoshopBtn = response.data.listorders_backtoshop_btn;
-				this.vE.listordersExportOrders = response.data.listorders_export_orders;
-				this.vE.listordersTodaysTotal = response.data.listorders_todays_total;
-				this.vE.listordersOverallTotal = response.data.listorders_overall_total;
-				this.vE.listordersOrderId = response.data.listorders_order_id;
-				this.vE.listordersOrderTotal = response.data.listorders_order_total;
-				this.vE.listordersItemLbl = response.data.listorders_item_lbl;
-				this.vE.listordersQtyLbl = response.data.listorders_qty_lbl;
-				this.vE.listordersTotalLbl = response.data.listorders_total_lbl;
-				this.vE.listordersInvoiceBtn = response.data.listorders_invoice_btn;
-				this.vE.listordersReceiptBtn = response.data.listorders_receipt_btn;
-				this.vE.listordersNoOrders = response.data.listorders_no_orders;
-				this.vE.listordersEndDate = response.data.listorders_end_date;
+					this.vE.listordersBacktoshopBtn = response.data.listorders_backtoshop_btn;
+					this.vE.listordersExportOrders = response.data.listorders_export_orders;
+					this.vE.listordersTodaysTotal = response.data.listorders_todays_total;
+					this.vE.listordersOverallTotal = response.data.listorders_overall_total;
+					this.vE.listordersOrderId = response.data.listorders_order_id;
+					this.vE.listordersOrderTotal = response.data.listorders_order_total;
+					this.vE.listordersItemLbl = response.data.listorders_item_lbl;
+					this.vE.listordersQtyLbl = response.data.listorders_qty_lbl;
+					this.vE.listordersTotalLbl = response.data.listorders_total_lbl;
+					this.vE.listordersInvoiceBtn = response.data.listorders_invoice_btn;
+					this.vE.listordersReceiptBtn = response.data.listorders_receipt_btn;
+					this.vE.listordersNoOrders = response.data.listorders_no_orders;
+					this.vE.listordersEndDate = response.data.listorders_end_date;

-			},
-			error: error  => { console.log('Error >> ',error); }
-		});
-	}  
+        },
+          error  => { console.log('Error >> ',error); }
+      );
+  }  

-  paySession() {
-	  const dialogConfig = new MatDialogConfig();
-
-	  dialogConfig.disableClose = true;
-	  dialogConfig.autoFocus = true;
-	  dialogConfig.data = {
-		  addr: this.nodeAddress,
-		  session: this.session,
-		  zecPrice: this.zecPrice
-	  };
-
-	  const dialogRef = this.dialog.open(SessionpayComponent, dialogConfig);
-  }
 }
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@ -2,7 +2,7 @@
 	<mat-card class="coolcard">
 		<mat-card-content>
 			<img mat-card-image src="/assets/logo-new-white_01.png" height="120px" />
-			<p class="text">{{ vE.loginLastBlock }}<span class="numbers"> {{ heightUpdate | async }}</span></p>
+			<p class="text">{{ vE.loginLastBlock }}<span class="numbers">{{ heightUpdate | async }}</span></p>
 		</mat-card-content>
 	</mat-card>
 </div>
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@ -1,7 +1,7 @@
-import { Component, OnInit, ChangeDetectorRef, ViewChild, AfterViewInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnInit, OnDestroy, Injectable, ChangeDetectorRef, ViewChild, AfterViewInit } from '@angular/core';
+import { CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot, ActivatedRoute } from '@angular/router';
 import { MatDialog, MatDialogConfig} from '@angular/material/dialog';
-import { UntypedFormBuilder, Validators, UntypedFormGroup } from '@angular/forms';
+import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
 import { ProgressBarMode } from '@angular/material/progress-bar';
 import { MatStepper } from '@angular/material/stepper';
 import { UserService } from '../user.service';
@ -11,9 +11,15 @@ import { Tx } from '../tx.model';
 import { User } from '../user.model';
 import { Owner } from '../owner.model';
 import { Subscription, Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
 import { v4 as uuidv4 } from 'uuid';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';
+
+var QRCode = require('easyqrcodejs');
+var URLSafeBase64 = require('urlsafe-base64');
+var Buffer = require('buffer/').Buffer;

@Component({
 	selector: 'app-login',
@ -43,14 +49,23 @@ export class LoginComponent implements OnInit, AfterViewInit {
 		taxValue:0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration: new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};
 	private FullnodeSub: Subscription = new Subscription();
 	private UserSub: Subscription = new Subscription();
@ -58,7 +73,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
 	public uZaddrUpdate: Observable<string>;
 	public userUpdate: Observable<User>;
 	public ownerUpdate: Observable<Owner>;
-	//public txsUpdate: Observable<Tx[]>;
+	public txsUpdate: Observable<Tx[]>;
 	prompt: boolean = false;
 	confirmedMemo: boolean = false;
 	targetBlock: number = 0;
@ -67,6 +82,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
 	barMessage = 'Scanning blockchain for login memo, please wait.';
 	@ViewChild('stepper') private myStepper?: MatStepper;

+	entryForm: UntypedFormGroup;
 	pinForm: UntypedFormGroup;

    //
@ -96,6 +112,9 @@ export class LoginComponent implements OnInit, AfterViewInit {
 	){

 		//this.fullnodeService.getAddr();
+		this.entryForm = fb.group({
+			selectedSession: [0.001, Validators.required]
+		});
 		this.pinForm = fb.group({
 			pinValue: [null, Validators.required]
 		});
@ -109,10 +128,10 @@ export class LoginComponent implements OnInit, AfterViewInit {
 		this.ownerUpdate.subscribe((owner) => {
 			this.owner = owner;
 		});
-		//this.txsUpdate = userService.txUpdate;
-		//this.txsUpdate.subscribe((txs) => {
-			//this.txs = txs;
-		//});
+		this.txsUpdate = userService.txUpdate;
+		this.txsUpdate.subscribe((txs) => {
+			this.txs = txs;
+		});
 	}

 	ngAfterViewInit(){
@ -139,35 +158,34 @@ export class LoginComponent implements OnInit, AfterViewInit {
        this.chgUILanguage();
 		this.intervalHolder = setInterval(() => {
 			this.fullnodeService.getHeight();
+			//this.userService.findUser();
 			this.loginCheck();
 			this._changeDetectorRef.markForCheck();
 		}, 1000 * 60);
 	}

 	loginCheck(){
-		this.userService.checkUser()!.subscribe({
-			next: (checkResponse) => {
-				if (checkResponse.status == 200) {
-					console.log('checkUser true');
-					if(this.myStepper!.selectedIndex === 0) {
+		this.userService.findUser();
+		this.userUpdate.subscribe((user) => {
+			if (user.blocktime > 0) {
+				if(this.myStepper!.selectedIndex === 0) {
+					this.myStepper!.next();
+					this.myStepper!.next();
+				} else {
+					if(this.myStepper!.selectedIndex === 1){
 						this.myStepper!.next();
-						this.myStepper!.next();
-					} else {
-						if(this.myStepper!.selectedIndex === 1){
-							this.myStepper!.next();
-						}
-					}
-					if(checkResponse.body!.validated) {
-						console.log('redirecting to biz');
-						this.userService.getOwner();
-						this.router.navigate(['/biz']);
-						clearInterval(this.intervalHolder);
-					} else {
-						console.log('validated failed');
 					}
 				}
-			},
-			error: (error) => {console.log(error);}
+				//console.log('Log in found in blockchain!');
+				if (user.validated) {
+					clearInterval(this.intervalHolder);
+					if (this.owner.paid) {
+						this.router.navigate(['/shop']);
+					} else {
+						this.router.navigate(['/biz']);
+					}
+				}
+			}
 		});
 	}

@ -211,13 +229,13 @@ export class LoginComponent implements OnInit, AfterViewInit {
 	}

 	chgUILanguage(){
-        //console.log('LOGIN.chgUILanguage Called ');
+        console.log('LOGIN.chgUILanguage Called ');
 		this.languageService.getViewElements('login').subscribe(
 				response => { 
-					//console.log('Received >> ', response );
-					//console.log('Language Code : ', response.language);
-					//console.log('Component Name : ',response.component);
-					//console.log('Language data : ',response.data);
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

 			        this.vE.loginLastBlock = response.data.login_last_block;
 			        this.vE.loginConnectToZGo = response.data.login_connect_to_zgo;
--- a/src/app/node-resolver.service.ts
+++ b/src/app/node-resolver.service.ts
@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
 import { Observable, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';

@ -9,13 +9,13 @@ import { FullnodeService} from './fullnode.service';
 	providedIn: 'root'
 })

-export class NodeResolverService  {
+export class NodeResolverService implements Resolve<any> {
 	constructor(private fullnode: FullnodeService) {}

 	resolve(route: ActivatedRouteSnapshot): Observable<any> {
-		//console.log('Called getAddr in resolver...', route);
+		console.log('Called getAddr in resolver...', route);
 		return this.fullnode.getAddr().pipe(
-			catchError(() => {
+			catchError(error => {
 				return of('No data');
 			})
 		);
--- a/src/app/order/order.component.ts
+++ b/src/app/order/order.component.ts
@ -47,7 +47,6 @@ export class OrderComponent implements OnInit{
 		paid: false,
 		externalInvoice: '',
 		shortCode: '',
-		token: '',
 		lines: [
 			{
 				qty: 1,
@ -107,7 +106,7 @@ export class OrderComponent implements OnInit{
 		this.orderUpdate.subscribe((order) => {
 			this.order = order;

-			//console.log('this.order > ' + JSON.stringify(this.order));
+			console.log('this.order > ' + JSON.stringify(this.order));
 // ------------------------------------------------
 			this.oLines = [];
 			this.myLines = this.order.lines;
@ -151,7 +150,7 @@ export class OrderComponent implements OnInit{
 		const dialogRef = this.dialog.open(CancelComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe((val) => {
 			if (val) {
-				//console.log('Canceling');
+				console.log('Canceling');
 				this.orderService.cancelOrder(this.order._id!).subscribe((response) => {
 					this.orderService.getOrder();
 				this.notifierService
@ -160,10 +159,9 @@ export class OrderComponent implements OnInit{
 			    	              'success',
 			    	              this.vE.orderNotservSuccess);
 				});
+			} else {
+				console.log('Returning to page');
 			}
-			//else {
-				//console.log('Returning to page');
-			//}
 			this.orderService.getOrder();
 			this.oLines = [];
 		});
@ -214,11 +212,10 @@ export class OrderComponent implements OnInit{
 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;
 		dialogConfig.data = {
-			orderId: this.order._id,
-			orderToken: this.order.token
+			orderId: this.order._id
 		};

-        //console.log ('order_id :  ' + this.order._id);
+        console.log ('order_id :  ' + this.order._id);

 		const dialogRef = this.dialog.open(PromptInvoiceComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe((val) => {
@ -279,13 +276,13 @@ export class OrderComponent implements OnInit{
 	}

 	chgUILanguage(){
-        //console.log('ORDER.chgUILanguage Called ');
- 		this.languageService.getViewElements('order').subscribe({
-			next: response => { 
-					//console.log('Received >> ', response );
-					//console.log('Language Code : ', response.language);
-					//console.log('Component Name : ',response.component);
-					//console.log('Language data : ',response.data);
+        console.log('ORDER.chgUILanguage Called ');
+ 		this.languageService.getViewElements('order').subscribe(
+				response => { 
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

 			        this.vE.orderNoOpenorder = response.data.order_no_openorder;
 			        this.vE.orderCancelOrder = response.data.order_cancel_order;
@ -305,8 +302,8 @@ export class OrderComponent implements OnInit{
 			        this.vE.orderCheckoutBtn = response.data.order_checkout_btn;

 			    },
-			error: error  => { console.log('Error >> ',error); }
-		});
+				error  => { console.log('Error >> ',error); }
+			);
 	}

 }
--- a/src/app/order/order.model.ts
+++ b/src/app/order/order.model.ts
@ -13,6 +13,5 @@ export interface Order {
 	lines: LineItem[],
 	paid: boolean,
 	externalInvoice: string,
-	shortCode: string,
-	token: string
+	shortCode: string
 }
--- a/src/app/order/order.service.ts
+++ b/src/app/order/order.service.ts
@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable }  from 'rxjs';
+import { Subject, BehaviorSubject, Observable }  from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
 import { Order } from './order.model';
 import { UserService } from '../user.service';
@ -35,14 +35,23 @@ export class OrderService {
 			taxValue: 0,
 			vat: false,
 			vatValue: 0,
+			first: '',
+			last: '',
+			email: '',
+			street: '',
+			city: '',
+			state: '',
+			postal: '',
+			phone: '',
 			paid: false,
+			website: '',
+			country: '',
 			zats: false,
 			invoices: false,
 			expiration: new Date(Date.now()).toISOString(),
 			payconf: false,
-			crmToken: '',
 			viewkey: '',
-			tips: false
+			crmToken: ''
 		},
 		order: {
 			address: '',
@ -56,7 +65,6 @@ export class OrderService {
 			paid: false,
 			externalInvoice: '',
 			shortCode: '',
-			token: '',
 			lines: [
 				{
 					qty: 1,
@ -75,8 +83,6 @@ export class OrderService {
 	public userUpdate: Observable<User>;
 	public ownerUpdate: Observable<Owner>;
 	private reqHeaders: HttpHeaders;
-	private reqParams: HttpParams;
-	private session: null|string;

 	constructor(
 		private http: HttpClient,
@ -84,13 +90,12 @@ export class OrderService {
 		public userService: UserService
 	) {
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
-		this.session = localStorage.getItem('s4z_token');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		this.reqParams = new HttpParams().append('session', this.session!);
 		this.userUpdate = userService.userUpdate;
 		this.ownerUpdate = userService.ownerUpdate;
 		this.userUpdate.subscribe((user) => {
 			this.dataStore.user = user;
+			//console.log('OS: const', user);
 			this.getOrder();
 		});
 		this.ownerUpdate.subscribe((owner) => {
@ -99,7 +104,9 @@ export class OrderService {
 	}

 	getOrder() {
-		let obs = this.http.get<{message: string, order: any}>(this.beUrl+'api/order', { headers:this.reqHeaders, params: this.reqParams, observe: 'response'});
+		var session = this.dataStore.user.session;
+		const params = new HttpParams().append('session', session);
+		let obs = this.http.get<{message: string, order: any}>(this.beUrl+'api/order', { headers:this.reqHeaders, params:params, observe: 'response'});

 		obs.subscribe((OrderDataResponse) => {
 			if (OrderDataResponse.status == 200) {
@ -120,7 +127,7 @@ export class OrderService {

 	getAllOrders(){
 		var address = this.dataStore.user.address;
-		const params = this.reqParams.append('address', address);
+		const params = new HttpParams().append('address', address);
 		let obs = this.http.get<{message: string, orders: any}>(this.beUrl+'api/allorders', { headers:this.reqHeaders, params:params, observe: 'response'});
 		obs.subscribe((OrdersData) => {
 			if (OrdersData.status == 200 ){
@ -138,7 +145,7 @@ export class OrderService {
 	addToOrder(lineItem: LineItem) {
 		if(this.dataStore.order._id != null) {
 			this.dataStore.order.lines.push(lineItem);
-			let obs = this.http.post(this.beUrl+'api/order', { payload: this.dataStore.order }, { headers: this.reqHeaders, params: this.reqParams });
+			let obs = this.http.post(this.beUrl+'api/order', { payload: this.dataStore.order }, { headers: this.reqHeaders });
 			obs.subscribe((orderData) => {
 				this.getOrder();
 			});
@ -161,10 +168,9 @@ export class OrderService {
 			paid: false,
 			externalInvoice: '',
 			shortCode: '',
-			token: '',
 			lines: [lineItem]
 		};
-		let obs = this.http.post<{message: string, order: Order}>(this.beUrl+'api/order', {payload: order}, { headers: this.reqHeaders, params: this.reqParams });
+		let obs = this.http.post<{message: string, order: Order}>(this.beUrl+'api/order', {payload: order}, { headers: this.reqHeaders });
 		obs.subscribe((orderData) => {
 			console.log('Created order');
 			this.getOrder()
@ -174,7 +180,7 @@ export class OrderService {
 	}

 	cancelOrder(id: string) {
-		let obs = this.http.delete<{message: string}>(this.beUrl+'api/order/'+id, { headers: this.reqHeaders, params: this.reqParams });
+		let obs = this.http.delete<{message: string}>(this.beUrl+'api/order/'+id, { headers: this.reqHeaders });

 		obs.subscribe((OrderResponse) => {
 			console.log('Order deleted');
@ -191,7 +197,6 @@ export class OrderService {
 				paid: false,
 				externalInvoice: '',
 				shortCode: '',
-				token: '',
 				lines: [
 					{
 						qty: 1,
@ -212,7 +217,7 @@ export class OrderService {
 		});
 		this.dataStore.order.closed = true;
 		this.dataStore.order.paid = paid;
-		let obs = this.http.post(this.beUrl+'api/order', {payload: this.dataStore.order}, { headers: this.reqHeaders, params: this.reqParams });
+		let obs = this.http.post(this.beUrl+'api/order', {payload: this.dataStore.order}, { headers: this.reqHeaders });
 		obs.subscribe((orderData) => {
 			console.log('Closed order', orderData);
 			this.dataStore.order = {
@ -227,7 +232,6 @@ export class OrderService {
 				paid: false,
 				externalInvoice: '',
 				shortCode: '',
-				token: '',
 				lines: [
 					{
 						qty: 1,
--- a/src/app/owner.model.ts
+++ b/src/app/owner.model.ts
@ -7,12 +7,21 @@ export interface Owner {
 	taxValue: number;
 	vat: boolean;
 	vatValue: number;
+	first: string;
+	last: string;
+	email: string;
+	street: string;
+	city: string;
+	state: string;
+	postal: string;
+	phone: string;
 	paid: boolean;
+	website: string;
+	country: string;
 	zats: boolean;
 	invoices: boolean;
 	expiration: string;
 	payconf: boolean;
-	crmToken: string;
 	viewkey: string;
-	tips: boolean;
+	crmToken: string;
 }
--- a/src/app/pmtservice/pmtservice.component.html
+++ b/src/app/pmtservice/pmtservice.component.html
@ -24,11 +24,11 @@
 			 <div style="height: 50px;">
 			</div>	
 			<div style="font-weight: 700;
-			 		fonT-size: 25px;
+			 		font-size: 25px;
 			 		text-align: center;">
 				{{ vE.pmtservicePmtsrvNot }}<br>
 				{{ vE.pmtserviceEnabledFor }}<br>
-				{{ shop }}
+				{{ owner.name}}
 			</div>	
 			 <div style="height: 40px;">
 			</div>	
@ -131,7 +131,7 @@
 		</div>	
 		<div class="invoiceDetail"
 			 *ngIf="reportType==0" 
-			 >
+			 id="invoice">
 			<div class="invoiceHdrTxt1">{{ vE.pmtserviceHdrTxt1 }}</div>
 			<div class="invoiceHdrTxt2">{{ vE.pmtserviceHdrTxt2 }}{{orderId}}</div>
 			<div class="invoiceHdrTxt3">{{ vE.pmtserviceHdrTxt3 }}{{order.timestamp | date}}
@ -206,7 +206,7 @@
 						</td>
 						<td width="25%">		
 							<div style="text-align: right;" 
-								 id="invoice-qr" 
+								 id="payment-qr" 
 								 *ngIf="!order.paid"></div>
 						</td>
 					</tr>
@ -253,4 +253,4 @@


 	</div>
-</div>
+</div>
--- a/src/app/pmtservice/pmtservice.component.ts
+++ b/src/app/pmtservice/pmtservice.component.ts
@ -1,9 +1,11 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute} from "@angular/router";
+import { Router, ActivatedRoute, Params } from "@angular/router";
 import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 import { PmtData } from "./pmtservice.model";
 import { XeroInvoice } from "./xeroinvoice.model";
+import { Owner } from '../owner.model';
+// import { Item } from '../items/item.model'
 import { Order } from '../order/order.model'
 import { ConfigData } from '../configdata';
 import { faCheck, faHourglass } from '@fortawesome/free-solid-svg-icons';
@ -15,304 +17,492 @@ var URLSafeBase64 = require('urlsafe-base64');
 var Buffer = require('buffer/').Buffer;

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

@Component({
-	selector: 'app-pmtservice',
-	templateUrl: './pmtservice.component.html',
-	styleUrls: ['./pmtservice.component.css']
+  selector: 'app-pmtservice',
+  templateUrl: './pmtservice.component.html',
+  styleUrls: ['./pmtservice.component.css']
 })

 export class PmtserviceComponent implements OnInit {

-	faCheck = faCheck;
-	faHourglass = faHourglass;
+  faCheck = faCheck;
+  faHourglass = faHourglass;

-	beUrl = ConfigData.Be_URL;
-	private reqHeaders: HttpHeaders = new HttpHeaders();
+  beUrl = ConfigData.Be_URL;
+  private reqHeaders: HttpHeaders = new HttpHeaders();

-	public shop: string = '';
-	public pmtData : PmtData = {
-		ownerId :'',
-		invoice: '',
-		amount: 0,
-		currency: '',
-		shortcode: ''
-	};
+  public pmtData : PmtData = {
+      ownerId :'',
+      invoice: '',
+      amount: 0,
+      currency: '',
+      shortcode: ''
+  };

-	public invData : XeroInvoice = { 
-		inv_Type : '',
-		inv_Id : '',
-		inv_No : '',
-		inv_Contact : '',
-		inv_Currency : '',
-		inv_CurrencyRate : 0,
-		inv_Status : '',
-		inv_Total : 0,
-		inv_Date : new Date(),
-		inv_shortCode : '',
-		inv_ProcDate : new Date()
-	};
+  public invData : XeroInvoice = { 
+      inv_Type : '',
+      inv_Id : '',
+      inv_No : '',
+      inv_Contact : '',
+      inv_Currency : '',
+      inv_CurrencyRate : 0,
+      inv_Status : '',
+      inv_Total : 0,
+      inv_Date : new Date(),
+      inv_shortCode : '',
+      inv_ProcDate : new Date()
+  };

+  public owner: Owner = {
+         _id: '',
+         address: '',
+         name: '',
+         currency: 'usd',
+         tax: false,
+         taxValue: 0,
+         vat: false,
+         vatValue: 0,
+         first: '',
+         last: '',
+         email: '',
+         street: '',
+         city: '',
+         state: '',
+         postal: '',
+         phone: '',
+         paid: false,
+         website: '',
+         country: '',
+         zats: false,
+         invoices: false,
+         expiration: new Date(Date.now()).toISOString(),
+         payconf: false,
+         viewkey: '',
+		   crmToken: ''
+      }; 

-	public order: Order = {
-		_id : '',
-		address: '',
-		session: '',
-		timestamp: '',
-		closed: false,
-		currency: '',
-		price: 0,
-		total: 0,
-		totalZec: 0,
-		paid: false,
-		externalInvoice: '',
-		shortCode: '',
-		token: '',
-		lines: [
-			{
-				qty: 1,
-				name: '',
-				cost:0
-			}
-		]
-	};
+public order: Order = {
+         _id : '',
+         address: '',
+         session: '',
+         timestamp: '',
+         closed: false,
+         currency: '',
+         price: 0,
+         total: 0,
+         totalZec: 0,
+         paid: false,
+         externalInvoice: '',
+         shortCode: '',
+         lines: [
+            {
+               qty: 1,
+               name: '',
+               cost:0
+            }
+         ]
+      };

-	private invData_raw : string = '';
-	private invData_buff : any = null;
+ private invData_raw : string = '';
+ private invData_buff : any = null;

-	public reportType = 0;
-	public Status = 0;
+ public reportType = 1000;
+ public Status = 0;

-	codeString: string = 'ZGo - The Zcash Register';
-	zcashUrl: SafeUrl = '';
-	zPrice: number = 1.0;
-	name: string = '';
-	error: boolean = false;
-	orderId : string = '';
-	// -------------------------------------
-	// Language Support
-	//
-	vE = {
-		pmtserviceInvalidOwnerid : '',
-		pmtserviceNotservClose : '',
-		pmtserviceNotservError : '',
-		pmtserviceCopyNotavail : '',
-		pmtserviceCopyaddressError : '',
-		pmtserviceCopyamountError : '',
-		pmtserviceCopymemoError : '',
-		pmtservicePaymentNotprocessed : '',
-		pmtservicePmtsrvNot : '',
-		pmtserviceEnabledFor : '',
-		pmtserviceConnectoXero : '',
-		pmtserviceServerFailed : '',
-		pmtserviceInvoiceNum : '',
-		pmtserviceInvoiceNotfound : '',
-		pmtserviceInvoiceInvalid : '',
-		pmtserviceInvoicePaid : '',
-		pmtserviceInvoiceCurrency : '',
-		pmtserviceCurrencyNotsup : '',
-		pmtserviceAmountDoesnot : '',
-		pmtserviceMatchValue : '', 
-		pmtserviceReportedByxero : '',
-		pmtserviceHdrTxt1 : '',
-		pmtserviceHdrTxt2 : '',
-		pmtserviceHdrTxt3 : '',
-		pmtserviceZecdataPrice : '',
-		pmtserviceZecdataTotal : '',
-		pmtserviceInvoiceItem : '',
-		pmtserviceInvoiceQty : '',
-		pmtserviceInvoicePrice : '',
-		pmtserviceInvoiceTotal : '',
-		pmtservicePaymentConfirmed : '',
-		pmtservicePaymentPending : '',
-		pmtserviceScanQrcode : '',
-		pmtserviceCantScan : '',
-		pmtserviceUseThis : '',
-		pmtserviceWalletLink : '',
-		pmtserviceCopyAddress : '',
-		pmtserviceCopyAmount : '',
-		pmtserviceCopyMemo : ''
-	}
-	//
-	constructor(private activatedRoute : ActivatedRoute,
-				private http : HttpClient,
-				private sanitizer: DomSanitizer,
-				private notifierService : NotifierService,
-				private languageService : LanguageService  ){
-		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
-		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		this.activatedRoute.queryParams.subscribe((params) => {
-			this.pmtData.ownerId = params["owner"];
-			this.pmtData.invoice = params["invoiceNo"];
-			this.pmtData.amount = +params["amount"];
-			this.pmtData.currency = params["currency"];
-			this.pmtData.shortcode = params["shortCode"];
-			this.getInvoiceData( this.pmtData );
-		});
-		this.chgUILanguage();
-	}
+ codeString: string = '';
+ zcashUrl: SafeUrl = '';
+ zPrice: number = 1.0;
+ name: string = '';
+ error: boolean = false;
+ orderId : string = '';
+// -------------------------------------
+// Language Support
+//
+vE = {
+   pmtserviceInvalidOwnerid : '',
+   pmtserviceNotservClose : '',
+   pmtserviceNotservError : '',
+   pmtserviceCopyNotavail : '',
+   pmtserviceCopyaddressError : '',
+   pmtserviceCopyamountError : '',
+   pmtserviceCopymemoError : '',
+   pmtservicePaymentNotprocessed : '',
+   pmtservicePmtsrvNot : '',
+   pmtserviceEnabledFor : '',
+   pmtserviceConnectoXero : '',
+   pmtserviceServerFailed : '',
+   pmtserviceInvoiceNum : '',
+   pmtserviceInvoiceNotfound : '',
+   pmtserviceInvoiceInvalid : '',
+   pmtserviceInvoicePaid : '',
+   pmtserviceInvoiceCurrency : '',
+   pmtserviceCurrencyNotsup : '',
+   pmtserviceAmountDoesnot : '',
+   pmtserviceMatchValue : '', 
+   pmtserviceReportedByxero : '',
+   pmtserviceHdrTxt1 : '',
+   pmtserviceHdrTxt2 : '',
+   pmtserviceHdrTxt3 : '',
+   pmtserviceZecdataPrice : '',
+   pmtserviceZecdataTotal : '',
+   pmtserviceInvoiceItem : '',
+   pmtserviceInvoiceQty : '',
+   pmtserviceInvoicePrice : '',
+   pmtserviceInvoiceTotal : '',
+   pmtservicePaymentConfirmed : '',
+   pmtservicePaymentPending : '',
+   pmtserviceScanQrcode : '',
+   pmtserviceCantScan : '',
+   pmtserviceUseThis : '',
+   pmtserviceWalletLink : '',
+   pmtserviceCopyAddress : '',
+   pmtserviceCopyAmount : '',
+   pmtserviceCopyMemo : ''
+}
+//
+  constructor(private activatedRoute : ActivatedRoute,
+              private http : HttpClient,
+              private sanitizer: DomSanitizer,
+              private notifierService : NotifierService,
+              private languageService : LanguageService  ) {}

-	ngOnInit() {
-	}
+  ngOnInit() {
+   var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
+   this.reqHeaders = new HttpHeaders().set('Authorization', auth);
+   this.activatedRoute.queryParams.subscribe((params) => {
+      this.pmtData.ownerId = params["owner"];
+      this.pmtData.invoice = params["invoiceNo"];
+      this.pmtData.amount = params["amount"];
+      this.pmtData.currency = params["currency"];
+      this.pmtData.shortcode = params["shortCode"];
+      this.getInvoiceData( this.pmtData );
+    });
+   this.chgUILanguage();
+  }

-	getInvoiceData( reqData : PmtData ) { 
-		//this.getXeroInvoiceData( reqData );
-		let obs = this.http.post<{reportType: number, order: Order, shop: string}>
-		(this.beUrl+'invdata', 
-		 {payload: reqData},
-		 {headers: this.reqHeaders, observe: 'response' }
-		);
-		obs.subscribe((invoiceData) => {
-			if(invoiceData.status == 201) {
-				this.reportType = invoiceData.body!.reportType;
-				this.order = invoiceData.body!.order;
-				this.shop = invoiceData.body!.shop;
-				this.orderId = String(this.order._id);
+  getInvoiceData( reqData : PmtData ) { 
+    
+    // 
+    // Verify owner id ( Status = 1 if not exists )
+    //                 ( Status = 2 if service not available for user )
+    //
+//    console.log('getOwner -> '+ reqData.ownerId);
+//    console.log('received amount -> ' + reqData.amount);
+    const ownParams = new HttpParams().append('id', reqData.ownerId);
+    let obs = this.http.get<{message:string, owner: any}>
+                            ( this.beUrl+'api/ownerid', 
+                            { headers: this.reqHeaders,
+                              params: ownParams, 
+                              observe: 'response'});
+    obs.subscribe((OwnerDataResponse) => {
+         //console.log('api/getowner', OwnerDataResponse.status);
+         if (OwnerDataResponse.status == 200) {
+            this.owner = OwnerDataResponse.body!.owner;
+            console.log('Owner => ' + this.owner.name );
+//
+// ==> remove "== false" for production enviroment
+// 
+            if ( this.owner.invoices ) {
+               // process data
+               console.log("Owner check passed!!!");
+               this.getXeroInvoiceData( reqData );
+            } else {
+               console.log("Owner check failed!!!") 
+               this.reportType = 2;
+            };
+         } else {
+            if ( OwnerDataResponse.status == 204 ) {
+               console.log('Res.Status = ' + OwnerDataResponse.status)
+               console.log('Owner id not found!!!');
+               this.reportType = 1;
+            }
+         }});
+  }

-				//         console.log('Generating QRCode....')
+  getXeroInvoiceData( reqData : PmtData  )  { 

-				this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId).concat(' Invoice: ').concat(this.order.externalInvoice)))}`; 
+/*
+    // Call test Xero API 
+    let url : string = "http://localhost:3000/xero/" + reqData.invoice;
+    this.http
+         .get<any>(url)
+*/
+   console.log('>> find current zcash price');
+   this.getPrice(this.owner.currency);

-				var qrcode = new QRCode(document.getElementById("invoice-qr"), {
-					text: this.codeString,
-					logo: "/assets/zcash.png",
-					width: 180,
-					height: 180,
-					logoWidth: 50,
-					logoHeight: 50,
-					correctLevel: QRCode.CorrectLevel.H
-				});
+    console.log('get Invoice -> ' + reqData.invoice);
+    let invParams = new HttpParams();
+    invParams = invParams.append('address', this.owner.address);
+    invParams = invParams.append('inv', reqData.invoice);
+    let inv = this.http.get<{message:string, invData: any}>
+                            ( this.beUrl+'api/invdata', 
+                            { headers: this.reqHeaders,
+                              params: invParams, 
+                              observe: 'response'});
+    inv.subscribe( invDataResponse => {
+//                  console.log('Response from ZGo-Xero');
+//                  console.log(invDataResponse.status);
+                  this.invData_buff = invDataResponse.body;
+                  this.invData.inv_Type = this.invData_buff.invdata.inv_Type;
+                  this.invData.inv_Id = this.invData_buff.invdata.inv_Id;
+                  this.invData.inv_No = this.invData_buff.invdata.inv_No;
+                  this.invData.inv_Contact = this.invData_buff.invdata.inv_Contact;
+                  this.invData.inv_Currency = this.invData_buff.invdata.inv_Currency;
+                  this.invData.inv_CurrencyRate = this.invData_buff.invdata.inv_CurrencyRate;
+                  this.invData.inv_Total = this.invData_buff.invdata.inv_Total;
+                  this.invData.inv_Status = this.invData_buff.invdata.inv_Status;
+                  this.invData.inv_Date = this.invData_buff.invdata.inv_Date;
+                  this.invData.inv_shortCode = reqData.shortcode;
+ /*              
+                  console.log('>>> inv_Type -> ' + this.invData.inv_Type);
+                  console.log('>>> inv_Id -> ' + this.invData.inv_Id);
+                  console.log('>>> inv_No -> ' + this.invData.inv_No);
+                  console.log('>>> inv_Contact -> ' + this.invData.inv_Contact);
+                  console.log('>>> inv_Currency-> ' + this.invData.inv_Currency);
+                  console.log('>>> inv_CurrencyRate -> ' + this.invData.inv_CurrencyRate);
+                  console.log('>>> inv_Total -> ' + this.invData.inv_Total);
+                  console.log('>>> inv_Status-> ' + this.invData.inv_Status);
+                  console.log('>>> inv_Date -> ' + this.invData.inv_Date);
+*/
+                  if ( this.invData.inv_Type == 'ACCREC' ) {
+                     console.log('Invoice type is correct!!');
+                     // Test if invoice is not already paid
+                     if ( this.invData.inv_Status == 'AUTHORISED') {
+                           console.log('invoice is payable');
+                        // Test if Invoice's currency is supported
+                        if ( this.invData.inv_Currency == reqData.currency ) {
+                           console.log('Invoice currency supported');
+                           // Test if requested amount is as reported by Xero
+                           if ( this.invData.inv_Total == reqData.amount ) {
+                              console.log('Invoice amount Ok - create Order');
+     // =====> Create order here
+                              this.createOrder();
+   //
+                           } else {
+                              console.log('Invoice amount does not match')
+                              this.reportType = 8;
+                           }
+                        } else {
+                           console.log('Invoice currency not supported');
+                           this.reportType = 7;
+                        }
+                     } else {
+                        console.log('Invoice already paid');
+                        this.reportType = 6; 
+                     }
+                  } else {
+                     console.log('Invoice type is invalid' );
+                     this.reportType = 5;
+                  }
+               }, 
+       error => {
+                  console.log("Error while getting invData!!!");
+                  console.log(error);
+                  console.log(error.status);
+                  if ( error.status == 500 ) {
+                     // Assume that invoice was not found by haskell server
+                     this.reportType = 4;
+                  }

-				this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
-			} else {
-				this.reportType = invoiceData.body!.reportType;
-				console.log('reportType ' + invoiceData.body!.reportType + ' code ' + invoiceData.status);
-			}
-		});
-	}
+               });
+  }

-	getIconStyle(order : Order) {
-		if( order.paid )
-			return "font-size: 14px; color: #72cc50; margin-bottom: -2px;";
-		return "color: #FB4F14; margin-bottom: -2px; cursor: pointer;";
+  createOrder() {
+      this.reportType = 0;
+//      console.log('Starting order generation');
+//      console.log('>> find current zcash price');

-	}
+      this.order = {
+         _id: '',
+         address: this.owner.address,
+         session: 'Xero-' + this.owner._id,
+         currency: this.owner.currency,
+         timestamp: new Date(Date.now()).toISOString(),
+         closed: true,
+         totalZec: this.invData.inv_Total/this.zPrice,
+         price: this.zPrice,
+         total: this.invData.inv_Total,
+         paid: false,
+         externalInvoice: this.invData.inv_No,
+         shortCode: this.invData.inv_shortCode,
+         lines: [{qty: 1,
+                  name: 'Invoice from ' + this.owner.name + '[' + this.invData.inv_No + ']',
+                  cost: this.invData.inv_Total}]
+      };
+ 
+      let obs = this.http.post<{message: string, order: Order}>
+                (this.beUrl+'api/orderx', 
+                 {payload: this.order},
+                 { headers: this.reqHeaders }
+                );
+      obs.subscribe((orderData) => {
+//         console.log('Order created');

-	copyAddress() {
-		if (!navigator.clipboard) {
-			//       alert("Copy functionality not supported");
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopyNotavail,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-		}
-		try {
-			navigator.clipboard.writeText(this.order.address);
-		} catch (err) {
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopyaddressError,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-							  //       console.error("Error", err);
-		}
-	}
+//         console.log(orderData.order);
+         this.order = orderData.order
+         console.log('>> order -> ' + JSON.stringify(this.order));
+         this.orderId = String(this.order._id);

-	copyAmount() {
-		if (!navigator.clipboard) {
-			//       alert("Copy functionality not supported");
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopyNotavail,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-		}
-		try {
-			navigator.clipboard.writeText(this.order.totalZec.toString());
-		} catch (err) {
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopyamountError,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-							  //       console.error("Error", err);
-		}
-	}
+//         console.log('Generating QRCode....')

-	copyMemo() {
-		if (!navigator.clipboard) {
-			//       alert("Copy functionality not supported");
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopyNotavail,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-		}
-		try {
-			navigator.clipboard.writeText("ZGo Order::" + this.orderId + " Invoice: " + this.order.externalInvoice);
-		} catch (err) {
-			this.notifierService
-			.showNotification(this.vE.pmtserviceCopymemoError,
-							  this.vE.pmtserviceNotservClose,
-							  "error",
-							  this.vE.pmtserviceNotservError);
-							  //       console.error("Error", err);
-		}
-	}
+         this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId).concat(' Invoice: ').concat(orderData.order.externalInvoice)))}`; 

-	chgUILanguage(){
-		console.log('PMTSERVICE.chgUILanguage Called ');
-		this.languageService.getViewElements('pmtservice').subscribe(
-			response => { 
-				console.log('Received >> ', response );
-				console.log('Language Code : ', response.language);
-				console.log('Component Name : ',response.component);
-				console.log('Language data : ',response.data);
+         var qrcode = new QRCode(document.getElementById("payment-qr"), {
+           text: this.codeString,
+               logo: "/assets/zcash.png",
+               width: 180,
+               height: 180,
+               logoWidth: 50,
+               logoHeight: 50,
+           correctLevel: QRCode.CorrectLevel.H
+         });

-				this.vE.pmtserviceInvalidOwnerid = response.data.pmtservice_invalid_ownerid;
-				this.vE.pmtserviceNotservClose = response.data.pmtservice_notserv_close;
-				this.vE.pmtserviceNotservError = response.data.pmtservice_notserv_error;
-				this.vE.pmtserviceCopyNotavail = response.data.pmtservice_copy_notavail;
-				this.vE.pmtserviceCopyaddressError = response.data.pmtservice_copyaddress_error;
-				this.vE.pmtserviceCopyamountError = response.data.pmtservice_copyamount_error;
-				this.vE.pmtserviceCopymemoError = response.data.pmtservice_copymemo_error;
-				this.vE.pmtservicePaymentNotprocessed = response.data.pmtservice_payment_notprocessed;
-				this.vE.pmtservicePmtsrvNot = response.data.pmtservice_pmtsrv_not;
-				this.vE.pmtserviceEnabledFor = response.data.pmtservice_enabled_for;
-				this.vE.pmtserviceConnectoXero = response.data.pmtservice_connecto_xero;
-				this.vE.pmtserviceServerFailed = response.data.pmtservice_server_failed;
-				this.vE.pmtserviceInvoiceNum = response.data.pmtservice_invoice_num;
-				this.vE.pmtserviceInvoiceNotfound = response.data.pmtservice_invoice_notfound;
-				this.vE.pmtserviceInvoiceInvalid = response.data.pmtservice_invoice_invalid;
-				this.vE.pmtserviceInvoicePaid = response.data.pmtservice_invoice_paid;
-				this.vE.pmtserviceInvoiceCurrency = response.data.pmtservice_invoice_currency; 
-				this.vE.pmtserviceCurrencyNotsup = response.data.pmtservice_currensy_notsup; 
-				this.vE.pmtserviceAmountDoesnot = response.data.pmtservice_amount_doesnot;
-				this.vE.pmtserviceMatchValue = response.data.pmtservice_match_value;
-				this.vE.pmtserviceReportedByxero = response.data.pmtservice_reported_byxero;
-				this.vE.pmtserviceHdrTxt1 = response.data.pmtservice_hdr_txt1;
-				this.vE.pmtserviceHdrTxt2 = response.data.pmtservice_hdr_txt2;
-				this.vE.pmtserviceHdrTxt3 = response.data.pmtservice_hdr_txt3;
-				this.vE.pmtserviceZecdataPrice = response.data.pmtservice_zecdata_price;
-				this.vE.pmtserviceZecdataTotal = response.data.pmtservice_zecdata_total;
-				this.vE.pmtserviceInvoiceItem = response.data.pmtservice_invoice_item;
-				this.vE.pmtserviceInvoiceQty = response.data.pmtservice_invoice_qty;
-				this.vE.pmtserviceInvoicePrice = response.data.pmtservice_invoice_price;
-				this.vE.pmtserviceInvoiceTotal = response.data.pmtservice_invoice_total;
-				this.vE.pmtservicePaymentConfirmed = response.data.pmtservice_payment_confirmed;
-				this.vE.pmtservicePaymentPending = response.data.pmtservice_payment_pending;
-				this.vE.pmtserviceScanQrcode = response.data.pmtservice_scan_qrcode;
-				this.vE.pmtserviceCantScan = response.data.pmtservice_cant_scan;
-				this.vE.pmtserviceUseThis = response.data.pmtservice_use_this;
-				this.vE.pmtserviceWalletLink = response.data.pmtservice_wallet_link;
-				this.vE.pmtserviceCopyAddress = response.data.pmtservice_copy_address;
-				this.vE.pmtserviceCopyAmount = response.data.pmtservice_copy_amount;
-				this.vE.pmtserviceCopyMemo = response.data.pmtservice_copy_memo;
+         this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
+      }, error => {
+         console.log(error.message);
+      
+      });
+   }

-			},
-			error  => { console.log('Error >> ',error); }
-		);
-	}  
+   getIconStyle(order : Order) {
+      if( order.paid )
+        return "font-size: 14px; color: #72cc50; margin-bottom: -2px;";
+      return "color: #FB4F14; margin-bottom: -2px; cursor: pointer;";
+
+   }
+
+   getPrice(currency: string){
+      //var currency = 'usd';
+      const params = new HttpParams().append('currency', currency);
+      let obs = this.http.get<{message: string, price: any}>(this.beUrl+'api/price', { headers:this.reqHeaders, params: params, observe: 'response'});
+      obs.subscribe((PriceData) => {
+         if (PriceData.status == 200) {
+            this.zPrice = PriceData.body!.price.price;
+            console.log("price", this.zPrice);
+         } else {
+            console.log('No price found for currency', currency);
+            this.zPrice = 1.0;
+         }
+      });
+     return obs;
+   }
+
+   copyAddress() {
+      if (!navigator.clipboard) {
+//       alert("Copy functionality not supported");
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopyNotavail,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+      }
+      try {
+         navigator.clipboard.writeText(this.order.address);
+      } catch (err) {
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopyaddressError,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+//       console.error("Error", err);
+      }
+   }
+   copyAmount() {
+      if (!navigator.clipboard) {
+//       alert("Copy functionality not supported");
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopyNotavail,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+      }
+      try {
+         navigator.clipboard.writeText(this.order.totalZec.toString());
+      } catch (err) {
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopyamountError,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+//       console.error("Error", err);
+      }
+   }
+
+   copyMemo() {
+      if (!navigator.clipboard) {
+//       alert("Copy functionality not supported");
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopyNotavail,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+      }
+      try {
+         navigator.clipboard.writeText("ZGo Order::" + this.orderId + " Invoice: " + this.order.externalInvoice);
+      } catch (err) {
+         this.notifierService
+             .showNotification(this.vE.pmtserviceCopymemoError,
+               this.vE.pmtserviceNotservClose,
+               "error",
+               this.vE.pmtserviceNotservError);
+//       console.error("Error", err);
+      }
+   }
+
+   chgUILanguage(){
+      console.log('PMTSERVICE.chgUILanguage Called ');
+      this.languageService.getViewElements('pmtservice').subscribe(
+         response => { 
+               console.log('Received >> ', response );
+               console.log('Language Code : ', response.language);
+               console.log('Component Name : ',response.component);
+               console.log('Language data : ',response.data);
+
+               this.vE.pmtserviceInvalidOwnerid = response.data.pmtservice_invalid_ownerid;
+               this.vE.pmtserviceNotservClose = response.data.pmtservice_notserv_close;
+               this.vE.pmtserviceNotservError = response.data.pmtservice_notserv_error;
+               this.vE.pmtserviceCopyNotavail = response.data.pmtservice_copy_notavail;
+               this.vE.pmtserviceCopyaddressError = response.data.pmtservice_copyaddress_error;
+               this.vE.pmtserviceCopyamountError = response.data.pmtservice_copyamount_error;
+               this.vE.pmtserviceCopymemoError = response.data.pmtservice_copymemo_error;
+               this.vE.pmtservicePaymentNotprocessed = response.data.pmtservice_payment_notprocessed;
+               this.vE.pmtservicePmtsrvNot = response.data.pmtservice_pmtsrv_not;
+               this.vE.pmtserviceEnabledFor = response.data.pmtservice_enabled_for;
+               this.vE.pmtserviceConnectoXero = response.data.pmtservice_connecto_xero;
+               this.vE.pmtserviceServerFailed = response.data.pmtservice_server_failed;
+               this.vE.pmtserviceInvoiceNum = response.data.pmtservice_invoice_num;
+               this.vE.pmtserviceInvoiceNotfound = response.data.pmtservice_invoice_notfound;
+               this.vE.pmtserviceInvoiceInvalid = response.data.pmtservice_invoice_invalid;
+               this.vE.pmtserviceInvoicePaid = response.data.pmtservice_invoice_paid;
+               this.vE.pmtserviceInvoiceCurrency = response.data.pmtservice_invoice_currency; 
+               this.vE.pmtserviceCurrencyNotsup = response.data.pmtservice_currensy_notsup; 
+               this.vE.pmtserviceAmountDoesnot = response.data.pmtservice_amount_doesnot;
+               this.vE.pmtserviceMatchValue = response.data.pmtservice_match_value;
+               this.vE.pmtserviceReportedByxero = response.data.pmtservice_reported_byxero;
+               this.vE.pmtserviceHdrTxt1 = response.data.pmtservice_hdr_txt1;
+               this.vE.pmtserviceHdrTxt2 = response.data.pmtservice_hdr_txt2;
+               this.vE.pmtserviceHdrTxt3 = response.data.pmtservice_hdr_txt3;
+               this.vE.pmtserviceZecdataPrice = response.data.pmtservice_zecdata_price;
+               this.vE.pmtserviceZecdataTotal = response.data.pmtservice_zecdata_total;
+               this.vE.pmtserviceInvoiceItem = response.data.pmtservice_invoice_item;
+               this.vE.pmtserviceInvoiceQty = response.data.pmtservice_invoice_qty;
+               this.vE.pmtserviceInvoicePrice = response.data.pmtservice_invoice_price;
+               this.vE.pmtserviceInvoiceTotal = response.data.pmtservice_invoice_total;
+               this.vE.pmtservicePaymentConfirmed = response.data.pmtservice_payment_confirmed;
+               this.vE.pmtservicePaymentPending = response.data.pmtservice_payment_pending;
+               this.vE.pmtserviceScanQrcode = response.data.pmtservice_scan_qrcode;
+               this.vE.pmtserviceCantScan = response.data.pmtservice_cant_scan;
+               this.vE.pmtserviceUseThis = response.data.pmtservice_use_this;
+               this.vE.pmtserviceWalletLink = response.data.pmtservice_wallet_link;
+               this.vE.pmtserviceCopyAddress = response.data.pmtservice_copy_address;
+               this.vE.pmtserviceCopyAmount = response.data.pmtservice_copy_amount;
+               this.vE.pmtserviceCopyMemo = response.data.pmtservice_copy_memo;
+ 
+           },
+               error  => { console.log('Error >> ',error); }
+         );
+   }  

 }
--- a/src/app/prompt-invoice/prompt-invoice.component.html
+++ b/src/app/prompt-invoice/prompt-invoice.component.html
@ -20,13 +20,13 @@
 			    style="text-align: left;" 
 			    width="94%">
 			    <div>
-					<textarea matInput readonly
+					<textarea
 					    style="border: none;
 					    	   outline: none;
 					    	   width: 95%;"
 				        cdkTextareaAutosize
 				        cdkAutosizeMinRows="1"
-				        cdkAutosizeMaxRows="5">{{ invoiceUrl }}
+				        cdkAutosizeMaxRows="4">{{ invoiceUrl }}
 					</textarea>
 				</div>

--- a/src/app/prompt-invoice/prompt-invoice.component.ts
+++ b/src/app/prompt-invoice/prompt-invoice.component.ts
@ -18,7 +18,6 @@ var Buffer = require('buffer/').Buffer;

 export class PromptInvoiceComponent implements OnInit {
 	orderId: string;
-	orderToken: string = '';
 	invoiceUrl: string;
 	// ------------------------------------
 	//
@ -42,11 +41,10 @@ export class PromptInvoiceComponent implements OnInit {
 	constructor(
 		  private languageService : LanguageService,
 			private dialogRef: MatDialogRef<PromptInvoiceComponent>,
-			@Inject(MAT_DIALOG_DATA) public data: {orderId: string, orderToken: string},
+			@Inject(MAT_DIALOG_DATA) public data: {orderId: string},
 			private notifierService : NotifierService ) {
 		this.orderId = data.orderId;
-		this.orderToken = data.orderToken;
-		this.invoiceUrl = 'https://app.zgo.cash/invoice/'+this.orderId + '?token=' + this.orderToken;
+		this.invoiceUrl = 'https://app.zgo.cash/invoice/'+this.orderId;
 	}

 	ngOnInit(): void {
--- a/src/app/prompt-receipt/prompt-receipt.component.html
+++ b/src/app/prompt-receipt/prompt-receipt.component.html
@ -21,13 +21,13 @@
 			    style="text-align: left;" 
 			    width="94%">
 			    <div>
-					<textarea matInput readonly
+					<textarea
 					    style="border: none;
 					    	   outline: none;
 					    	   width: 95%;"
 				        cdkTextareaAutosize
 				        cdkAutosizeMinRows="1"
-				        cdkAutosizeMaxRows="5">{{ receiptUrl }}
+				        cdkAutosizeMaxRows="4">{{ receiptUrl }}
 					</textarea>
 				</div>

--- a/src/app/prompt-receipt/prompt-receipt.component.ts
+++ b/src/app/prompt-receipt/prompt-receipt.component.ts
@ -19,7 +19,6 @@ var Buffer = require('buffer/').Buffer;

 export class PromptReceiptComponent implements OnInit {
 	orderId: string;
-	orderToken: string;
 	receiptUrl: string;
 
 	// ------------------------------------
@ -44,11 +43,10 @@ export class PromptReceiptComponent implements OnInit {
 	constructor(
 		  private languageService : LanguageService,
 			private dialogRef: MatDialogRef<PromptReceiptComponent>,
-			@Inject(MAT_DIALOG_DATA) public data: {orderId: string, orderToken: string},
+			@Inject(MAT_DIALOG_DATA) public data: {orderId: string},
 			private notifierService : NotifierService ) {
 		this.orderId = data.orderId;
-		this.orderToken = data.orderToken;
-		this.receiptUrl = 'https://app.zgo.cash/receipt/' + this.orderId + '?token=' + this.orderToken;
+		this.receiptUrl = 'https://app.zgo.cash/receipt/'+this.orderId;

 	}

--- a/src/app/receipt.service.ts
+++ b/src/app/receipt.service.ts
@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable }  from 'rxjs';
+import { Subject, BehaviorSubject, Observable }  from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
 import { Order } from './order/order.model';
 import { Owner } from './owner.model';
@ -14,8 +14,7 @@ var Buffer = require('buffer/').Buffer;
 })
 export class ReceiptService {
 	beUrl = ConfigData.Be_URL;
-	private dataStore: {order: Order, owner: Owner, name: string } = {
-		name: '',
+	private dataStore: {order: Order, owner: Owner } = {
 		owner: {
 			_id: '',
 			name: '',
@ -25,14 +24,23 @@ export class ReceiptService {
 			taxValue: 0,
 			vat: false,
 			vatValue: 0,
+			first: '',
+			last: '',
+			email: '',
+			street: '',
+			city: '',
+			state: '',
+			postal: '',
+			phone: '',
 			paid: false,
+			website: '',
+			country: '',
 			zats: false,
 			invoices: false,
 			expiration: new Date(Date.now()).toISOString(),
 			payconf: false,
-			crmToken: '',
 			viewkey: '',
-			tips: false
+			crmToken: ''
 		},
 		order: {
 			address: '',
@ -46,7 +54,6 @@ export class ReceiptService {
 			paid: false,
 			externalInvoice: '',
 			shortCode: '',
-			token: '',
 			lines: [
 				{
 					qty: 1,
@ -60,30 +67,31 @@ export class ReceiptService {
 	public readonly orderUpdate: Observable<Order> = this._orderUpdated.asObservable();
 	public _nameUpdated: BehaviorSubject<string> = new BehaviorSubject(this.dataStore.owner.name);
 	public readonly nameUpdate: Observable<string>= this._nameUpdated.asObservable();
-	//public readonly ownerUpdate;
+	public readonly ownerUpdate;
 	private reqHeaders: HttpHeaders;
-	private params: HttpParams;

-	constructor(
+  constructor(
 		private http: HttpClient,
 		public userService: UserService
-	) {
-		//this.session = localStorage.getItem('s4z_token');
-		this.params = new HttpParams();
+  ) {
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		//this.ownerUpdate = userService.ownerUpdate;
-	}
+		this.ownerUpdate = userService.ownerUpdate;
+  }

-	getOrderById(id:string, token: string) {
-		let obs = this.http.get<{message: string, order: any, shop: string}>(this.beUrl+'order/'+id, { headers:this.reqHeaders, params: this.params.append("token", token), observe: 'response'});
+	getOrderById(id:string) {
+		//const params = new HttpParams().append('id', id);
+		let obs = this.http.get<{message: string, order: any}>(this.beUrl+'api/order/'+id, { headers:this.reqHeaders, observe: 'response'});

 		obs.subscribe((OrderDataResponse) => {
 			if (OrderDataResponse.status == 200) {
 				this.dataStore.order = OrderDataResponse.body!.order;
-				this.dataStore.name = OrderDataResponse.body!.shop;
 				this._orderUpdated.next(Object.assign({}, this.dataStore).order);
-				this._nameUpdated.next(Object.assign({}, this.dataStore).name);
+				this.userService.getOwner(this.dataStore.order.address);
+				this.ownerUpdate.subscribe((owner) => {
+					this.dataStore.owner = owner;
+					this._nameUpdated.next(Object.assign({}, this.dataStore).owner.name);
+				});
 			} else {
 				this._orderUpdated.next(Object.assign({}, this.dataStore).order);
 				console.log('No order found');
--- a/src/app/receipt/receipt.component.ts
+++ b/src/app/receipt/receipt.component.ts
@ -14,7 +14,6 @@ import { LanguageData } from '../language.model';
 })
 export class ReceiptComponent implements OnInit {
 	orderId;
-	orderToken: string = '';
 	public orderUpdate: Observable<Order>;
 	public nameUpdate: Observable<string>;
 	name: string = '';
@ -31,7 +30,6 @@ export class ReceiptComponent implements OnInit {
 			paid: false,
 			externalInvoice: '',
 			shortCode: '',
-			token: '',
 			lines: [
 				{
 					qty: 1,
@ -62,15 +60,12 @@ export class ReceiptComponent implements OnInit {
 	  public receiptService: ReceiptService
  ) {
 	  this.orderId = this._ActiveRoute.snapshot.paramMap.get("orderId");
-	  this._ActiveRoute.queryParams.subscribe((params) => {
-		  this.orderToken = params["token"];
-		  receiptService.getOrderById(this.orderId!, this.orderToken!);
-	  });
 	  this.orderUpdate = receiptService.orderUpdate;
+	  this.nameUpdate = receiptService.nameUpdate;
+	  receiptService.getOrderById(this.orderId!);
 	  this.orderUpdate.subscribe(order => {
 		  this.order = order;
 	  });
-	  this.nameUpdate = receiptService.nameUpdate;

 	  this.nameUpdate.subscribe(name => {
 		  this.name = name;
--- a/src/app/scan/scan.component.ts
+++ b/src/app/scan/scan.component.ts
@ -5,6 +5,7 @@ import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 import { NotifierService } from '../notifier.service';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

 var QRCode = require('easyqrcodejs');
 var URLSafeBase64 = require('urlsafe-base64');
@ -147,14 +148,13 @@ export class ScanComponent implements OnInit{
 	}

 	chgUILanguage(){
-	  //console.log('SCAN.chgUILanguage Called ');
-	  this.languageService.getViewElements('scan').subscribe({
-		  next: 
+	  console.log('SCAN.chgUILanguage Called ');
+	  this.languageService.getViewElements('scan').subscribe(
 	    	response => { 
-				//console.log('Received >> ', response );
-				//console.log('Language Code : ', response.language);
-				//console.log('Component Name : ',response.component);
-				//console.log('Language data : ',response.data);
+		        console.log('Received >> ', response );
+		        console.log('Language Code : ', response.language);
+		        console.log('Component Name : ',response.component);
+		        console.log('Language data : ',response.data);

 				this.vE.scanScanqrCode = response.data.scan_scanqr_code;
 				this.vE.scanTextInfo = response.data.scan_text_info;
@ -172,8 +172,8 @@ export class ScanComponent implements OnInit{
 				this.vE.scanOrButton = response.data.scan_or_button;

 	      	},
-	       error: error  => { console.log('Error >> ',error); }
-	  });
+	        	error  => { console.log('Error >> ',error); }
+	    );
 	}  

 }
--- a/src/app/sessionpay/sessionpay.component.css
+++ b/src/app/sessionpay/sessionpay.component.css
@ -1,20 +0,0 @@
-
-* {
-	font-family: 'Spartan', sans-serif;
-}
-
-.settings-title {
-	font-family: 'Spartan', sans-serif;
-	background: #ff5722;
-	color: white;
-	font-size: 30px;
-	text-align: center;
-	padding: 5px;
-	margin-bottom: 10px;
-}
-
-.container {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
--- a/src/app/sessionpay/sessionpay.component.html
+++ b/src/app/sessionpay/sessionpay.component.html
@ -1,15 +0,0 @@
-<div class="settings-title">Purchase Session</div>
-<mat-card [formGroup]="payForm">
-	<mat-form-field appearance="outline">
-		<mat-label>Select session:</mat-label>
-		<mat-select formControlName="session">
-			<mat-option *ngFor="let ticket of tickets" [value]="ticket.value">
-				{{ticket.viewValue}}
-			</mat-option>
-		</mat-select>
-	</mat-form-field>
-	<div class="container">
-		<button mat-raised-button (click)="close()">Cancel</button>
-		<button mat-raised-button color="primary" [disabled]="payForm.invalid" (click)="pay()">Pay</button>
-	</div>
-</mat-card>
--- a/src/app/sessionpay/sessionpay.component.spec.ts
+++ b/src/app/sessionpay/sessionpay.component.spec.ts
@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SessionpayComponent } from './sessionpay.component';
-
-describe('SessionpayComponent', () => {
-  let component: SessionpayComponent;
-  let fixture: ComponentFixture<SessionpayComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SessionpayComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(SessionpayComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/sessionpay/sessionpay.component.ts
+++ b/src/app/sessionpay/sessionpay.component.ts
@ -1,68 +0,0 @@
-import { Inject, Component } from '@angular/core';
-import { ScanComponent } from '../scan/scan.component';
-import { Validators, UntypedFormGroup, FormBuilder } from '@angular/forms';
-import { MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
-
-@Component({
-  selector: 'app-sessionpay',
-  templateUrl: './sessionpay.component.html',
-  styleUrls: ['./sessionpay.component.css']
-})
-export class SessionpayComponent {
-
-	nodeAddress: string = '';
-	zecPrice: number = 1;
-	tickets = [
-		{
-			value: 1,
-			viewValue: '1 day: USD $1'
-		},{
-			value: 6,
-			viewValue: '1 week: USD $6'
-		},{
-			value: 22,
-			viewValue: '1 month: USD $22'
-		},{
-			value: 30,
-			viewValue: '1 month Pro: USD $30'
-		}
-	];
-	payForm: UntypedFormGroup;
-	session: string;
-
-	constructor(
-		private dialog: MatDialog,
-		private dialogRef: MatDialogRef<SessionpayComponent>,
-		private fb: FormBuilder,
-		@Inject(MAT_DIALOG_DATA) public data: { addr: string, session: string, zecPrice: number }
-	) {
-		this.payForm= fb.group({
-			session: ['', Validators.required]
-		});
-		this.session = data.session;
-		this.zecPrice = data.zecPrice;
-		this.nodeAddress = data.addr;
-	}
-
-	pay(){
-		const dialogConfig = new MatDialogConfig();
-
-		dialogConfig.disableClose = true;
-		dialogConfig.autoFocus = true;
-		dialogConfig.data = {
-			totalZec: (this.payForm.get('session')!.value)/this.zecPrice,
-			addr: this.nodeAddress,
-			session: this.session,
-			pay: true
-		};
-
-		const dialogRef1 = this.dialog.open(ScanComponent, dialogConfig);
-		dialogRef1.afterClosed().subscribe(val => {
-			this.dialogRef.close();
-		});
-	}
-
-	close(){
-		this.dialogRef.close();
-	}
-}
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@ -42,50 +42,18 @@
 					<mat-form-field class="full-width" 
 									appearance="fill">
 						<mat-label>{{ vE.settingsVkeyLbl }}</mat-label>
-						<textarea matInput [readonly]="vKaccess" placeholder="{{ vE.settingsVkeyPlaceholder }}" 
+						<textarea matInput placeholder="{{ vE.settingsVkeyPlaceholder }}" 
 								formControlName="vKey">
 						</textarea>
 					</mat-form-field>
-					<table cellspacing="0" style="width: 100%">
-						<colgroup>
-							<col span="1" style="width: 20%;">
-							<col span="1" style="width: 40%;">
-							<col span="1" style="width: 40%;">
-						</colgroup>
-						<tr>
-							<td>
-								<mat-slide-toggle formControlName="useTips" class="settings-toggle" (change)="onChangeTips($event)">
-									Use Tips?
-								</mat-slide-toggle>
-							</td>
-							<td align="center">
-								<mat-slide-toggle formControlName="useTax" class="settings-toggle" (change)="onChangeTax($event)">
-									Use Sales Tax?
-								</mat-slide-toggle>
-								<br>
-								<mat-form-field *ngIf="useTax" class="settings-field" [style.width.%]="100">
-									<mat-label>Sales Tax Rate (%)</mat-label>
-									<input matInput 
-										   type="number"
-										   placeholder="Sales Tax Rate (%)" 
-										   formControlName="taxRate">
-								</mat-form-field>
-							</td>
-							<td align="center">
-								<mat-slide-toggle formControlName="useVat" class="settings-toggle" (change)="onChangeVat($event)">
-									Use VAT?
-								</mat-slide-toggle>
-								<br>
-								<mat-form-field *ngIf="useVat" class="settings-field" [style.width.%]="100">
-									<mat-label>Value-Added Tax Rate (%)</mat-label>
-									<input matInput 
-										   type="number"
-										   placeholder="Value-Added Tax Rate (%)" 
-										   formControlName="vatRate">
-								</mat-form-field>
-							</td>
-						</tr>
-					</table>
+<!--					
+					<pre></pre>
+					<mat-slide-toggle formControlName="proVersion" 
+									  class="settings-toggle"
+								  (change)="onChangeProVersion($event)">
+						Enable Integrations
+					</mat-slide-toggle>
+-->
 				</mat-dialog-content>
 			</div>

--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@ -1,5 +1,5 @@
 import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
 import { Subject, Observable } from 'rxjs';
@ -11,6 +11,7 @@ import { NotifierService } from '../notifier.service';
 import { faCopy } from '@fortawesome/free-solid-svg-icons';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

@Component({
 	selector: 'app-settings',
@ -28,14 +29,11 @@ export class SettingsComponent implements OnInit {
 	accCodForm:	UntypedFormGroup;
 	owner: Owner;
 	useZats: boolean;
-	useTax: boolean;
-	useVat: boolean;
-	useTips: boolean;
 	proVersion: boolean = false;
+	useVKey: boolean = false;
 	linkMsg: string = '';
 	xeroAccCod: string = '';
 	saveAccOk: boolean = false;
-	private viewkey: string = '';
 	
 	coins = [
 		{
@ -119,7 +117,6 @@ export class SettingsComponent implements OnInit {
    };
    //
    languageRdy = new Subject<boolean>();
-	vKaccess = true;

    // ------------------------------------------------------------
 	constructor(
@ -129,33 +126,25 @@ export class SettingsComponent implements OnInit {
 		public xeroService: XeroService,
 		public wooService: WoocommerceService,
 		private dialogRef: MatDialogRef<SettingsComponent>,
-		@Inject(MAT_DIALOG_DATA) public data: {o: Owner}) {
-			this.useZats = data.o.zats;
-			this.useTax = data.o.tax;
-			this.useVat = data.o.vat;
-			this.useTips = data.o.tips;
+		@Inject(MAT_DIALOG_DATA) public data: Owner) {
+			this.useZats = data.zats;
+			this.useVKey = data.payconf;
 			this.settingsForm = fb.group({
-					name: [data.o.name, Validators.required],
-					currency: [data.o.currency, Validators.required],
-					useZats: [data.o.zats,  Validators.required],
-					useVKey: [data.o.payconf, Validators.required],
-					vKey: [data.o.viewkey],
-					useTips: [data.o.tips, Validators.required],
-					useTax: [data.o.tax, Validators.required],
-					taxRate: [data.o.taxValue],
-					useVat: [data.o.vat, Validators.required],
-					vatRate: [data.o.vatValue]
+					name: [data.name, Validators.required],
+					currency: [data.currency, Validators.required],
+					useZats: [data.zats,  Validators.required],
+					useVKey: [data.payconf, Validators.required],
+	//				proVersion: [data.invoices, Validators.required],
+					vKey: [data.viewkey]
 				});
 			this.accCodForm = fb.group ({
 					xAcc: [this.xeroAccCod]
 				});

-			if (data.o.payconf) {
-				this.vKaccess = false;
-				//this.settingsForm.get('vKey')!.enable();
+			if (data.payconf) {
+				this.settingsForm.get('vKey')!.enable();
 			}
-			this.owner = data.o;
-			this.viewkey = data.o.viewkey;
+			this.owner = data;
 			this.proVersion = this.owner.invoices;
 			if ( this.owner.crmToken !== '' ) {
 			  this.linked2Xero = true;	
@ -167,10 +156,10 @@ export class SettingsComponent implements OnInit {
 				this.xeroLink = `https://login.xero.com/identity/connect/authorize?response_type=code&client_id=${this.clientId}&redirect_uri=http%3A%2F%2Flocalhost%3A4200%2Fxeroauth&scope=accounting.transactions offline_access&state=${this.owner.address.substring(0, 6)}`
 			});
 			this.accCodeUpdate = xeroService.accCodeUpdate;
-			xeroService.getXeroAccountCode();
+			xeroService.getXeroAccountCode(this.owner.address);
 			this.accCodeUpdate.subscribe(accData => {
 				this.xeroAccCod = accData;
-				//console.log("xeroAccCod -> [" + this.xeroAccCod + "]");
+				console.log("xeroAccCod -> [" + this.xeroAccCod + "]");
 				this.accCodForm.get('xAcc')!.setValue(this.xeroAccCod);
 			});
 			this.wooOwnerUpdate = wooService.ownerUpdate;
@ -191,24 +180,23 @@ export class SettingsComponent implements OnInit {

 	ngOnInit() {

-		//this.settingsForm.get('vKey')!.disable();
-		// 
-		this.vKaccess = true;
-		this.chgUILanguage();
-		//console.log('SETTINGS: Return from chgUILanguage()');
-		//
-		this.languageRdy.subscribe (
-			data => {
-				this.linkMsg = this.vE.settingsLink2Xero; 
-				this.pmtServiceURL + '';
-				if ( this.linked2Xero ) {
-					this.linkMsg = this.vE.settingsRelink2Xero; //'Relink to Xero';
-					this.pmtServiceURL = 
-						'https://zgo.cash/pmtservice?owner=' + 
-					this.owner._id + 
-						'&invoiceNo=[INVOICENUMBER]&currency=[CURRENCY]&amount=[AMOUNTDUE]&shortCode=[SHORTCODE]';
-				}
-			});
+	      this.settingsForm.get('vKey')!.disable();
+  			// 
+  			this.chgUILanguage();
+         console.log('SETTINGS: Return from chgUILanguage()');
+         //
+         this.languageRdy.subscribe (
+         	  data => {
+			      	this.linkMsg = this.vE.settingsLink2Xero; 
+			      	this.pmtServiceURL + '';
+			      	if ( this.linked2Xero ) {
+		   	   		this.linkMsg = this.vE.settingsRelink2Xero; //'Relink to Xero';
+		      			this.pmtServiceURL = 
+		      				'https://zgo.cash/pmtservice?owner=' + 
+		      	         this.owner._id + 
+		      	         '&invoiceNo=[INVOICENUMBER]&currency=[CURRENCY]&amount=[AMOUNTDUE]&shortCode=[SHORTCODE]';
+	      			}
+         	  });
 	}

 	safeURL(s: string){
@ -217,7 +205,7 @@ export class SettingsComponent implements OnInit {

 	close() {

-		this.dialogRef.close(null);
+		this.dialogRef.close();
 	}

 	closeIntegration() {
@ -235,12 +223,7 @@ export class SettingsComponent implements OnInit {
 		this.owner.zats = this.settingsForm.value.useZats;
 		this.owner.payconf = this.settingsForm.value.useVKey;
 		this.owner.viewkey = this.settingsForm.value.vKey;
-		this.owner.tax = this.settingsForm.value.useTax;
-		this.owner.taxValue = this.settingsForm.value.taxRate;
-		this.owner.vat = this.settingsForm.value.useVat;
-		this.owner.vatValue = this.settingsForm.value.vatRate;
-		this.owner.tips = this.settingsForm.value.useTips;
-		//console.log('Settings component key: ' + this.owner.viewkey);
+		//this.owner.invoices = this.settingsForm.value.proVersion
 		this.dialogRef.close(this.owner);
 	}

@ -248,29 +231,20 @@ export class SettingsComponent implements OnInit {
 		this.useZats = ob.checked;
 	}

-	onChangeTax(ob: MatSlideToggleChange) {
-		this.useTax = ob.checked;
-	}
-	
-	onChangeVat(ob: MatSlideToggleChange) {
-		this.useVat = ob.checked;
-	}
-
-	onChangeTips(ob: MatSlideToggleChange) {
-		this.useTips = ob.checked;
+	onChangeProVersion(ob: MatSlideToggleChange) {
+		this.proVersion = ob.checked;
 	}

 	onChangeVKeyOn(ob: MatSlideToggleChange) {
-		//		console.log("Viewing key switch is " + 
-		//			        ( ob.checked ? "[ON]." : "[OFF]." ) );
+//		console.log("Viewing key switch is " + 
+//			        ( ob.checked ? "[ON]." : "[OFF]." ) );
+        
+        this.useVKey = ob.checked;

-		if ( ob.checked ) {
-			//this.settingsForm.get('vKey')!.enable();
-			this.vKaccess = false;
-		} else { 
-			//this.settingsForm.get('vKey')!.disable();
-			this.vKaccess = true;
-		}
+	    if ( ob.checked ) 
+	      this.settingsForm.get('vKey')!.enable();
+	    else 
+	      this.settingsForm.get('vKey')!.disable();

 	}

@ -358,33 +332,32 @@ export class SettingsComponent implements OnInit {
 	saveAccCod() {

 	  this.xeroAccCod = 	this.accCodForm.value.xAcc;
-	  //console.log(">>> " + this.xeroAccCod);	
+	  console.log(">>> " + this.xeroAccCod);	
 	  if ( this.xeroAccCod.length <= 10 ) {
         const obs = this.xeroService
                        .setXeroAccountCode(this.owner.address,
         	        			            this.xeroAccCod);
-											obs.subscribe({ next: responseData => {
-												if (responseData.status == 202) {
-													//console.log('Account saved');
-													this.notifierService
-													.showNotification(this.vE.settingsAcodeSaved,
-																	  this.vE.settingsNotservClose,
-																	  "success",
-																	  this.vE.settingsNotservSuccess);
-												} else {
-													//console.log('Account not saved -> status[' + responseData.status + ']');
-													this.notifierService
-													.showNotification(
-														this.vE.settingsAcodeNotsaved, 
-														this.vE.settingsNotservClose,
-														"error",
-														this.vE.settingsNotservError);
-												}
+  		  obs.subscribe(responseData => {
+		   	  if (responseData.status == 202) {
+			  	console.log('Account saved');
+				this.notifierService
+	 		        .showNotification(this.vE.settingsAcodeSaved,
+						this.vE.settingsNotservClose,
+						"success",
+						this.vE.settingsNotservSuccess);
+			  } else {
+			  	console.log('Account not saved -> status[' + responseData.status + ']');
+				this.notifierService
+	 		        .showNotification(
+	 		        	   this.vE.settingsAcodeNotsaved, 
+							this.vE.settingsNotservClose,
+					   	"error",
+							this.vE.settingsNotservError);
+			  }

-											},
-											error: error => {
-												//console.log('Error saving Account Code -> ' + error.msg)
-											}});
+ 		   }, error => {
+ 		   		console.log('Error saving Account Code -> ' + error.msg)
+ 		   });

 	  } else {
 			this.notifierService
@ -403,63 +376,63 @@ export class SettingsComponent implements OnInit {
 	}
 */
 	checkStatus( arg : any ) {
-		//console.log('onChange - checkStatus');
-		//console.log(arg.target.value);
+		console.log('onChange - checkStatus');
+		console.log(arg.target.value);
 		this.saveAccOk = (arg.target.value != this.xeroAccCod );
   }

 	chgUILanguage(){
-      //console.log('SETTINGS.chgUILanguage Called ');
-		this.languageService.getViewElements('settings').subscribe({
-			next: response => {
-				//console.log('Received >> ', response );
-				//console.log('Language Code : ', response.language);
-				//console.log('Component Name : ',response.component);
-				//console.log('Language data : ',response.data);
+      console.log('SETTINGS.chgUILanguage Called ');
+ 		this.languageService.getViewElements('settings').subscribe(
+				response => { 
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

-				this.vE.settingsViewTitle = response.data.settings_view_title;
-				this.vE.settingsTabMainlbl = response.data.settings_tab_mainlbl;
-				this.vE.settingsNameLbl = response.data.settings_name_lbl;
-				this.vE.settingsCurrencyLbl = response.data.settings_currency_lbl;
-				this.vE.settingsNamePlaceholder = response.data.settings_name_placeholder;
-				this.vE.settingsUseSatoshi = response.data.settings_use_satoshi;
-				this.vE.settingsVkeyLbl = response.data.settings_vkey_lbl;
-				this.vE.settingsVkeyPlaceholder = response.data.settings_vkey_placeholder;
-				this.vE.settingsConfirmPayments = response.data.settings_confirm_payments;
-				this.vE.settingsCloseBtn = response.data.settings_close_btn; 
-				this.vE.settingsSaveBtn = response.data.settings_save_btn;
-				this.vE.settingsTabIntegrations = response.data.settings_tab_integrations;
-				this.vE.settingsXeroLbl = response.data.settings_xero_lbl;
-				this.vE.settingsLink2Xero = response.data.settings_link_2xero;
-				this.vE.settingsRelink2Xero = response.data.settings_relink_2xero;
-				this.vE.settingsXeropmtConfirmdis = response.data.settings_xeropmt_confirmdis;
-				this.vE.settingsNotservClose = response.data.settings_notserv_close;
-				this.vE.settingsNotservWarning = response.data.settings_notserv_warning;
-				this.vE.settingsPmtservURL = response.data.settings_pmtserv_url;	
-				this.vE.settingsAcodeLbl = response.data.settings_acode_lbl;	
-				this.vE.settingsXeroClosebtn = response.data.settings_xero_closebtn;
-				this.vE.settingsXeroSavebtn = response.data.settings_xero_savebtn;
-				this.vE.settingsWCLbl = response.data.settings_wc_lbl;
-				this.vE.settingsWCGentoken = response.data.settings_wc_gentoken;
-				this.vE.settingsWCOwnerlbl	= response.data.settings_wc_ownerlbl;   
-				this.vE.settingsWCClosebtn = response.data.settings_wc_closebtn;     
-				this.vE.settingsURLCopied = response.data.settings_url_copied;
-				this.vE.settingsNotservSuccess = response.data.settings_notserv_success;
-				this.vE.settingsNotservError = response.data.settings_notserv_error;
-				this.vE.settingsCopyNotavail = response.data.settings_copy_notavail;
-				this.vE.settingsOwneridCopied = response.data.settings_ownerid_copied;
-				this.vE.settingsOwneridNotcopied = response.data.settings_ownerid_notcopied;
-				this.vE.settingsWCTokenCopied = response.data.settings_wctoken_copied;
-				this.vE.settingsWCTokenNotcopied = response.data.settings_wctoken_notcopied;
-				this.vE.settingsWCTokenGenerated = response.data.settings_wctoken_generated;
-				this.vE.settingsWCTokenGenfail = response.data.settings_wctoken_genfail;
-				this.vE.settingsAcodeSaved = response.data.settings_acode_saved;
-				this.vE.settingsAcodeNotsaved = response.data.settings_acode_notsaved;
-				this.vE.settingsAcodeInvalid = response.data.settings_acode_invalid;
-				//
-				this.languageRdy.next(true);
-			},
-			error: error  => { console.log('Error >> ',error); }
-		});
+					this.vE.settingsViewTitle = response.data.settings_view_title;
+			      this.vE.settingsTabMainlbl = response.data.settings_tab_mainlbl;
+			      this.vE.settingsNameLbl = response.data.settings_name_lbl;
+			      this.vE.settingsCurrencyLbl = response.data.settings_currency_lbl;
+			      this.vE.settingsNamePlaceholder = response.data.settings_name_placeholder;
+			      this.vE.settingsUseSatoshi = response.data.settings_use_satoshi;
+			      this.vE.settingsVkeyLbl = response.data.settings_vkey_lbl;
+			      this.vE.settingsVkeyPlaceholder = response.data.settings_vkey_placeholder;
+			      this.vE.settingsConfirmPayments = response.data.settings_confirm_payments;
+			      this.vE.settingsCloseBtn = response.data.settings_close_btn; 
+			      this.vE.settingsSaveBtn = response.data.settings_save_btn;
+			      this.vE.settingsTabIntegrations = response.data.settings_tab_integrations;
+			      this.vE.settingsXeroLbl = response.data.settings_xero_lbl;
+			      this.vE.settingsLink2Xero = response.data.settings_link_2xero;
+			      this.vE.settingsRelink2Xero = response.data.settings_relink_2xero;
+			      this.vE.settingsXeropmtConfirmdis = response.data.settings_xeropmt_confirmdis;
+			      this.vE.settingsNotservClose = response.data.settings_notserv_close;
+			      this.vE.settingsNotservWarning = response.data.settings_notserv_warning;
+			      this.vE.settingsPmtservURL = response.data.settings_pmtserv_url;	
+			      this.vE.settingsAcodeLbl = response.data.settings_acode_lbl;	
+			      this.vE.settingsXeroClosebtn = response.data.settings_xero_closebtn;
+			      this.vE.settingsXeroSavebtn = response.data.settings_xero_savebtn;
+			      this.vE.settingsWCLbl = response.data.settings_wc_lbl;
+			      this.vE.settingsWCGentoken = response.data.settings_wc_gentoken;
+			      this.vE.settingsWCOwnerlbl	= response.data.settings_wc_ownerlbl;   
+			      this.vE.settingsWCClosebtn = response.data.settings_wc_closebtn;     
+					this.vE.settingsURLCopied = response.data.settings_url_copied;
+					this.vE.settingsNotservSuccess = response.data.settings_notserv_success;
+					this.vE.settingsNotservError = response.data.settings_notserv_error;
+					this.vE.settingsCopyNotavail = response.data.settings_copy_notavail;
+					this.vE.settingsOwneridCopied = response.data.settings_ownerid_copied;
+					this.vE.settingsOwneridNotcopied = response.data.settings_ownerid_notcopied;
+					this.vE.settingsWCTokenCopied = response.data.settings_wctoken_copied;
+					this.vE.settingsWCTokenNotcopied = response.data.settings_wctoken_notcopied;
+					this.vE.settingsWCTokenGenerated = response.data.settings_wctoken_generated;
+					this.vE.settingsWCTokenGenfail = response.data.settings_wctoken_genfail;
+					this.vE.settingsAcodeSaved = response.data.settings_acode_saved;
+					this.vE.settingsAcodeNotsaved = response.data.settings_acode_notsaved;
+					this.vE.settingsAcodeInvalid = response.data.settings_acode_invalid;
+			      //
+			      this.languageRdy.next(true);
+			    },
+					error  => { console.log('Error >> ',error); }
+			);
 	}
 }
--- a/src/app/user.service.ts
+++ b/src/app/user.service.ts
@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Subject, BehaviorSubject, Observable } from 'rxjs';

 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';

@ -8,6 +8,7 @@ import { NotifierService } from './notifier.service';
 import { User } from './user.model';
 import { Owner } from './owner.model';
 import { Country } from './country.model';
+import { Tx } from './tx.model';

 import { ConfigData } from './configdata';

@ -17,7 +18,7 @@ var Buffer = require('buffer/').Buffer;

 export class UserService{
 	beUrl = ConfigData.Be_URL;
-	private dataStore: { user: User, owner: Owner, countries: Country[]} = { 
+	private dataStore: { user: User, owner: Owner, txs: Tx[], countries: Country[]} = { 
 		user: {
 			address: '',
 			session: '',
@ -33,31 +34,45 @@ export class UserService{
 			taxValue: 0,
 			vat: false,
 			vatValue: 0,
+			first: '',
+			last: '',
+			email: '',
+			street: '',
+			city: '',
+			state: '',
+			postal: '',
+			phone: '',
 			paid: false,
+			website: '',
+			country: '',
 			zats: false,
 			invoices: false,
 			expiration: new Date(Date.now()).toISOString(),
 			payconf: false,
-			crmToken: '',
 			viewkey: '',
-			tips: false
+			crmToken: ''
 		},
+		txs : [],
 		countries: []
 	};
 	private uZaddr = '';
+	private oZaddr = '';
+	private uName = '';
 	private session: string | null = '';
 	private _uZaddrUpdated: BehaviorSubject<string> = new BehaviorSubject(this.uZaddr);
 	private _userUpdated: BehaviorSubject<User> = new BehaviorSubject(this.dataStore.user);
+	private uNameUpdated = new Subject<string>();
 	private _ownerUpdated: BehaviorSubject<Owner> = new BehaviorSubject(this.dataStore.owner);
+	private _txsUpdated: BehaviorSubject<Tx[]> = new BehaviorSubject(this.dataStore.txs);
 	private _paidUpdated: BehaviorSubject<boolean> = new BehaviorSubject(this.dataStore.owner.paid);
 	private _countriesUpdated: BehaviorSubject<Country[]> = new BehaviorSubject(this.dataStore.countries);
 	public readonly uZaddrUpdate: Observable<string> = this._uZaddrUpdated.asObservable();
 	public readonly ownerUpdate: Observable<Owner> = this._ownerUpdated.asObservable();
 	public readonly userUpdate: Observable<User> = this._userUpdated.asObservable();
+	public readonly txUpdate: Observable<Tx[]> = this._txsUpdated.asObservable();
 	public readonly paidUpdate: Observable<boolean> = this._paidUpdated.asObservable();
 	public readonly countriesUpdate: Observable<Country[]> = this._countriesUpdated.asObservable();
 	private reqHeaders: HttpHeaders;
-	private reqParams: HttpParams;

 	constructor(private http: HttpClient,
 				private notifierService : NotifierService ){
@ -65,14 +80,13 @@ export class UserService{
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
 		//console.log('US:', this.reqHeaders);
 		this.session = localStorage.getItem('s4z_token');
-		this.reqParams = new HttpParams().append('session', this.session!);
-		//if (this.session != null) {
-			//this.findUser();
-		//}
+		if (this.session != null) {
+			this.findUser();
+		}
 	}

 	getCountries() {
-		let obs = this.http.get<{message: string, countries: any}>(this.beUrl+'api/countries', { headers: this.reqHeaders, params: this.reqParams, observe: 'response'});
+		let obs = this.http.get<{message: string, countries: any}>(this.beUrl+'api/countries', { headers: this.reqHeaders, observe: 'response'});

 		obs.subscribe((CountryResponse) => {
 			if (CountryResponse.status == 200) {
@ -82,29 +96,20 @@ export class UserService{
 		});
 	}

-	checkUser() {
-		if (this.session != null) {
-			console.log('calling checkUser');
-			let obs = this.http.get<{validated: boolean}>(this.beUrl + 'checkuser', {headers: this.reqHeaders, params: this.reqParams, observe: 'response'});
-
-			return obs;
-		} else {
-			return null;
-		}
-	}
-
 	findUser() {
+		this.session = localStorage.getItem('s4z_token');
 		if (this.session != null) {
-			let obs = this.http.get<{message: string, user: any}>(this.beUrl+'api/user', { headers: this.reqHeaders, params: this.reqParams, observe: 'response'});
+			const params = new HttpParams().append('session', this.session!);
+			let obs = this.http.get<{message: string, user: any}>(this.beUrl+'api/user', { headers: this.reqHeaders, params: params, observe: 'response'});

 			obs.subscribe((UserDataResponse) => {
-				//console.log(UserDataResponse.status);
+				console.log(UserDataResponse.status);
 				if (UserDataResponse.status == 200){
 					this.dataStore.user = UserDataResponse.body!.user;
-					//console.log(`US: Found user, returning it`);
+					console.log(`US: Found user, returning it`);
 					this._uZaddrUpdated.next(Object.assign({},this.dataStore).user.address);
 					this._userUpdated.next(Object.assign({}, this.dataStore).user);
-					this.getOwner();
+					this.getOwner(Object.assign({},this.dataStore.user).address);
 				} else {
 					this.dataStore.user = {
 						address: '',
@ -115,7 +120,7 @@ export class UserService{
 					};
 					this._uZaddrUpdated.next(Object.assign({},this.dataStore).user.address);
 					this._userUpdated.next(Object.assign({}, this.dataStore).user);
-					//console.log('US: Did not find user');
+					console.log('US: Did not find user');
 				}
 			});

@ -127,8 +132,8 @@ export class UserService{
 	}
 	
 	validateUser(pinString:string){
-		const params = this.reqParams.append('pin', pinString);
-		let obs = this.http.post(this.beUrl+'validateuser', {}, {headers: this.reqHeaders, params: params, observe: 'response'});
+		const params = new HttpParams().append('session', this.dataStore.user.session).append('pin', pinString);
+		let obs = this.http.post(this.beUrl+'api/validateuser', {}, {headers: this.reqHeaders, params: params, observe: 'response'});
 		obs.subscribe((responseData) => {
 			if (responseData.status == 202) {
 				console.log('Pin validated!');
@ -142,81 +147,29 @@ export class UserService{
 		return obs;
 	}

-	addOwner(oData: {first: string, last: string, phone: string, name: string, street: string, city: string, state: string, postal: string, country: string, email: string, website: string}) {
+	addOwner(owner: Owner) {

-		let obs = this.http.post(this.beUrl+'api/owner', {payload: oData}, {headers: this.reqHeaders, params: this.reqParams});
+		owner.address = this.dataStore.user.address;
+		let obs = this.http.post(this.beUrl+'api/owner', {payload: owner}, {headers: this.reqHeaders});

-		obs.subscribe({
-			next: () => {
-				//console.log("Entra a console log");
-				this.getOwner();
-			},
-			error: (error) => {
-				//console.log("Status is : [" + error.status + "]");
-				if ( error.status = 500 ) {
-					this.notifierService.showNotification("Invalid Viewing Key, changes not saved!!","Close",'error');
-				};
-			}
+		obs.subscribe((responseData) => {
+			//console.log("Entra a console log");
+			this.getOwner(this.dataStore.user.address);
+		}, (error) => {
+			//console.log("Status is : [" + error.status + "]");
+			if ( error.status = 500 ) {
+				this.notifierService
+				    .showNotification("Invalid Viewing Key, changes not saved!!","Close",'error');
+			};
 		});

 		return obs;
 	}

-	saveOwnerSettings(o: Owner) {
-		//console.log('saveOwnerSettings: ' + o.viewkey);
-		if(o.viewkey.length > 20) {
-			this.saveOwnerViewingKey(o.viewkey).subscribe({
-				next: () => {
-					let obs = this.http.post(this.beUrl + 'api/ownersettings', {payload: o}, {headers: this.reqHeaders, params: this.reqParams});
-					obs.subscribe({
-						next: () => {
-							this.getOwner();
-						},
-						error: (error) => {
-							if ( error.status == 500 ){
-								this.notifierService.showNotification("Saving settings failed", "Close", "error")
-							}
-						}
-					});
-				}
-			});
-		} else {
-			let obs = this.http.post(this.beUrl + 'api/ownersettings', {payload: o}, {headers: this.reqHeaders, params: this.reqParams});
-			obs.subscribe({
-				next: () => {
-					this.getOwner();
-				},
-				error: (error) => {
-					if ( error.status == 500 ){
-						this.notifierService.showNotification("Saving settings failed", "Close", "error")
-					}
-				}
-			});
-		}
-	}
-
-	saveOwnerViewingKey(vk: string){
-		let obs = this.http.post(this.beUrl + 'api/ownervk', {payload: vk}, {headers: this.reqHeaders, params: this.reqParams});
-		obs.subscribe({
-			next: () => {
-				this.getOwner();
-			},
-			error: (error) => {
-				if (error.status == 400) {
-					this.notifierService.showNotification('Invalid viewing key, changes not saved', 'Close', 'error');
-				} else if (error.status == 403) {
-					this.notifierService.showNotification('Viewing key does not match shop, changes not saved', 'Close', 'error');
-				}
-			}
-		});
-
-		return obs;
-	}
-
-	getOwner() {
-		//console.log('getOwner', address);
-		//const ownParams = this.reqParams.append('address', address)
-		let obs = this.http.get<{message:string, owner: any}>(this.beUrl+'api/owner', { headers: this.reqHeaders, params: this.reqParams, observe: 'response'});
+	getOwner(address: string) {
+		console.log('getOwner', address);
+		const ownParams = new HttpParams().append('address', address);
+		let obs = this.http.get<{message:string, owner: any}>(this.beUrl+'api/owner', { headers: this.reqHeaders, params: ownParams, observe: 'response'});

 		obs.subscribe((OwnerDataResponse) => {
 			//console.log('api/getowner', OwnerDataResponse.status);
@ -234,19 +187,16 @@ export class UserService{
 	}

 	deleteUser() {
-		let obs = this.http.delete<{message: string}>(this.beUrl+'api/user/'+this.dataStore.user._id, {headers: this.reqHeaders, params: this.reqParams });
+		let obs = this.http.delete<{message: string}>(this.beUrl+'api/user/'+this.dataStore.user._id, {headers: this.reqHeaders });

-		obs.subscribe({next: () => {
+		obs.subscribe(UserResponse => {
 			//console.log('User delete request sent.');
 			this.findUser();
-		}});
+		});

 		return obs;
 	}

-	saveSettings(o: Owner) {
-	}
-
 	currentOwner() : Owner {
 		return this.dataStore.owner;
 	}
--- a/src/app/viewer/viewer.component.ts
+++ b/src/app/viewer/viewer.component.ts
@ -1,15 +1,17 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { UserService } from '../user.service';
 import { FullnodeService } from '../fullnode.service';
-import { Observable } from 'rxjs';
+import { ItemService } from '../items/items.service';
+import { Subscription, Observable } from 'rxjs';
 import { SettingsComponent } from '../settings/settings.component';

 import {Owner} from '../owner.model';
 import {User} from '../user.model';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

@Component({
 	selector: 'app-viewer',
@ -36,14 +38,23 @@ export class ViewerComponent implements OnInit {
 		taxValue: 0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration:  new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};
 	public price: number = 1;
 	public addrUpdate: Observable<string>;
@ -116,13 +127,13 @@ export class ViewerComponent implements OnInit {

 		dialogConfig.disableClose = true;
 		dialogConfig.autoFocus = true;
-		dialogConfig.data = {o: this.owner};
+		dialogConfig.data = this.owner;

 		const dialogRef = this.dialog.open(SettingsComponent, dialogConfig);
 		dialogRef.afterClosed().subscribe((val) => {
 			if (val != null) {
 				//console.log('Saving settings', val);
-				this.userService.saveOwnerSettings(val);
+				this.userService.addOwner(val);
 				this.fullnodeService.getPrice(val.currency);
 				this.loginCheck();
 			}
@ -137,7 +148,7 @@ export class ViewerComponent implements OnInit {
 				this.user = user;
 				//console.log('Viewer loginCheck', this.user);
 				if (!this.owner.paid || !this.user.validated) {
-				//	console.log('Log in expired!');
+					console.log('Log in expired!');
 					this.router.navigate(['/login']);
 				}
 			});
@ -145,18 +156,18 @@ export class ViewerComponent implements OnInit {
 	}

 	chgUILanguage(){
-        //console.log('VIEWER.chgUILanguage Called ');
- 		this.languageService.getViewElements('viewer').subscribe({
-			next: response => { 
-					//console.log('Received >> ', response );
-					//console.log('Language Code : ', response.language);
-					//console.log('Component Name : ',response.component);
-					//console.log('Language data : ',response.data);
+        console.log('VIEWER.chgUILanguage Called ');
+ 		this.languageService.getViewElements('viewer').subscribe(
+				response => { 
+					console.log('Received >> ', response );
+					console.log('Language Code : ', response.language);
+					console.log('Component Name : ',response.component);
+					console.log('Language data : ',response.data);

 			        this.vE.viewerViewOrders = response.data.viewer_view_orders;
 			    },
-			error: error  => { console.log('Error >> ',error); }
-		});
+				error  => { console.log('Error >> ',error); }
+			);
 	}

 }
--- a/src/app/woocommerce.service.ts
+++ b/src/app/woocommerce.service.ts
@ -12,11 +12,9 @@ var Buffer = require('buffer/').Buffer;
 export class WoocommerceService {
 	beUrl = ConfigData.Be_URL;
 	private reqHeaders: HttpHeaders;
-	private reqParams: HttpParams;
 	private ownerId: string = '';
 	private token: string = '';
 	private siteurl: string = '';
-	private session: null | string;
 	private _ownerIdUpdated: BehaviorSubject<string> = new BehaviorSubject(this.ownerId);
 	private _tokenUpdated: BehaviorSubject<string> = new BehaviorSubject(this.token);
 	private _siteurlUpdated: BehaviorSubject<string> = new BehaviorSubject(this.siteurl);
@ -29,15 +27,13 @@ export class WoocommerceService {
 	) {
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		this.session = localStorage.getItem('s4z_token');
-		this.reqParams = new HttpParams().append('session', this.session!);
 		this._ownerIdUpdated.next(Object.assign({}, this).ownerId);
 		this._tokenUpdated.next(Object.assign({}, this).token);
 		this._siteurlUpdated.next(Object.assign({}, this).siteurl);
 	}

 	getWooToken(ownerId: string) {
-		const params = this.reqParams.append('ownerid', ownerId);
+		const params = new HttpParams().append('ownerid', ownerId);
 		let obs = this.http.get<{ownerid: string, token: string, siteurl: string}>(this.beUrl + 'api/wootoken', {headers: this.reqHeaders, params: params, observe: 'response'});
 		obs.subscribe(tokenResponse => {
 			if (tokenResponse.status == 200) {
@ -55,7 +51,7 @@ export class WoocommerceService {
 	}

 	createWooToken(ownerId: string) {
-		const params = this.reqParams.append('ownerid', ownerId);
+		const params = new HttpParams().append('ownerid', ownerId);
 		let obs = this.http.post(this.beUrl+'api/wootoken', {}, {headers: this.reqHeaders, params: params, observe: 'response'});
 		obs.subscribe(responseData => {
 			if (responseData.status == 202) {
--- a/src/app/xero.service.ts
+++ b/src/app/xero.service.ts
@ -24,7 +24,7 @@ export class XeroService {
 	savedAcc : boolean = false;

 	public savedAccObs = new Observable((observer) => {
-     //console.log("starting savedAccObs");
+     console.log("starting savedAccObs");
     setTimeout(() => {observer.next(this.savedAcc)},1000);
 	})

@ -37,26 +37,24 @@ export class XeroService {
 	public readonly tokenUpdate: Observable<any> = this._tokenUpdated.asObservable();
 	public readonly accCodeUpdate: Observable<string> = this._accCodeUpdated.asObservable();
 	private reqHeaders: HttpHeaders;
-	private reqParams: HttpParams;
-	private session: null | string;

 	constructor(
 		private http: HttpClient
 	) {
 		var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
 		this.reqHeaders = new HttpHeaders().set('Authorization', auth);
-		this.session = localStorage.getItem('s4z_token');
-		this.reqParams = new HttpParams().append('session', this.session!);
 		this.getXeroConfig();
 	}

 	getXeroConfig(){
-		let obs = this.http.get<{message: string, xeroConfig: any}>(this.beUrl+'api/xero', { headers:this.reqHeaders, observe: 'response', params: this.reqParams});
+		let obs = this.http.get<{message: string, xeroConfig: any}>(this.beUrl+'api/xero', { headers:this.reqHeaders, observe: 'response'});

 		obs.subscribe(xeroDataResponse => {
 			if (xeroDataResponse.status == 200) {
 				this.clientId = xeroDataResponse.body!.xeroConfig.clientId;
+				//this.clientSecret = xeroDataResponse.body!.xeroConfig.clientSecret;
 				this._clientIdUpdated.next(Object.assign({}, this).clientId);
+				//this._clientSecretUpdated.next(Object.assign({}, this).clientSecret);
 			} else {
 				console.log('No config in DB!');
 			}
@ -65,14 +63,15 @@ export class XeroService {
 		return obs;
 	}

-	getXeroAccessToken(code: string){
-		const params = this.reqParams.append('code', code);
+	getXeroAccessToken(code: string, address: string){
+		const params = new HttpParams().append('code', code).append('address', address);
 		let obs = this.http.get(this.beUrl + 'api/xerotoken' , {headers: this.reqHeaders, params: params, observe: 'response'});
 		return obs;
 	}

-	getXeroAccountCode(){
-		let obs = this.http.get<{message: string, code: string}>(this.beUrl + 'api/xeroaccount', {headers: this.reqHeaders, params: this.reqParams, observe: 'response'});
+	getXeroAccountCode(address: string){
+		const params = new HttpParams().append('address', address);
+		let obs = this.http.get<{message: string, code: string}>(this.beUrl + 'api/xeroaccount', {headers: this.reqHeaders, params: params, observe: 'response'});
 		obs.subscribe(accountResponse => {
 			if (accountResponse.status == 200) {
 				this.xeroAcc = accountResponse.body!.code;
@ -86,7 +85,7 @@ export class XeroService {

 	setXeroAccountCode(address: string, code: string) {

-		const params = this.reqParams.append('address', address).append('code', code);
+		const params = new HttpParams().append('address', address).append('code', code);
 		let obs = this.http.post(this.beUrl + 'api/xeroaccount', {}, {headers: this.reqHeaders, params: params, observe: 'response'});
 /*
 		obs.subscribe(responseData => {
--- a/src/app/xeroreg/xeroreg.component.ts
+++ b/src/app/xeroreg/xeroreg.component.ts
@ -6,6 +6,7 @@ import { Owner } from '../owner.model';
 import { Observable } from 'rxjs';

 import { LanguageService } from '../language.service';
+import { LanguageData } from '../language.model';

 var Buffer = require('buffer/').Buffer;

@ -26,7 +27,6 @@ async function redirect(r: Router) {

 export class XeroRegComponent implements OnInit {
 	public owner:Owner = {
-		_id: '',
 		address: '',
 		name: '',
 		currency: '',
@ -34,14 +34,23 @@ export class XeroRegComponent implements OnInit {
 		taxValue:0,
 		vat: false,
 		vatValue: 0,
+		first: '',
+		last: '',
+		email: '',
+		street: '',
+		city: '',
+		state: '',
+		postal: '',
+		phone: '',
 		paid: false,
+		website: '',
+		country: '',
 		zats: false,
 		invoices: false,
 		expiration: new Date(Date.now()).toISOString(),
 		payconf: false,
-		crmToken: '',
 		viewkey: '',
-		tips: false
+		crmToken: ''
 	};
 	public ownerUpdate:Observable<Owner>;
 	public flag: boolean = false;
@ -76,15 +85,15 @@ export class XeroRegComponent implements OnInit {
 		this.ownerUpdate.subscribe((owner) => {
 			this.owner = owner;
 			this.activatedRoute.queryParams.subscribe((params) => {
-				//console.log(params);
+				console.log(params);
 				if (params.state === this.owner.address.substring(0,6)) {
-					this.xeroService.getXeroAccessToken(params.code).subscribe(tokenData => {
+					this.xeroService.getXeroAccessToken(params.code, this.owner.address).subscribe(tokenData => {
 						if (tokenData.status == 200) {
-							//console.log(tokenData.body!);
+							console.log(tokenData.body!);
 							this.flag = true;
 							redirect(this.router);
 						} else {
-							//console.log('Error: '+tokenData.status);
+							console.log('Error: '+tokenData.status);
 							this.flag = false;
 						}
 					});
@ -97,20 +106,20 @@ export class XeroRegComponent implements OnInit {
 	}

 	chgUILanguage(){
-	  //console.log('XERO.chgUILanguage Called ');
-		this.languageService.getViewElements('xero').subscribe({
-			next: response => { 
-				//console.log('Received >> ', response );
-				//console.log('Language Code : ', response.language);
-				//console.log('Component Name : ',response.component);
-				//console.log('Language data : ',response.data);
+	  console.log('XERO.chgUILanguage Called ');
+	  this.languageService.getViewElements('xero').subscribe(
+	    	response => { 
+		        console.log('Received >> ', response );
+		        console.log('Language Code : ', response.language);
+		        console.log('Component Name : ',response.component);
+		        console.log('Language data : ',response.data);

 				this.vE.xeroConnecting2xero = response.data.xero_connecting_2xero;
 				this.vE.xeroConnected2xero = response.data.xero_connected_2xero;

-			},
-			error: error  => { console.log('Error >> ',error); }
-		});
+	      	},
+	        	error  => { console.log('Error >> ',error); }
+	    );
 	}  

 }
--- a/src/index.html
+++ b/src/index.html
@ -1,16 +1,8 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <meta http-equiv="Content-Security-Policy"
-   content=
-     "connect-src 'self' https://test.zgo.cash https://zgo.cash ; 
-      default-src 'self'; 
-      style-src 'self' https://fonts.googleapis.com 'unsafe-inline' ; 
-      img-src 'self' https://fonts.googleapis.com http://www.w3.org data: ; 
-      font-src 'self' http://www.w3.org https://fonts.gstatic.com https://fonts.gstatic.com ; "> 
-
  <meta charset="utf-8">
-  <title>ZGo - The Zcash Register</title>
+  <title>Z-Go!</title>
  <base href="/">
  <meta name="viewport" content="width=device-width, initial-scale=1">
  <link rel="icon" type="image/x-icon" href="favicon.ico">
@ -22,4 +14,4 @@
 <body>
  <app-root></app-root>
 </body>
-</html>
+</html>
--- a/tsconfig.json
+++ b/tsconfig.json
@ -6,7 +6,7 @@
    "outDir": "./dist/out-tsc",
    "forceConsistentCasingInFileNames": true,
    "strict": true,
-    "noImplicitReturns": false,
+    "noImplicitReturns": true,
    "noFallthroughCasesInSwitch": true,
    "sourceMap": true,
    "declaration": false,