Merge branch 'xero' of gitlab.com:pitmutt/zgo into xero

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
+- Field for Xero's AccountCode added to Settings component's integration tab
 - Listorders component updated to show date in ANSI international format.
 - Settings component updated to use owner's invoices field to control 
   integrations tab (Pro version)

src/app/pmtservice/url.txt

@@ -2,6 +2,6 @@ http://localhost:4200/pmtservice?ownerid=62cca13f5530331e2a97c78e&invoiceNo=INV-
 
 https://test.zgo.cash/api/invdata?address=zs17faa6l5ma55s55exq9rnr32tu0wl8nmqg7xp3e6tz0m5ajn2a6yxlc09t03mqdmvyphavvf3sl8&inv=INV-0034
 
-
+https://www.paymentservice.com/?invoiceNo=[INVOICENUMBER]&currency=[CURRENCY]&amount=[AMOUNTDUE]&shortCode=[SHORTCODE]
 
 https://app.zgo.cash/invoice/

src/app/settings/settings.component.html

@@ -77,7 +77,20 @@
 		<mat-tab *ngIf="proVersion"
 		         label="Integrations"
 				 style="align-items: center;">
-			<div style="height: 20px;
+			<div class="container" style="margin-bottom:  20px;">
+				<mat-dialog-content [formGroup]="settingsForm">
+					<div style="height: 10px;
+								margin-top: 10px;">
+					</div>			
+					<mat-form-field  class="settings-field" [style.width.%]="100">
+						<mat-label>Account Code</mat-label>
+						<input matInput 
+							   width="100%"
+							   placeholder="9999999999" 
+							   formControlName="xeroAccCod"
+							   (change)="xeroAccCodChanged($event)">
+					</mat-form-field>
+					<div style="height: 10px;
 								margin-top: 10px;">
 					</div>			
 					<div class="container" 
@@ -91,8 +104,8 @@
 						</p>
 
 						<table *ngIf="linked2Xero"
-				       style="width:100%;
+						       [style.width.%]="100"
-							  margin-top: 10px;">
+						       style="margin-top: 10px;">
 							<thead style="width: 100%;">
 								<tr>
 									<th class="urlLabel"
@@ -127,10 +140,28 @@
 									   </fa-icon>
 								   </a>
 								</td>
-						
 							</tbody>
 						</table>
-
+					</div>	
+				</mat-dialog-content>		
+			</div>	
+			<div class="container" 
+			 	 style="display: flex;
+						justify-content: space-between;
+						align-items: center;">
+				<button mat-raised-button 
+						(click)="closeIntegration()">
+					Close
+				</button>
+				<button *ngIf="saveAccOk" 
+				        mat-raised-button 
+						color="primary" 
+						(click)="saveAccCod()">
+					Save Code
+				</button>
+			</div>
+			<div style="height: 20px;
+						margin-top: 10px;">
 			</div>			
 		</mat-tab>
 	</mat-tab-group>

src/app/settings/settings.component.ts

@@ -28,6 +28,8 @@ export class SettingsComponent implements OnInit {
 	proVersion: boolean = false;
 	useVKey: boolean = false;
 	linkMsg: String = 'Link to Xero';
+	xeroAccCod: String = '';
+	saveAccOk: boolean = false;
 	
 	coins = [
 		{
@@ -106,6 +108,14 @@ export class SettingsComponent implements OnInit {
 	}
 
 	close() {
+
+		this.dialogRef.close();
+	}
+
+	closeIntegration() {
+		if ( this.xeroAccCod == '' ) 
+			this.notifierService
+		    .showNotification("Warning: Payment confirmation disabled","Close",'success');
 		this.dialogRef.close();
 	}
 
@@ -140,6 +150,10 @@ export class SettingsComponent implements OnInit {
 
 	}
 
+	saveAccCod() {
+
+	}
+
 	copyUrl() {
 //		console.log("Inside copyUrl()");
 		if (navigator.clipboard) {
@@ -155,6 +169,12 @@ export class SettingsComponent implements OnInit {
 			    .showNotification("Functionality not available for your browser. Use send button instead.","Close",'error');
 		}
 	}
+
+	xeroAccCodChanged( arg: any ) {
+//		console.log("Account Code changed: " + arg.target.value);
+//		console.log(arg);
+		this.saveAccOk = (arg.target.value !== '');
+	}
 }