diff --git a/src/app/modules/admin/admin.component.ts b/src/app/modules/admin/admin.component.ts
index 23e1c03..6900e61 100644
--- a/src/app/modules/admin/admin.component.ts
+++ b/src/app/modules/admin/admin.component.ts
@@ -9,8 +9,6 @@ export class AdminComponent implements OnInit {
 
   constructor() { }
 
-  ngOnInit() {
-    console.log("");
-  }
+  ngOnInit() { }
 
 }
diff --git a/src/app/modules/carrito/carrito.module.ts b/src/app/modules/carrito/carrito.module.ts
index 5f83428..00391e0 100644
--- a/src/app/modules/carrito/carrito.module.ts
+++ b/src/app/modules/carrito/carrito.module.ts
@@ -1,8 +1,8 @@
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
 
-import { CarritoRoutingModule } from "./carrito-routing.module";
-import { CarritoComponent } from "./carrito.component";
+import { CarritoRoutingModule } from './carrito-routing.module';
+import { CarritoComponent } from './carrito.component';
 import { SeleccionArticulosModule } from '../seleccion-articulos/seleccion-articulos.module';
 import { SharedModule } from '../shared/shared.module';
 
diff --git a/src/app/modules/info-formas-pago/info-formas-pago-routing.module.ts b/src/app/modules/info-formas-pago/info-formas-pago-routing.module.ts
index 6d8893b..678200a 100644
--- a/src/app/modules/info-formas-pago/info-formas-pago-routing.module.ts
+++ b/src/app/modules/info-formas-pago/info-formas-pago-routing.module.ts
@@ -1,8 +1,8 @@
-import { NgModule } from "@angular/core";
-import { Routes, RouterModule } from "@angular/router";
-import { InfoFormasPagoComponent } from "./info-formas-pago.component";
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { InfoFormasPagoComponent } from './info-formas-pago.component';
 
-const routes: Routes = [{ path: "", component: InfoFormasPagoComponent }];
+const routes: Routes = [{ path: '', component: InfoFormasPagoComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/modules/info-formas-pago/info-formas-pago.component.ts b/src/app/modules/info-formas-pago/info-formas-pago.component.ts
index cd32162..e808bf3 100644
--- a/src/app/modules/info-formas-pago/info-formas-pago.component.ts
+++ b/src/app/modules/info-formas-pago/info-formas-pago.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: "app-formas-pago",
-  templateUrl: "./info-formas-pago.component.html",
-  styleUrls: ["./info-formas-pago.component.scss"]
+  selector: 'app-formas-pago',
+  templateUrl: './info-formas-pago.component.html',
+  styleUrls: ['./info-formas-pago.component.scss']
 })
 export class InfoFormasPagoComponent implements OnInit {
   constructor() {}
diff --git a/src/app/modules/mensaje-final/mensaje-final.component.ts b/src/app/modules/mensaje-final/mensaje-final.component.ts
index f531e36..e80eee7 100644
--- a/src/app/modules/mensaje-final/mensaje-final.component.ts
+++ b/src/app/modules/mensaje-final/mensaje-final.component.ts
@@ -17,7 +17,7 @@ export class MensajeFinalComponent implements OnInit {
   ngOnInit() {
     setTimeout(() => {
       this.goToSplash();
-    }, 10000)
+    }, 10000);
   }
 
   goToSplash() {
diff --git a/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts b/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts
index 3cada33..3748c71 100644
--- a/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts
+++ b/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts
@@ -1,8 +1,8 @@
-import { NgModule } from "@angular/core";
-import { Routes, RouterModule } from "@angular/router";
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
 import { OpcionPedidoComponent } from './opcion-pedido.component';
 
-const routes: Routes = [{ path: "", component: OpcionPedidoComponent }];
+const routes: Routes = [{ path: '', component: OpcionPedidoComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.ts b/src/app/modules/opcion-pedido/opcion-pedido.component.ts
index 0e56a36..e2b17d8 100644
--- a/src/app/modules/opcion-pedido/opcion-pedido.component.ts
+++ b/src/app/modules/opcion-pedido/opcion-pedido.component.ts
@@ -20,6 +20,6 @@ export class OpcionPedidoComponent implements OnInit {
   }
 
   seleccionPedido(lugar) {
-    localStorage.setItem('pedidoPara', lugar)
+    localStorage.setItem('pedidoPara', lugar);
   }
 }
diff --git a/src/app/modules/opcion-pedido/opcion-pedido.module.ts b/src/app/modules/opcion-pedido/opcion-pedido.module.ts
index 077c204..3f8df79 100644
--- a/src/app/modules/opcion-pedido/opcion-pedido.module.ts
+++ b/src/app/modules/opcion-pedido/opcion-pedido.module.ts
@@ -1,7 +1,7 @@
-import { NgModule } from "@angular/core";
-import { CommonModule } from "@angular/common";
-import { OpcionPedidoRoutingModule } from "./opcion-pedido-routing.module";
-import { OpcionPedidoComponent } from "./opcion-pedido.component";
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { OpcionPedidoRoutingModule } from './opcion-pedido-routing.module';
+import { OpcionPedidoComponent } from './opcion-pedido.component';
 
 @NgModule({
   declarations: [OpcionPedidoComponent],
diff --git a/src/app/modules/pago-electronico/pago-electronico.component.ts b/src/app/modules/pago-electronico/pago-electronico.component.ts
index dac18ac..8fd6375 100644
--- a/src/app/modules/pago-electronico/pago-electronico.component.ts
+++ b/src/app/modules/pago-electronico/pago-electronico.component.ts
@@ -21,9 +21,10 @@ export class PagoElectronicoComponent implements OnInit {
       this.router.navigate(['']);
       return;
     }
-    let dataPago = {
+    const dataPago = {
       pedidoAnombreDe: ''
-    }
+    };
+    dataPago.pedidoAnombreDe = '';
     this.articuloService.pay(dataPago)
       .subscribe((res: any) => {
         this.articuloService.idComanda = res.data;
diff --git a/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts b/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
index 2d98636..0ae313b 100644
--- a/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
+++ b/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
@@ -19,9 +19,9 @@ export class PagoTarjetaComponent implements OnInit {
       this.router.navigate(['']);
       return;
     }
-    let dataPago = {
+    const dataPago = {
       pedidoAnombreDe: ''
-    }
+    };
     this.articuloService.pay(dataPago)
       .subscribe((res: any) => {
         this.articuloService.idComanda = res.data;
diff --git a/src/app/modules/pedidos-salientes/pedidos-salientes.component.ts b/src/app/modules/pedidos-salientes/pedidos-salientes.component.ts
index 04e3fd6..caa0dfe 100644
--- a/src/app/modules/pedidos-salientes/pedidos-salientes.component.ts
+++ b/src/app/modules/pedidos-salientes/pedidos-salientes.component.ts
@@ -21,7 +21,7 @@ export class PedidosSalientesComponent implements OnInit {
     this.ciclo();
   }
 
-  ngOnDestroy() {
+  OnDestroy() {
     clearTimeout(this.cicloTime);
   }
 
diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
index c9d4254..f304b4f 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit } from '@angular/core';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
@@ -7,9 +7,9 @@ import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
 
 @Component({
-  selector: "app-seleccion-articulos",
-  templateUrl: "./seleccion-articulos.component.html",
-  styleUrls: ["./seleccion-articulos.component.scss"]
+  selector: 'app-seleccion-articulos',
+  templateUrl: './seleccion-articulos.component.html',
+  styleUrls: ['./seleccion-articulos.component.scss']
 })
 export class SeleccionArticulosComponent implements OnInit {
   showSpinner = true;
@@ -68,10 +68,10 @@ export class SeleccionArticulosComponent implements OnInit {
     this.articuloService.getAll()
       .subscribe((result: IArticulo[]) => {
         this.articuloService.setArticulosSinImagen(result);
-        if (this.queMostrar == 'ordenar') {
+        if (this.queMostrar === 'ordenar') {
           this.categorias.forEach((categoria: ICategoria) => {
-            let tempArticulos = result.filter((articulo: IArticulo) => {
-              return articulo.categoria_selfservice == categoria.id;
+            const tempArticulos = result.filter((articulo: IArticulo) => {
+              return articulo.categoria_selfservice === categoria.id;
             });
             result = tempArticulos;
           });
@@ -90,7 +90,7 @@ export class SeleccionArticulosComponent implements OnInit {
   }
 
   filterItems() {
-    if (this.categoriaActive == 0) {
+    if (this.categoriaActive === 0) {
       this.auxArticulos = this.articulos;
       return;
     }
@@ -109,7 +109,7 @@ export class SeleccionArticulosComponent implements OnInit {
   }
 
   selectCategoria(index: number, idCategoria?: number) {
-    if (this.categoriaActive == idCategoria) return;
+    if (this.categoriaActive === idCategoria) return;
     this.categoriaActive = idCategoria;
     this.allActive = idCategoria === 0 ? true : false;
     this.categorias.forEach((categoria, i) => {
@@ -136,16 +136,16 @@ export class SeleccionArticulosComponent implements OnInit {
   }
 
   scrollY(el: HTMLElement, value) {
-    el.scroll({ behavior: "smooth", top: value + el.scrollTop });
+    el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     this.timeoutHandler = setInterval(() => {
-      el.scroll({ behavior: "smooth", top: value + el.scrollTop });
+      el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     }, 500);
   }
 
   scrollX(el: HTMLElement, value) {
-    el.scroll({ behavior: "smooth", left: value + el.scrollLeft });
+    el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     this.timeoutHandler = setInterval(() => {
-      el.scroll({ behavior: "smooth", left: value + el.scrollLeft });
+      el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     }, 500);
   }
 }
diff --git a/src/app/services/articulo/articulo.service.ts b/src/app/services/articulo/articulo.service.ts
index cad045b..9a73636 100644
--- a/src/app/services/articulo/articulo.service.ts
+++ b/src/app/services/articulo/articulo.service.ts
@@ -11,7 +11,7 @@ export class ArticuloService {
   articuloAcargar: IArticulo;
   promoAcargar: IArticulo;
   mostrar: string;
-  esPromoPersonalizada: boolean = false;
+  esPromoPersonalizada = false;
   urlDeboSuite = APP_SETTINGS.apiDeboSuite;
   medioPago: number;
   idComanda: number;
@@ -34,10 +34,10 @@ export class ArticuloService {
   }
 
   setArticulo(articulo: IArticulo) {
-    for (let i = 0; i < this.carrito.length; i++) {
-      if (this.carrito[i].id === articulo.id) {
+    for (const articuloCarrito of this.carrito) {
+      if (articuloCarrito.id === articulo.id) {
         if (articulo.PRO) break;
-        this.carrito[i].cantidad++;
+        articuloCarrito.cantidad++;
         return;
       }
     }
@@ -49,14 +49,13 @@ export class ArticuloService {
     return new Observable((observer) => {
       this.clienteService.getById(-1)
         .subscribe(cliente => {
-          let puntoVenta = APP_SETTINGS.puntoVenta;
           this.markArticuloInPromoAsRemoved();
           this.http.post(`${this.urlDeboSuite}/comprobante/guardar/${this.medioPago}`, {
             productos: this.carrito,
-            cliente: cliente,
+            cliente,
             origen: 'autoservicio',
             codigoVendedor: 5,
-            puntoVenta: puntoVenta,
+            puntoVenta: APP_SETTINGS.puntoVenta,
             pedidoAnombreDe: dataPago.pedidoAnombreDe,
             numeroPlanilla: APP_SETTINGS.numeroPlanilla,
           })
@@ -82,9 +81,9 @@ export class ArticuloService {
   }
 
   markArticuloInPromoAsRemoved() {
-    this.carrito.forEach((articulo: IArticulo) => {
-      if (articulo.PRO) {
-        articulo.productos.forEach((articulo: IArticulo) => {
+    this.carrito.forEach((articuloCarrito: IArticulo) => {
+      if (articuloCarrito.PRO) {
+        articuloCarrito.productos.forEach((articulo: IArticulo) => {
           if (articulo.cantidadAdicionada === 0) {
             articulo.cantidad = 0;
             articulo.importeValorExtra = 0;
diff --git a/src/app/services/cliente/cliente.service.ts b/src/app/services/cliente/cliente.service.ts
index b99954e..54dc66a 100644
--- a/src/app/services/cliente/cliente.service.ts
+++ b/src/app/services/cliente/cliente.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { APP_SETTINGS } from "src/etc/AppSettings";
+import { APP_SETTINGS } from 'src/etc/AppSettings';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/services/comanda/comanda.service.ts b/src/app/services/comanda/comanda.service.ts
index 1020ed2..26ce17a 100644
--- a/src/app/services/comanda/comanda.service.ts
+++ b/src/app/services/comanda/comanda.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from "@angular/common/http";
-import { APP_SETTINGS } from "src/etc/AppSettings";
+import { HttpClient } from '@angular/common/http';
+import { APP_SETTINGS } from 'src/etc/AppSettings';
 
 @Injectable({
   providedIn: 'root'
diff --git a/tslint.json b/tslint.json
index d7e0bc6..857367f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -8,6 +8,10 @@
     },
     "component-class-suffix": true,
     "contextual-lifecycle": true,
+    "curly": [
+      true,
+      "ignore-same-line"
+    ],
     "directive-class-suffix": true,
     "directive-selector": [
       true,