Commit 0fbd0891ceae2408818454f35f0073c50fde7355
Exists in
develop
Merge branch 'develop' of git.focasoftware.com:angular/autoservicio-axion into develop
Showing
2 changed files
Show diff stats
src/app/modules/carrito/carrito.component.html
| ... | ... | @@ -39,7 +39,7 @@ |
| 39 | 39 | onerror="this.src='assets/img/image-not-found.jpg'"> |
| 40 | 40 | <div class="row mx-0 h-100 h-md-45"> |
| 41 | 41 | <p class="col text-primary text-truncate align-self-center"> |
| 42 | - <small>{{articulo.DetArt}}</small> | |
| 42 | + <small>{{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}}</small> | |
| 43 | 43 | </p> |
| 44 | 44 | </div> |
| 45 | 45 | </div> |
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -42,15 +42,11 @@ |
| 42 | 42 | onerror="this.src='assets/img/image-not-found.jpg'" |
| 43 | 43 | class="card-img-top h-30 h-md-55 rounded-sm"> |
| 44 | 44 | <div class="row mx-0 py-1 h-auto justify-content-center"> |
| 45 | - <p | |
| 46 | - [ngClass]="{'text-primary': articulo.PRO, 'text-secondary': !articulo.PRO}" | |
| 47 | - class="col-12 px-1 h6 h-auto text-center min-h-60"> | |
| 48 | - {{articulo.DetArt.toUpperCase()}} | |
| 45 | + <p class="col-12 px-1 h6 h-auto text-primary text-center min-h-60"> | |
| 46 | + {{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}} | |
| 49 | 47 | </p> |
| 50 | 48 | <div class="col-12 px-1 align-self-end h-auto"> |
| 51 | - <div | |
| 52 | - [ngClass]="{'bg-primary': articulo.PRO, 'bg-secondary': !articulo.PRO}" | |
| 53 | - class="row mx-0 justify-content-between badge-pill"> | |
| 49 | + <div class="row mx-0 justify-content-between bg-primary badge-pill"> | |
| 54 | 50 | <div class="col px-0 align-self-center text-white text-right"> |
| 55 | 51 | {{articulo.PreVen | currency}} |
| 56 | 52 | </div> |
| ... | ... | @@ -130,7 +126,7 @@ |
| 130 | 126 | src="{{urlImagenes}}{{articulo.imagenes[0].imagen}}" |
| 131 | 127 | onerror="this.src='assets/img/image-not-found.jpg'"> |
| 132 | 128 | <p class="d-block mt-auto text-center text-primary text-truncate"> |
| 133 | - <small>{{articulo.DetArt}}</small> | |
| 129 | + <small>{{articulo.MKT_DESC ? articulo.MKT_DESC.toUpperCase() : articulo.DetArt.toUpperCase()}}</small> | |
| 134 | 130 | </p> |
| 135 | 131 | <app-articulo-cantidad [articulo]="articulo"></app-articulo-cantidad> |
| 136 | 132 | </div> |