Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 0e8f037ca5a98e7a790235377abea739a8cc2a6a

Authored by Marcelo Puebla
2 parents 09fee67329 da1fa303aa
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

See merge request !116
Showing 12 changed files   Show diff stats
src/app/app-routing.module.ts
Diff comments   View file @ 0e8f037
1 import { NgModule } from '@angular/core'; 1 import { NgModule } from '@angular/core';
2 import { Routes, RouterModule } from '@angular/router'; 2 import { Routes, RouterModule } from '@angular/router';
3 import { SplashScreenComponent } from './modules/splash-screen/splash-screen.component'; 3 import { SplashScreenComponent } from './modules/splash-screen/splash-screen.component';
4 import { AdminComponent } from './modules/admin/admin.component'; 4 import { AdminComponent } from './modules/admin/admin.component';
5 5
6 const routes: Routes = [ 6 const routes: Routes = [
7 { path: '', component: SplashScreenComponent }, 7 { path: '', component: SplashScreenComponent },
8 { 8 {
9 path: '', 9 path: '',
10 component: AdminComponent, 10 component: AdminComponent,
11 children: [ 11 children: [
12 { 12 {
13 path: 'info-formas-pago', 13 path: 'info-formas-pago',
14 loadChildren: () => import('./modules/info-formas-pago/info-formas-pago.module').then(m => m.InfoFormasPagoModule) 14 loadChildren: () => import('./modules/info-formas-pago/info-formas-pago.module').then(m => m.InfoFormasPagoModule)
15 }, 15 },
16 { 16 {
17 path: 'indicaciones-pago-tarjeta',
18 loadChildren: () => import('./modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.module').then(m => m.IndicacionesPagoTarjetaModule)
19 },
20 {
17 path: 'opcion-pedido', 21 path: 'opcion-pedido',
18 loadChildren: () => import('./modules/opcion-pedido/opcion-pedido.module').then(m => m.OpcionPedidoModule) 22 loadChildren: () => import('./modules/opcion-pedido/opcion-pedido.module').then(m => m.OpcionPedidoModule)
19 }, 23 },
20 { 24 {
21 path: 'seleccion-articulos', 25 path: 'seleccion-articulos',
22 loadChildren: () => import('./modules/seleccion-articulos/seleccion-articulos.module').then(m => m.SeleccionArticulosModule) 26 loadChildren: () => import('./modules/seleccion-articulos/seleccion-articulos.module').then(m => m.SeleccionArticulosModule)
23 }, 27 },
24 { 28 {
25 path: 'carrito', 29 path: 'carrito',
26 loadChildren: () => import('./modules/carrito/carrito.module').then(m => m.CarritoModule) 30 loadChildren: () => import('./modules/carrito/carrito.module').then(m => m.CarritoModule)
27 }, 31 },
28 { 32 {
29 path: 'forma-pago', 33 path: 'forma-pago',
30 loadChildren: () => import('./modules/forma-pago/forma-pago.module').then(m => m.FormaPagoModule) 34 loadChildren: () => import('./modules/forma-pago/forma-pago.module').then(m => m.FormaPagoModule)
31 }, 35 },
32 { 36 {
33 path: 'pago-electronico', 37 path: 'pago-electronico',
34 loadChildren: () => import('./modules/pago-electronico/pago-electronico.module').then(m => m.PagoElectronicoModule) 38 loadChildren: () => import('./modules/pago-electronico/pago-electronico.module').then(m => m.PagoElectronicoModule)
35 }, 39 },
36 { 40 {
37 path: 'pago-tarjeta', 41 path: 'pago-tarjeta',
38 loadChildren: () => import('./modules/pago-tarjeta/pago-tarjeta.module').then(m => m.PagoTarjetaModule) 42 loadChildren: () => import('./modules/pago-tarjeta/pago-tarjeta.module').then(m => m.PagoTarjetaModule)
39 }, 43 },
40 ] 44 ]
41 }, 45 },
42 { 46 {
43 path: 'mensaje-final', 47 path: 'mensaje-final',
44 loadChildren: () => import('./modules/mensaje-final/mensaje-final.module').then(m => m.MensajeFinalModule) 48 loadChildren: () => import('./modules/mensaje-final/mensaje-final.module').then(m => m.MensajeFinalModule)
45 }, 49 },
46 { 50 {
47 path: 'pedidos-salientes', 51 path: 'pedidos-salientes',
48 loadChildren: () => import('./modules/pedidos-salientes/pedidos-salientes.module').then(m => m.PedidosSalientesModule) 52 loadChildren: () => import('./modules/pedidos-salientes/pedidos-salientes.module').then(m => m.PedidosSalientesModule)
49 }, 53 },
50 { 54 {
51 path: 'comanda', 55 path: 'comanda',
52 loadChildren: () => import('./modules/comanda/comanda.module').then(m => m.ComandaModule) 56 loadChildren: () => import('./modules/comanda/comanda.module').then(m => m.ComandaModule)
53 }, 57 },
54 { 58 {
55 path: 'cancelar-compra', 59 path: 'cancelar-compra',
56 loadChildren: () => import('./shared/cancelar-compra/cancelar-compra.module').then(m => m.CancelarCompraModule) 60 loadChildren: () => import('./shared/cancelar-compra/cancelar-compra.module').then(m => m.CancelarCompraModule)
57 }, 61 },
58 { path: '**', redirectTo: '', pathMatch: 'full' }, 62 { path: '**', redirectTo: '', pathMatch: 'full' },
59 ]; 63 ];
60 64
61 @NgModule({ 65 @NgModule({
62 imports: [RouterModule.forRoot(routes, { useHash: true })], 66 imports: [RouterModule.forRoot(routes, { useHash: true })],
63 exports: [RouterModule] 67 exports: [RouterModule]
64 }) 68 })
65 export class AppRoutingModule { } 69 export class AppRoutingModule { }
66 70
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta-routing.module.ts
Diff comments   View file @ 0e8f037
File was created 1 import { NgModule } from '@angular/core';
2 import { Routes, RouterModule } from '@angular/router';
3 import { IndicacionesPagoTarjetaComponent } from './indicaciones-pago-tarjeta.component';
4
5 const routes: Routes = [
6 { path: '', component: IndicacionesPagoTarjetaComponent }
7 ];
8
9 @NgModule({
10 imports: [RouterModule.forChild(routes)],
11 exports: [RouterModule]
12 })
13 export class IndicacionesPagoTarjetaRoutingModule { }
14
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.html
Diff comments   View file @ 0e8f037
File was created 1 <div class="h-92 bg-white fade-in-left">
2 <div class="row mx-0 h-15">
3 <div class="col-12 px-0 h-80 my-auto">
4 <img
5 draggable="false"
6 ondragstart="return false;"
7 (contextmenu)="(false)"
8 class="d-block mx-auto h-100"
9 src="assets/img/logo-spot.svg"/>
10 </div>
11 </div>
12 <div class="h-85">
13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 <div
15 class="col-12 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
16 btn-effect border border-primary rounded reduce-card-2">
17 <div class="row h-auto">
18 <div class="col-12 col-md-4">
19 <img
20 draggable="false"
21 ondragstart="return false;"
22 (contextmenu)="(false)"
23 class="w-100 h-auto bg-white"
24 src="assets/img/tarjeta-banda.jpg"/>
25 </div>
26 <div class="col-12 col-md-8 h-auto">
27 <p class="h2 m-0 text-primary">Banda Magnética</p>
28 <small class=" m-0">
29 DESLIZÁ LA TARJETA POR LA RANURA<br>
30 CUANDO LA PANTALLA LO INDIQUE
31 </small>
32 <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
33 <div class="row mx-0 bg-primary badge-pill h-auto">
34 <div class="col-10 align-self-center text-center text-white">
35 Continuar
36 </div>
37 <div class="col-2 align-self-center p-0">
38 <img
39 draggable="false"
40 ondragstart="return false;"
41 (contextmenu)="(false)"
42 class="p-1 icon-50"
43 src="assets/img/ir.svg"/>
44 </div>
45 </div>
46 </div>
47 </div>
48 </div>
49 </div>
50 <div
51 class="col-12 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
52 btn-effect border border-primary rounded reduce-card-2">
53 <div class="row h-auto">
54 <div class="col-12 col-md-4">
55 <img
56 draggable="false"
57 ondragstart="return false;"
58 (contextmenu)="(false)"
59 class="w-100 h-auto bg-white"
60 src="assets/img/tarjeta-chip.jpg"/>
61 </div>
62 <div class="col-12 col-md-8 h-auto">
63 <p class="h2 m-0 text-primary">Chip</p>
64 <small class=" m-0">
65 INTRODUCÍ TU TARJETA POR LA<br>
66 PARTE INFERIOR DE LECTOR <br>
67 CUANDO LA PANTALLA LO INDIQUE
68 </small>
69 <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
70 <div class="row mx-0 bg-primary badge-pill h-auto">
71 <div class="col-10 align-self-center text-center text-white">
72 Continuar
73 </div>
74 <div class="col-2 align-self-center p-0">
75 <img
76 draggable="false"
77 ondragstart="return false;"
78 (contextmenu)="(false)"
79 class="p-1 icon-50"
80 src="assets/img/ir.svg"/>
81 </div>
82 </div>
83 </div>
84 </div>
85 </div>
86 </div>
87 <div
88 class="col-12 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
89 btn-effect border border-primary rounded reduce-card-2">
90 <div class="row h-auto">
91 <div class="col-12 col-md-4">
92 <img
93 draggable="false"
94 ondragstart="return false;"
95 (contextmenu)="(false)"
96 class="w-100 h-auto bg-white"
97 src="assets/img/tarjeta-contact-less.jpg"/>
98 </div>
99 <div class="col-12 col-md-8 h-auto">
100 <p class="h2 m-0 text-primary">Contact-less</p>
101 <small class=" m-0">
102 ACERCÁ LA TARJETA AL POSNET<br>
103 CUANDO LA PANTALLA LO INDIQUE
104 </small>
105 <div class="btn-effect col-10 px-0 bg-white mt-4 mx-auto">
106 <div class="row mx-0 bg-primary badge-pill h-auto">
107 <div class="col-10 align-self-center text-center text-white">
108 Continuar
109 </div>
110 <div class="col-2 align-self-center p-0">
111 <img
112 draggable="false"
113 ondragstart="return false;"
114 (contextmenu)="(false)"
115 class="p-1 icon-50"
116 src="assets/img/ir.svg"/>
117 </div>
118 </div>
119 </div>
120 </div>
121 </div>
122 </div>
123 </div>
124 </div>
125 </div>
126
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.scss
Diff comments   View file @ 0e8f037
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.spec.ts
Diff comments   View file @ 0e8f037
File was created 1 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2
3 import { IndicacionesPagoTarjetaComponent } from './indicaciones-pago-tarjeta.component';
4
5 describe('IndicacionesPagoTarjetaComponent', () => {
6 let component: IndicacionesPagoTarjetaComponent;
7 let fixture: ComponentFixture<IndicacionesPagoTarjetaComponent>;
8
9 beforeEach(async(() => {
10 TestBed.configureTestingModule({
11 declarations: [ IndicacionesPagoTarjetaComponent ]
12 })
13 .compileComponents();
14 }));
15
16 beforeEach(() => {
17 fixture = TestBed.createComponent(IndicacionesPagoTarjetaComponent);
18 component = fixture.componentInstance;
19 fixture.detectChanges();
20 });
21
22 it('should create', () => {
23 expect(component).toBeTruthy();
24 });
25 });
26
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.component.ts
Diff comments   View file @ 0e8f037
File was created 1 import { Component, OnInit, OnChanges } from '@angular/core';
2
3 @Component({
4 selector: 'app-indicaciones-pago-tarjeta',
5 templateUrl: './indicaciones-pago-tarjeta.component.html',
6 styleUrls: ['./indicaciones-pago-tarjeta.component.scss']
7 })
8 export class IndicacionesPagoTarjetaComponent implements OnInit {
9 mediaPantalla: boolean;
10 constructor() { }
11
12 ngOnInit() {}
13 }
14
src/app/modules/indicaciones-pago-tarjeta/indicaciones-pago-tarjeta.module.ts
Diff comments   View file @ 0e8f037
File was created 1 import { NgModule } from '@angular/core';
2 import { CommonModule } from '@angular/common';
3
4 import { IndicacionesPagoTarjetaRoutingModule } from './indicaciones-pago-tarjeta-routing.module';
5 import { IndicacionesPagoTarjetaComponent } from './indicaciones-pago-tarjeta.component';
6
7
8 @NgModule({
9 declarations: [IndicacionesPagoTarjetaComponent],
10 imports: [
11 CommonModule,
12 IndicacionesPagoTarjetaRoutingModule
13 ]
14 })
15 export class IndicacionesPagoTarjetaModule { }
16
src/app/modules/info-formas-pago/info-formas-pago.component.html
Diff comments   View file @ 0e8f037
1 <div class="h-92 bg-white fade-in-left"> 1 <div class="h-92 bg-white fade-in-left">
2 <div class="row mx-0 h-15"> 2 <div class="row mx-0 h-15">
3 <div class="col-12 px-0 h-80 my-auto"> 3 <div class="col-12 px-0 h-80 my-auto">
4 <img 4 <img
5 draggable="false" 5 draggable="false"
6 ondragstart="return false;" 6 ondragstart="return false;"
7 (contextmenu)="false" 7 (contextmenu)="false"
8 class="d-block mx-auto h-100" 8 class="d-block mx-auto h-100"
9 src="assets/img/logo-spot.svg"> 9 src="assets/img/logo-spot.svg">
10 </div> 10 </div>
11 </div> 11 </div>
12 <div class="h-85"> 12 <div class="h-85">
13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 <div 14 <div
15 [routerLink]="['/opcion-pedido']" 15 [routerLink]="['/opcion-pedido']"
16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto 16 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto
17 btn-effect align-self-end border border-secondary rounded reduce-card-1"> 17 btn-effect align-self-end border border-secondary rounded reduce-card-1">
18 <img 18 <img
19 draggable="false" 19 draggable="false"
20 ondragstart="return false;" 20 ondragstart="return false;"
21 (contextmenu)="false" 21 (contextmenu)="false"
22 class="img-in-top px-4 bg-white" 22 class="img-in-top px-4 bg-white"
23 src="assets/img/icono-tarjetas.svg"> 23 src="assets/img/icono-tarjetas.svg">
24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p> 24 <p class="h6 m-0">ESTA TERMINAL OPERA CON</p>
25 <p class="h2 mb-3 text-secondary"> 25 <p class="h2 mb-3 text-secondary">
26 tarjetas y 26 tarjetas y
27 <img 27 <img
28 draggable="false" 28 draggable="false"
29 ondragstart="return false;" 29 ondragstart="return false;"
30 (contextmenu)="false" 30 (contextmenu)="false"
31 class="icon-150" 31 class="icon-150"
32 src="assets/img/icono-mercado-pago.svg"> 32 src="assets/img/icono-mercado-pago.svg">
33 </p> 33 </p>
34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white"> 34 <div class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white">
35 CONTINUAR 35 CONTINUAR
36 <img 36 <img
37 draggable="false" 37 draggable="false"
38 ondragstart="return false;" 38 ondragstart="return false;"
39 (contextmenu)="false" 39 (contextmenu)="false"
40 class="icon-30" 40 class="icon-30"
41 src="assets/img/ir.svg"> 41 src="assets/img/ir.svg">
42 </div> 42 </div>
43 </div> 43 </div>
44 <div 44 <div
45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center 45 class="col-11 col-sm-10 col-md-7 p-5 m-5 h-auto align-self-center
46 btn-effect border border-primary rounded reduce-card-2" 46 btn-effect border border-primary rounded reduce-card-2"
47 (click)="openGoCaja(templateGoCaja)"> 47 (click)="openGoCaja(templateGoCaja)">
48 <img 48 <img
49 draggable="false" 49 draggable="false"
50 ondragstart="return false;" 50 ondragstart="return false;"
51 (contextmenu)="false" 51 (contextmenu)="false"
52 class="img-in-top px-4 bg-white" 52 class="img-in-top px-4 bg-white"
53 src="assets/img/icono-efectivo.svg"> 53 src="assets/img/icono-efectivo.svg">
54 <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> 54 <p class="h6 m-0">SI PREFERÍS PAGAR EN EFECTIVO</p>
55 <p class="h2 m-0 text-primary">haga su pedido<br>en caja</p> 55 <p class="h2 m-0 text-primary">hacé tu pedido<br>en caja</p>
56 </div> 56 </div>
57 </div> 57 </div>
58 </div> 58 </div>
59 </div> 59 </div>
60 60
61 <ng-template #templateGoCaja> 61 <ng-template #templateGoCaja>
62 <div class="col-12 bg-primary rounded shadow text-white"> 62 <div class="col-12 bg-primary rounded shadow text-white">
63 <div class="row justify-content-center"> 63 <div class="row justify-content-center">
64 <img 64 <img
65 draggable="false" 65 draggable="false"
66 ondragstart="return false;" 66 ondragstart="return false;"
67 (contextmenu)="false" 67 (contextmenu)="false"
68 class="align-self-center icon-60 mt-4" 68 class="align-self-center icon-60 mt-4"
69 src="assets/img/icono-cajero.svg"> 69 src="assets/img/icono-cajero.svg">
70 </div> 70 </div>
71 <div class="modal-body text-center h1 mt-2 mb-4"> 71 <div class="modal-body text-center h1 mt-2 mb-4">
72 hacé tu pedido<br>en caja. 72 hacé tu pedido<br>en caja.
73 </div> 73 </div>
74 </div> 74 </div>
75 </ng-template> 75 </ng-template>
76 76
src/app/modules/mensaje-final/mensaje-final.component.ts
Diff comments   View file @ 0e8f037
1 import { Component, OnInit } from '@angular/core'; 1 import { Component, OnInit } from '@angular/core';
2 import { ArticuloService } from 'src/app/services/articulo/articulo.service'; 2 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
3 import { Router } from '@angular/router'; 3 import { Router } from '@angular/router';
4 4
5 @Component({ 5 @Component({
6 selector: 'app-mensaje-final', 6 selector: 'app-mensaje-final',
7 templateUrl: './mensaje-final.component.html', 7 templateUrl: './mensaje-final.component.html',
8 styleUrls: ['./mensaje-final.component.scss'] 8 styleUrls: ['./mensaje-final.component.scss']
9 }) 9 })
10 export class MensajeFinalComponent implements OnInit { 10 export class MensajeFinalComponent implements OnInit {
11 timer: any; 11 timer: any;
12 12
13 constructor( 13 constructor(
14 public articuloService: ArticuloService, 14 public articuloService: ArticuloService,
15 private router: Router, 15 private router: Router
16 ) { } 16 ) {}
17 17
18 ngOnInit() { 18 ngOnInit() {
19 this.timer = setTimeout(() => {
20 this.goToSplash();
21 }, 15000);
22 this.mediaPantalla(); 19 this.mediaPantalla();
23 } 20 }
24 21
25 OnDestroy() { 22 OnDestroy() {}
26 clearTimeout(this.timer);
27 }
28 23
29 goToSplash() { 24 goToSplash() {
30 this.articuloService.cleanShoppingCar(); 25 this.articuloService.cleanShoppingCar();
31 this.router.navigate(['']); 26 this.router.navigate(['']);
32 } 27 }
33 28
34 mediaPantalla() { 29 mediaPantalla() {
35 if ($('body').hasClass('media-pantalla')) { 30 if ($('body').hasClass('media-pantalla')) {
36 $('body').removeClass('media-pantalla'); 31 $('body').removeClass('media-pantalla');
37 } 32 }
38 } 33 }
39 } 34 }
40 35
src/assets/img/tarjeta-banda.jpg
Diff comments   View file @ 0e8f037

115 KB
src/assets/img/tarjeta-chip.jpg
Diff comments   View file @ 0e8f037

117 KB
src/assets/img/tarjeta-contact-less.jpg
Diff comments   View file @ 0e8f037

102 KB