etkr4k/bedolaga-cabinet
1
0
Fork 0
mirror of https://github.com/chillpadclub/bedolaga-cabinet.git synced 2026-07-28 09:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict markers in types

Browse Source
This commit is contained in:
PEDZEO
2026-01-19 00:56:23 +03:00
parent 5f25dabb46
commit 89a219c3ef
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/types/index.ts
View File

@@ -517,16 +517,6 @@ export interface ManualCheckResponse {
new_status: string | null new_status: string | null
} }
<<<<<<< HEAD
// Ticket notification types
export interface TicketNotification {
id: number
ticket_id: number
notification_type: string
message: string
is_read: boolean
created_at: string
=======
// Ticket notifications types // Ticket notifications types
export interface TicketNotification { export interface TicketNotification {
id: number id: number
@@ -536,25 +526,17 @@ export interface TicketNotification {
is_read: boolean is_read: boolean
created_at: string created_at: string
read_at: string | null read_at: string | null
>>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076
} }
export interface TicketNotificationList { export interface TicketNotificationList {
items: TicketNotification[] items: TicketNotification[]
<<<<<<< HEAD
total: number
=======
unread_count: number unread_count: number
>>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076
} }
export interface UnreadCountResponse { export interface UnreadCountResponse {
unread_count: number unread_count: number
} }
<<<<<<< HEAD
=======
// Extended TicketSettings with cabinet notifications
export interface TicketSettings { export interface TicketSettings {
sla_enabled: boolean sla_enabled: boolean
sla_minutes: number sla_minutes: number
@@ -564,4 +546,3 @@ export interface TicketSettings {
cabinet_user_notifications_enabled: boolean cabinet_user_notifications_enabled: boolean
cabinet_admin_notifications_enabled: boolean cabinet_admin_notifications_enabled: boolean
} }
>>>>>>> af948391078db4bb97a333feb7e0ddfcf638b076