Merge branch 'master' into 'master'

Master(mpuebla) See merge request !101

Merge branch 'master' into 'master'
Master(mpuebla) See merge request !101
Eric Fernandez
2 parents 44394d2d5c b89fa247bc
Showing 4 changed files Show diff stats
src/app/components/comanda/comanda.component.html
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
src/app/components/confirmacion-carrito/confirmacion-carrito.component.scss
src/app/components/confirmacion-carrito/confirmacion-carrito.component.ts
 <div class="container-fluid fade-in p-0">
  
-  <div class="row m-2">
+    <div class="row z-index-0 fixed-top m-0 w-100">
+      <div class="col-12 p-3">
+        <img class="w-15 float-right" src="../../../assets/img/debo-gray.png">
+      </div>
+    </div>
+
+  <div class="row pt-5 m-2">
     <div class="col-12">
       <p class="m-0 h2 text-center">Pedidos a elaborar</p>
     </div>
@@ -155,10 +155,10 @@
  
         <!-- EFECTIVO -->
         <div
-          class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white"
+          class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white"
           (click)="pagar('efectivo')">
-          <div class="col-7 text-center my-auto py-3 px-2">
-            <span class="h5">Efectivo</span>
+          <div class="col-7 text-center my-auto px-2">
+            <span class="h5 font-weight-bold">Efectivo</span>
           </div>
           <div class="col-5 my-auto p-0">
             <img
@@ -168,9 +168,9 @@
         </div>
  
         <!-- TARJETA -->
-        <div class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white">
-          <div class="col-7 text-center my-auto py-3 px-2">
-            <span class="h5">Tarjeta</span>
+        <div class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white">
+          <div class="col-7 text-center my-auto px-2">
+            <span class="h5 font-weight-bold">Tarjeta</span>
           </div>
           <div class="col-5 my-auto p-0">
             <img
@@ -181,10 +181,10 @@
  
         <!-- QR -->
         <div
-          class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white"
+          class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white"
           (click)="pagar('electronico')">
-          <div class="col-7 text-center my-auto py-1 px-2">
-            <span class="h5">Pago Electrónico</span>
+          <div class="col-7 text-center my-auto px-2">
+            <span class="h5 font-weight-bold">Pago Electrónico</span>
           </div>
           <div class="col-5 my-auto p-0">
             <img
@@ -0,0 +1,3 @@
+.card-forma-pago {
+  height: 95px;
+}
@@ -92,7 +92,7 @@ export class ConfirmacionCarritoComponent implements OnInit, OnDestroy {
         setTimeout(() => {
  
           this.router.navigate(['mensaje-final']);
-        }, 15000);
+        }, 10000);
       }, err => {
         console.log(err);
         alert('algo salió mal');
1	1	<div class="container-fluid fade-in p-0">
2	2
3		- <div class="row m-2">
	3	+ <div class="row z-index-0 fixed-top m-0 w-100">
	4	+ <div class="col-12 p-3">
	5	+ <img class="w-15 float-right" src="../../../assets/img/debo-gray.png">
	6	+ </div>
	7	+ </div>
	8	+
	9	+ <div class="row pt-5 m-2">
4	10	<div class="col-12">
5	11	<p class="m-0 h2 text-center">Pedidos a elaborar</p>
6	12	</div>
...	...	@@ -155,10 +155,10 @@
155	155
156	156	<!-- EFECTIVO -->
157	157	<div
158		- class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white"
	158	+ class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white"
159	159	(click)="pagar('efectivo')">
160		- <div class="col-7 text-center my-auto py-3 px-2">
161		- <span class="h5">Efectivo</span>
	160	+ <div class="col-7 text-center my-auto px-2">
	161	+ <span class="h5 font-weight-bold">Efectivo</span>
162	162	</div>
163	163	<div class="col-5 my-auto p-0">
164	164	<img
...	...	@@ -168,9 +168,9 @@
168	168	</div>
169	169
170	170	<!-- TARJETA -->
171		- <div class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white">
172		- <div class="col-7 text-center my-auto py-3 px-2">
173		- <span class="h5">Tarjeta</span>
	171	+ <div class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white">
	172	+ <div class="col-7 text-center my-auto px-2">
	173	+ <span class="h5 font-weight-bold">Tarjeta</span>
174	174	</div>
175	175	<div class="col-5 my-auto p-0">
176	176	<img
...	...	@@ -181,10 +181,10 @@
181	181
182	182	<!-- QR -->
183	183	<div
184		- class="row card-effect mx-1 my-3 rounded-sm shadow-sm bg-white"
	184	+ class="row card-effect card-forma-pago mx-1 my-3 rounded-sm shadow-sm bg-white"
185	185	(click)="pagar('electronico')">
186		- <div class="col-7 text-center my-auto py-1 px-2">
187		- <span class="h5">Pago Electrónico</span>
	186	+ <div class="col-7 text-center my-auto px-2">
	187	+ <span class="h5 font-weight-bold">Pago Electrónico</span>
188	188	</div>
189	189	<div class="col-5 my-auto p-0">
190	190	<img
...	...	@@ -0,0 +1,3 @@
	1	+.card-forma-pago {
	2	+ height: 95px;
	3	+}
...	...	@@ -92,7 +92,7 @@ export class ConfirmacionCarritoComponent implements OnInit, OnDestroy {
92	92	setTimeout(() => {
93	93
94	94	this.router.navigate(['mensaje-final']);
95		- }, 15000);
	95	+ }, 10000);
96	96	}, err => {
97	97	console.log(err);
98	98	alert('algo salió mal');