fix: Merge conflicts resolved in backend folder

This commit is contained in:
dhinesh-m24
2026-02-04 11:37:30 +05:30
parent 599890c58d
commit fcb1ddbbb3
7 changed files with 825 additions and 26 deletions

View File

@@ -34,6 +34,7 @@ query listRecentPayments(
shift {
title
date
location
locationAddress
description
}
@@ -85,6 +86,7 @@ query getRecentPaymentById($id: UUID!) @auth(level: USER) {
shift {
title
date
location
locationAddress
description
}
@@ -157,7 +159,18 @@ query listRecentPaymentsByStaffId(
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
@@ -203,7 +216,18 @@ query listRecentPaymentsByApplicationId(
amount
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
@@ -249,7 +273,18 @@ query listRecentPaymentsByInvoiceId(
amount
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
@@ -295,7 +330,18 @@ query listRecentPaymentsByStatus(
amount
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
@@ -342,7 +388,18 @@ query listRecentPaymentsByInvoiceIds(
amount
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
@@ -392,6 +449,7 @@ query listRecentPaymentsByBusinessId(
id
title
date
location
locationAddress
description
}
@@ -408,7 +466,18 @@ query listRecentPaymentsByBusinessId(
business { id businessName }
vendor { id companyName }
order { id eventName }
order {
id
eventName
#location
teamHub {
address
placeId
hubName
}
}
}
}
}
}