+ 
Last block seen: {{ heightUpdate | async }}
+
,
private sanitizer: DomSanitizer,
- @Inject(MAT_DIALOG_DATA) public data: { totalZec: number, addr: string, orderId: string}
- ) {
+ @Inject(MAT_DIALOG_DATA) public data: { totalZec: number, addr: string, orderId: string},
+ private notifierService : NotifierService ) {
+
console.log("Entra a Constructor")
this.address = data.addr;
this.total = data.totalZec;
this.orderId = data.orderId;
- this.codeString = `zcash:${this.address}?amount=${this.total.toFixed(6)}&memo=${URLSafeBase64.encode(Buffer.from('Z-Go Order '.concat(this.orderId)))}`;
+ this.codeString = `zcash:${this.address}?amount=${this.total.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId)))}`;
this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
}
@@ -37,8 +40,8 @@ export class CheckoutComponent implements OnInit{
{
text: this.codeString,
logo: "/assets/zcash.png",
- width: 220,
- height: 220,
+ width: 230,
+ height: 230,
logoWidth: 60,
logoHeight: 60,
correctLevel: QRCode.CorrectLevel.H
@@ -54,4 +57,48 @@ export class CheckoutComponent implements OnInit{
close() {
this.dialogRef.close(false);
}
+
+ copyAddress() {
+ if (!navigator.clipboard) {
+// alert("Copy functionality not supported");
+ this.notifierService
+ .showNotification("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText(this.address);
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error copying address","Close","error");
+// console.error("Error", err);
+ }
+ }
+ copyAmount() {
+ if (!navigator.clipboard) {
+// alert("Copy functionality not supported");
+ this.notifierService
+ .showNotification("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText(this.total.toString());
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error while copying ammount","Close","error");
+// console.error("Error", err);
+ }
+ }
+
+ copyMemo() {
+ if (!navigator.clipboard) {
+// alert("Copy functionality not supported");
+ this.notifierService
+ .showNotification("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText("ZGo Order::" + this.orderId);
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error while copying Memo","Close","error");
+// console.error("Error", err);
+ }
+ }
}
diff --git a/src/app/db-export/db-export.component.css b/src/app/db-export/db-export.component.css
new file mode 100644
index 0000000..fa61b0a
--- /dev/null
+++ b/src/app/db-export/db-export.component.css
@@ -0,0 +1,68 @@
+* {
+ font-family: 'Spartan', sans-serif;
+ font-size: 11px;
+}
+
+.description {
+ padding-top: 30px;
+ padding-bottom: 20px;
+ font-size: 14px;
+ font-weight: 700;
+ text-align: center;
+}
+
+.datepicker {
+ border-color: dimgray;
+ border-width: 3px;
+ border-radius: 8px;
+ background-color: white;
+}
+
+.noorders {
+ font-size: 14px;
+ font-weight: 700;
+ text-align: center;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ border-color: dimgray;
+ border-width: 3px;
+ border-radius: 8px;
+ background-color: #f9e79f;
+}
+
+.settings-title {
+ font-family: 'Spartan', sans-serif;
+ background: #ff5722;
+ color: white;
+ font-size: 30px;
+ text-align: center;
+ padding: 5px;
+}
+
+.daterange {
+ font-size: 13px;
+ font-weight: 700;
+ padding-bottom: 15px;
+}
+
+.downloadbtn {
+ min-width: 120px;
+ max-width: 150px;
+ height: 25px;
+ border-color: dimgray;
+ border-width: 3px;
+ border-radius: 8px;
+ box-shadow: lightgray;
+ font-family: 'Spartan', sans-serif;
+ background: #ff5722;
+ color: white;
+ font-size: 16px;
+ text-align: center;
+ padding: 6px;
+}
+
+::ng-deep .downloadbtntxt {
+ color: white;
+ font-size: 14px;
+ font-weight: 600;
+}
diff --git a/src/app/db-export/db-export.component.html b/src/app/db-export/db-export.component.html
new file mode 100644
index 0000000..628b19a
--- /dev/null
+++ b/src/app/db-export/db-export.component.html
@@ -0,0 +1,54 @@
+
+
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ DbExportComponent ]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(DbExportComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/db-export/db-export.component.ts b/src/app/db-export/db-export.component.ts
new file mode 100644
index 0000000..2a30ddc
--- /dev/null
+++ b/src/app/db-export/db-export.component.ts
@@ -0,0 +1,146 @@
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormControl } from '@angular/forms';
+import { DomSanitizer } from '@angular/platform-browser';
+import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+import { Observable } from 'rxjs';
+import { Order } from '../order/order.model';
+import { FullnodeService } from '../fullnode.service';
+import { UserService } from '../user.service';
+import { Owner } from '../owner.model';
+import { OrderService } from '../order/order.service';
+import { NotifierService } from '../notifier.service';
+
+
+@Component({
+ selector: 'app-db-export',
+ templateUrl: './db-export.component.html',
+ styleUrls: ['./db-export.component.css']
+})
+
+export class DbExportComponent implements OnInit {
+
+ public orders: Order[] = [];
+ public ownerUpdate: Observable;
+ public ordersUpdate: Observable;
+ fileUrl : any;
+ owner : Owner = {
+ 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: ''
+ };
+
+ _ordersOk = false;
+
+ range = new FormGroup({
+ start: new FormControl(null),
+ end: new FormControl(null),
+ });
+
+ constructor(private notifierService : NotifierService,
+ private dialogRef: MatDialogRef,
+ private sanitizer: DomSanitizer,
+ public orderService: OrderService,
+ public userService: UserService) {
+ this.ownerUpdate = userService.ownerUpdate;
+ this.orderService.getAllOrders();
+ this.ordersUpdate = orderService.allOrdersUpdate;
+ }
+
+ ngOnInit(): void {
+ console.log('db-export Init -->');
+ this.owner = this.userService.currentOwner();
+ console.log(this.owner.name);
+ console.log(this.range);
+ this.ordersUpdate.subscribe((orders) => {
+ this.orders = orders;
+// console.log('Order -> ' + this.orders[0].timestamp);
+ if( this.orders.length != 0 ) {
+ this._ordersOk = true
+ }
+ });
+ }
+
+
+
+ ordersOk() : boolean {
+ return this._ordersOk;
+ }
+
+ checkReady() : boolean {
+ var data : string = '';
+ var chkRdy : boolean = false;
+ if ( (this.range.value.start != null ) &&
+ (this.range.value.end != null) ) {
+ // process order list
+ const formatter = new Intl.NumberFormat('en-US', {
+ minimumFractionDigits: 8,
+ maximumFractionDigits: 8,
+ });
+
+ // create header
+ data = '"Date","Order ID","Currency","Closed?","Amount","Rate","ZEC","Paid?","Invoice"' + "\n";
+
+ var iniDate = new Date(this.range.value.start);
+ var endDate = new Date(this.range.value.end);
+ for (let i=0; i < this.orders.length; i++){
+ var date = new Date(this.orders[i]!.timestamp!);
+ var orderid = String(this.orders[i]._id);
+ var closed = this.orders[i].closed ? 'Yes' : 'No';
+/*
+ console.log('Order No. ' +
+ this.orders[i]._id! + ' - totalZec = ' +
+ this.orders[i].totalZec);
+*/
+ var paid = this.orders[i].paid ? 'Yes' : 'No';
+ if ( (date >= iniDate) && (date <= endDate) ) {
+ data = data +
+ date.getFullYear() + '-' +
+ (date.getMonth()+1).toString().padStart(2,'0') + '-' +
+ date.getDate().toString().padStart(2,'0')
+ + ',' +
+ orderid + ',' +
+ this.orders[i].currency + ',' +
+ closed + ',' +
+ this.orders[i].total + ',' +
+ this.orders[i].price! + ',' +
+ this.orders[i].totalZec + ',' +
+ paid + ',"' +
+ this.orders[i].externalInvoice + '"' +
+ '\n';
+ }
+ }
+ const blob = new Blob([data], { type: 'application/octet-stream' });
+ this.fileUrl = this.sanitizer.bypassSecurityTrustResourceUrl(window.URL.createObjectURL(blob));
+
+ chkRdy = true;
+ }
+ return chkRdy;
+ }
+
+ closedbExport() {
+ this.dialogRef.close();
+ }
+
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index df9e337..22ec837 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,6 +1,6 @@
-
+
diff --git a/src/app/invoice/invoice.component.html b/src/app/invoice/invoice.component.html
index b155848..23f8302 100644
--- a/src/app/invoice/invoice.component.html
+++ b/src/app/invoice/invoice.component.html
@@ -88,6 +88,65 @@
+
+
diff --git a/src/app/invoice/invoice.component.ts b/src/app/invoice/invoice.component.ts
index 75e91ed..dbe710d 100644
--- a/src/app/invoice/invoice.component.ts
+++ b/src/app/invoice/invoice.component.ts
@@ -1,9 +1,12 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
import { ReceiptService } from '../receipt.service';
import { Order} from '../order/order.model';
import { Observable } from 'rxjs';
-import { faCheck, faHourglass } from '@fortawesome/free-solid-svg-icons';
+import { faCheck, faHourglass, faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
+
+import { NotifierService } from '../notifier.service';
var QRCode = require('easyqrcodejs');
var URLSafeBase64 = require('urlsafe-base64');
@@ -14,17 +17,22 @@ var Buffer = require('buffer/').Buffer;
templateUrl: './invoice.component.html',
styleUrls: ['./invoice.component.css']
})
+
export class InvoiceComponent implements OnInit {
faCheck = faCheck;
faHourglass = faHourglass;
+ faArrowUpRightFromSquare = faArrowUpRightFromSquare;
orderId;
public orderUpdate: Observable
Scan to make payment
@@ -14,7 +15,7 @@
-
+
-
+
+
diff --git a/src/app/checkout/checkout.component.ts b/src/app/checkout/checkout.component.ts
index 5298fc0..7273f13 100644
--- a/src/app/checkout/checkout.component.ts
+++ b/src/app/checkout/checkout.component.ts
@@ -2,6 +2,8 @@ import { Inject, Component, OnInit, ViewEncapsulation} from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { NotifierService } from '../notifier.service';
+
var QRCode = require('easyqrcodejs');
var URLSafeBase64 = require('urlsafe-base64');
var Buffer = require('buffer/').Buffer;
@@ -22,13 +24,14 @@ export class CheckoutComponent implements OnInit{
constructor(
private dialogRef: MatDialogRefExport Orders
+
+ Export orders in a .CSV format file
+
+
+
+
+
+
+
+
+ MM/DD/YYYY – MM/DD/YYYY
+ Invalid start date
+ Invalid end date
+
+
+
+
+
+
+Date range:
+ +
+
+
+
+ You have no orders created. +
+ Nothing to do. +
+
+
+
++ You have no orders created. +
+ Nothing to do. +
+
+
+
+
+
+
+
+ Download
+
+
+
+
diff --git a/src/app/db-export/db-export.component.spec.ts b/src/app/db-export/db-export.component.spec.ts
new file mode 100644
index 0000000..8fde107
--- /dev/null
+++ b/src/app/db-export/db-export.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DbExportComponent } from './db-export.component';
+
+describe('DbExportComponent', () => {
+ let component: DbExportComponent;
+ let fixture: ComponentFixture
+
diff --git a/src/app/invoice/invoice.component.html b/src/app/invoice/invoice.component.html
index b155848..23f8302 100644
--- a/src/app/invoice/invoice.component.html
+++ b/src/app/invoice/invoice.component.html
@@ -88,6 +88,65 @@
+
+
+ Scan the QR code with your wallet to make payment
+
+
+
{{(ownerUpdate | async)!.name}}
- +| + + | ++ | ++ + | +
|
- |
+ |
- - {{order.timestamp | date: 'short'}} - | ++ {{order.timestamp | date: 'YYYY-MM-dd, HH:mm'}} + |
+
{{ data.type | titlecase }}
diff --git a/src/app/order/order.component.ts b/src/app/order/order.component.ts
index e924f2d..0f5e61d 100644
--- a/src/app/order/order.component.ts
+++ b/src/app/order/order.component.ts
@@ -32,6 +32,7 @@ export class OrderComponent implements OnInit{
faInvoice = faFileInvoiceDollar;
public order: Order = {
+ _id: '',
address: '',
session: '',
timestamp: '',
@@ -79,6 +80,8 @@ export class OrderComponent implements OnInit{
this.orderUpdate = orderService.orderUpdate;
this.orderUpdate.subscribe((order) => {
this.order = order;
+
+ console.log('this.order > ' + JSON.stringify(this.order));
// ------------------------------------------------
this.oLines = [];
this.myLines = this.order.lines;
@@ -183,6 +186,8 @@ export class OrderComponent implements OnInit{
orderId: this.order._id
};
+ console.log ('order_id : ' + this.order._id);
+
const dialogRef = this.dialog.open(PromptInvoiceComponent, dialogConfig);
dialogRef.afterClosed().subscribe((val) => {
if (val) {
diff --git a/src/app/pmtservice/pmtservice.component.css b/src/app/pmtservice/pmtservice.component.css
index e69de29..ef2d460 100644
--- a/src/app/pmtservice/pmtservice.component.css
+++ b/src/app/pmtservice/pmtservice.component.css
@@ -0,0 +1,111 @@
+.invoice {
+ font-family: Roboto Mono !important;
+}
+
+.zecSign {
+ margin-bottom: -4px;
+ font-size: 18px;
+ height: 18px;
+}
+
+.invoiceHeader {
+ display: flex;
+ font-family: Spartan;
+ font-weight: 700;
+ font-size: 26px;
+ color: white;
+ justify-content: space-between;
+ line-height: 40px;
+ padding: 10px;
+ vertical-align: center;
+ max-width: 600px;
+ background: #ff5722;
+}
+
+.invoiceDetail {
+ font-family: Roboto Mono !important;
+ padding: 10px;
+ max-width: 600px;
+}
+
+.invoiceHdrTxt1 {
+ font-family: Spartan !important;
+ text-align: center;
+ font-size: 30px;
+ font-weight: 700;
+}
+
+.invoiceHdrTxt2 {
+ font-family: Spartan !important;
+ text-align: center;
+ font-size: 16px;
+ font-weight: 400;
+}
+
+.invoiceHdrTxt3 {
+ font-family: Spartan !important;
+ text-align: center;
+ font-size: 12px;
+ font-weight: 300;
+}
+
+.detailTitle1 {
+ border-top: solid 2px;
+ border-bottom: solid 2px;
+ border-color: navy;
+ text-align: left;
+}
+
+.detailTitle2 {
+ border-top: solid 2px;
+ border-bottom: solid 2px;
+ border-color: navy;
+ text-align: right;
+}
+
+.detailLineRight {
+ border-top: solid 2px;
+ border-bottom: solid 2px;
+ border-color: navy;
+ text-align: right;
+}
+
+.detailLineLeft {
+ border-top: solid 2px;
+ border-bottom: solid 2px;
+ border-color: navy;
+ text-align: right;
+}
+
+.invoice-title {
+ font-size: 16px;
+ font-weight: 700;
+ background: lightcyan;
+ line-height: 30px;
+ padding: 5px;
+}
+
+.invoice-detail {
+ line-height: 20px;
+ font-size: 16px;
+ font-weight: 400;
+ padding-top: 4px;
+ padding-bottom: 4px;
+}
+
+.invoice-total {
+ margin-top: 40px;
+}
+
+.qrcode {
+ display: flex;
+ float: right;
+}
+
+.zecData {
+ width: auto;
+ font-family: Spartan !important;
+ font-size: 16px;
+ font-weight: 700;
+ text-align: right;
+}
diff --git a/src/app/pmtservice/pmtservice.component.html b/src/app/pmtservice/pmtservice.component.html
index d7bbf3a..4bb8410 100644
--- a/src/app/pmtservice/pmtservice.component.html
+++ b/src/app/pmtservice/pmtservice.component.html
@@ -1 +1,255 @@
-(url)
+*/
+ console.log('>> find current zcash price');
+ this.getPrice(this.owner.currency);
+
+ 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;
+ }
+
+ });
+ }
+
+
+ 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');
+
+// console.log(orderData.order);
+ this.order = orderData.order
+ console.log('>> order -> ' + JSON.stringify(this.order));
+ this.orderId = String(this.order._id);
+
+// console.log('Generating QRCode....')
+
+ this.codeString = `zcash:${this.order.address}?amount=${this.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.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId)))}`;
+ this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
+ }, error => {
+ console.log(error.message);
+
+ });
+ }
+
+ 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("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText(this.order.address);
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error copying address","Close","error");
+// console.error("Error", err);
+ }
+ }
+ copyAmount() {
+ if (!navigator.clipboard) {
+// alert("Copy functionality not supported");
+ this.notifierService
+ .showNotification("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText(this.order.totalZec.toString());
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error while copying ammount","Close","error");
+// console.error("Error", err);
+ }
+ }
+
+ copyMemo() {
+ if (!navigator.clipboard) {
+// alert("Copy functionality not supported");
+ this.notifierService
+ .showNotification("Copy functionality not supported","Close","error");
+ }
+ try {
+ navigator.clipboard.writeText("ZGo Order::" + this.orderId);
+ } catch (err) {
+ this.notifierService
+ .showNotification("Error while copying Memo","Close","error");
+// console.error("Error", err);
+ }
+ }
}
diff --git a/src/app/pmtservice/url.txt b/src/app/pmtservice/url.txt
index 1d562d8..b7e17ab 100644
--- a/src/app/pmtservice/url.txt
+++ b/src/app/pmtservice/url.txt
@@ -1 +1,7 @@
-http://localhost:4200/pmtservice?ownerid=Rene&amount=30¤cy=USD&invoice=INV-003234&shortcode=abcde
\ No newline at end of file
+http://localhost:4200/pmtservice?ownerid=62cca13f5530331e2a97c78e&invoiceNo=INV-0034¤cy=USD&amount=753.95&shortCode=!w8T62
+
+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/pmtservice/xeroinvoice.model.ts b/src/app/pmtservice/xeroinvoice.model.ts
new file mode 100644
index 0000000..e906e34
--- /dev/null
+++ b/src/app/pmtservice/xeroinvoice.model.ts
@@ -0,0 +1,13 @@
+export interface XeroInvoice {
+ inv_Type : string;
+ inv_Id : string;
+ inv_No : string;
+ inv_Contact : string;
+ inv_Currency : string;
+ inv_CurrencyRate : number;
+ inv_Total : number;
+ inv_Status : string;
+ inv_Date : Date;
+ inv_shortCode : string;
+ inv_ProcDate : Date;
+}
\ No newline at end of file
diff --git a/src/app/settings/settings.component.css b/src/app/settings/settings.component.css
index 3f66cd2..2779c59 100644
--- a/src/app/settings/settings.component.css
+++ b/src/app/settings/settings.component.css
@@ -23,3 +23,37 @@
.mat-slide-toggle-content {
font-family: 'Spartan', sans-serif;
}
+
+.full-width {
+ width: 100%;
+}
+
+.urlLabel {
+ font-family: "Spartan";
+ font-size: 13px;
+ color: dimgray;
+}
+
+.urlDetail {
+ font-family: "Spartan";
+ font-size: 10px;
+ color: black;
+}
+
+.urlCopyBtn {
+ cursor: pointer;
+ color: dodgerblue;
+}
+
+.small {
+ font-size: 12px;
+ background: #dddddd;
+}
+
+.heading {
+ padding-top: 10px;
+}
+
+.toolbar {
+ padding: 12px;
+}
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index c0b2296..f44700b 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -1,56 +1,263 @@
{{ pmtData.ownerId }}
+
+
\ No newline at end of file
diff --git a/src/app/pmtservice/pmtservice.component.ts b/src/app/pmtservice/pmtservice.component.ts
index 543dc24..98a11a8 100644
--- a/src/app/pmtservice/pmtservice.component.ts
+++ b/src/app/pmtservice/pmtservice.component.ts
@@ -1,6 +1,20 @@
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute, Params } from "@angular/router";
-import { PmtData } from "./pmtservice.model"
+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';
+
+import { NotifierService } from '../notifier.service';
+
+var QRCode = require('easyqrcodejs');
+var URLSafeBase64 = require('urlsafe-base64');
+var Buffer = require('buffer/').Buffer;
@Component({
selector: 'app-pmtservice',
@@ -10,6 +24,11 @@ import { PmtData } from "./pmtservice.model"
export class PmtserviceComponent implements OnInit {
+ faCheck = faCheck;
+ faHourglass = faHourglass;
+
+ beUrl = ConfigData.Be_URL;
+ private reqHeaders: HttpHeaders = new HttpHeaders();
public pmtData : PmtData = {
ownerId :'',
@@ -19,18 +38,354 @@ export class PmtserviceComponent implements OnInit {
shortcode: ''
};
- constructor(private activatedRoute: ActivatedRoute) {}
+ 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: '',
+ lines: [
+ {
+ qty: 1,
+ name: '',
+ cost:0
+ }
+ ]
+ };
+
+ private invData_raw : string = '';
+ private invData_buff : any = null;
+
+ public reportType = 1000;
+ public Status = 0;
+
+ codeString: string = '';
+ zcashUrl: SafeUrl = '';
+ zPrice: number = 1.0;
+ name: string = '';
+ error: boolean = false;
+ orderId : string = '';
+
+ constructor(private activatedRoute : ActivatedRoute,
+ private http : HttpClient,
+ private sanitizer: DomSanitizer,
+ private notifierService : NotifierService ) {}
ngOnInit() {
- this.activatedRoute.queryParams.subscribe((params) => {
- this.pmtData.ownerId = params["ownerid"];
- this.pmtData.invoice = params["invoice"];
+ 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.pmtData.shortcode = params["shortCode"];
+// console.log(this.pmtData);
- console.log(this.pmtData);
+ this.getInvoiceData( this.pmtData );
});
+
}
+ 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;
+ }
+ }});
+ }
+
+ getXeroInvoiceData( reqData : PmtData ) {
+
+/*
+ // Call test Xero API
+ let url : string = "http://localhost:3000/xero/" + reqData.invoice;
+ this.http
+ .get
+
+
+
+
+
+
+
+
+
+
+ Invalid Owner ID!!
+
+
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Payment service not
+ enabled for
+ {{ owner.name}} +
+ + enabled for
+ {{ owner.name}} +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Connection to Xero
server failed!! +
+ server failed!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Invoice
{{ pmtData.invoice }}
not found!! +
+ {{ pmtData.invoice }}
not found!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Invoice
{{ pmtData.invoice }}
type invalid!! +
+ {{ pmtData.invoice }}
type invalid!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Invoice
{{ pmtData.invoice }}
already paid!! +
+ {{ pmtData.invoice }}
already paid!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+
+ Currency
[ {{ pmtData.currency }} ]
not supported!! +
+ [ {{ pmtData.currency }} ]
not supported!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+
+ Amount does not
+ match value
+ reported by Xero!! +
+ + match value
+ reported by Xero!! +
+
+ Payment request was not processed!!
+
+
+
+
+
+
+ Invoice
+ Order ID: {{orderId}}
+ Date:{{order.timestamp | date}}
+
+
+ Zcash Price: {{order.price | number: '1.02' | currency: order.currency.toUpperCase()}}
+
+ Total: 
{{order.totalZec | number: '1.08'}}
+
+ {{order.totalZec | number: '1.08'}}
+
+
+
+
+
+
+
+
+
+ | + Item + | ++ Qty. + | ++ Price ({{order.currency.toUpperCase()}}) + | +
|---|---|---|
| + {{item.name}} + | ++ {{item.qty}} + | ++ {{( item.qty * item.cost ) | number : '1.02' | currency: order.currency.toUpperCase()}} + | +
| + Invoice Total: + | ++ + | ++ {{ order.total | currency: order.currency.toUpperCase()}} + | +
|
+
+
+ |
+ + + | +
+ Scan the QR code with your wallet to make payment
+
+
+
+
+
+ Can't scan?
Use this wallet link, or +
+ Use this wallet link, or +
+
+
+
+
+
+ Settings
-
-
-
- Name
-
-
-
- Currency
-
-
- {{coin.label}}
-
-
-
-
- Use zatoshis?
-
-
-
- Confirm payments?
-
-
-
- Viewing key
-
-
+;
+ wooTokenUpdate: Observable;
+ wooUrlUpdate: Observable;
+
+ clientIdUpdate: Observable;
+ accCodeUpdate: Observable;
+ linked2Xero : boolean = false;
+ pmtServiceURL : string = '';
constructor(
+ private notifierService : NotifierService,
private fb: UntypedFormBuilder,
+ public xeroService: XeroService,
+ public wooService: WoocommerceService,
private dialogRef: MatDialogRef,
@Inject(MAT_DIALOG_DATA) public data: Owner) {
this.useZats = data.zats;
this.useVKey = data.payconf;
this.settingsForm = fb.group({
- name: [data.name, Validators.required],
- currency: [data.currency, Validators.required],
- useZats: [data.zats, Validators.required],
- useVKey: [data.payconf, Validators.required],
- vKey: [data.viewkey]
- });
+ 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.payconf) {
this.settingsForm.get('vKey')!.enable();
}
this.owner = data;
+ this.proVersion = this.owner.invoices;
+ if ( this.owner.crmToken !== '' ) {
+ this.linked2Xero = true;
+ }
+ this.clientIdUpdate = xeroService.clientIdUpdate;
+ xeroService.getXeroConfig();
+ this.clientIdUpdate.subscribe(clientId => {
+ this.clientId = clientId;
+ 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(this.owner.address);
+ this.accCodeUpdate.subscribe(accData => {
+ this.xeroAccCod = accData;
+ console.log("xeroAccCod -> [" + this.xeroAccCod + "]");
+ this.accCodForm.get('xAcc')!.setValue(this.xeroAccCod);
+ });
+ this.wooOwnerUpdate = wooService.ownerUpdate;
+ this.wooTokenUpdate = wooService.tokenUpdate;
+ this.wooUrlUpdate = wooService.siteurlUpdate;
+ wooService.getWooToken(this.owner._id!);
+ this.wooOwnerUpdate.subscribe(owData => {
+ this.wooOwner = owData;
+ });
+ this.wooTokenUpdate.subscribe(tkData => {
+ this.wooToken = tkData;
+ });
+ this.wooUrlUpdate.subscribe(uData => {
+ this.wooUrl = uData;
+ });
}
ngOnInit() {
+ this.settingsForm.get('vKey')!.disable();
+ this.linkMsg = 'Link to Xero';
+ this.pmtServiceURL + '';
+ if ( this.linked2Xero ) {
+ this.linkMsg = 'Relink to Xero';
+ this.pmtServiceURL = 'https://zgo.cash/pmtservice?owner=' +
+ this.owner._id +
+ '&invoiceNo=[INVOICENUMBER]¤cy=[CURRENCY]&amount=[AMOUNTDUE]&shortCode=[SHORTCODE]';
+ }
+ }
+
+ safeURL(s: string){
+ return s.replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
}
close() {
+
+ this.dialogRef.close();
+ }
+
+ closeIntegration() {
+ if ( (this.xeroAccCod == '') && (this.linked2Xero) )
+ this.notifierService
+ .showNotification("Xero Payment confirmation disabled!!","Close",'warning');
this.dialogRef.close();
}
@@ -67,9 +159,8 @@ export class SettingsComponent implements OnInit {
this.owner.currency = this.settingsForm.value.currency;
this.owner.zats = this.settingsForm.value.useZats;
this.owner.payconf = this.settingsForm.value.useVKey;
-
this.owner.viewkey = this.settingsForm.value.vKey;
-
+ //this.owner.invoices = this.settingsForm.value.proVersion
this.dialogRef.close(this.owner);
}
@@ -77,6 +168,10 @@ export class SettingsComponent implements OnInit {
this.useZats = ob.checked;
}
+ onChangeProVersion(ob: MatSlideToggleChange) {
+ this.proVersion = ob.checked;
+ }
+
onChangeVKeyOn(ob: MatSlideToggleChange) {
// console.log("Viewing key switch is " +
// ( ob.checked ? "[ON]." : "[OFF]." ) );
@@ -89,4 +184,100 @@ export class SettingsComponent implements OnInit {
this.settingsForm.get('vKey')!.disable();
}
+
+ copyUrl() {
+// console.log("Inside copyUrl()");
+ if (navigator.clipboard) {
+ };
+ try {
+ navigator.clipboard.writeText(this.pmtServiceURL);
+ this.notifierService
+ .showNotification("ZGo URL copied to Clipboard!!","Close",'success');
+
+ } catch (err) {
+// console.error("Error", err);
+ this.notifierService
+ .showNotification("Functionality not available for your browser. Use send button instead.","Close",'error');
+ }
+ }
+
+ copyWooOwner(){
+ try {
+ navigator.clipboard.writeText(this.wooOwner);
+ this.notifierService.showNotification("Owner ID copied to clipboard", "Close", "success");
+ } catch (err) {
+ this.notifierService.showNotification("Copying not available in your browser", "Close", "error");
+ }
+ }
+
+ copyWooToken(){
+ try {
+ navigator.clipboard.writeText(this.wooToken);
+ this.notifierService.showNotification("WooCommerce Token copied to clipboard", "Close", "success");
+ } catch (err) {
+ this.notifierService.showNotification("Copying not available in your browser", "Close", "error");
+ }
+ }
+
+ generateWooToken(){
+ this.wooService.createWooToken(this.owner._id!).subscribe(responseData => {
+ if (responseData.status == 202) {
+ this.notifierService.showNotification("WooCommerce Token generated!", "Close", "success");
+ this.wooService.getWooToken(this.owner._id!);
+ this.wooOwnerUpdate.subscribe(owData => {
+ this.wooOwner = owData;
+ });
+ this.wooTokenUpdate.subscribe(tkData => {
+ this.wooToken = tkData;
+ });
+ this.wooUrlUpdate.subscribe(uData => {
+ this.wooUrl = uData;
+ });
+ close();
+ } else {
+ this.notifierService.showNotification("WooCommerce Token generation failed.", "Close", "error");
+ }
+ });
+ }
+
+ saveAccCod() {
+
+ this.xeroAccCod = this.accCodForm.value.xAcc;
+ console.log(">>> " + this.xeroAccCod);
+ if ( this.xeroAccCod.length <= 10 ) {
+ const obs = this.xeroService
+ .setXeroAccountCode(this.owner.address,
+ this.xeroAccCod);
+ obs.subscribe(responseData => {
+ if (responseData.status == 202) {
+ console.log('Account saved');
+ this.notifierService
+ .showNotification("Account Code saved!!","Close",'success');
+ } else {
+ console.log('Account not saved -> status[' + responseData.status + ']');
+ this.notifierService
+ .showNotification("Account Code not saved","Close",'error');
+ }
+
+ }, error => {
+ console.log('Error saving Account Code -> ' + error.msg)
+ });
+
+ } else {
+ this.notifierService
+ .showNotification("Invalid Account code (10 chars max.)","Close",'error');
+ };
+ }
+/*
+ xeroAccCodChanged( arg: any ) {
+ console.log("Account Code changed: " + arg.target.value);
+// console.log(arg);
+ this.saveAccOk = (arg.target.value != this.xeroAccCod );
+ }
+*/
+ checkStatus( arg : any ) {
+ console.log('onChange - checkStatus');
+ console.log(arg.target.value);
+ this.saveAccOk = (arg.target.value != this.xeroAccCod );
+ }
}
diff --git a/src/app/user.service.ts b/src/app/user.service.ts
index fd8973e..7b16793 100644
--- a/src/app/user.service.ts
+++ b/src/app/user.service.ts
@@ -197,4 +197,8 @@ export class UserService{
return obs;
}
+ currentOwner() : Owner {
+ return this.dataStore.owner;
+ }
+
}
diff --git a/src/app/viewer/viewer.component.ts b/src/app/viewer/viewer.component.ts
index 471e328..d4d7864 100644
--- a/src/app/viewer/viewer.component.ts
+++ b/src/app/viewer/viewer.component.ts
@@ -73,6 +73,9 @@ export class ViewerComponent implements OnInit {
this.ownerUpdate.subscribe((owner) => {
this.owner = owner;
});
+
+// console.log(this.owner._id);
+
this.userUpdate = userService.userUpdate;
this.userUpdate.subscribe((user) => {
this.user = user;
diff --git a/src/app/woocommerce.service.spec.ts b/src/app/woocommerce.service.spec.ts
new file mode 100644
index 0000000..500c1f1
--- /dev/null
+++ b/src/app/woocommerce.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WoocommerceService } from './woocommerce.service';
+
+describe('WoocommerceService', () => {
+ let service: WoocommerceService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(WoocommerceService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/woocommerce.service.ts b/src/app/woocommerce.service.ts
new file mode 100644
index 0000000..a25c13d
--- /dev/null
+++ b/src/app/woocommerce.service.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
+
+import { ConfigData } from './configdata';
+
+var Buffer = require('buffer/').Buffer;
+
+@Injectable({
+ providedIn: 'root'
+})
+export class WoocommerceService {
+ beUrl = ConfigData.Be_URL;
+ private reqHeaders: HttpHeaders;
+ private ownerId: string = '';
+ private token: string = '';
+ private siteurl: string = '';
+ private _ownerIdUpdated: BehaviorSubject = new BehaviorSubject(this.ownerId);
+ private _tokenUpdated: BehaviorSubject = new BehaviorSubject(this.token);
+ private _siteurlUpdated: BehaviorSubject = new BehaviorSubject(this.siteurl);
+ public readonly ownerUpdate: Observable = this._ownerIdUpdated.asObservable();
+ public readonly tokenUpdate: Observable = this._tokenUpdated.asObservable();
+ public readonly siteurlUpdate: Observable = this._siteurlUpdated.asObservable();
+
+ constructor(
+ private http: HttpClient
+ ) {
+ var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
+ this.reqHeaders = new HttpHeaders().set('Authorization', auth);
+ 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 = 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) {
+ this.ownerId = tokenResponse.body!.ownerid;
+ this.token = tokenResponse.body!.token;
+ this.siteurl = tokenResponse.body!.siteurl;
+ this._ownerIdUpdated.next(Object.assign({}, this).ownerId);
+ this._tokenUpdated.next(Object.assign({}, this).token);
+ this._siteurlUpdated.next(Object.assign({}, this).siteurl);
+ } else {
+ console.log('No WooCommerce token found');
+ }
+ });
+ return obs;
+ }
+
+ createWooToken(ownerId: string) {
+ 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) {
+ console.log('WooToken created.');
+ } else {
+ console.log('WooToken creation failed.');
+ }
+ });
+ return obs;
+ }
+}
diff --git a/src/app/xero.service.spec.ts b/src/app/xero.service.spec.ts
new file mode 100644
index 0000000..4119cc1
--- /dev/null
+++ b/src/app/xero.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { XeroService } from './xero.service';
+
+describe('XeroService', () => {
+ let service: XeroService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(XeroService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/xero.service.ts b/src/app/xero.service.ts
new file mode 100644
index 0000000..1edeb0f
--- /dev/null
+++ b/src/app/xero.service.ts
@@ -0,0 +1,103 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
+
+import { ConfigData } from './configdata';
+
+var Buffer = require('buffer/').Buffer;
+
+@Injectable({
+ providedIn: 'root'
+})
+export class XeroService {
+ beUrl = ConfigData.Be_URL;
+ clientId: string = '';
+ //clientSecret: string = '';
+ xeroToken: any = {
+ accessToken: '',
+ refreshToken: '',
+ expiresIn: 0,
+ scope: '',
+ tokenType: ''
+ };
+ xeroAcc: string = '';
+ savedAcc : boolean = false;
+
+ public savedAccObs = new Observable((observer) => {
+ console.log("starting savedAccObs");
+ setTimeout(() => {observer.next(this.savedAcc)},1000);
+ })
+
+ private _clientIdUpdated: BehaviorSubject = new BehaviorSubject(this.clientId);
+ //private _clientSecretUpdated: BehaviorSubject = new BehaviorSubject(this.clientSecret);
+ private _tokenUpdated: BehaviorSubject = new BehaviorSubject(this.xeroToken);
+ private _accCodeUpdated: BehaviorSubject = new BehaviorSubject(this.xeroAcc);
+ public readonly clientIdUpdate: Observable = this._clientIdUpdated.asObservable();
+ //public readonly clientSecretUpdate: Observable = this._clientSecretUpdated.asObservable();
+ public readonly tokenUpdate: Observable = this._tokenUpdated.asObservable();
+ public readonly accCodeUpdate: Observable = this._accCodeUpdated.asObservable();
+ private reqHeaders: HttpHeaders;
+
+ constructor(
+ private http: HttpClient
+ ) {
+ var auth = 'Basic ' + Buffer.from(ConfigData.UsrPwd).toString('base64');
+ this.reqHeaders = new HttpHeaders().set('Authorization', auth);
+ this.getXeroConfig();
+ }
+
+ getXeroConfig(){
+ 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!');
+ }
+ });
+
+ return obs;
+ }
+
+ 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(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;
+ this._accCodeUpdated.next(Object.assign({}, this).xeroAcc);
+ } else {
+ console.log('No account in DB');
+ }
+ });
+ return obs;
+ }
+
+ setXeroAccountCode(address: string, code: string) {
+
+ 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 => {
+ if (responseData.status == 202) {
+ console.log('Account saved');
+ this.savedAcc = true;
+ }
+ }, error => {
+ this.savedAcc = false;
+ console.log("error : " + error.msg)
+ });
+*/
+ return obs;
+ }
+}
diff --git a/src/app/xeroreg/xeroreg.component.css b/src/app/xeroreg/xeroreg.component.css
new file mode 100644
index 0000000..0b79f36
--- /dev/null
+++ b/src/app/xeroreg/xeroreg.component.css
@@ -0,0 +1,3 @@
+.text {
+ font-family: 'Spartan', sans-serif;
+}
diff --git a/src/app/xeroreg/xeroreg.component.html b/src/app/xeroreg/xeroreg.component.html
new file mode 100644
index 0000000..7d9878c
--- /dev/null
+++ b/src/app/xeroreg/xeroreg.component.html
@@ -0,0 +1,6 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ TestComponent ]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(TestComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/xeroreg/xeroreg.component.ts b/src/app/xeroreg/xeroreg.component.ts
new file mode 100644
index 0000000..4783326
--- /dev/null
+++ b/src/app/xeroreg/xeroreg.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import { UserService } from '../user.service';
+import { XeroService } from '../xero.service';
+import { Owner } from '../owner.model';
+import { Observable } from 'rxjs';
+
+var Buffer = require('buffer/').Buffer;
+
+function sleep(ms:number) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function redirect(r: Router) {
+ await sleep(2000);
+ r.navigate(['/shop']);
+}
+
+@Component({
+ selector: 'app-xeroreg',
+ templateUrl: './xeroreg.component.html',
+ styleUrls: ['./xeroreg.component.css']
+})
+
+
+export class XeroRegComponent implements OnInit {
+ public owner:Owner = {
+ address: '',
+ name: '',
+ currency: '',
+ 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 ownerUpdate:Observable;
+ public flag: boolean = false;
+
+
+
+ constructor(
+ public xeroService: XeroService,
+ public userService: UserService,
+ private router: Router,
+ private activatedRoute: ActivatedRoute
+ ) {
+ this.ownerUpdate = userService.ownerUpdate;
+ this.ownerUpdate.subscribe((owner) => {
+ this.owner = owner;
+ });
+ this.userService.findUser();
+ }
+
+ ngOnInit(): void {
+ }
+
+ ngAfterViewInit(): void {
+ this.ownerUpdate.subscribe((owner) => {
+ this.owner = owner;
+ this.activatedRoute.queryParams.subscribe((params) => {
+ console.log(params);
+ if (params.state === this.owner.address.substring(0,6)) {
+ this.xeroService.getXeroAccessToken(params.code, this.owner.address).subscribe(tokenData => {
+ if (tokenData.status == 200) {
+ console.log(tokenData.body!);
+ this.flag = true;
+ redirect(this.router);
+ } else {
+ console.log('Error: '+tokenData.status);
+ this.flag = false;
+ }
+ });
+ } else {
+ console.log('Error: State mismatch');
+ }
+ });
+
+ });
+ }
+
+}
diff --git a/src/assets/logo-new-white-orange_00.png b/src/assets/logo-new-white-orange_00.png
new file mode 100644
index 0000000..e2ca03c
Binary files /dev/null and b/src/assets/logo-new-white-orange_00.png differ
diff --git a/src/assets/logo-new-white_01.png b/src/assets/logo-new-white_01.png
new file mode 100644
index 0000000..ae43fb7
Binary files /dev/null and b/src/assets/logo-new-white_01.png differ
diff --git a/src/assets/notifier.mp3 b/src/assets/notifier.mp3
new file mode 100644
index 0000000..f8bec44
Binary files /dev/null and b/src/assets/notifier.mp3 differ
diff --git a/src/assets/notifier_1.mp3 b/src/assets/notifier_1.mp3
new file mode 100644
index 0000000..5325142
Binary files /dev/null and b/src/assets/notifier_1.mp3 differ
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index d69d162..0ea9ee6 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -2,8 +2,14 @@ import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angula
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 { User } from '../user.model';
+import { Observable } from 'rxjs';
import { Owner } from '../owner.model';
+import { XeroService } from '../xero.service';
+import { WoocommerceService } from '../woocommerce.service';
+
+import { NotifierService } from '../notifier.service';
+import { faCopy } from '@fortawesome/free-solid-svg-icons';
+
@Component({
selector: 'app-settings',
@@ -13,10 +19,20 @@ import { Owner } from '../owner.model';
export class SettingsComponent implements OnInit {
+ // ------------------------------------
+ //
+ faCopy = faCopy;
+ // ------------------------------------
settingsForm: UntypedFormGroup;
+ accCodForm: UntypedFormGroup;
owner: Owner;
useZats: boolean;
+ proVersion: boolean = false;
useVKey: boolean = false;
+ linkMsg: string = 'Link to Xero';
+ xeroAccCod: string = '';
+ saveAccOk: boolean = false;
+
coins = [
{
label: 'US Dollar',
@@ -33,32 +49,108 @@ export class SettingsComponent implements OnInit {
},{
label: 'Australian Dollar',
symbol: 'aud'
+ },{
+ label: 'New Zealand Dollar',
+ symbol: 'nzd'
}
];
+ xeroLink: string = '';
+ localToken: string = '';
+ clientId: string = '';
+ wooOwner: string = '';
+ wooToken: string = '';
+ wooUrl: string = '';
+ wooOwnerUpdate: Observable
+
+
+ Name
+
+
+
+ Currency
+
+
+ {{coin.label}}
+
+
+
+
+ Use zatoshis?
+
+
+
+ Confirm payments?
+
+
+
+ Viewing key
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+ Account Code
+
+
+
+
+ | Payment Service URL: + | ++ |
+
+
+
+
+ |
+
+
+ |
+
+
|---|
+
+
+
+
+
+
+
+
+
+Connecting to Xero...
+
+
diff --git a/src/app/xeroreg/xeroreg.component.spec.ts b/src/app/xeroreg/xeroreg.component.spec.ts
new file mode 100644
index 0000000..f55af9d
--- /dev/null
+++ b/src/app/xeroreg/xeroreg.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestComponent } from './test.component';
+
+describe('TestComponent', () => {
+ let component: TestComponent;
+ let fixture: ComponentFixture