Mauricio Cattafi / autoservicio

Commit 2c878eabc68055f6ebe59964629dfe98ceb949bb

Authored by Marcelo Puebla 2019-08-15 12:33:52 -0300

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !25

Showing 6 changed files Show diff stats

src/app/app-routing.module.ts

Diff comments View file @ 2c878ea

 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { HomeComponent } from './components/home/home.component';
 import { InicioComponent } from './components/inicio/inicio.component';
 import { BusquedaProductosComponent } from './components/busqueda-productos/busqueda-productos.component';
 import { ConfirmacionCarritoComponent } from './components/confirmacion-carrito/confirmacion-carrito.component';
 import { MasterComponent } from './components/master/master.component';
 import { AmbImagenesComponent } from './components/amb-imagenes/amb-imagenes.component';
+import { PagoComponent } from './components/pago/pago.component';
 const routes: Routes = [
   { path: '', component: HomeComponent },
   { path: 'home', component: HomeComponent },
   { path: 'abm-imagenes', component: AmbImagenesComponent },
   {
     path: '',
     component: MasterComponent,
     children: [
       { path: 'inicio', component: InicioComponent },
       { path: 'busqueda-productos', component: BusquedaProductosComponent },
-      { path: 'confirmacion-carrito', component: ConfirmacionCarritoComponent }
+      { path: 'confirmacion-carrito', component: ConfirmacionCarritoComponent },
+      { path: 'pago', component: PagoComponent }
     ]
   },
   { path: '**', redirectTo: '/home', pathMatch: 'full' },
 ];
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

src/app/app.module.ts

Diff comments View file @ 2c878ea

 //#region MODULES
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { AppRoutingModule } from './app-routing.module';
 import { HttpClientModule } from '@angular/common/http';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TooltipModule } from 'ngx-bootstrap/tooltip';
 import { PopoverModule } from 'ngx-bootstrap/popover';
 //#endregion
 //#region COMPONENTS
 import { AppComponent } from './app.component';
 import { HeaderComponent } from './components/header/header.component';
 import { SidebarComponent } from './components/sidebar/sidebar.component';
 import { CarouselComponent } from './components/carousel/carousel.component';
 import { HomeComponent } from './components/home/home.component';
 import { InicioComponent } from './components/inicio/inicio.component';
 import { BusquedaProductosComponent } from './components/busqueda-productos/busqueda-productos.component';
 import { ConfirmacionCarritoComponent } from './components/confirmacion-carrito/confirmacion-carrito.component';
 import { MasterComponent } from './components/master/master.component';
 import { PopoverPromosComponent } from './components/popover-promos/popover-promos.component';
 import { PopoverSinonimosComponent } from './components/popover-sinonimos/popover-sinonimos.component';
 import { AmbImagenesComponent } from './components/amb-imagenes/amb-imagenes.component';
+import { PagoComponent } from './components/pago/pago.component';
 //#endregion
 @NgModule({
   declarations: [
     AppComponent,
     HeaderComponent,
     SidebarComponent,
     CarouselComponent,
     HomeComponent,
     InicioComponent,
     BusquedaProductosComponent,
     ConfirmacionCarritoComponent,
     MasterComponent,
     PopoverPromosComponent,
     PopoverSinonimosComponent,
-    AmbImagenesComponent
+    AmbImagenesComponent,
+    PagoComponent
   ],
   imports: [
     BrowserModule,
     AppRoutingModule,
     HttpClientModule,
     FormsModule,
     ReactiveFormsModule,
     ReactiveFormsModule.withConfig({ warnOnNgModelWithFormControl: 'never' }),
     TooltipModule.forRoot(),
     PopoverModule.forRoot()
   ],
   providers: [],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

src/app/components/pago/pago.component.html

Diff comments View file @ 2c878ea

File was created	1	<div class="row">
	2
	3	<div class="col-12">
	4
	5	<!-- NOMBRE DE SECCION -->
	6	<div class="row m-0">
	7	<div class="col-12 p-0">
	8	<p class="h5 py-1 bg-gray text-muted text-center">Pago <i class="fa fa-usd"></i></p>
	9	</div>
	10	</div>
	11
	12	<div class="row m-3 d-flex align-items-center">
	13	<div class="col-4">
	14	<h1>Mi Compra <i class="fa fa-shopping-cart "></i></h1>
	15	</div>
	16	<div class="col-8">
	17	<h2>Seleccione medio de pago</h2>
	18	</div>
	19	</div>
	20
	21	</div>
	22
	23	<div class="col-6 card bg-white border-0 shadow rounded mb-auto">
	24	<h3>Pago con tarjeta de débito/crédito</h3>
	25	<div class="card-body">
	26	<img src="{{apiUrl}}/imagenes/posnet.jpg">
	27	</div>
	28	</div>
	29
	30	<div class="col-6 card bg-white border-0 shadow rounded mb-auto">
	31	<h3>Pago con QR mercado pago</h3>
	32	<div class="card-body">
	33	<img src="{{apiUrl}}/imagenes/qrmp.jpg" alt="">
	34	</div>
	35	</div>
	36	</div>
	37

src/app/components/pago/pago.component.scss

Diff comments View file @ 2c878ea

src/app/components/pago/pago.component.spec.ts

Diff comments View file @ 2c878ea

File was created	1	import { async, ComponentFixture, TestBed } from '@angular/core/testing';
	2
	3	import { PagoComponent } from './pago.component';
	4
	5	describe('PagoComponent', () => {
	6	let component: PagoComponent;
	7	let fixture: ComponentFixture<PagoComponent>;
	8
	9	beforeEach(async(() => {
	10	TestBed.configureTestingModule({
	11	declarations: [ PagoComponent ]
	12	})
	13	.compileComponents();
	14	}));
	15
	16	beforeEach(() => {
	17	fixture = TestBed.createComponent(PagoComponent);
	18	component = fixture.componentInstance;
	19	fixture.detectChanges();
	20	});
	21
	22	it('should create', () => {
	23	expect(component).toBeTruthy();
	24	});
	25	});
	26

src/app/components/pago/pago.component.ts

Diff comments View file @ 2c878ea

File was created	1	import { Component, OnInit } from '@angular/core';
	2	import { appSettings } from 'src/etc/AppSettings';
	3
	4	@Component({
	5	selector: 'app-pago',
	6	templateUrl: './pago.component.html',
	7	styleUrls: ['./pago.component.scss']
	8	})
	9	export class PagoComponent implements OnInit {
	10
	11	private apiUrl: string = appSettings.apiUrl;
	12
	13	constructor() { }
	14
	15	ngOnInit() {
	16	}
	17
	18	}
	19