PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: unselect product that not active

Browse Source
This commit is contained in:
ilham 2021-12-20 12:33:48 +07:00
parent 691035c394
commit bee8557055
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/product/product.service.ts
View File

@ -57,11 +57,12 @@ export class ProductService {
if (supplier == 'null' || !supplier) { if (supplier == 'null' || !supplier) {
supplier = (await this.supplierService.findByActive()).id; supplier = (await this.supplierService.findByActive()).id;
} }
const baseQuery = this.productRepository const baseQuery = this.productRepository
.createQueryBuilder('product') .createQueryBuilder('product')
.leftJoin('product.sub_categories', 'sub_categories') .leftJoin('product.sub_categories', 'sub_categories')
.leftJoin('sub_categories.category', 'category') .leftJoin('sub_categories.category', 'category')
.where('product.supplier_id = :supplier_id', { .where(`product.supplier_id = :supplier_id`, {
supplier_id: supplier, supplier_id: supplier,
}) })
.leftJoinAndMapOne( .leftJoinAndMapOne(
@ -131,12 +132,16 @@ export class ProductService {
if (supplier != 'null' && !supplier) { if (supplier != 'null' && !supplier) {
supplier = (await this.supplierService.findByActive()).id; supplier = (await this.supplierService.findByActive()).id;
} }
const baseQuery = this.productRepository const baseQuery = this.productRepository
.createQueryBuilder('product') .createQueryBuilder('product')
.leftJoin('product.sub_categories', 'sub_categories') .leftJoin('product.sub_categories', 'sub_categories')
.where('product.supplier_id = :supplier_id', { .where(
`product.supplier_id = :supplier_id and product.status = 'ACTIVE'`,
{
supplier_id: supplier, supplier_id: supplier,
}) },
)
.leftJoinAndMapOne( .leftJoinAndMapOne(
'product.currentPrice', 'product.currentPrice',
'product.priceHistory', 'product.priceHistory',
@ -176,7 +181,7 @@ export class ProductService {
.createQueryBuilder('product') .createQueryBuilder('product')
.leftJoin('product.sub_categories', 'sub_categories') .leftJoin('product.sub_categories', 'sub_categories')
.where( .where(
'sub_categories.category_id = :id and product.supplier_id = :supplier_id', `sub_categories.category_id = :id and product.supplier_id = :supplier_id and product.status = 'ACTIVE'`,
{ {
id: categories, id: categories,
supplier_id: supplier.id, supplier_id: supplier.id,