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

src/app/app-routing.module.ts

@@ -8,6 +8,7 @@ import { InvoiceComponent } from './invoice/invoice.component';
 import { ListOrdersComponent } from './listorders/listorders.component';
 import { AuthGuardService } from './auth-guard.service';
 import { NodeResolverService } from './node-resolver.service';
+import { PmtserviceComponent } from './pmtservice/pmtservice.component';
 
 const routes: Routes = [
 	{ path: '', component: LoginComponent, resolve: { response: NodeResolverService} },
@@ -17,6 +18,7 @@ const routes: Routes = [
 	{ path: 'biz', component: BusinessComponent, canActivate: [AuthGuardService]}, 
 	{ path: 'receipt/:orderId', component: ReceiptComponent},
 	{ path: 'invoice/:orderId', component: InvoiceComponent},
+	{ path: 'pmtservice', component: PmtserviceComponent},
 	{ path: 'login', component: LoginComponent, resolve: { response: NodeResolverService}}
 ];
 

src/app/app.module.ts

@@ -45,6 +45,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { PromptInvoiceComponent } from './prompt-invoice/prompt-invoice.component';
 import { PromptReceiptComponent } from './prompt-receipt/prompt-receipt.component';
 import { NotifierComponent } from './notifier/notifier.component';
+import { PmtserviceComponent } from './pmtservice/pmtservice.component';
 
 @NgModule({
     declarations: [
@@ -71,7 +72,8 @@ import { NotifierComponent } from './notifier/notifier.component';
         InvoiceComponent,
         PromptInvoiceComponent,
         PromptReceiptComponent,
-        NotifierComponent
+        NotifierComponent,
+        PmtserviceComponent
     ],
     imports: [
         BrowserModule,

src/app/checkout/checkout.component.ts

@@ -24,6 +24,7 @@ export class CheckoutComponent implements OnInit{
 		private sanitizer: DomSanitizer,
 		@Inject(MAT_DIALOG_DATA) public data: { totalZec: number, addr: string, orderId: string}
 	) {
+		console.log("Entra a Constructor")
 		this.address = data.addr;
 		this.total = data.totalZec;
 		this.orderId = data.orderId;
@@ -42,7 +43,7 @@ export class CheckoutComponent implements OnInit{
 				logoHeight: 60,
 		        correctLevel: QRCode.CorrectLevel.H
 	    	});
-//	    console.log(">>> " + qrcode);
+	    console.log("mgOnInit - pasa");
 
 	}
 

src/app/order/order.component.ts

@@ -124,7 +124,7 @@ export class OrderComponent implements OnInit{
 				this.notifierService
 				    .showNotification("Order successfully cancelled!",
 			    	              "Close","success");
-				});;
+				});
 			} else {
 				console.log('Returning to page');
 			}
@@ -227,6 +227,12 @@ export class OrderComponent implements OnInit{
 //					         + " => (" + item.name +")");
 				this.orderService.updateOrder(item.line_id,lines);
 				this.orderService.getOrder();
+				if ( this.order.lines.length == 0 ) {
+					this.orderService.cancelOrder(this.order._id!)
+					                 .subscribe((response) => {
+							this.orderService.getOrder();
+						});	
+				}
 					
 			} else {
 				console.log('Returning to order');

src/app/pmtservice/pmtservice.component.html

@@ -0,0 +1 @@
+<p>{{ pmtData.ownerId }}</p>

src/app/pmtservice/pmtservice.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PmtserviceComponent } from './pmtservice.component';
+
+describe('PmtserviceComponent', () => {
+  let component: PmtserviceComponent;
+  let fixture: ComponentFixture<PmtserviceComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PmtserviceComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(PmtserviceComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pmtservice/pmtservice.component.ts

@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, ActivatedRoute, Params } from "@angular/router";
+import { PmtData } from "./pmtservice.model"
+
+@Component({
+  selector: 'app-pmtservice',
+  templateUrl: './pmtservice.component.html',
+  styleUrls: ['./pmtservice.component.css']
+})
+
+export class PmtserviceComponent implements OnInit {
+
+
+  public pmtData : PmtData = {
+      ownerId :'',
+      invoice: '',
+      amount: 0,
+      currency: '',
+      shortcode: ''
+  };
+
+  constructor(private activatedRoute: ActivatedRoute) {}
+
+  ngOnInit() {
+    this.activatedRoute.queryParams.subscribe((params) => {
+      this.pmtData.ownerId = params["ownerid"];
+      this.pmtData.invoice = params["invoice"];
+      this.pmtData.amount = params["amount"];
+      this.pmtData.currency = params["currency"];
+      this.pmtData.shortcode = params["shortcode"];
+
+      console.log(this.pmtData);
+    });
+  }
+
+}

src/app/pmtservice/pmtservice.model.ts

@@ -0,0 +1,7 @@
+export interface PmtData {
+	ownerId: string;
+	invoice: string;
+	amount: number;
+	currency: string;
+	shortcode: string;
+}

src/app/pmtservice/url.txt

@@ -0,0 +1 @@
+http://localhost:4200/pmtservice?ownerid=Rene&amount=30&currency=USD&invoice=INV-003234&shortcode=abcde