Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	src/transaction/transaction.service.ts

src/transaction/transaction.controller.ts

@@ -155,6 +155,23 @@ export class TransactionController {
     };
   }
 
+  @Get('check-bill-history/:id')
+  async getCheckBillHistory(
+    @Param('id') id: string,
+    @Request() req,
+  ) {
+    const data = await this.transactionService.findOne(
+      req.user.userId,
+      id,
+    );
+
+    return {
+      ...data,
+      statusCode: HttpStatus.OK,
+      message: 'success',
+    };
+  }
+
   @Get('history-user/:id')
   async getHistoryTransactionUserByParam(
     @Query('page') page: number,

src/transaction/transaction.service.ts

@@ -50,7 +50,7 @@ export class TransactionService {
     private commissionService: CommissionService,
     private supplierService: SupplierService,
     private connection: Connection,
-  ) { }
+  ) {}
 
   async addSupplierSaldo(addSaldoSupplier: AddSaldoSupplier, currentUser: any) {
     const supplier = await this.supplierService.findByCode(
@@ -1380,6 +1380,25 @@ export class TransactionService {
     };
   }
 
+  async findOne(user: string, id: string) {
+    try {
+      return this.checkBillHistoryRepository.findOneOrFail({
+        where: {
+          trx_id: id,
+          user: user,
+        },
+      });
+    } catch (e) {
+        throw new HttpException(
+            {
+              statusCode: HttpStatus.NOT_FOUND,
+              error: 'Billing not found',
+            },
+            HttpStatus.NOT_FOUND,
+        );
+    }
+  }
+
   async topUpHistoryByUser(
     page: number,
     user: string,
@@ -1836,7 +1855,7 @@ export class TransactionService {
   async findOneBillById(trxId: string) {
     try {
       return await this.checkBillHistoryRepository.findOneOrFail({
-        where:{
+        where: {
           trx_id: trxId,
         },
       });