danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug in the customer and tikcet for admin panel

Browse Source
This commit is contained in:
mahyargdz
2025-03-03 09:31:23 +03:30
parent 73fb9b915c
commit 0abac00bde
9 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/invoices/repositories/invoices.repository.ts
+4 -2
View File
@@ -21,7 +21,9 @@ export class InvoicesRepository extends Repository<Invoice> {
.leftJoinAndSelect("invoice.user", "user")
.leftJoinAndSelect("invoice.items", "items")
.leftJoinAndSelect("items.subscriptionPlan", "subscriptionPlan", "subscriptionPlan.id IS NOT NULL")
.leftJoinAndSelect("subscriptionPlan.service", "service", "subscriptionPlan.id IS NOT NULL");
.leftJoinAndSelect("subscriptionPlan.plan", "plan", "subscriptionPlan.id IS NOT NULL")
.leftJoin("plan.service", "service", "subscriptionPlan.id IS NOT NULL")
.addSelect(["service.name", "service.id"]);
if (queryDto.q) {
queryBuilder
@@ -39,7 +41,7 @@ export class InvoicesRepository extends Repository<Invoice> {
}
if (queryDto.serviceId) {
queryBuilder.andWhere("subscriptionPlan.serviceId = :serviceId", { serviceId: queryDto.serviceId });
queryBuilder.andWhere("plan.serviceId = :serviceId", { serviceId: queryDto.serviceId });
}
if (queryDto.since) {