Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend

src/product/product.service.ts

@@ -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();
 

src/transaction/transaction.service.ts

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