Luis Suarez / autoservicio-axion

Download as
Browse Code ยป

Commit 77cc13762559f043ba777af28abe0101a18cd5b5

Authored by Luis Suarez
2 parents c6054a09bf 77c21febeb
Exists in develop

solving merge

Showing 7 changed files   Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
Diff comments   View file @ 77cc137
... ... @@ -13,7 +13,8 @@
13 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14 14 <div
15 15 [routerLink]="['/opcion-pedido']"
16   - class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
  16 + class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto
  17 + btn-effect align-self-end border border-secondary rounded">
17 18 <img
18 19 draggable="false"
19 20 ondragstart="return false;"
... ... @@ -40,8 +41,8 @@
40 41 src="assets/img/ir.svg">
41 42 </div>
42 43 </div>
43   - <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border
44   - border-primary rounded reduce-card-2">
  44 + <div class="col-11 col-sm-10 col-md-7 col-lg-4 p-5 m-5 h-auto align-self-center
  45 + btn-effect border border-primary rounded reduce-card-2">
45 46 <img
46 47 draggable="false"
47 48 ondragstart="return false;"
src/app/modules/pago-electronico/pago-electronico.component.ts
Diff comments   View file @ 77cc137
... ... @@ -9,7 +9,7 @@ import { APP_SETTINGS } from &#39;src/etc/AppSettings&#39;;
9 9 styleUrls: ['./pago-electronico.component.scss']
10 10 })
11 11 export class PagoElectronicoComponent implements OnInit {
12   - urlQr = `${APP_SETTINGS.apiDeboSuite}/qr/dev/${APP_SETTINGS.codigoP}/tienda/${APP_SETTINGS.terminal}`;
  12 + urlQr = `${APP_SETTINGS.apiDeboSuite}/qr/${APP_SETTINGS.deploy}/${APP_SETTINGS.codigoP}/tienda/${APP_SETTINGS.terminal}`;
13 13  
14 14 constructor(
15 15 private articuloService: ArticuloService,
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
Diff comments   View file @ 77cc137
... ... @@ -165,7 +165,7 @@
165 165 (mouseleave)="mouseup()">
166 166 </div>
167 167 <!-- CARRITO -->
168   - <div class="col-6 col-sm-8 col-md-9 col-lg-10 h-100">
  168 + <div class="col-6 col-sm-8 col-lg-10 h-100">
169 169 <div
170 170 #templateCarrito
171 171 class="row flex-row flex-nowrap h-100 mx-0 my-2 scroll-x"
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ 77cc137
... ... @@ -43,7 +43,9 @@
43 43 (scroll)="scrollEvent($event)">
44 44 <div class="col-12">
45 45 <div *ngFor="let promo of promociones">
46   - <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="selectPromo(promo)">
  46 + <div
  47 + class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
  48 + (click)="selectPromo(promo)">
47 49 <div class="d-flex">
48 50 <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
49 51 <p class="font-weight-bold my-auto pr-2">
src/app/shared/sinonimo/sinonimo.component.html
Diff comments   View file @ 77cc137
... ... @@ -28,7 +28,7 @@
28 28 <div class="modal-footer">
29 29 <div
30 30 [ngClass]="validate()"
31   - class="d-inline-block py-1 btn-effect bg-white badge-pill text-primary"
  31 + class="d-inline-block py-1 bg-white badge-pill text-primary"
32 32 (click)="continue()">
33 33 CONTINUAR
34 34 <img
src/app/shared/sinonimo/sinonimo.component.ts
Diff comments   View file @ 77cc137
... ... @@ -45,7 +45,7 @@ export class SinonimoComponent implements OnInit {
45 45 }
46 46 }
47 47 }
48   - return !this.isValid ? 'disabled' : '';
  48 + return !this.isValid ? 'disabled' : 'btn-effect';
49 49 }
50 50  
51 51 continue() {
src/etc/AppSettings.ejemplo.ts
Diff comments   View file @ 77cc137
... ... @@ -0,0 +1,8 @@
  1 +// export const APP_SETTINGS = {
  2 +// apiDeboSuite: 'http://localhost:1515',
  3 +// puntoVenta: 9998,
  4 +// numeroPlanilla: 1111,
  5 +// codigoP: 99996,
  6 +// terminal: 101,
  7 +// deploy: 'dev'
  8 +// };