Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
This commit is contained in:
commit
1160ddff8c
|
@ -366,11 +366,13 @@ export class ProductService {
|
||||||
'product.currentStatus',
|
'product.currentStatus',
|
||||||
'product.statusHistory',
|
'product.statusHistory',
|
||||||
'history_status',
|
'history_status',
|
||||||
'history_status.deleted_at is NULL and history_status.partner_id = :id_partner and history_status.status = ACTIVE',
|
'history_status.deleted_at is NULL'
|
||||||
|
)
|
||||||
|
.where(`history_status.partner_id = :id_partner and history_status.status = 'ACTIVE'`,
|
||||||
{
|
{
|
||||||
id_partner: user.partner.id,
|
id_partner: user.partner.id,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.select(['product.id'])
|
.select(['product.id'])
|
||||||
.addSelect([
|
.addSelect([
|
||||||
'product.name',
|
'product.name',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user