Merge branch 'master' of git.focasoftware.com:angular/autoservicio

# Conflicts: # src/app/services/producto.service.ts

Merge branch 'master' of git.focasoftware.com:angular/autoservicio
# Conflicts: # src/app/services/producto.service.ts
Marcelo Puebla
2 parents 1cbb6ed285 8487f9d126
Showing 4 changed files Show diff stats
src/app/services/cliente.service.spec.ts
src/app/services/cliente.service.ts
src/app/services/producto.service.ts
src/etc/AppSettings ejemplo.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ClienteService } from './cliente.service';
+
+describe('ClienteService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: ClienteService = TestBed.get(ClienteService);
+    expect(service).toBeTruthy();
+  });
+});
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { appSettings } from "src/etc/AppSettings";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ClienteService {
+
+  private url = appSettings.apiClientes
+
+  constructor(private http: HttpClient) { }
+
+  getClienteById(id: number) {
+    return this.http.get(`${this.url}/get/${id}`);
+  }
+}
@@ -3,6 +3,7 @@ import { HttpClient } from &#39;@angular/common/http&#39;;
 import { Observable } from 'rxjs';
 import { appSettings } from 'src/etc/AppSettings';
 import { Producto } from '../wrappers/producto';
+import { ClienteService } from './cliente.service';
  
 @Injectable({
   providedIn: 'root'
@@ -15,7 +16,7 @@ export class ProductoService {
   mostrar: string;
   esPromoPersonalizada: boolean = false;
  
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient, private clienteService: ClienteService) { }
  
   getProductoById(id): Observable<any> {
  
@@ -80,8 +81,20 @@ export class ProductoService {
   }
  
   pagar(medioPago: string) {
-    return this.http.post(`${appSettings.apiUrl}/comprobante/guardar/${medioPago}`, {
-      productos: this.productos
+
+    return new Observable((observer) => {
+
+      this.clienteService.getClienteById(-1).subscribe(cliente => {
+
+        this.http.post(`${appSettings.apiUrl}/comprobante/guardar/${medioPago}`, {
+          productos: this.productos,
+          cliente: cliente
+        }).subscribe((data) => {
+
+          observer.next(data);
+          observer.complete();
+        });
+      });
     });
   }
  
 export const appSettings = {
   // apiUrl: 'http://10.231.45.117:4705/autoservicio',
-  // apiImagenes: 'http://10.231.45.117:4513/'
+  // apiImagenes: 'http://10.231.45.117:4513/',
+  // apiClientes: 'http://localhost:1515/clientes'
 };
...	...	@@ -0,0 +1,12 @@
	1	+import { TestBed } from '@angular/core/testing';
	2	+
	3	+import { ClienteService } from './cliente.service';
	4	+
	5	+describe('ClienteService', () => {
	6	+ beforeEach(() => TestBed.configureTestingModule({}));
	7	+
	8	+ it('should be created', () => {
	9	+ const service: ClienteService = TestBed.get(ClienteService);
	10	+ expect(service).toBeTruthy();
	11	+ });
	12	+});
...	...	@@ -0,0 +1,17 @@
	1	+import { Injectable } from '@angular/core';
	2	+import { HttpClient } from '@angular/common/http';
	3	+import { appSettings } from "src/etc/AppSettings";
	4	+
	5	+@Injectable({
	6	+ providedIn: 'root'
	7	+})
	8	+export class ClienteService {
	9	+
	10	+ private url = appSettings.apiClientes
	11	+
	12	+ constructor(private http: HttpClient) { }
	13	+
	14	+ getClienteById(id: number) {
	15	+ return this.http.get(`${this.url}/get/${id}`);
	16	+ }
	17	+}
...	...	@@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http';
3	3	import { Observable } from 'rxjs';
4	4	import { appSettings } from 'src/etc/AppSettings';
5	5	import { Producto } from '../wrappers/producto';
	6	+import { ClienteService } from './cliente.service';
6	7
7	8	@Injectable({
8	9	providedIn: 'root'
...	...	@@ -15,7 +16,7 @@ export class ProductoService {
15	16	mostrar: string;
16	17	esPromoPersonalizada: boolean = false;
17	18
18		- constructor(private http: HttpClient) { }
	19	+ constructor(private http: HttpClient, private clienteService: ClienteService) { }
19	20
20	21	getProductoById(id): Observable<any> {
21	22
...	...	@@ -80,8 +81,20 @@ export class ProductoService {
80	81	}
81	82
82	83	pagar(medioPago: string) {
83		- return this.http.post(`${appSettings.apiUrl}/comprobante/guardar/${medioPago}`, {
84		- productos: this.productos
	84	+
	85	+ return new Observable((observer) => {
	86	+
	87	+ this.clienteService.getClienteById(-1).subscribe(cliente => {
	88	+
	89	+ this.http.post(`${appSettings.apiUrl}/comprobante/guardar/${medioPago}`, {
	90	+ productos: this.productos,
	91	+ cliente: cliente
	92	+ }).subscribe((data) => {
	93	+
	94	+ observer.next(data);
	95	+ observer.complete();
	96	+ });
	97	+ });
85	98	});
86	99	}
87	100
1	1	export const appSettings = {
2	2	// apiUrl: 'http://10.231.45.117:4705/autoservicio',
3		- // apiImagenes: 'http://10.231.45.117:4513/'
	3	+ // apiImagenes: 'http://10.231.45.117:4513/',
	4	+ // apiClientes: 'http://localhost:1515/clientes'
4	5	};