From 52f7102309dbc3675ea9c1ae0c5b17d43dce86b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lara=20Mi=C3=B1ones=20Rodr=C3=ADguez?= Date: Thu, 8 Jan 2026 16:47:30 +0100 Subject: [PATCH] DELETE product orders' date filter --- .../product-orders.component.ts | 29 ------------------- .../order-info/order-info.component.ts | 29 ------------------- .../order-info/order-info.component.ts | 29 ------------------- src/app/services/pagination.service.ts | 4 +-- .../services/product-order-service.service.ts | 5 +--- 5 files changed, 3 insertions(+), 93 deletions(-) diff --git a/src/app/pages/product-orders/product-orders.component.ts b/src/app/pages/product-orders/product-orders.component.ts index d1f7055e..3ee3e139 100644 --- a/src/app/pages/product-orders/product-orders.component.ts +++ b/src/app/pages/product-orders/product-orders.component.ts @@ -41,7 +41,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy { showOrderDetails:boolean=false; orderToShow:any; dateRange = new FormControl(); - selectedDate:any; countries: any[] = countries; preferred:boolean=false; loading_more: boolean = false; @@ -90,10 +89,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy { ngOnInit() { this.loading=true; - let today = new Date(); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - this.dateRange.setValue('month'); let order_button = document.getElementById('order-button') let invoices_button = document.getElementById('bill-button') @@ -159,7 +154,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy { let options = { "filters": this.filters, "partyId": this.partyId, - "selectedDate": this.selectedDate, "orders": this.orders, "role": this.role } @@ -205,29 +199,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy { } } - filterOrdersByDate(){ - if(this.dateRange.value == 'month'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - } else if (this.dateRange.value == 'months'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-3); - this.selectedDate = today.toISOString(); - } else if(this.dateRange.value == 'year'){ - let today = new Date(); - today.setDate(1); - today.setMonth(0); - today.setFullYear(today.getFullYear()-1); - this.selectedDate = today.toISOString(); - } else { - this.selectedDate = undefined - } - this.getOrders(false); - } - getTotalPrice(items:any[]){ let totalPrice = []; let insertCheck = false; diff --git a/src/app/pages/product-orders/sections/order-info/order-info.component.ts b/src/app/pages/product-orders/sections/order-info/order-info.component.ts index fc7de776..dc10d67c 100644 --- a/src/app/pages/product-orders/sections/order-info/order-info.component.ts +++ b/src/app/pages/product-orders/sections/order-info/order-info.component.ts @@ -41,7 +41,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy { showOrderDetails:boolean=false; orderToShow:any; dateRange = new FormControl(); - selectedDate:any; countries: any[] = countries; preferred:boolean=false; loading_more: boolean = false; @@ -205,10 +204,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy { ngOnInit() { this.loading = true; - let today = new Date(); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - this.dateRange.setValue('month'); this.initPartyInfo(); } @@ -320,7 +315,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy { let options = { "filters": this.filters, "partyId": this.partyId, - "selectedDate": this.selectedDate, "orders": this.orders, "role": this.role } @@ -378,29 +372,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy { } } - filterOrdersByDate(){ - if(this.dateRange.value == 'month'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - } else if (this.dateRange.value == 'months'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-3); - this.selectedDate = today.toISOString(); - } else if(this.dateRange.value == 'year'){ - let today = new Date(); - today.setDate(1); - today.setMonth(0); - today.setFullYear(today.getFullYear()-1); - this.selectedDate = today.toISOString(); - } else { - this.selectedDate = undefined - } - this.getOrders(false); - } - getTotalPrice(items:any[]){ let totalPrice = []; let insertCheck = false; diff --git a/src/app/pages/user-profile/profile-sections/order-info/order-info.component.ts b/src/app/pages/user-profile/profile-sections/order-info/order-info.component.ts index c225ca3e..4fef62b4 100644 --- a/src/app/pages/user-profile/profile-sections/order-info/order-info.component.ts +++ b/src/app/pages/user-profile/profile-sections/order-info/order-info.component.ts @@ -34,7 +34,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy { showOrderDetails:boolean=false; orderToShow:any; dateRange = new FormControl(); - selectedDate:any; countries: any[] = countries; preferred:boolean=false; loading_more: boolean = false; @@ -81,10 +80,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy { ngOnInit() { this.loading=true; - let today = new Date(); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - this.dateRange.setValue('month'); this.initPartyInfo(); } @@ -143,7 +138,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy { let options = { "filters": this.filters, "partyId": this.partyId, - "selectedDate": this.selectedDate, "orders": this.orders, "role": this.role } @@ -189,29 +183,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy { } } - filterOrdersByDate(){ - if(this.dateRange.value == 'month'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-1); - this.selectedDate = today.toISOString(); - } else if (this.dateRange.value == 'months'){ - let today = new Date(); - today.setDate(1); - today.setMonth(today.getMonth()-3); - this.selectedDate = today.toISOString(); - } else if(this.dateRange.value == 'year'){ - let today = new Date(); - today.setDate(1); - today.setMonth(0); - today.setFullYear(today.getFullYear()-1); - this.selectedDate = today.toISOString(); - } else { - this.selectedDate = undefined - } - this.getOrders(false); - } - getTotalPrice(items:any[]){ let totalPrice = []; let insertCheck = false; diff --git a/src/app/services/pagination.service.ts b/src/app/services/pagination.service.ts index d90fd5d3..89444cb7 100644 --- a/src/app/services/pagination.service.ts +++ b/src/app/services/pagination.service.ts @@ -546,10 +546,10 @@ export class PaginationService { } }*/ - async getOrders(page: number, filters: Category[], partyId: any, selectedDate: any, orders: any[], role: any): Promise { + async getOrders(page: number, filters: Category[], partyId: any, orders: any[], role: any): Promise { try { // Get Orders - orders = await this.orderService.getProductOrders(partyId, page, filters, selectedDate, role); + orders = await this.orderService.getProductOrders(partyId, page, filters, role); console.log('getOrders', orders); // Obtener todas las cuentas de facturación en paralelo const billingAccounts = await Promise.all(orders.map(order => this.accountService.getBillingAccountById(order.billingAccount.id))); diff --git a/src/app/services/product-order-service.service.ts b/src/app/services/product-order-service.service.ts index 7044bbb1..7aeff623 100644 --- a/src/app/services/product-order-service.service.ts +++ b/src/app/services/product-order-service.service.ts @@ -24,7 +24,7 @@ export class ProductOrderService { return this.http.post(url, prod, { observe: 'response' }); } - getProductOrders(partyId:any,page:any,filters:any[],date:any,role:any){ + getProductOrders(partyId:any,page:any,filters:any[],role:any){ console.log('getProductOrders'); let url = `${ProductOrderService.BASE_URL}${ProductOrderService.API_ORDERING}/productOrder?limit=${ProductOrderService.ORDER_LIMIT}&offset=${page}&relatedParty.id=${partyId}&relatedParty.role=${role}`; @@ -40,9 +40,6 @@ export class ProductOrderService { } url=url+'&state='+status; } - if(date!=undefined){ - url=url+'&orderDate>'+date; - } return lastValueFrom(this.http.get(url)); }