From 0eb84b8f7c0def2db35930d286c9350849053949 Mon Sep 17 00:00:00 2001 From: Rene Vergara A Date: Wed, 31 Aug 2022 17:10:55 -0500 Subject: [PATCH 1/3] Settings component - close button added to Integration tab --- src/app/pmtservice/pmtservice.component.ts | 2 +- src/app/pmtservice/url.txt | 2 +- src/app/settings/settings.component.html | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/pmtservice/pmtservice.component.ts b/src/app/pmtservice/pmtservice.component.ts index 78114a4..b3153b7 100644 --- a/src/app/pmtservice/pmtservice.component.ts +++ b/src/app/pmtservice/pmtservice.component.ts @@ -77,7 +77,7 @@ export class PmtserviceComponent implements OnInit { expiration: new Date(Date.now()).toISOString(), payconf: false, viewkey: '', - crmToken: '' + crmToken: '' }; public order: Order = { diff --git a/src/app/pmtservice/url.txt b/src/app/pmtservice/url.txt index 6140d72..b7e17ab 100644 --- a/src/app/pmtservice/url.txt +++ b/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]¤cy=[CURRENCY]&amount=[AMOUNTDUE]&shortCode=[SHORTCODE] https://app.zgo.cash/invoice/ \ No newline at end of file diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 1581a6b..2bd2524 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -132,6 +132,18 @@ +
+ +
+
+
From ab11c949eb9a4bf531df2b923d12cd231448e1c2 Mon Sep 17 00:00:00 2001 From: Rene Vergara A Date: Fri, 2 Sep 2022 06:33:24 -0500 Subject: [PATCH 2/3] Add AccountCode field in settings component's integration tab --- src/app/settings/settings.component.html | 125 +++++++++++++---------- src/app/settings/settings.component.ts | 20 ++++ 2 files changed, 92 insertions(+), 53 deletions(-) diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 2bd2524..bfd676e 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -77,69 +77,88 @@ -
-
-
-

- - {{ linkMsg }} - -

+
+ +
+
+ + Account Code + + +
+
+
+

+ + {{ linkMsg }} + +

- - - - - - - - - - - - -
Payment Service URL: -
-
- -
- - 		- - - - -
+ + + + + + + + + + + +
Payment Service URL: +
+
+ +
+ 		+ + + + +
+
+
+
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index cc016c6..80341c0 100644 --- a/src/app/settings/settings.component.ts +++ b/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 = [ { @@ -103,6 +105,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(); } @@ -137,6 +147,10 @@ export class SettingsComponent implements OnInit { } + saveAccCod() { + + } + copyUrl() { // console.log("Inside copyUrl()"); if (navigator.clipboard) { @@ -152,6 +166,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 !== ''); + } } From 8e04755cd47bccb7b7e3e887aa826b1998e9b586 Mon Sep 17 00:00:00 2001 From: Rene Vergara A Date: Fri, 2 Sep 2022 06:36:49 -0500 Subject: [PATCH 3/3] CHANGELOG.md updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecfa6f1..78e322a 100644 --- a/CHANGELOG.md +++ b/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)