diff --git a/angular/src/app/pages/account/orders/orders.component.ts b/angular/src/app/pages/account/orders/orders.component.ts index 8121c87..6d99d5f 100644 --- a/angular/src/app/pages/account/orders/orders.component.ts +++ b/angular/src/app/pages/account/orders/orders.component.ts @@ -73,12 +73,34 @@ export class OrdersComponent implements OnInit { this.lastViewOrder = 3; switch (dateFilter.filterType) { case 'between': - this.filteredOfDatePurchases = this.purchases.filter((value) => { - return moment(value.transactionCreateDate).isBetween( - dateFilter.from, - moment(dateFilter.to).add(1, 'day') - ); - }); + this.ordersLoadingStatus = true; + this.filteredOfDatePurchases = [] + const token = this.cookiesService.getItem('token') + this.wpJsonService.getTransactionsBetween(environment.systemId, token || '', environment.icardProxy, { + date_from: dateFilter.from?.toLocaleString() || '', + date_to: dateFilter.to?.toLocaleString() || '' + }).subscribe({ + next: (value) => { + this.filteredOfDatePurchases = Object.values(value)[0] as Purchase[] + this.ordersLoadingStatus = false + this.purchasesShortArray = this.filteredOfDatePurchases.slice( + 0, + this.lastViewOrder + ); + console.log(value); + + }, + error: (err) => { + console.error(err); + + } + }) + // this.filteredOfDatePurchases = this.purchases.filter((value) => { + // return moment(value.transactionCreateDate).isBetween( + // dateFilter.from, + // moment(dateFilter.to).add(1, 'day') + // ); + // }); break; case 'currentMonth': diff --git a/angular/src/app/services/wp-json.service.ts b/angular/src/app/services/wp-json.service.ts index 68fb9fb..4540729 100644 --- a/angular/src/app/services/wp-json.service.ts +++ b/angular/src/app/services/wp-json.service.ts @@ -58,6 +58,10 @@ export class WpJsonService { return this._request(`trans/${systemId}/${token}/`, 'GET', null, false, url) } + getTransactionsBetween(systemId: string, token: string, url: string, body: {date_from: string, date_to: string}): Observable { + return this._request(`trans/${systemId}/${token}/`, 'POST', body, false, url) + } + getTransactionsInfo(systemId: string, token: string, url: string, delta: number): Observable { return this._request(`purchase/${systemId}/${token}/`, 'GET', null, false, url) }