Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production

This commit is contained in:
Fadli 2022-12-20 11:02:27 +07:00
commit 83ef6ea225
2 changed files with 2 additions and 1 deletions

View File

@ -357,6 +357,7 @@ export class ProductService {
.addSelect('product.supplier_id', 'supplier')
.addSelect('supplier.status', 'status')
.addSelect('history_status.partner_id', 'partner')
.addSelect('product.type')
.orderBy('price', 'ASC')
.distinct();

View File

@ -1044,7 +1044,7 @@ export class TransactionService {
};
} else {
hitSupplier = {
success: hitSupplier.includes('diproses'),
success: hitSupplier.includes('diproses') || hitSupplier.includes('dalam proses'),
msg: hitSupplier,
};
}