Merge branch 'dev' into zgointl

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - Parametrization of text elements
+- Expanded Xero reference message to include ZEC amount
 
 ## [1.4.1] - 2023-01-09
 
@@ -76,15 +77,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Convenience buttons on checkout for wallets that are not ZIP-321-compliant
 - PmtService Component first alpha version ready for testing
+- Add `crmToken` field to `owner.model.ts`
+- Add `externalInvoice` field and `shortCode` field to `order.model.ts`
 
 ### Fixed
 
 - Memo for checkout orders
 
-## Added
-
-- Add `crmToken` field to `owner.model.ts`
-- Add `externalInvoice` field and `shortCode` field to `order.model.ts`
 
 ## [1.2.1] - 2022-08-01
 

src/app/invoice/invoice.component.ts

@@ -31,6 +31,7 @@ export class InvoiceComponent implements OnInit {
 	name: string = '';
 	error: boolean = false;
 	codeString: string = 'Test';
+	invString: string = '';
 	public isWCOrder : boolean = false;
 	zcashUrl: SafeUrl = '';
 	externalURL: string = '';
@@ -124,7 +125,10 @@ export class InvoiceComponent implements OnInit {
 			if ( order.session.substring(0,1) == 'W') {
 				this.isWCOrder = true;
 			}
-      		this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!)))}`; 
+			if( order.session.substring(0,1) == 'X') {
+				this.invString = 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)))}`; 
 			this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
 		});
 		this.nameUpdate.subscribe(name => {