Skip to content

Commit cfea266

Browse files
laraminoneslaraminones
authored
DELETE product orders' date filter (#179)
1 parent 18bf033 commit cfea266

5 files changed

Lines changed: 3 additions & 93 deletions

File tree

‎src/app/pages/product-orders/product-orders.component.ts‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy {
4141
showOrderDetails:boolean=false;
4242
orderToShow:any;
4343
dateRange = new FormControl();
44-
selectedDate:any;
4544
countries: any[] = countries;
4645
preferred:boolean=false;
4746
loading_more: boolean = false;
@@ -90,10 +89,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy {
9089

9190
ngOnInit() {
9291
this.loading=true;
93-
let today = new Date();
94-
today.setMonth(today.getMonth()-1);
95-
this.selectedDate = today.toISOString();
96-
this.dateRange.setValue('month');
9792

9893
let order_button = document.getElementById('order-button')
9994
let invoices_button = document.getElementById('bill-button')
@@ -159,7 +154,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy {
159154
let options = {
160155
"filters": this.filters,
161156
"partyId": this.partyId,
162-
"selectedDate": this.selectedDate,
163157
"orders": this.orders,
164158
"role": this.role
165159
}
@@ -205,29 +199,6 @@ export class ProductOrdersComponent implements OnInit, OnDestroy {
205199
}
206200
}
207201

208-
filterOrdersByDate(){
209-
if(this.dateRange.value == 'month'){
210-
let today = new Date();
211-
today.setDate(1);
212-
today.setMonth(today.getMonth()-1);
213-
this.selectedDate = today.toISOString();
214-
} else if (this.dateRange.value == 'months'){
215-
let today = new Date();
216-
today.setDate(1);
217-
today.setMonth(today.getMonth()-3);
218-
this.selectedDate = today.toISOString();
219-
} else if(this.dateRange.value == 'year'){
220-
let today = new Date();
221-
today.setDate(1);
222-
today.setMonth(0);
223-
today.setFullYear(today.getFullYear()-1);
224-
this.selectedDate = today.toISOString();
225-
} else {
226-
this.selectedDate = undefined
227-
}
228-
this.getOrders(false);
229-
}
230-
231202
getTotalPrice(items:any[]){
232203
let totalPrice = [];
233204
let insertCheck = false;

‎src/app/pages/product-orders/sections/order-info/order-info.component.ts‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy {
4141
showOrderDetails:boolean=false;
4242
orderToShow:any;
4343
dateRange = new FormControl();
44-
selectedDate:any;
4544
countries: any[] = countries;
4645
preferred:boolean=false;
4746
loading_more: boolean = false;
@@ -205,10 +204,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy {
205204

206205
ngOnInit() {
207206
this.loading = true;
208-
let today = new Date();
209-
today.setMonth(today.getMonth()-1);
210-
this.selectedDate = today.toISOString();
211-
this.dateRange.setValue('month');
212207
this.initPartyInfo();
213208
}
214209

@@ -320,7 +315,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy {
320315
let options = {
321316
"filters": this.filters,
322317
"partyId": this.partyId,
323-
"selectedDate": this.selectedDate,
324318
"orders": this.orders,
325319
"role": this.role
326320
}
@@ -378,29 +372,6 @@ export class OrderInfoComponent implements OnInit, AfterViewInit, OnDestroy {
378372
}
379373
}
380374

381-
filterOrdersByDate(){
382-
if(this.dateRange.value == 'month'){
383-
let today = new Date();
384-
today.setDate(1);
385-
today.setMonth(today.getMonth()-1);
386-
this.selectedDate = today.toISOString();
387-
} else if (this.dateRange.value == 'months'){
388-
let today = new Date();
389-
today.setDate(1);
390-
today.setMonth(today.getMonth()-3);
391-
this.selectedDate = today.toISOString();
392-
} else if(this.dateRange.value == 'year'){
393-
let today = new Date();
394-
today.setDate(1);
395-
today.setMonth(0);
396-
today.setFullYear(today.getFullYear()-1);
397-
this.selectedDate = today.toISOString();
398-
} else {
399-
this.selectedDate = undefined
400-
}
401-
this.getOrders(false);
402-
}
403-
404375
getTotalPrice(items:any[]){
405376
let totalPrice = [];
406377
let insertCheck = false;

‎src/app/pages/user-profile/profile-sections/order-info/order-info.component.ts‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy {
3434
showOrderDetails:boolean=false;
3535
orderToShow:any;
3636
dateRange = new FormControl();
37-
selectedDate:any;
3837
countries: any[] = countries;
3938
preferred:boolean=false;
4039
loading_more: boolean = false;
@@ -81,10 +80,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy {
8180

8281
ngOnInit() {
8382
this.loading=true;
84-
let today = new Date();
85-
today.setMonth(today.getMonth()-1);
86-
this.selectedDate = today.toISOString();
87-
this.dateRange.setValue('month');
8883
this.initPartyInfo();
8984
}
9085

@@ -143,7 +138,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy {
143138
let options = {
144139
"filters": this.filters,
145140
"partyId": this.partyId,
146-
"selectedDate": this.selectedDate,
147141
"orders": this.orders,
148142
"role": this.role
149143
}
@@ -189,29 +183,6 @@ export class OrderInfoComponent implements OnInit, OnDestroy {
189183
}
190184
}
191185

192-
filterOrdersByDate(){
193-
if(this.dateRange.value == 'month'){
194-
let today = new Date();
195-
today.setDate(1);
196-
today.setMonth(today.getMonth()-1);
197-
this.selectedDate = today.toISOString();
198-
} else if (this.dateRange.value == 'months'){
199-
let today = new Date();
200-
today.setDate(1);
201-
today.setMonth(today.getMonth()-3);
202-
this.selectedDate = today.toISOString();
203-
} else if(this.dateRange.value == 'year'){
204-
let today = new Date();
205-
today.setDate(1);
206-
today.setMonth(0);
207-
today.setFullYear(today.getFullYear()-1);
208-
this.selectedDate = today.toISOString();
209-
} else {
210-
this.selectedDate = undefined
211-
}
212-
this.getOrders(false);
213-
}
214-
215186
getTotalPrice(items:any[]){
216187
let totalPrice = [];
217188
let insertCheck = false;

‎src/app/services/pagination.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,10 @@ export class PaginationService {
546546
}
547547
}*/
548548

549-
async getOrders(page: number, filters: Category[], partyId: any, selectedDate: any, orders: any[], role: any): Promise<any[]> {
549+
async getOrders(page: number, filters: Category[], partyId: any, orders: any[], role: any): Promise<any[]> {
550550
try {
551551
// Get Orders
552-
orders = await this.orderService.getProductOrders(partyId, page, filters, selectedDate, role);
552+
orders = await this.orderService.getProductOrders(partyId, page, filters, role);
553553
console.log('getOrders', orders);
554554
// Obtener todas las cuentas de facturación en paralelo
555555
const billingAccounts = await Promise.all(orders.map(order => this.accountService.getBillingAccountById(order.billingAccount.id)));

‎src/app/services/product-order-service.service.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class ProductOrderService {
2424
return this.http.post<any>(url, prod, { observe: 'response' });
2525
}
2626

27-
getProductOrders(partyId:any,page:any,filters:any[],date:any,role:any){
27+
getProductOrders(partyId:any,page:any,filters:any[],role:any){
2828
console.log('getProductOrders');
2929
let url = `${ProductOrderService.BASE_URL}${ProductOrderService.API_ORDERING}/productOrder?limit=${ProductOrderService.ORDER_LIMIT}&offset=${page}&relatedParty.id=${partyId}&relatedParty.role=${role}`;
3030

@@ -40,9 +40,6 @@ export class ProductOrderService {
4040
}
4141
url=url+'&state='+status;
4242
}
43-
if(date!=undefined){
44-
url=url+'&orderDate>'+date;
45-
}
4643
return lastValueFrom(this.http.get<any[]>(url));
4744
}
4845

0 commit comments

Comments
 (0)