Commit 29059ce0201164fe6b6b35987b77cc00df0a646f
Exists in
develop
and in
1 other branch
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !18
Showing
3 changed files
Show diff stats
src/app/app.module.ts
| ... | ... | @@ -10,7 +10,6 @@ import { SplashScreenComponent } from './modules/splash-screen/splash-screen.com |
| 10 | 10 | import { AdminComponent } from './modules/admin/admin.component'; |
| 11 | 11 | import { FooterComponent } from './shared/footer/footer.component'; |
| 12 | 12 | import { SharedModule } from './modules/shared/shared.module'; |
| 13 | -import { NgxSpinnerModule } from 'ngx-spinner'; | |
| 14 | 13 | |
| 15 | 14 | @NgModule({ |
| 16 | 15 | declarations: [ |
| ... | ... | @@ -29,7 +28,6 @@ import { NgxSpinnerModule } from 'ngx-spinner'; |
| 29 | 28 | ReactiveFormsModule, |
| 30 | 29 | ReactiveFormsModule.withConfig({ warnOnNgModelWithFormControl: 'never' }), |
| 31 | 30 | SharedModule.forRoot(), |
| 32 | - NgxSpinnerModule, | |
| 33 | 31 | ], |
| 34 | 32 | bootstrap: [AppComponent] |
| 35 | 33 | }) |
src/app/modules/comanda/comanda.component.html
| ... | ... | @@ -52,6 +52,11 @@ |
| 52 | 52 | <small>{{detalle.DetLar}}</small><br> |
| 53 | 53 | <small>CANT.{{detalle.cantidad}}</small> |
| 54 | 54 | </p> |
| 55 | + <blockquote | |
| 56 | + *ngIf="detalle.comentario"> | |
| 57 | + <p class="text-muted font-italic px-4" *ngIf="comanda.estado === 1"><small>{{detalle.comentario}}</small></p> | |
| 58 | + <p class="text-white font-italic px-4" *ngIf="comanda.estado !== 1"><small>{{detalle.comentario}}</small></p> | |
| 59 | + </blockquote> | |
| 55 | 60 | </div> |
| 56 | 61 | <!-- BOTONES --> |
| 57 | 62 | <button |
src/app/modules/comanda/comanda.component.ts
| ... | ... | @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; |
| 2 | 2 | import { IComanda, IComandaDetalle, IComponente } from 'src/app/interfaces/IComanda'; |
| 3 | 3 | import { ComandaService } from 'src/app/services/comanda/comanda.service'; |
| 4 | 4 | import * as _ from 'lodash'; |
| 5 | -import { NgxSpinnerService } from 'ngx-spinner' | |
| 6 | 5 | |
| 7 | 6 | @Component({ |
| 8 | 7 | selector: 'app-comanda', |
| ... | ... | @@ -15,7 +14,6 @@ export class ComandaComponent implements OnInit { |
| 15 | 14 | |
| 16 | 15 | constructor( |
| 17 | 16 | private comandaService: ComandaService, |
| 18 | - private spinnerService: NgxSpinnerService, | |
| 19 | 17 | ) { } |
| 20 | 18 | |
| 21 | 19 | ngOnInit() { |
| ... | ... | @@ -110,7 +108,6 @@ export class ComandaComponent implements OnInit { |
| 110 | 108 | } |
| 111 | 109 | |
| 112 | 110 | startTimerElaboracion(comanda: IComanda) { |
| 113 | - this.spinnerService.show(comanda.id.toString()); | |
| 114 | 111 | this.comandaService.startTimerComanda(comanda, 'Elaboracion'); |
| 115 | 112 | } |
| 116 | 113 | //#endregion |