diff --git a/src/product/product-sub-categories.service.ts b/src/product/product-sub-categories.service.ts index f5b30a3..34e79a4 100644 --- a/src/product/product-sub-categories.service.ts +++ b/src/product/product-sub-categories.service.ts @@ -48,6 +48,7 @@ export class ProductSubCategoriesService { return this.productSubCategoriesRepository.findAndCount({ skip: page * 10, take: 10, + relations: ['category'], order: { version: 'DESC', }, diff --git a/src/product/product.controller.ts b/src/product/product.controller.ts index 4c33c15..a3bea09 100644 --- a/src/product/product.controller.ts +++ b/src/product/product.controller.ts @@ -117,11 +117,13 @@ export class ProductController { @Get('by-categories') async findByCategories( @Query('page') page: number, + @Query('pageSize') pageSize: number, @Query('categories') categories: string, @Request() req, ) { const data = await this.productService.findAllForPartner( page, + pageSize, categories, req.user.username, ); diff --git a/src/product/product.service.ts b/src/product/product.service.ts index 53be4c3..8e2980d 100644 --- a/src/product/product.service.ts +++ b/src/product/product.service.ts @@ -125,7 +125,12 @@ export class ProductService { }; } - async findAllForPartner(page: number, categories: string, username: string) { + async findAllForPartner( + page: number, + pageSize: number, + categories: string, + username: string, + ) { const user = await this.usersService.findOneByUsername(username); const supplier = await this.supplierService.findByActive(); @@ -148,8 +153,8 @@ export class ProductService { .setParameter('id_partner', user.partner.id); const data = await baseQuery - .skip(page * 10) - .take(10) + .skip(page * pageSize) + .take(pageSize) .getMany(); const totalData = await baseQuery.getCount(); diff --git a/src/users/supplier/supplier.service.ts b/src/users/supplier/supplier.service.ts index 22a7b92..7a5155e 100644 --- a/src/users/supplier/supplier.service.ts +++ b/src/users/supplier/supplier.service.ts @@ -137,7 +137,7 @@ export class SupplierService { 'supplier.coa', COA, 'coa', - `coa.supplier = supplier.id`, + `coa.supplier = supplier.id and coa.type = '2'`, ) .select(['supplier', 'coa.amount']);