Vergara_Tech/zgo
Vergara_Tech/zgo
2
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

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

Browse source
This commit is contained in:
Rene Vergara 2022-09-06 14:43:55 -05:00
commit 072da66c10
Signed by: pitmutt
GPG key ID: 65122AD495A7F5B2
5 changed files with 106 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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)

2
src/app/pmtservice/pmtservice.component.ts
View file

@ -77,7 +77,7 @@ export class PmtserviceComponent implements OnInit {
expiration: new Date(Date.now()).toISOString(),
payconf: false,
viewkey: '',
crmToken: ''
crmToken: ''
};
public order: Order = {

2
src/app/pmtservice/url.txt
View file

@ -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/

135
src/app/settings/settings.component.html
View file

@ -77,61 +77,92 @@
<mat-tab *ngIf="proVersion"
label="Integrations"
style="align-items: center;">
<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"
style="height: 300;">
<p style="text-align:center">
<a mat-raised-button
color="primary"
href="{{this.xeroLink}}">
{{ linkMsg }}
</a>
</p>
<table *ngIf="linked2Xero"
[style.width.%]="100"
style="margin-top: 10px;">
<thead style="width: 100%;">
<tr>
<th class="urlLabel"
style="text-align: left;"
width="94%">Payment Service URL:
</th>
<th></th>
</tr>
</thead>
<tbody>
<td class="urlDetail"
style="text-align: left;"
width="94%">
<div>
<textarea disabled
style="font-size: 10px !important;
border: none;
outline: none;
min-height: 150px;
width: 95%;"
cdkTextareaAutosize
cdkAutosizeMinRows="6"
cdkAutosizeMaxRows="10">{{ pmtServiceURL }}
</textarea>
</div>
</td>
<td class="urlCopyBtn">
<a (click)='copyUrl()' >
<fa-icon [icon]="faCopy"
class="copy-button">
</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>
<div class="container"
style="height: 300;">
<p style="text-align:center">
<a mat-raised-button
color="primary"
href="{{this.xeroLink}}">
{{ linkMsg }}
</a>
</p>
<table *ngIf="linked2Xero"
style="width:100%;
margin-top: 10px;">
<thead style="width: 100%;">
<tr>
<th class="urlLabel"
style="text-align: left;"
width="94%">Payment Service URL:
</th>
<th></th>
</tr>
</thead>
<tbody>
<td class="urlDetail"
style="text-align: left;"
width="94%">
<div>
<textarea disabled
style="font-size: 10px !important;
border: none;
outline: none;
min-height: 150px;
width: 95%;"
cdkTextareaAutosize
cdkAutosizeMinRows="6"
cdkAutosizeMaxRows="10">{{ pmtServiceURL }}
</textarea>
</div>
</td>
<td class="urlCopyBtn">
<a (click)='copyUrl()' >
<fa-icon [icon]="faCopy"
class="copy-button">
</fa-icon>
</a>
</td>
</tbody>
</table>
</div>
</mat-tab>
</mat-tab-group>
</div>

20
src/app/settings/settings.component.ts
View file

@ -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 !== '');
}
}