Merge pull request #151 from open-commercial/master

Merge master changes
open-commercial · Mar 8, 2023 · 05e8ede · 05e8ede
2 parents 1c9ba73 + 61582c4
commit 05e8ede
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/app/components/facturas-venta/facturas-venta.component.ts b/src/app/components/facturas-venta/facturas-venta.component.ts
@@ -437,4 +437,14 @@ export class FacturasVentaComponent extends ListadoDirective implements OnInit {
       })
     ;
   }
+
+  filter(): void {
+    this.batchActionsService.clear(this.baKey)
+    super.filter();
+  }
+
+  reset() {
+    this.batchActionsService.clear(this.baKey);
+    super.reset();
+  }
 }
diff --git a/src/app/components/producto-multi-editor/producto-multi-editor.component.html b/src/app/components/producto-multi-editor/producto-multi-editor.component.html
@@ -14,7 +14,7 @@ <h1 class="h3 col-md-10">
       <li *ngFor="let bae of baElements">{{ bae.description }}</li>
     </ul>
   </div>
-  <form [formGroup]="form" class="mt-2" *ngIf="form" (ngSubmit)="submit()">
+  <form [formGroup]="form" class="mt-2" *ngIf="form">
     <table class="table table-sm table-bordered">
       <caption class="sr-only">Campos de productos a editar</caption>
       <thead class="sr-only">
@@ -183,7 +183,7 @@ <h1 class="h3 col-md-10">
       </tbody>
     </table>
     <div class="text-end">
-      <button class="btn btn-primary" type="submit" [disabled]="form.invalid || !hasCheckedAnything()">
+      <button class="btn btn-primary" type="button" (click)="submit()" [disabled]="form.invalid || !hasCheckedAnything()">
         <fa-icon [icon]="['fas', 'check']"></fa-icon> Actualizar
       </button>
     </div>

diff --git a/src/app/components/productos/productos.component.ts b/src/app/components/productos/productos.component.ts
@@ -394,4 +394,14 @@ export class ProductosComponent extends ListadoDirective implements OnInit {
       ;
     }
   }
+
+  filter(): void {
+    this.batchActionsService.clear(this.baKey)
+    super.filter();
+  }
+
+  reset() {
+    this.batchActionsService.clear(this.baKey);
+    super.reset();
+  }
 }