diff --git a/src/modules/payment/controllers/payment.controller.ts b/src/modules/payment/controllers/payment.controller.ts
index b4a306d..319f1d8 100644
--- a/src/modules/payment/controllers/payment.controller.ts
+++ b/src/modules/payment/controllers/payment.controller.ts
@@ -42,12 +42,20 @@ export class PaymentController {
 
   @ApiBearerAuth()
   @Get('public/payments')
-  @ApiOperation({ summary: 'get all payments as admin' })
+  @ApiOperation({ summary: 'get all payments as user' })
   findAllByUser(@UserId() userId: string, @Query() dto: FindPaymentsDto) {
     return this.paymentsService.findAllByUser(dto, userId);
   }
 
-  /*===============Admin=============== */
+  /*=============== Admin =============== */
+
+  @ApiBearerAuth()
+  @Get('public/payments')
+  @ApiOperation({ summary: 'get all payments as user' })
+  findAll(@Query() dto: FindPaymentsDto) {
+    return this.paymentsService.findAll(dto);
+  }
+
 
   @Post('admin/payments/:paymentId/verify/cash')
   @UseGuards(AuthGuard)
diff --git a/src/modules/payment/dto/find-payments.dto.ts b/src/modules/payment/dto/find-payments.dto.ts
index 41d8eba..57f3866 100644
--- a/src/modules/payment/dto/find-payments.dto.ts
+++ b/src/modules/payment/dto/find-payments.dto.ts
@@ -55,6 +55,11 @@ export class FindPaymentsDto {
   @IsString()
   search?: string;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  orderId?: string;
+
   @ApiPropertyOptional({ format: 'date-time' })
   @IsOptional()
   @IsDateString()
diff --git a/src/modules/payment/repositories/payment.repository.ts b/src/modules/payment/repositories/payment.repository.ts
index fb54aa4..4ce8af8 100644
--- a/src/modules/payment/repositories/payment.repository.ts
+++ b/src/modules/payment/repositories/payment.repository.ts
@@ -25,7 +25,8 @@ export class PaymentRepository extends EntityRepository<Payment> {
       order = 'desc',
       userId,
       from,
-      to
+      to,
+      orderId
     } = opts;
 
     const offset = (page - 1) * limit;
@@ -53,6 +54,9 @@ export class PaymentRepository extends EntityRepository<Payment> {
       where.order = { user: { id: userId } };
     }
 
+    if (orderId) {
+      where.order = { id: orderId }
+    }
     // Filter by date range
     if (from || to) {
       where.createdAt = {};