Corrected the spelling mistake JobTicketId in job attendance

Reviewed-on: #155

Marco.Pms.DataAccess/Data/ApplicationDbContext.cs

@@ -7,12 +7,15 @@ using Marco.Pms.Model.DocumentManager;
 using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Expenses;
+using Marco.Pms.Model.Expenses.Masters;
 using Marco.Pms.Model.Forum;
 using Marco.Pms.Model.Mail;
 using Marco.Pms.Model.Master;
 using Marco.Pms.Model.OrganizationModel;
+using Marco.Pms.Model.PaymentGetway;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Roles;
+using Marco.Pms.Model.ServiceProject;
 using Marco.Pms.Model.TenantModels;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Http;
@@ -32,46 +35,149 @@ namespace Marco.Pms.DataAccess.Data
             _httpContextAccessor = httpContextAccessor;
 
         }
-
+        #region ======================================================= System Masters =======================================================
         public DbSet<RefreshToken> RefreshTokens { get; set; }
         public DbSet<TenantStatus> TenantStatus { get; set; }
         public DbSet<SubscriptionStatus> SubscriptionStatus { get; set; }
+        public DbSet<Module> Modules { get; set; }
+        public DbSet<Feature> Features { get; set; }
+        public DbSet<FeaturePermission> FeaturePermissions { get; set; }
+        public DbSet<CurrencyMaster> CurrencyMaster { get; set; }
+        public DbSet<Industry> Industries { get; set; }
+        public DbSet<Inquiries> Inquiries { get; set; }
+        public DbSet<StatusUpdateLog> StatusUpdateLogs { get; set; }
+        public DbSet<PaymentDetail> PaymentDetails { get; set; }
+
+        #endregion
+
+        #region ======================================================= Tenant Masters =======================================================
+        public DbSet<Document> Documents { get; set; }
+        public DbSet<MailingList> MailingList { get; set; }
+        public DbSet<MailDetails> MailDetails { get; set; }
+        public DbSet<MailLog> MailLogs { get; set; }
+        public DbSet<OTPDetails> OTPDetails { get; set; }
+        public DbSet<MPINDetails> MPINDetails { get; set; }
+        public DbSet<FCMTokenMapping> FCMTokenMappings { get; set; }
+
+        #endregion
+
+        #region ======================================================= Tenant =======================================================
         public DbSet<Tenant> Tenants { get; set; }
         public DbSet<SubscriptionPlan> SubscriptionPlans { get; set; }
         public DbSet<SubscriptionPlanDetails> SubscriptionPlanDetails { get; set; }
         public DbSet<TenantSubscriptions> TenantSubscriptions { get; set; }
+        public DbSet<TenantEnquire> TenantEnquires { get; set; }
+
+        #endregion
+
+        #region ======================================================= Employees =======================================================
+
+        #region ======================================================= Masters =======================================================
+        public DbSet<JobRole> JobRoles { get; set; }
+        public DbSet<ApplicationRole> ApplicationRoles { get; set; }
+        public DbSet<RolePermissionMappings> RolePermissionMappings { get; set; }
+        #endregion
+
         public DbSet<ApplicationUser> ApplicationUsers { get; set; }
+        public DbSet<Employee> Employees { get; set; }
+        public DbSet<EmployeeRoleMapping> EmployeeRoleMappings { get; set; }
+        #endregion
+
+        #region ======================================================= Project =======================================================
+
+        #region ======================================================= Masters =======================================================
         public DbSet<ServiceMaster> ServiceMasters { get; set; }
         public DbSet<ActivityGroupMaster> ActivityGroupMasters { get; set; }
         public DbSet<ActivityMaster> ActivityMasters { get; set; }
+        public DbSet<StatusMaster> StatusMasters { get; set; }
+        public DbSet<ActivityCheckList> ActivityCheckLists { get; set; }
+        public DbSet<CheckListMappings> CheckListMappings { get; set; }
+        public DbSet<WorkCategoryMaster> WorkCategoryMasters { get; set; }
+        public DbSet<WorkStatusMaster> WorkStatusMasters { get; set; }
+        public DbSet<GlobalServiceMaster> GlobalServiceMasters { get; set; }
+        public DbSet<GlobalActivityGroupMaster> GlobalActivityGroupMasters { get; set; }
+        public DbSet<GlobalActivityMaster> GlobalActivityMasters { get; set; }
+        #endregion
+
         public DbSet<Project> Projects { get; set; }
         public DbSet<ProjectAllocation> ProjectAllocations { get; set; }
-        public DbSet<StatusMaster> StatusMasters { get; set; }
         public DbSet<Building> Buildings { get; set; }
         public DbSet<Floor> Floor { get; set; }
         public DbSet<WorkArea> WorkAreas { get; set; }
         public DbSet<WorkItem> WorkItems { get; set; }
         public DbSet<WorkShift> WorkShifts { get; set; }
+        public DbSet<ProjectLevelPermissionMapping> ProjectLevelPermissionMappings { get; set; }
+        public DbSet<ProjectServiceMapping> ProjectServiceMappings { get; set; }
+
+        #endregion
+
+        #region ======================================================= Task Allocation =======================================================
         public DbSet<TaskAllocation> TaskAllocations { get; set; }
         public DbSet<TaskComment> TaskComments { get; set; }
         public DbSet<TaskMembers> TaskMembers { get; set; }
         public DbSet<TaskAttachment> TaskAttachments { get; set; }
+        #endregion
+
+        #region ======================================================= Attendace =======================================================
         public DbSet<Attendance> Attendes { get; set; }
         public DbSet<AttendanceLog> AttendanceLogs { get; set; }
-        public DbSet<Employee> Employees { get; set; }
-        public DbSet<EmployeeRoleMapping> EmployeeRoleMappings { get; set; }
-        public DbSet<Module> Modules { get; set; }
-        public DbSet<Feature> Features { get; set; }
-        public DbSet<FeaturePermission> FeaturePermissions { get; set; }
-        public DbSet<ProjectLevelPermissionMapping> ProjectLevelPermissionMappings { get; set; }
-        public DbSet<CurrencyMaster> CurrencyMaster { get; set; }
-        public DbSet<ApplicationRole> ApplicationRoles { get; set; }
-        public DbSet<JobRole> JobRoles { get; set; }
-        public DbSet<RolePermissionMappings> RolePermissionMappings { get; set; }
-        public DbSet<Industry> Industries { get; set; }
-        public DbSet<ActivityCheckList> ActivityCheckLists { get; set; }
-        public DbSet<CheckListMappings> CheckListMappings { get; set; }
-        public DbSet<Inquiries> Inquiries { get; set; }
+        #endregion
+
+        #region ======================================================= Directory =======================================================
+
+        #region ======================================================= Masters =======================================================
+        public DbSet<Bucket> Buckets { get; set; }
+        public DbSet<ContactTagMaster> ContactTagMasters { get; set; }
+        public DbSet<ContactCategoryMaster> ContactCategoryMasters { get; set; }
+        #endregion
+
+        public DbSet<Contact> Contacts { get; set; }
+        public DbSet<ContactEmail> ContactsEmails { get; set; }
+        public DbSet<ContactPhone> ContactsPhones { get; set; }
+        public DbSet<ContactNote> ContactNotes { get; set; }
+        public DbSet<ContactTagMapping> ContactTagMappings { get; set; }
+        public DbSet<EmployeeBucketMapping> EmployeeBucketMappings { get; set; }
+        public DbSet<ContactBucketMapping> ContactBucketMappings { get; set; }
+        public DbSet<ContactProjectMapping> ContactProjectMappings { get; set; }
+        public DbSet<DirectoryUpdateLog> DirectoryUpdateLogs { get; set; }
+        #endregion
+
+        #region ======================================================= Finance =======================================================
+
+        #region ======================================================= Masters =======================================================
+        public DbSet<PaymentModeMatser> PaymentModeMatser { get; set; }
+        public DbSet<ExpensesStatusMaster> ExpensesStatusMaster { get; set; }
+        public DbSet<ExpensesTypeMaster> ExpensesTypeMaster { get; set; }
+        public DbSet<ExpenseCategoryMaster> ExpenseCategoryMasters { get; set; }
+        public DbSet<RecurringPaymentStatus> RecurringPaymentStatus { get; set; }
+
+        #endregion
+
+        #region ======================================================= Expenses =======================================================
+        public DbSet<Expenses> Expenses { get; set; }
+        public DbSet<ExpenseLog> ExpenseLogs { get; set; }
+        public DbSet<BillAttachments> BillAttachments { get; set; }
+        public DbSet<ExpensesReimburse> ExpensesReimburse { get; set; }
+        public DbSet<ExpensesReimburseMapping> ExpensesReimburseMapping { get; set; }
+        public DbSet<StatusPermissionMapping> StatusPermissionMapping { get; set; }
+        public DbSet<ExpensesStatusMapping> ExpensesStatusMapping { get; set; }
+
+        #endregion
+
+        #region ======================================================= Collection =======================================================
+        public DbSet<Invoice> Invoices { get; set; }
+        public DbSet<InvoiceComment> InvoiceComments { get; set; }
+        public DbSet<InvoiceAttachment> InvoiceAttachments { get; set; }
+        public DbSet<ReceivedInvoicePayment> ReceivedInvoicePayments { get; set; }
+        public DbSet<PaymentAdjustmentHead> PaymentAdjustmentHeads { get; set; }
+        #endregion
+        public DbSet<PaymentRequest> PaymentRequests { get; set; }
+        public DbSet<PaymentRequestAttachment> PaymentRequestAttachments { get; set; }
+        public DbSet<RecurringPayment> RecurringPayments { get; set; }
+        public DbSet<AdvancePaymentTransaction> AdvancePaymentTransactions { get; set; }
+        #endregion
+
+        #region ======================================================= Tickets =======================================================
         public DbSet<TicketForum> Tickets { get; set; }
         public DbSet<TicketAttachment> TicketAttachments { get; set; }
         public DbSet<TicketComment> TicketComments { get; set; }
@@ -79,42 +185,10 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<TicketTypeMaster> TicketTypeMasters { get; set; }
         public DbSet<TicketPriorityMaster> TicketPriorityMasters { get; set; }
         public DbSet<TicketTagMaster> TicketTagMasters { get; set; }
-        public DbSet<Document> Documents { get; set; }
         public DbSet<TicketTag> TicketTags { get; set; }
-        public DbSet<WorkCategoryMaster> WorkCategoryMasters { get; set; }
-        public DbSet<WorkStatusMaster> WorkStatusMasters { get; set; }
-        public DbSet<Contact> Contacts { get; set; }
-        public DbSet<ContactCategoryMaster> ContactCategoryMasters { get; set; }
-        public DbSet<ContactEmail> ContactsEmails { get; set; }
-        public DbSet<ContactPhone> ContactsPhones { get; set; }
-        public DbSet<ContactNote> ContactNotes { get; set; }
-        public DbSet<Bucket> Buckets { get; set; }
-        public DbSet<ContactTagMaster> ContactTagMasters { get; set; }
-        public DbSet<ContactTagMapping> ContactTagMappings { get; set; }
-        public DbSet<EmployeeBucketMapping> EmployeeBucketMappings { get; set; }
-        public DbSet<ContactBucketMapping> ContactBucketMappings { get; set; }
-        public DbSet<ContactProjectMapping> ContactProjectMappings { get; set; }
-        public DbSet<DirectoryUpdateLog> DirectoryUpdateLogs { get; set; }
-
-        public DbSet<MailingList> MailingList { get; set; }
-        public DbSet<MailDetails> MailDetails { get; set; }
-        public DbSet<MailLog> MailLogs { get; set; }
-        public DbSet<OTPDetails> OTPDetails { get; set; }
-        public DbSet<MPINDetails> MPINDetails { get; set; }
-
-        public DbSet<Expenses> Expenses { get; set; }
-        public DbSet<ExpenseLog> ExpenseLogs { get; set; }
-        public DbSet<ExpensesTypeMaster> ExpensesTypeMaster { get; set; }
-        public DbSet<PaymentModeMatser> PaymentModeMatser { get; set; }
-        public DbSet<ExpensesStatusMaster> ExpensesStatusMaster { get; set; }
-        public DbSet<BillAttachments> BillAttachments { get; set; }
-        public DbSet<ExpensesReimburse> ExpensesReimburse { get; set; }
-        public DbSet<ExpensesReimburseMapping> ExpensesReimburseMapping { get; set; }
-        public DbSet<StatusPermissionMapping> StatusPermissionMapping { get; set; }
-        public DbSet<ExpensesStatusMapping> ExpensesStatusMapping { get; set; }
-
-        public DbSet<FCMTokenMapping> FCMTokenMappings { get; set; }
+        #endregion
 
+        #region ======================================================= Project and Employee Documents =======================================================
         public DbSet<EntityTypeMaster> EntityTypeMasters { get; set; }
         public DbSet<DocumentTypeMaster> DocumentTypeMasters { get; set; }
         public DbSet<DocumentCategoryMaster> DocumentCategoryMasters { get; set; }
@@ -122,24 +196,47 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<DocumentAttachment> DocumentAttachments { get; set; }
         public DbSet<AttachmentVersionMapping> AttachmentVersionMappings { get; set; }
         public DbSet<AttachmentTagMapping> AttachmentTagMappings { get; set; }
+        #endregion
 
-        public DbSet<GlobalServiceMaster> GlobalServiceMasters { get; set; }
-        public DbSet<GlobalActivityGroupMaster> GlobalActivityGroupMasters { get; set; }
-        public DbSet<GlobalActivityMaster> GlobalActivityMasters { get; set; }
-
+        #region ======================================================= Organizations =======================================================
         public DbSet<Organization> Organizations { get; set; }
         public DbSet<OrgTypeMaster> OrgTypeMasters { get; set; }
         public DbSet<TenantOrgMapping> TenantOrgMappings { get; set; }
         public DbSet<OrgServiceMapping> OrgServiceMappings { get; set; }
-        public DbSet<ProjectServiceMapping> ProjectServiceMappings { get; set; }
         public DbSet<ProjectOrgMapping> ProjectOrgMappings { get; set; }
+        public DbSet<OrganizationHierarchy> OrganizationHierarchies { get; set; }
+        public DbSet<OrgHierarchyLog> OrgHierarchyLogs { get; set; }
+        #endregion
 
-        // Collection
-        public DbSet<Invoice> Invoices { get; set; }
-        public DbSet<InvoiceComment> InvoiceComments { get; set; }
-        public DbSet<InvoiceAttachment> InvoiceAttachments { get; set; }
-        public DbSet<ReceivedInvoicePayment> ReceivedInvoicePayments { get; set; }
-        public DbSet<PaymentAdjustmentHead> PaymentAdjustmentHeads { get; set; }
+        #region ======================================================= Service Project =======================================================
+        public DbSet<ServiceProject> ServiceProjects { get; set; }
+        public DbSet<ServiceProjectServiceMapping> ServiceProjectServiceMapping { get; set; }
+        public DbSet<TeamRoleMaster> TeamRoleMasters { get; set; }
+        public DbSet<ServiceProjectTag> ServiceProjectTags { get; set; }
+        //public DbSet<TalkingPoint> TalkingPoints { get; set; }
+        //public DbSet<TalkingPointAttachment> TalkingPointAttachments { get; set; }
+        public DbSet<ServiceProjectTagMapping> ServiceProjectTagMappings { get; set; }
+        public DbSet<ServiceProjectAllocation> ServiceProjectAllocations { get; set; }
+
+        #region ======================================================= Project Branch =======================================================
+        public DbSet<ProjectBranch> ProjectBranches { get; set; }
+        #endregion
+
+        #region ======================================================= Job =======================================================
+        public DbSet<JobTicket> JobTickets { get; set; }
+        public DbSet<JobStatus> JobStatus { get; set; }
+        public DbSet<JobStatusMapping> JobStatusMappings { get; set; }
+        public DbSet<JobComment> JobComments { get; set; }
+        public DbSet<JobEmployeeMapping> JobEmployeeMappings { get; set; }
+        public DbSet<JobTag> JobTags { get; set; }
+        public DbSet<JobTagMapping> JobTagMappings { get; set; }
+        public DbSet<JobAttachment> JobAttachments { get; set; }
+        public DbSet<JobAttendance> JobAttendance { get; set; }
+        public DbSet<JobAttendanceLog> JobAttendanceLogs { get; set; }
+
+        #endregion
+
+        #endregion
 
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -466,6 +563,7 @@ namespace Marco.Pms.DataAccess.Data
                 .HasOne<Tenant>() // No navigation property in ApplicationRole
                 .WithMany()
                 .HasForeignKey(ar => ar.TenantId);
+
             // Configure the relationship between ApplicationRole and FeaturePermission via a join table
             modelBuilder.Entity<RolePermissionMappings>(entity =>
             {
@@ -481,6 +579,64 @@ namespace Marco.Pms.DataAccess.Data
             });
 
 
+            modelBuilder.Entity<CurrencyMaster>().HasData(
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("78e96e4a-7ce0-4164-ae3a-c833ad45ec2c"),
+                    CurrencyCode = "INR",
+                    CurrencyName = "Indian Rupee",
+                    Symbol = "₹",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("2f672568-a67b-4961-acb2-a8c7834e1762"),
+                    CurrencyCode = "USD",
+                    CurrencyName = "US Dollar",
+                    Symbol = "$",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("4d1155bb-1448-4d97-a732-96c92eb99c45"),
+                    CurrencyCode = "EUR",
+                    CurrencyName = "Euro",
+                    Symbol = "€",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("3e456237-ef06-4ea1-a261-188c9b0c6df6"),
+                    CurrencyCode = "GBP",
+                    CurrencyName = "Pound Sterling",
+                    Symbol = "£",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("297e237a-56d3-48f6-b39d-ec3991dea8bf"),
+                    CurrencyCode = "JPY",
+                    CurrencyName = "Japanese Yen",
+                    Symbol = "¥",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("efe9b4f6-64d6-446e-a42d-1c7aaf6dd70d"),
+                    CurrencyCode = "RUB",
+                    CurrencyName = "Russian Ruble",
+                    Symbol = "₽",
+                    IsActive = true
+                },
+                new CurrencyMaster
+                {
+                    Id = Guid.Parse("b960166a-f7e9-49e3-bb4b-28511f126c08"),
+                    CurrencyCode = "CNY",
+                    CurrencyName = "Chinese Yuan (Renminbi)",
+                    Symbol = "¥",
+                    IsActive = true
+                }
+                );
 
             modelBuilder.Entity<ExpensesStatusMaster>().HasData(
                 new ExpensesStatusMaster
@@ -497,7 +653,7 @@ namespace Marco.Pms.DataAccess.Data
                 {
                     Id = Guid.Parse("6537018f-f4e9-4cb3-a210-6c3b2da999d7"),
                     Name = "Review Pending",
-                    DisplayName = "Submit",
+                    DisplayName = "Submit for Review",
                     Description = "Reviewer is currently reviewing the expense.",
                     Color = "#696cff",
                     IsSystem = true,
@@ -552,10 +708,27 @@ namespace Marco.Pms.DataAccess.Data
                     Color = "#71dd37",
                     IsSystem = true,
                     IsActive = true
+                },
+                new ExpensesStatusMaster
+                {
+                    Id = Guid.Parse("b8586f67-dc19-49c3-b4af-224149efe1d3"),
+                    Name = "Done",
+                    DisplayName = "Create Expense",
+                    Description = "Create new Expense.",
+                    Color = "#0E9F6E",
+                    IsSystem = true,
+                    IsActive = true
                 }
                 );
 
             modelBuilder.Entity<ExpensesStatusMapping>().HasData(
+                // processed to Done
+                new ExpensesStatusMapping
+                {
+                    Id = Guid.Parse("a1cc95ed-b276-4a3e-9f00-0a249b522d64"),
+                    StatusId = Guid.Parse("61578360-3a49-4c34-8604-7b35a3787b95"),
+                    NextStatusId = Guid.Parse("b8586f67-dc19-49c3-b4af-224149efe1d3")
+                },
                 // Process to processed
                 new ExpensesStatusMapping
                 {
@@ -663,10 +836,17 @@ namespace Marco.Pms.DataAccess.Data
                     Id = Guid.Parse("214354e5-daad-4569-ad69-eb5bf4e87fbc"),
                     PermissionId = Guid.Parse("ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"),
                     StatusId = Guid.Parse("61578360-3a49-4c34-8604-7b35a3787b95")
+                },
+                // Done Permission Mapping
+                new StatusPermissionMapping
+                {
+                    Id = Guid.Parse("de04b6c7-a5cd-4a61-88b0-b43b0008202e"),
+                    PermissionId = Guid.Parse("ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"),
+                    StatusId = Guid.Parse("b8586f67-dc19-49c3-b4af-224149efe1d3")
                 });
 
-            modelBuilder.Entity<ExpensesTypeMaster>().HasData(
-                new ExpensesTypeMaster
+            modelBuilder.Entity<ExpenseCategoryMaster>().HasData(
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("5e0c6227-d49d-41ff-9f1f-781f0aee2469"),
                     Name = "Procurement",
@@ -676,7 +856,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("2de53163-0dbd-404b-8e60-1b02e6b4886a"),
                     Name = "Transport",
@@ -686,7 +866,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = false,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("dd120bc4-ab0a-45ba-8450-5cd45ff221ca"),
                     Name = "Travelling",
@@ -696,7 +876,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = false,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("52484820-1b54-4865-8f0f-baa2b1d339b9"),
                     Name = "Mobilization",
@@ -706,7 +886,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("fc59eb90-98ea-481c-b421-54bfa9e42d8f"),
                     Name = "Employee Welfare",
@@ -716,7 +896,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("77013784-9324-4d8b-bd36-d6f928e68942"),
                     Name = "Maintenance & Utilities",
@@ -726,7 +906,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("1e2d697a-76b4-4be8-bc66-87144561a1a0"),
                     Name = "Vendor/Supplier Payments",
@@ -736,7 +916,7 @@ namespace Marco.Pms.DataAccess.Data
                     IsAttachmentRequried = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("4842fa61-64eb-4241-aebd-8282065af9f9"),
                     Name = "Compliance & Safety",
@@ -754,32 +934,49 @@ namespace Marco.Pms.DataAccess.Data
                     Id = Guid.Parse("24e6b0df-7929-47d2-88a3-4cf14c1f28f9"),
                     Name = "Cash",
                     Description = "Physical currency; still used for small or informal transactions.",
-                    IsActive = true,
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                    IsActive = true
                 },
                 new PaymentModeMatser
                 {
                     Id = Guid.Parse("48d9b462-5d87-4dec-8dec-2bc943943172"),
                     Name = "Cheque",
                     Description = "Paper-based payment order; less common now due to processing delays and fraud risks.",
-                    IsActive = true,
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                    IsActive = true
                 },
                 new PaymentModeMatser
                 {
                     Id = Guid.Parse("ed667353-8eea-4fd1-8750-719405932480"),
                     Name = "NetBanking",
                     Description = "Online banking portals used to transfer funds directly between accounts",
-                    IsActive = true,
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                    IsActive = true
                 },
                 new PaymentModeMatser
                 {
                     Id = Guid.Parse("2e919e94-694c-41d9-9489-0a2b4208a027"),
                     Name = "UPI",
                     Description = "Real-time bank-to-bank transfer using mobile apps; widely used for peer-to-peer and merchant payments.",
-                    IsActive = true,
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                    IsActive = true
+                },
+                new PaymentModeMatser
+                {
+                    Id = Guid.Parse("a820f240-5e9a-4ae9-9091-8a7aa7720cea"),
+                    Name = "Credit card",
+                    Description = "A credit card is a payment card that allows you to borrow funds from a financial institution to pay for goods and services",
+                    IsActive = true
+                },
+                new PaymentModeMatser
+                {
+                    Id = Guid.Parse("95697409-baf6-4f78-86ab-42d93d9569a8"),
+                    Name = "Debit Card",
+                    Description = "A debit card is a payment card that deducts funds directly from the cardholder's bank account when a purchase is made.",
+                    IsActive = true
+                },
+                new PaymentModeMatser
+                {
+                    Id = Guid.Parse("f67beee6-6763-4108-922c-03bd86b9178d"),
+                    Name = "Advance Payment",
+                    Description = "When a bill is paid using the amount received in advance from a company.",
+                    IsActive = true
                 }
                 );
 
@@ -1072,42 +1269,79 @@ namespace Marco.Pms.DataAccess.Data
                }
            );
 
+            modelBuilder.Entity<RecurringPaymentStatus>().HasData(
+                  new RecurringPaymentStatus { Id = Guid.Parse("da462422-13b2-45cc-a175-910a225f6fc8"), Name = "Active" },
+                  new RecurringPaymentStatus { Id = Guid.Parse("3ec864d2-8bf5-42fb-ba70-5090301dd816"), Name = "De-Activated" },
+                  new RecurringPaymentStatus { Id = Guid.Parse("306856fb-5655-42eb-bf8b-808bb5e84725"), Name = "Completed" },
+                  new RecurringPaymentStatus { Id = Guid.Parse("8bfc9346-e092-4a80-acbf-515ae1ef6868"), Name = "Paused" }
+            );
+
+            modelBuilder.Entity<TeamRoleMaster>().HasData(
+                new TeamRoleMaster { Id = Guid.Parse("8cfbf16f-7d3b-4c29-af5b-18935f20aa7b"), Name = "Support", Description = "A Support role involves assisting users or customers by resolving technical or service-related issues, answering inquiries, and ensuring a positive experience with products or services." },
+                new TeamRoleMaster { Id = Guid.Parse("145d7222-408b-4733-8a17-f417e070b8b8"), Name = "Service Engineer", Description = "A Service Engineer installs, maintains, repairs, and troubleshoots equipment to ensure optimal operation and customer satisfaction." },
+                new TeamRoleMaster { Id = Guid.Parse("03bf5853-5e0b-4eb8-9f37-33bd999a05b3"), Name = "Manager", Description = "A Manager oversees and coordinates a team or department to achieve organizational goals through planning, decision-making, and leadership." }
+            );
+
+            modelBuilder.Entity<JobStatus>().HasData(
+                new JobStatus { Id = Guid.Parse("32d76a02-8f44-4aa0-9b66-c3716c45a918"), Name = "New", DisplayName = "New", Level = 1 },
+                new JobStatus { Id = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), Name = "Assigned", DisplayName = "Assigned", Level = 2 },
+                new JobStatus { Id = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), Name = "In Progress", DisplayName = "In Progress", Level = 3 },
+                new JobStatus { Id = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), Name = "Work Done", DisplayName = "Work Done", Level = 4 },
+                new JobStatus { Id = Guid.Parse("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), Name = "Review Done", DisplayName = "Review Done", Level = 5 },
+                new JobStatus { Id = Guid.Parse("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), Name = "Closed", DisplayName = "Closed", Level = 6 },
+                new JobStatus { Id = Guid.Parse("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), Name = "On Hold", DisplayName = "On Hold", Level = 7 }
+            );
+
+            modelBuilder.Entity<JobStatusMapping>().HasData(
+                // New to Assigned
+                new JobStatusMapping { Id = Guid.Parse("024e1810-6a57-4a0d-8d2e-be88da79fcd4"), StatusId = Guid.Parse("32d76a02-8f44-4aa0-9b66-c3716c45a918"), NextStatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Assinged to In Progress
+                new JobStatusMapping { Id = Guid.Parse("cb0db140-87fa-4a6f-812d-2834bd0f53a9"), StatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), NextStatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Assinged to On Hold
+                new JobStatusMapping { Id = Guid.Parse("42f24930-387e-4f51-9c2d-3e29ffaaf02a"), StatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), NextStatusId = Guid.Parse("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Assigned to closed
+                new JobStatusMapping { Id = Guid.Parse("16c83c23-09be-40fd-9d05-f44795d8dee8"), StatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), NextStatusId = Guid.Parse("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // In Progress to Resolved
+                new JobStatusMapping { Id = Guid.Parse("8c4ecdae-7435-4475-8389-15bc453561a1"), StatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), NextStatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // In Progress to Assigned
+                new JobStatusMapping { Id = Guid.Parse("a44b0a66-ee33-47e7-a01f-6b8d9b621543"), StatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), NextStatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // In Progress to Closed
+                new JobStatusMapping { Id = Guid.Parse("7165ecee-10e3-4fc0-85d2-6d93d5b11776"), StatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), NextStatusId = Guid.Parse("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // In Progress to On Hold
+                new JobStatusMapping { Id = Guid.Parse("87891499-e45d-406b-bf22-722db1beedc9"), StatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), NextStatusId = Guid.Parse("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Resolved to Done
+                new JobStatusMapping { Id = Guid.Parse("dc986ec4-858e-4c98-b330-4a5c98c91f07"), StatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), NextStatusId = Guid.Parse("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Resolved to Assigned
+                new JobStatusMapping { Id = Guid.Parse("ca8b4358-3122-4aaa-bcf8-0b66e4ab313a"), StatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), NextStatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Resolved to In Progress
+                new JobStatusMapping { Id = Guid.Parse("5602d32c-290e-48a3-83dd-91af6d12ed46"), StatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), NextStatusId = Guid.Parse("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Resolved to Closed
+                new JobStatusMapping { Id = Guid.Parse("9c2918be-b3c1-46fb-a03b-14dd613e1021"), StatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), NextStatusId = Guid.Parse("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Resolved to On Hold
+                new JobStatusMapping { Id = Guid.Parse("ab974bdb-2d8f-4ddc-9b71-bd6d198bae75"), StatusId = Guid.Parse("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), NextStatusId = Guid.Parse("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // On Hold to Assigned
+                new JobStatusMapping { Id = Guid.Parse("2787c903-1b39-4e7d-a0f2-3bb2309bb341"), StatusId = Guid.Parse("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), NextStatusId = Guid.Parse("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") },
+                // Done to Close
+                new JobStatusMapping { Id = Guid.Parse("76bc5551-8f80-469d-ba23-95d7e746c9a9"), StatusId = Guid.Parse("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), NextStatusId = Guid.Parse("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") }
+            );
+
             modelBuilder.Entity<Module>().HasData(
-                new Module
-                {
-                    Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
-                    Name = "Project",
-                    Description = "Project Module",
-                    Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02"
-                },
-                new Module
-                {
-                    Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
-                    Name = "Employee",
-                    Description = "Employee Module",
-                    Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637"
-                },
-                new Module
-                {
-                    Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
-                    Name = "Masters",
-                    Description = "Masters Module",
-                    Key = "504ec132-e6a9-422f-8f85-050602cfce05"
-                },
-                new Module
-                {
-                    Id = new Guid("f482a079-4dec-4f2d-9867-6baf2a4f23d9"),
-                    Name = "Tenant",
-                    Description = "Tenant Module",
-                    Key = "504ec132-e6a9-422f-8f85-050602cfce05"
-                });
+                new Module { Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), Name = "Project", Description = "Project Module", Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02" },
+                new Module { Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), Name = "Employee", Description = "Employee Module", Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637" },
+                new Module { Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), Name = "Masters", Description = "Masters Module", Key = "504ec132-e6a9-422f-8f85-050602cfce05" },
+                new Module { Id = new Guid("f482a079-4dec-4f2d-9867-6baf2a4f23d9"), Name = "Tenant", Description = "Tenant Module", Key = "504ec132-e6a9-422f-8f85-050602cfce05" },
+                new Module { Id = new Guid("0a79687a-86d7-430d-a2d7-8b8603cc76a1"), Name = "Finance", Description = "Finance Module", Key = "504ec132-e6a9-422f-8f85-050602cfce05" }
+            );
 
             modelBuilder.Entity<Feature>().HasData(
                 // Project Module
                 new Feature { Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), Description = "Manage Project", Name = "Project Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
+                new Feature { Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"), Description = "Manage Tasks", Name = "Task Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
+
+                // Finance Module
                 new Feature { Id = new Guid("a4e25142-449b-4334-a6e5-22f70e4732d7"), Description = "Expense Management is the systematic process of tracking, controlling, and reporting business-related expenditures.", Name = "Expense Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
                 new Feature { Id = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), Description = "Collection Management is a feature that enables organizations to track, organize, and manage the status and recovery of receivables or assets efficiently throughout their lifecycle, supporting systematic follow-up and resolution of outstanding accounts.", Name = "Collection Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
-                new Feature { Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"), Description = "Manage Tasks", Name = "Task Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
+                new Feature { Id = new Guid("86e80017-0698-4efe-93d0-806de67266e0"), Description = "Recurring Template Management is the automated creation and scheduling of repetitive tasks, processes, or transactions using predefined templates at set intervals to ensure consistent and efficient workflow execution without manual recreation each time.", Name = "Recurring Template Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
 
                 // Employee Module
                 new Feature { Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), Description = "Manage Employee", Name = "Employee Management", ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), IsActive = true },
@@ -1185,6 +1419,11 @@ namespace Marco.Pms.DataAccess.Data
                 new FeaturePermission { Id = new Guid("455187b4-fef1-41f9-b3d0-025d0b6302c3"), FeatureId = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), IsEnabled = true, Name = "Edit Collection", Description = "Ability to modify collection properties, content, and access rights." },
                 new FeaturePermission { Id = new Guid("061d9ccd-85b4-4cb0-be06-2f9f32cebb72"), FeatureId = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), IsEnabled = true, Name = "Add Payment", Description = " Enables entry and processing of payment transactions." },
 
+                // Recurring Template Management
+                new FeaturePermission { Id = new Guid("6382ea8b-aff2-4cd2-a48f-a652b35825d8"), FeatureId = new Guid("86e80017-0698-4efe-93d0-806de67266e0"), IsEnabled = true, Name = "Manage Recurring", Description = "Manage Recurring Template payment permission allows authorized users to set up, modify, and execute automated recurring payments using predefined templates, ensuring secure and controlled handling of repetitive financial transactions." },
+                new FeaturePermission { Id = new Guid("7ddf2fba-c44d-4fe3-b4ec-690ff70be2e3"), FeatureId = new Guid("86e80017-0698-4efe-93d0-806de67266e0"), IsEnabled = true, Name = "View All Recurring", Description = "The \"View All Recurring Template payment permission\" generally allows users to see and access all recurring payment templates in the system, enabling them to review, manage, and process recurring transactions efficiently." },
+                new FeaturePermission { Id = new Guid("e5d21efe-573d-4a16-a0f8-414d3e442e78"), FeatureId = new Guid("86e80017-0698-4efe-93d0-806de67266e0"), IsEnabled = true, Name = "View Self Recurring", Description = "View Self Recurring Template payment permission allows a user to view and access their own recurring payment templates without editing rights." },
+
                 // Organization Management Feature
                 new FeaturePermission { Id = new Guid("068cb3c1-49c5-4746-9f29-1fce16e820ac"), FeatureId = new Guid("6d4c82d6-dbce-48ab-b8b8-f785f4d8c914"), IsEnabled = true, Name = "Add Organization", Description = "Allow user to create new organization" },
                 new FeaturePermission { Id = new Guid("c1ae1363-ab8a-4bd9-a9d1-8c2c6083873a"), FeatureId = new Guid("6d4c82d6-dbce-48ab-b8b8-f785f4d8c914"), IsEnabled = true, Name = "Edit Organization", Description = "Allow the user to update the basic information of the organization" },
@@ -1192,64 +1431,6 @@ namespace Marco.Pms.DataAccess.Data
 
             );
 
-            modelBuilder.Entity<CurrencyMaster>().HasData(
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("78e96e4a-7ce0-4164-ae3a-c833ad45ec2c"),
-                    CurrencyCode = "INR",
-                    CurrencyName = "Indian Rupee",
-                    Symbol = "₹",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("2f672568-a67b-4961-acb2-a8c7834e1762"),
-                    CurrencyCode = "USD",
-                    CurrencyName = "US Dollar",
-                    Symbol = "$",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("4d1155bb-1448-4d97-a732-96c92eb99c45"),
-                    CurrencyCode = "EUR",
-                    CurrencyName = "Euro",
-                    Symbol = "€",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("3e456237-ef06-4ea1-a261-188c9b0c6df6"),
-                    CurrencyCode = "GBP",
-                    CurrencyName = "Pound Sterling",
-                    Symbol = "£",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("297e237a-56d3-48f6-b39d-ec3991dea8bf"),
-                    CurrencyCode = "JPY",
-                    CurrencyName = "Japanese Yen",
-                    Symbol = "¥",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("efe9b4f6-64d6-446e-a42d-1c7aaf6dd70d"),
-                    CurrencyCode = "RUB",
-                    CurrencyName = "Russian Ruble",
-                    Symbol = "₽",
-                    IsActive = true
-                },
-                new CurrencyMaster
-                {
-                    Id = Guid.Parse("b960166a-f7e9-49e3-bb4b-28511f126c08"),
-                    CurrencyCode = "CNY",
-                    CurrencyName = "Chinese Yuan (Renminbi)",
-                    Symbol = "¥",
-                    IsActive = true
-                }
-                );
         }
     }
 }

Marco.Pms.DataAccess/Migrations/20251027041510_Added_PaymentDetails_Table.cs

@@ -0,0 +1,46 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_PaymentDetails_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "PaymentDetails",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    PaymentId = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    OrderId = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Status = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Method = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EncryptedDetails = table.Column<byte[]>(type: "longblob", nullable: true),
+                    Nonce = table.Column<byte[]>(type: "longblob", nullable: true),
+                    Tag = table.Column<byte[]>(type: "longblob", nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PaymentDetails", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "PaymentDetails");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251027103648_Added_TenantEnquire_Table.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_TenantEnquire_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "TenantEnquires",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    FirstName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    OrganizationName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Email = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ContactNumber = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    BillingAddress = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    OrganizationSize = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IndustryId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Reference = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TenantEnquires", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TenantEnquires_Industries_IndustryId",
+                        column: x => x.IndustryId,
+                        principalTable: "Industries",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TenantEnquires_IndustryId",
+                table: "TenantEnquires",
+                column: "IndustryId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TenantEnquires");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251028052440_Added_PaymentDetails_In_TenantSubscription_Table.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_PaymentDetails_In_TenantSubscription_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "PaymentDetailId",
+                table: "TenantSubscriptions",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TenantSubscriptions_PaymentDetailId",
+                table: "TenantSubscriptions",
+                column: "PaymentDetailId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TenantSubscriptions_PaymentDetails_PaymentDetailId",
+                table: "TenantSubscriptions",
+                column: "PaymentDetailId",
+                principalTable: "PaymentDetails",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_TenantSubscriptions_PaymentDetails_PaymentDetailId",
+                table: "TenantSubscriptions");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TenantSubscriptions_PaymentDetailId",
+                table: "TenantSubscriptions");
+
+            migrationBuilder.DropColumn(
+                name: "PaymentDetailId",
+                table: "TenantSubscriptions");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251107110903_Added_Finance_Related_Tables.cs

@@ -0,0 +1,950 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Finance_Related_Tables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_ExpensesTypeMaster_ExpensesTypeId",
+                table: "Expenses");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentModeMatser_Tenants_TenantId",
+                table: "PaymentModeMatser");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentModeMatser_TenantId",
+                table: "PaymentModeMatser");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_ExpensesTypeId",
+                table: "Expenses");
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("1e2d697a-76b4-4be8-bc66-87144561a1a0"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("2de53163-0dbd-404b-8e60-1b02e6b4886a"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("4842fa61-64eb-4241-aebd-8282065af9f9"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("52484820-1b54-4865-8f0f-baa2b1d339b9"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("5e0c6227-d49d-41ff-9f1f-781f0aee2469"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("77013784-9324-4d8b-bd36-d6f928e68942"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("dd120bc4-ab0a-45ba-8450-5cd45ff221ca"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesTypeMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("fc59eb90-98ea-481c-b421-54bfa9e42d8f"));
+
+            migrationBuilder.DropColumn(
+                name: "TenantId",
+                table: "PaymentModeMatser");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExpenseUId",
+                table: "Expenses",
+                type: "longtext",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<double>(
+                name: "BaseAmount",
+                table: "Expenses",
+                type: "double",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "CurrencyId",
+                table: "Expenses",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("78e96e4a-7ce0-4164-ae3a-c833ad45ec2c"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ExpenseCategoryId",
+                table: "Expenses",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("5e0c6227-d49d-41ff-9f1f-781f0aee2469"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "PaymentRequestId",
+                table: "Expenses",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<double>(
+                name: "TDSPercentage",
+                table: "Expenses",
+                type: "double",
+                nullable: true);
+
+            migrationBuilder.AddColumn<double>(
+                name: "TaxAmount",
+                table: "Expenses",
+                type: "double",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "UIDPostfix",
+                table: "Expenses",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "UIDPrefix",
+                table: "Expenses",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "AdvancePaymentTransactions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    FinanceUIdPrefix = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    FinanceUIdPostfix = table.Column<int>(type: "int", nullable: false),
+                    Title = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Amount = table.Column<double>(type: "double", nullable: false),
+                    CurrentBalance = table.Column<double>(type: "double", nullable: false),
+                    PaidAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AdvancePaymentTransactions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AdvancePaymentTransactions_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AdvancePaymentTransactions_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_AdvancePaymentTransactions_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ExpenseCategoryMasters",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    NoOfPersonsRequired = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsAttachmentRequried = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ExpenseCategoryMasters", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ExpenseCategoryMasters_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "RecurringPaymentStatus",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RecurringPaymentStatus", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "StatusUpdateLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    NextStatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    EntityId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Comment = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_StatusUpdateLogs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_StatusUpdateLogs_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_StatusUpdateLogs_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "RecurringPayments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Title = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UIDPrefix = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UIDPostfix = table.Column<int>(type: "int", nullable: false),
+                    Payee = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    NotifyTo = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CurrencyId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Amount = table.Column<double>(type: "double", nullable: false),
+                    StrikeDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    LatestPRGeneratedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    PaymentBufferDays = table.Column<int>(type: "int", nullable: false),
+                    NumberOfIteration = table.Column<int>(type: "int", nullable: false),
+                    ExpenseCategoryId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Frequency = table.Column<int>(type: "int", nullable: false),
+                    IsVariable = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RecurringPayments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_CurrencyMaster_CurrencyId",
+                        column: x => x.CurrencyId,
+                        principalTable: "CurrencyMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_ExpenseCategoryMasters_ExpenseCategoryId",
+                        column: x => x.ExpenseCategoryId,
+                        principalTable: "ExpenseCategoryMasters",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_RecurringPaymentStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "RecurringPaymentStatus",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "PaymentRequests",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Title = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UIDPrefix = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UIDPostfix = table.Column<int>(type: "int", nullable: false),
+                    Payee = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsAdvancePayment = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CurrencyId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Amount = table.Column<double>(type: "double", nullable: false),
+                    BaseAmount = table.Column<double>(type: "double", nullable: true),
+                    TaxAmount = table.Column<double>(type: "double", nullable: true),
+                    TDSPercentage = table.Column<double>(type: "double", nullable: true),
+                    DueDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    RecurringPaymentId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    ExpenseCategoryId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    ExpenseStatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    PaidTransactionId = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    PaidAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    PaidById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    IsExpenseCreated = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PaymentRequests", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_CurrencyMaster_CurrencyId",
+                        column: x => x.CurrencyId,
+                        principalTable: "CurrencyMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_Employees_PaidById",
+                        column: x => x.PaidById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_ExpenseCategoryMasters_ExpenseCategoryId",
+                        column: x => x.ExpenseCategoryId,
+                        principalTable: "ExpenseCategoryMasters",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_ExpensesStatusMaster_ExpenseStatusId",
+                        column: x => x.ExpenseStatusId,
+                        principalTable: "ExpensesStatusMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_RecurringPayments_RecurringPaymentId",
+                        column: x => x.RecurringPaymentId,
+                        principalTable: "RecurringPayments",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "PaymentRequestAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    PaymentRequestId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PaymentRequestAttachments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequestAttachments_Documents_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "Documents",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequestAttachments_PaymentRequests_PaymentRequestId",
+                        column: x => x.PaymentRequestId,
+                        principalTable: "PaymentRequests",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequestAttachments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.InsertData(
+                table: "ExpenseCategoryMasters",
+                columns: new[] { "Id", "Description", "IsActive", "IsAttachmentRequried", "Name", "NoOfPersonsRequired", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("1e2d697a-76b4-4be8-bc66-87144561a1a0"), "Scheduled payments for external services or goods.", true, true, "Vendor/Supplier Payments", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("2de53163-0dbd-404b-8e60-1b02e6b4886a"), "Vehicle fuel, logistics services and delivery of goods or personnel.", true, false, "Transport", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("4842fa61-64eb-4241-aebd-8282065af9f9"), "Government fees, insurance, inspections and safety-related expenditures.", true, true, "Compliance & Safety", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("52484820-1b54-4865-8f0f-baa2b1d339b9"), "Site setup costs including equipment deployment and temporary infrastructure.", true, true, "Mobilization", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("5e0c6227-d49d-41ff-9f1f-781f0aee2469"), "Materials, equipment and supplies purchased for site operations.", true, true, "Procurement", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("77013784-9324-4d8b-bd36-d6f928e68942"), "Machinery servicing, electricity, water, and temporary office needs.", true, true, "Maintenance & Utilities", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("dd120bc4-ab0a-45ba-8450-5cd45ff221ca"), "Delivery of personnel.", true, false, "Travelling", true, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("fc59eb90-98ea-481c-b421-54bfa9e42d8f"), " Worker amenities like snacks, meals, safety gear, accommodation, medical support etc.", true, true, "Employee Welfare", true, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.UpdateData(
+                table: "ExpensesStatusMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"),
+                column: "DisplayName",
+                value: "Submit for Review");
+
+            migrationBuilder.InsertData(
+                table: "ExpensesStatusMaster",
+                columns: new[] { "Id", "Color", "Description", "DisplayName", "IsActive", "IsSystem", "Name" },
+                values: new object[] { new Guid("b8586f67-dc19-49c3-b4af-224149efe1d3"), "#0E9F6E", "Create new Expense.", "Create Expense", true, true, "Done" });
+
+            migrationBuilder.InsertData(
+                table: "Features",
+                columns: new[] { "Id", "Description", "IsActive", "ModuleId", "Name" },
+                values: new object[] { new Guid("86e80017-0698-4efe-93d0-806de67266e0"), "Recurring Template Management is the automated creation and scheduling of repetitive tasks, processes, or transactions using predefined templates at set intervals to ensure consistent and efficient workflow execution without manual recreation each time.", true, new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), "Recurring Template Management" });
+
+            migrationBuilder.InsertData(
+                table: "Modules",
+                columns: new[] { "Id", "Description", "Key", "Name" },
+                values: new object[] { new Guid("0a79687a-86d7-430d-a2d7-8b8603cc76a1"), "Finance Module", "504ec132-e6a9-422f-8f85-050602cfce05", "Finance" });
+
+            migrationBuilder.InsertData(
+                table: "PaymentModeMatser",
+                columns: new[] { "Id", "Description", "IsActive", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("95697409-baf6-4f78-86ab-42d93d9569a8"), "A debit card is a payment card that deducts funds directly from the cardholder's bank account when a purchase is made.", true, "Debit Card" },
+                    { new Guid("a820f240-5e9a-4ae9-9091-8a7aa7720cea"), "A credit card is a payment card that allows you to borrow funds from a financial institution to pay for goods and services", true, "Credit card" },
+                    { new Guid("f67beee6-6763-4108-922c-03bd86b9178d"), "When a bill is paid using the amount received in advance from a company.", true, "Advance Payment" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "RecurringPaymentStatus",
+                columns: new[] { "Id", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("306856fb-5655-42eb-bf8b-808bb5e84725"), "Completed" },
+                    { new Guid("3ec864d2-8bf5-42fb-ba70-5090301dd816"), "De-Activated" },
+                    { new Guid("8bfc9346-e092-4a80-acbf-515ae1ef6868"), "Paused" },
+                    { new Guid("da462422-13b2-45cc-a175-910a225f6fc8"), "Active" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "ExpensesStatusMapping",
+                columns: new[] { "Id", "NextStatusId", "StatusId" },
+                values: new object[] { new Guid("a1cc95ed-b276-4a3e-9f00-0a249b522d64"), new Guid("b8586f67-dc19-49c3-b4af-224149efe1d3"), new Guid("61578360-3a49-4c34-8604-7b35a3787b95") });
+
+            migrationBuilder.InsertData(
+                table: "FeaturePermissions",
+                columns: new[] { "Id", "Description", "FeatureId", "IsEnabled", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("6382ea8b-aff2-4cd2-a48f-a652b35825d8"), "Manage Recurring Template payment permission allows authorized users to set up, modify, and execute automated recurring payments using predefined templates, ensuring secure and controlled handling of repetitive financial transactions.", new Guid("86e80017-0698-4efe-93d0-806de67266e0"), true, "Manage Recurring" },
+                    { new Guid("7ddf2fba-c44d-4fe3-b4ec-690ff70be2e3"), "The \"View All Recurring Template payment permission\" generally allows users to see and access all recurring payment templates in the system, enabling them to review, manage, and process recurring transactions efficiently.", new Guid("86e80017-0698-4efe-93d0-806de67266e0"), true, "View All Recurring" },
+                    { new Guid("e5d21efe-573d-4a16-a0f8-414d3e442e78"), "View Self Recurring Template payment permission allows a user to view and access their own recurring payment templates without editing rights.", new Guid("86e80017-0698-4efe-93d0-806de67266e0"), true, "View Self Recurring" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "StatusPermissionMapping",
+                columns: new[] { "Id", "PermissionId", "StatusId" },
+                values: new object[] { new Guid("de04b6c7-a5cd-4a61-88b0-b43b0008202e"), new Guid("ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"), new Guid("b8586f67-dc19-49c3-b4af-224149efe1d3") });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_CurrencyId",
+                table: "Expenses",
+                column: "CurrencyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_ExpenseCategoryId",
+                table: "Expenses",
+                column: "ExpenseCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_PaymentRequestId",
+                table: "Expenses",
+                column: "PaymentRequestId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_CreatedById",
+                table: "AdvancePaymentTransactions",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_EmployeeId",
+                table: "AdvancePaymentTransactions",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_ProjectId",
+                table: "AdvancePaymentTransactions",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_TenantId",
+                table: "AdvancePaymentTransactions",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ExpenseCategoryMasters_TenantId",
+                table: "ExpenseCategoryMasters",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequestAttachments_DocumentId",
+                table: "PaymentRequestAttachments",
+                column: "DocumentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequestAttachments_PaymentRequestId",
+                table: "PaymentRequestAttachments",
+                column: "PaymentRequestId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequestAttachments_TenantId",
+                table: "PaymentRequestAttachments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_CreatedById",
+                table: "PaymentRequests",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_CurrencyId",
+                table: "PaymentRequests",
+                column: "CurrencyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_ExpenseCategoryId",
+                table: "PaymentRequests",
+                column: "ExpenseCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_ExpenseStatusId",
+                table: "PaymentRequests",
+                column: "ExpenseStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_PaidById",
+                table: "PaymentRequests",
+                column: "PaidById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_ProjectId",
+                table: "PaymentRequests",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_RecurringPaymentId",
+                table: "PaymentRequests",
+                column: "RecurringPaymentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_TenantId",
+                table: "PaymentRequests",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_UpdatedById",
+                table: "PaymentRequests",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_CreatedById",
+                table: "RecurringPayments",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_CurrencyId",
+                table: "RecurringPayments",
+                column: "CurrencyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_ExpenseCategoryId",
+                table: "RecurringPayments",
+                column: "ExpenseCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_ProjectId",
+                table: "RecurringPayments",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_StatusId",
+                table: "RecurringPayments",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_TenantId",
+                table: "RecurringPayments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_UpdatedById",
+                table: "RecurringPayments",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_StatusUpdateLogs_TenantId",
+                table: "StatusUpdateLogs",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_StatusUpdateLogs_UpdatedById",
+                table: "StatusUpdateLogs",
+                column: "UpdatedById");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_CurrencyMaster_CurrencyId",
+                table: "Expenses",
+                column: "CurrencyId",
+                principalTable: "CurrencyMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "Expenses",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpenseCategoryMasters",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_PaymentRequests_PaymentRequestId",
+                table: "Expenses",
+                column: "PaymentRequestId",
+                principalTable: "PaymentRequests",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_CurrencyMaster_CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "Expenses");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_PaymentRequests_PaymentRequestId",
+                table: "Expenses");
+
+            migrationBuilder.DropTable(
+                name: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropTable(
+                name: "PaymentRequestAttachments");
+
+            migrationBuilder.DropTable(
+                name: "StatusUpdateLogs");
+
+            migrationBuilder.DropTable(
+                name: "PaymentRequests");
+
+            migrationBuilder.DropTable(
+                name: "RecurringPayments");
+
+            migrationBuilder.DropTable(
+                name: "ExpenseCategoryMasters");
+
+            migrationBuilder.DropTable(
+                name: "RecurringPaymentStatus");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_ExpenseCategoryId",
+                table: "Expenses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_PaymentRequestId",
+                table: "Expenses");
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesStatusMapping",
+                keyColumn: "Id",
+                keyValue: new Guid("a1cc95ed-b276-4a3e-9f00-0a249b522d64"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("6382ea8b-aff2-4cd2-a48f-a652b35825d8"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("7ddf2fba-c44d-4fe3-b4ec-690ff70be2e3"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("e5d21efe-573d-4a16-a0f8-414d3e442e78"));
+
+            migrationBuilder.DeleteData(
+                table: "Modules",
+                keyColumn: "Id",
+                keyValue: new Guid("0a79687a-86d7-430d-a2d7-8b8603cc76a1"));
+
+            migrationBuilder.DeleteData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("95697409-baf6-4f78-86ab-42d93d9569a8"));
+
+            migrationBuilder.DeleteData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("a820f240-5e9a-4ae9-9091-8a7aa7720cea"));
+
+            migrationBuilder.DeleteData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("f67beee6-6763-4108-922c-03bd86b9178d"));
+
+            migrationBuilder.DeleteData(
+                table: "StatusPermissionMapping",
+                keyColumn: "Id",
+                keyValue: new Guid("de04b6c7-a5cd-4a61-88b0-b43b0008202e"));
+
+            migrationBuilder.DeleteData(
+                table: "ExpensesStatusMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("b8586f67-dc19-49c3-b4af-224149efe1d3"));
+
+            migrationBuilder.DeleteData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("86e80017-0698-4efe-93d0-806de67266e0"));
+
+            migrationBuilder.DropColumn(
+                name: "BaseAmount",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "ExpenseCategoryId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "PaymentRequestId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "TDSPercentage",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "TaxAmount",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "UIDPostfix",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "UIDPrefix",
+                table: "Expenses");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "TenantId",
+                table: "PaymentModeMatser",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.UpdateData(
+                table: "Expenses",
+                keyColumn: "ExpenseUId",
+                keyValue: null,
+                column: "ExpenseUId",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExpenseUId",
+                table: "Expenses",
+                type: "longtext",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.UpdateData(
+                table: "ExpensesStatusMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"),
+                column: "DisplayName",
+                value: "Submit");
+
+            migrationBuilder.InsertData(
+                table: "ExpensesTypeMaster",
+                columns: new[] { "Id", "Description", "IsActive", "IsAttachmentRequried", "Name", "NoOfPersonsRequired", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("1e2d697a-76b4-4be8-bc66-87144561a1a0"), "Scheduled payments for external services or goods.", true, true, "Vendor/Supplier Payments", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("2de53163-0dbd-404b-8e60-1b02e6b4886a"), "Vehicle fuel, logistics services and delivery of goods or personnel.", true, false, "Transport", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("4842fa61-64eb-4241-aebd-8282065af9f9"), "Government fees, insurance, inspections and safety-related expenditures.", true, true, "Compliance & Safety", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("52484820-1b54-4865-8f0f-baa2b1d339b9"), "Site setup costs including equipment deployment and temporary infrastructure.", true, true, "Mobilization", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("5e0c6227-d49d-41ff-9f1f-781f0aee2469"), "Materials, equipment and supplies purchased for site operations.", true, true, "Procurement", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("77013784-9324-4d8b-bd36-d6f928e68942"), "Machinery servicing, electricity, water, and temporary office needs.", true, true, "Maintenance & Utilities", false, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("dd120bc4-ab0a-45ba-8450-5cd45ff221ca"), "Delivery of personnel.", true, false, "Travelling", true, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("fc59eb90-98ea-481c-b421-54bfa9e42d8f"), " Worker amenities like snacks, meals, safety gear, accommodation, medical support etc.", true, true, "Employee Welfare", true, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.UpdateData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("24e6b0df-7929-47d2-88a3-4cf14c1f28f9"),
+                column: "TenantId",
+                value: new Guid("b3466e83-7e11-464c-b93a-daf047838b26"));
+
+            migrationBuilder.UpdateData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("2e919e94-694c-41d9-9489-0a2b4208a027"),
+                column: "TenantId",
+                value: new Guid("b3466e83-7e11-464c-b93a-daf047838b26"));
+
+            migrationBuilder.UpdateData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("48d9b462-5d87-4dec-8dec-2bc943943172"),
+                column: "TenantId",
+                value: new Guid("b3466e83-7e11-464c-b93a-daf047838b26"));
+
+            migrationBuilder.UpdateData(
+                table: "PaymentModeMatser",
+                keyColumn: "Id",
+                keyValue: new Guid("ed667353-8eea-4fd1-8750-719405932480"),
+                column: "TenantId",
+                value: new Guid("b3466e83-7e11-464c-b93a-daf047838b26"));
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentModeMatser_TenantId",
+                table: "PaymentModeMatser",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_ExpensesTypeId",
+                table: "Expenses",
+                column: "ExpensesTypeId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_ExpensesTypeMaster_ExpensesTypeId",
+                table: "Expenses",
+                column: "ExpensesTypeId",
+                principalTable: "ExpensesTypeMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaymentModeMatser_Tenants_TenantId",
+                table: "PaymentModeMatser",
+                column: "TenantId",
+                principalTable: "Tenants",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251108065039_Made_StatusId_Nullable_In_StatusUpdateLog_Table.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Made_StatusId_Nullable_In_StatusUpdateLog_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "StatusId",
+                table: "StatusUpdateLogs",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "StatusId",
+                table: "StatusUpdateLogs",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)",
+                oldNullable: true)
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251110044638_Added_NextStrikeDate_And_EndDate_In_RecurringPayment_Table.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_NextStrikeDate_And_EndDate_In_RecurringPayment_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "NumberOfIteration",
+                table: "RecurringPayments");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "EndDate",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(2025, 11, 10, 10, 17, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "NextStrikeDate",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EndDate",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropColumn(
+                name: "NextStrikeDate",
+                table: "RecurringPayments");
+
+            migrationBuilder.AddColumn<int>(
+                name: "NumberOfIteration",
+                table: "RecurringPayments",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251111041132_Added_ServiceProject_And_ServiceProjectServiceMapping_Table.cs

@@ -0,0 +1,160 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_ServiceProject_And_ServiceProjectServiceMapping_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ServiceProjects",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ShortName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ClientId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Address = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    AssignedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ContactName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ContactPhone = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ContactEmail = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServiceProjects", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjects_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjects_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_ServiceProjects_Organizations_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Organizations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjects_StatusMasters_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "StatusMasters",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjects_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ServiceProjectServiceMapping",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ServiceId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServiceProjectServiceMapping", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectServiceMapping_ServiceMasters_ServiceId",
+                        column: x => x.ServiceId,
+                        principalTable: "ServiceMasters",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectServiceMapping_ServiceProjects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "ServiceProjects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectServiceMapping_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjects_ClientId",
+                table: "ServiceProjects",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjects_CreatedById",
+                table: "ServiceProjects",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjects_StatusId",
+                table: "ServiceProjects",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjects_TenantId",
+                table: "ServiceProjects",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjects_UpdatedById",
+                table: "ServiceProjects",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectServiceMapping_ProjectId",
+                table: "ServiceProjectServiceMapping",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectServiceMapping_ServiceId",
+                table: "ServiceProjectServiceMapping",
+                column: "ServiceId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectServiceMapping_TenantId",
+                table: "ServiceProjectServiceMapping",
+                column: "TenantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ServiceProjectServiceMapping");
+
+            migrationBuilder.DropTable(
+                name: "ServiceProjects");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251111065550_Added_OrganiazationHierarchy_Related_Table.cs

@@ -0,0 +1,137 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_OrganiazationHierarchy_Related_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "OrganizationHierarchies",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ReportToId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    IsPrimary = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    AssignedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    AssignedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_OrganizationHierarchies", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_OrganizationHierarchies_Employees_AssignedById",
+                        column: x => x.AssignedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_OrganizationHierarchies_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_OrganizationHierarchies_Employees_ReportToId",
+                        column: x => x.ReportToId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_OrganizationHierarchies_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "OrgHierarchyLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    OrganizationHierarchyId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ReAssignedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    ReAssignedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_OrgHierarchyLogs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_OrgHierarchyLogs_Employees_ReAssignedById",
+                        column: x => x.ReAssignedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_OrgHierarchyLogs_OrganizationHierarchies_OrganizationHierarc~",
+                        column: x => x.OrganizationHierarchyId,
+                        principalTable: "OrganizationHierarchies",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_OrgHierarchyLogs_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrganizationHierarchies_AssignedById",
+                table: "OrganizationHierarchies",
+                column: "AssignedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrganizationHierarchies_EmployeeId",
+                table: "OrganizationHierarchies",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrganizationHierarchies_ReportToId",
+                table: "OrganizationHierarchies",
+                column: "ReportToId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrganizationHierarchies_TenantId",
+                table: "OrganizationHierarchies",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrgHierarchyLogs_OrganizationHierarchyId",
+                table: "OrgHierarchyLogs",
+                column: "OrganizationHierarchyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrgHierarchyLogs_ReAssignedById",
+                table: "OrgHierarchyLogs",
+                column: "ReAssignedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_OrgHierarchyLogs_TenantId",
+                table: "OrgHierarchyLogs",
+                column: "TenantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "OrgHierarchyLogs");
+
+            migrationBuilder.DropTable(
+                name: "OrganizationHierarchies");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251112134339_Added_JobTicket_Related_Tables.cs

@@ -0,0 +1,538 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_JobTicket_Related_Tables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "JobStatus",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobStatus", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobTags",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobTags", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobTags_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ServiceProjectTags",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServiceProjectTags", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectTags_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "TeamRoleMasters",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TeamRoleMasters", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobTickets",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Title = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    AssigneeId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StartDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    DueDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobTickets", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobTickets_Employees_AssigneeId",
+                        column: x => x.AssigneeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobTickets_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobTickets_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobTickets_JobStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobTickets_ServiceProjects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "ServiceProjects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobTickets_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ServiceProjectTagMappings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ServiceProjectTagId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ServiceProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServiceProjectTagMappings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectTagMappings_ServiceProjectTags_ServiceProjectT~",
+                        column: x => x.ServiceProjectTagId,
+                        principalTable: "ServiceProjectTags",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectTagMappings_ServiceProjects_ServiceProjectId",
+                        column: x => x.ServiceProjectId,
+                        principalTable: "ServiceProjects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobStatusMappings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TeamRoleId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    NextStatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobStatusMappings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobStatusMappings_JobStatus_NextStatusId",
+                        column: x => x.NextStatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobStatusMappings_JobStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobStatusMappings_TeamRoleMasters_TeamRoleId",
+                        column: x => x.TeamRoleId,
+                        principalTable: "TeamRoleMasters",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobStatusMappings_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobEmployeeMappings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    AssigneeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTicketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobEmployeeMappings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobEmployeeMappings_Employees_AssigneeId",
+                        column: x => x.AssigneeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobEmployeeMappings_JobTickets_JobTicketId",
+                        column: x => x.JobTicketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobEmployeeMappings_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobTagMappings",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTagId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTicketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobTagMappings", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobTagMappings_JobTags_JobTagId",
+                        column: x => x.JobTagId,
+                        principalTable: "JobTags",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobTagMappings_JobTickets_JobTicketId",
+                        column: x => x.JobTicketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobTagMappings_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobUpdateLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTicketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    NextStatusId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    Comment = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobUpdateLogs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobStatus_NextStatusId",
+                        column: x => x.NextStatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobTickets_JobTicketId",
+                        column: x => x.JobTicketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.InsertData(
+                table: "JobStatus",
+                columns: new[] { "Id", "DisplayName", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("32d76a02-8f44-4aa0-9b66-c3716c45a918"), "New", "New" },
+                    { new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), "Closed", "Closed" },
+                    { new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), "In Progress", "In Progress" },
+                    { new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), "On Hold", "On Hold" },
+                    { new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), "Resolved", "Resolved" },
+                    { new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), "Assigned", "Assigned" },
+                    { new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), "Done", "Done" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "TeamRoleMasters",
+                columns: new[] { "Id", "Description", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("03bf5853-5e0b-4eb8-9f37-33bd999a05b3"), "A Manager oversees and coordinates a team or department to achieve organizational goals through planning, decision-making, and leadership.", "Manager" },
+                    { new Guid("145d7222-408b-4733-8a17-f417e070b8b8"), "A Service Engineer installs, maintains, repairs, and troubleshoots equipment to ensure optimal operation and customer satisfaction.", "Service Engineer" },
+                    { new Guid("8cfbf16f-7d3b-4c29-af5b-18935f20aa7b"), "A Support role involves assisting users or customers by resolving technical or service-related issues, answering inquiries, and ensuring a positive experience with products or services.", "Support" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "JobStatusMappings",
+                columns: new[] { "Id", "NextStatusId", "StatusId", "TeamRoleId", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("024e1810-6a57-4a0d-8d2e-be88da79fcd4"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), new Guid("32d76a02-8f44-4aa0-9b66-c3716c45a918"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("16c83c23-09be-40fd-9d05-f44795d8dee8"), new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("2787c903-1b39-4e7d-a0f2-3bb2309bb341"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("42f24930-387e-4f51-9c2d-3e29ffaaf02a"), new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("5602d32c-290e-48a3-83dd-91af6d12ed46"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("7165ecee-10e3-4fc0-85d2-6d93d5b11776"), new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("76bc5551-8f80-469d-ba23-95d7e746c9a9"), new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("87891499-e45d-406b-bf22-722db1beedc9"), new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("8c4ecdae-7435-4475-8389-15bc453561a1"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("9c2918be-b3c1-46fb-a03b-14dd613e1021"), new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("a44b0a66-ee33-47e7-a01f-6b8d9b621543"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("ab974bdb-2d8f-4ddc-9b71-bd6d198bae75"), new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("ca8b4358-3122-4aaa-bcf8-0b66e4ab313a"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("cb0db140-87fa-4a6f-812d-2834bd0f53a9"), new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"), new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("dc986ec4-858e-4c98-b330-4a5c98c91f07"), new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"), new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"), null, new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobEmployeeMappings_AssigneeId",
+                table: "JobEmployeeMappings",
+                column: "AssigneeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobEmployeeMappings_JobTicketId",
+                table: "JobEmployeeMappings",
+                column: "JobTicketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobEmployeeMappings_TenantId",
+                table: "JobEmployeeMappings",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobStatusMappings_NextStatusId",
+                table: "JobStatusMappings",
+                column: "NextStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobStatusMappings_StatusId",
+                table: "JobStatusMappings",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobStatusMappings_TeamRoleId",
+                table: "JobStatusMappings",
+                column: "TeamRoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobStatusMappings_TenantId",
+                table: "JobStatusMappings",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTagMappings_JobTagId",
+                table: "JobTagMappings",
+                column: "JobTagId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTagMappings_JobTicketId",
+                table: "JobTagMappings",
+                column: "JobTicketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTagMappings_TenantId",
+                table: "JobTagMappings",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTags_TenantId",
+                table: "JobTags",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_AssigneeId",
+                table: "JobTickets",
+                column: "AssigneeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_CreatedById",
+                table: "JobTickets",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_ProjectId",
+                table: "JobTickets",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_StatusId",
+                table: "JobTickets",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_TenantId",
+                table: "JobTickets",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_UpdatedById",
+                table: "JobTickets",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_JobTicketId",
+                table: "JobUpdateLogs",
+                column: "JobTicketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_NextStatusId",
+                table: "JobUpdateLogs",
+                column: "NextStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_StatusId",
+                table: "JobUpdateLogs",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_TenantId",
+                table: "JobUpdateLogs",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_UpdatedById",
+                table: "JobUpdateLogs",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectTagMappings_ServiceProjectId",
+                table: "ServiceProjectTagMappings",
+                column: "ServiceProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectTagMappings_ServiceProjectTagId",
+                table: "ServiceProjectTagMappings",
+                column: "ServiceProjectTagId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectTags_TenantId",
+                table: "ServiceProjectTags",
+                column: "TenantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "JobEmployeeMappings");
+
+            migrationBuilder.DropTable(
+                name: "JobStatusMappings");
+
+            migrationBuilder.DropTable(
+                name: "JobTagMappings");
+
+            migrationBuilder.DropTable(
+                name: "JobUpdateLogs");
+
+            migrationBuilder.DropTable(
+                name: "ServiceProjectTagMappings");
+
+            migrationBuilder.DropTable(
+                name: "TeamRoleMasters");
+
+            migrationBuilder.DropTable(
+                name: "JobTags");
+
+            migrationBuilder.DropTable(
+                name: "JobTickets");
+
+            migrationBuilder.DropTable(
+                name: "ServiceProjectTags");
+
+            migrationBuilder.DropTable(
+                name: "JobStatus");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251113051300_Removed_Assignee_From_JobTicket_Table.cs

@@ -0,0 +1,50 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_Assignee_From_JobTicket_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobTickets_Employees_AssigneeId",
+                table: "JobTickets");
+
+            migrationBuilder.DropIndex(
+                name: "IX_JobTickets_AssigneeId",
+                table: "JobTickets");
+
+            migrationBuilder.DropColumn(
+                name: "AssigneeId",
+                table: "JobTickets");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "AssigneeId",
+                table: "JobTickets",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_AssigneeId",
+                table: "JobTickets",
+                column: "AssigneeId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobTickets_Employees_AssigneeId",
+                table: "JobTickets",
+                column: "AssigneeId",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251113060931_Removed_JobUpdateLog_Table_And_Added_JobComments_Table.cs

@@ -0,0 +1,151 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_JobUpdateLog_Table_And_Added_JobComments_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "JobUpdateLogs");
+
+            migrationBuilder.CreateTable(
+                name: "JobComments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTicketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Comment = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobComments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobComments_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobComments_JobTickets_JobTicketId",
+                        column: x => x.JobTicketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobComments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobComments_CreatedById",
+                table: "JobComments",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobComments_JobTicketId",
+                table: "JobComments",
+                column: "JobTicketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobComments_TenantId",
+                table: "JobComments",
+                column: "TenantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "JobComments");
+
+            migrationBuilder.CreateTable(
+                name: "JobUpdateLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTicketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    NextStatusId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Comment = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobUpdateLogs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobStatus_NextStatusId",
+                        column: x => x.NextStatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_JobTickets_JobTicketId",
+                        column: x => x.JobTicketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobUpdateLogs_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_JobTicketId",
+                table: "JobUpdateLogs",
+                column: "JobTicketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_NextStatusId",
+                table: "JobUpdateLogs",
+                column: "NextStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_StatusId",
+                table: "JobUpdateLogs",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_TenantId",
+                table: "JobUpdateLogs",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobUpdateLogs_UpdatedById",
+                table: "JobUpdateLogs",
+                column: "UpdatedById");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251113113335_Added_JobAttcahments_Table.cs

@@ -0,0 +1,222 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_JobAttcahments_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsActive",
+                table: "JobComments",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "JobComments",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "UpdatedById",
+                table: "JobComments",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateTable(
+                name: "JobAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StatusId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobCommentId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobAttachments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobAttachments_Documents_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "Documents",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttachments_JobComments_JobCommentId",
+                        column: x => x.JobCommentId,
+                        principalTable: "JobComments",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobAttachments_JobStatus_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "JobStatus",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttachments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ServiceProjectAllocations",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TeamRoleId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    AssignedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    AssignedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ReAssignedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    ReAssignedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ServiceProjectAllocations", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_Employees_AssignedById",
+                        column: x => x.AssignedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_Employees_ReAssignedById",
+                        column: x => x.ReAssignedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_ServiceProjects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "ServiceProjects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_TeamRoleMasters_TeamRoleId",
+                        column: x => x.TeamRoleId,
+                        principalTable: "TeamRoleMasters",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ServiceProjectAllocations_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobComments_UpdatedById",
+                table: "JobComments",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttachments_DocumentId",
+                table: "JobAttachments",
+                column: "DocumentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttachments_JobCommentId",
+                table: "JobAttachments",
+                column: "JobCommentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttachments_StatusId",
+                table: "JobAttachments",
+                column: "StatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttachments_TenantId",
+                table: "JobAttachments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_AssignedById",
+                table: "ServiceProjectAllocations",
+                column: "AssignedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_EmployeeId",
+                table: "ServiceProjectAllocations",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_ProjectId",
+                table: "ServiceProjectAllocations",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_ReAssignedById",
+                table: "ServiceProjectAllocations",
+                column: "ReAssignedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_TeamRoleId",
+                table: "ServiceProjectAllocations",
+                column: "TeamRoleId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ServiceProjectAllocations_TenantId",
+                table: "ServiceProjectAllocations",
+                column: "TenantId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobComments_Employees_UpdatedById",
+                table: "JobComments",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobComments_Employees_UpdatedById",
+                table: "JobComments");
+
+            migrationBuilder.DropTable(
+                name: "JobAttachments");
+
+            migrationBuilder.DropTable(
+                name: "ServiceProjectAllocations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_JobComments_UpdatedById",
+                table: "JobComments");
+
+            migrationBuilder.DropColumn(
+                name: "IsActive",
+                table: "JobComments");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "JobComments");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedById",
+                table: "JobComments");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251113114720_Added_Level_In_JobStatus_Table.cs

@@ -0,0 +1,85 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Level_In_JobStatus_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "Level",
+                table: "JobStatus",
+                type: "int",
+                nullable: false,
+                defaultValue: 1);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("32d76a02-8f44-4aa0-9b66-c3716c45a918"),
+                column: "Level",
+                value: 1);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("3ddeefb5-ae3c-4e10-a922-35e0a452bb69"),
+                column: "Level",
+                value: 6);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("5a6873a5-fed7-4745-a52f-8f61bf3bd72d"),
+                column: "Level",
+                value: 3);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("75a0c8b8-9c6a-41af-80bf-b35bab722eb2"),
+                column: "Level",
+                value: 7);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"),
+                columns: new[] { "DisplayName", "Level", "Name" },
+                values: new object[] { "Review", 4, "Review" });
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("cfa1886d-055f-4ded-84c6-42a2a8a14a66"),
+                column: "Level",
+                value: 2);
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"),
+                column: "Level",
+                value: 5);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Level",
+                table: "JobStatus");
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"),
+                columns: new[] { "DisplayName", "Name" },
+                values: new object[] { "Resolved", "Resolved" });
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251114120630_Added_GoogleMapUrl_In_ServiceProject_Table.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_GoogleMapUrl_In_ServiceProject_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GoogleMapUrl",
+                table: "ServiceProjects",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GoogleMapUrl",
+                table: "ServiceProjects");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251115101806_Added_GSTNumber_In_Organization_Table.cs

@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_GSTNumber_In_Organization_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<long>(
+                name: "SPRID",
+                table: "TenantOrgMappings",
+                type: "bigint",
+                nullable: false,
+                oldClrType: typeof(double),
+                oldType: "double");
+
+            migrationBuilder.AlterColumn<long>(
+                name: "SPRID",
+                table: "Organizations",
+                type: "bigint",
+                nullable: false,
+                oldClrType: typeof(double),
+                oldType: "double");
+
+            migrationBuilder.AddColumn<string>(
+                name: "GSTNumber",
+                table: "Organizations",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.UpdateData(
+                table: "Organizations",
+                keyColumn: "Id",
+                keyValue: new Guid("4e3a6d31-c640-40f7-8d67-6c109fcdb9ea"),
+                columns: new[] { "GSTNumber", "SPRID" },
+                values: new object[] { null, 5400L });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GSTNumber",
+                table: "Organizations");
+
+            migrationBuilder.AlterColumn<double>(
+                name: "SPRID",
+                table: "TenantOrgMappings",
+                type: "double",
+                nullable: false,
+                oldClrType: typeof(long),
+                oldType: "bigint");
+
+            migrationBuilder.AlterColumn<double>(
+                name: "SPRID",
+                table: "Organizations",
+                type: "double",
+                nullable: false,
+                oldClrType: typeof(long),
+                oldType: "bigint");
+
+            migrationBuilder.UpdateData(
+                table: "Organizations",
+                keyColumn: "Id",
+                keyValue: new Guid("4e3a6d31-c640-40f7-8d67-6c109fcdb9ea"),
+                column: "SPRID",
+                value: 5400.0);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251117045622_Added_JobAttendance_Related_Table.cs

@@ -0,0 +1,158 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_JobAttendance_Related_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "JobAttendance",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTcketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Action = table.Column<int>(type: "int", nullable: false),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TaggedInTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    TaggedOutTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    TaggedInAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    TaggedOutAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobAttendance", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobAttendance_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttendance_JobTickets_JobTcketId",
+                        column: x => x.JobTcketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttendance_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "JobAttendanceLogs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobAttendanceId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    JobTcketId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    Latitude = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Longitude = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Action = table.Column<int>(type: "int", nullable: false),
+                    Comment = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    MarkedTIme = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    MarkedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_JobAttendanceLogs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_JobAttendanceLogs_Documents_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "Documents",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_JobAttendanceLogs_Employees_EmployeeId",
+                        column: x => x.EmployeeId,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttendanceLogs_JobAttendance_JobAttendanceId",
+                        column: x => x.JobAttendanceId,
+                        principalTable: "JobAttendance",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttendanceLogs_JobTickets_JobTcketId",
+                        column: x => x.JobTcketId,
+                        principalTable: "JobTickets",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_JobAttendanceLogs_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendance_EmployeeId",
+                table: "JobAttendance",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendance_JobTcketId",
+                table: "JobAttendance",
+                column: "JobTcketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendance_TenantId",
+                table: "JobAttendance",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendanceLogs_DocumentId",
+                table: "JobAttendanceLogs",
+                column: "DocumentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendanceLogs_EmployeeId",
+                table: "JobAttendanceLogs",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendanceLogs_JobAttendanceId",
+                table: "JobAttendanceLogs",
+                column: "JobAttendanceId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendanceLogs_JobTcketId",
+                table: "JobAttendanceLogs",
+                column: "JobTcketId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobAttendanceLogs_TenantId",
+                table: "JobAttendanceLogs",
+                column: "TenantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "JobAttendanceLogs");
+
+            migrationBuilder.DropTable(
+                name: "JobAttendance");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251117074609_Added_UID_In_JobTicket_Table.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_UID_In_JobTicket_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "UIDPostfix",
+                table: "JobTickets",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "UIDPrefix",
+                table: "JobTickets",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UIDPostfix",
+                table: "JobTickets");
+
+            migrationBuilder.DropColumn(
+                name: "UIDPrefix",
+                table: "JobTickets");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251117135930_Added_BilledTo_In_Invoice_Table.cs

@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_BilledTo_In_Invoice_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Invoices_Projects_ProjectId",
+                table: "Invoices");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Invoices_ProjectId",
+                table: "Invoices");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "BilledToId",
+                table: "Invoices",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_BilledToId",
+                table: "Invoices",
+                column: "BilledToId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Invoices_Organizations_BilledToId",
+                table: "Invoices",
+                column: "BilledToId",
+                principalTable: "Organizations",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Invoices_Organizations_BilledToId",
+                table: "Invoices");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Invoices_BilledToId",
+                table: "Invoices");
+
+            migrationBuilder.DropColumn(
+                name: "BilledToId",
+                table: "Invoices");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_ProjectId",
+                table: "Invoices",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Invoices_Projects_ProjectId",
+                table: "Invoices",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251119065548_Added_ProjectBranches_Table.cs

@@ -0,0 +1,122 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_ProjectBranches_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "Projects",
+                keyColumn: "ContactPerson",
+                keyValue: null,
+                column: "ContactPerson",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ContactPerson",
+                table: "Projects",
+                type: "longtext",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ProjectBranches",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    BranchName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ContactInformation = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Address = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    BranchType = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    GoogleMapUrl = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatedById = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    UpdatedById = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ProjectBranches", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ProjectBranches_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ProjectBranches_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_ProjectBranches_ServiceProjects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "ServiceProjects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ProjectBranches_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectBranches_CreatedById",
+                table: "ProjectBranches",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectBranches_ProjectId",
+                table: "ProjectBranches",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectBranches_TenantId",
+                table: "ProjectBranches",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectBranches_UpdatedById",
+                table: "ProjectBranches",
+                column: "UpdatedById");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ProjectBranches");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ContactPerson",
+                table: "Projects",
+                type: "longtext",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251119123346_Added_ProjectBranch_As_ForignKey_In_JobTickets_Table.cs

@@ -0,0 +1,78 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_ProjectBranch_As_ForignKey_In_JobTickets_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ProjectBranchId",
+                table: "JobTickets",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"),
+                columns: new[] { "DisplayName", "Name" },
+                values: new object[] { "Work Done", "Work Done" });
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"),
+                columns: new[] { "DisplayName", "Name" },
+                values: new object[] { "Review Done", "Review Done" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_JobTickets_ProjectBranchId",
+                table: "JobTickets",
+                column: "ProjectBranchId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobTickets_ProjectBranches_ProjectBranchId",
+                table: "JobTickets",
+                column: "ProjectBranchId",
+                principalTable: "ProjectBranches",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobTickets_ProjectBranches_ProjectBranchId",
+                table: "JobTickets");
+
+            migrationBuilder.DropIndex(
+                name: "IX_JobTickets_ProjectBranchId",
+                table: "JobTickets");
+
+            migrationBuilder.DropColumn(
+                name: "ProjectBranchId",
+                table: "JobTickets");
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("aab71020-2fb8-44d9-9430-c9a7e9bf33b0"),
+                columns: new[] { "DisplayName", "Name" },
+                values: new object[] { "Review", "Review" });
+
+            migrationBuilder.UpdateData(
+                table: "JobStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("ed10ab57-dbaa-4ca5-8ecd-56745dcbdbd7"),
+                columns: new[] { "DisplayName", "Name" },
+                values: new object[] { "Done", "Done" });
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251120051203_Added_IsArchive_In_JobTicket_Table.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_IsArchive_In_JobTicket_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsArchive",
+                table: "JobTickets",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsArchive",
+                table: "JobTickets");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251120111120_Removed_Project_ForignKey_From_Expenses_Table.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_Project_ForignKey_From_Expenses_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_Projects_ProjectId",
+                table: "Expenses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_ProjectId",
+                table: "Expenses");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_ProjectId",
+                table: "Expenses",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_Projects_ProjectId",
+                table: "Expenses",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251120122017_Removed_Project_ForignKey_From_PaymentRequest_Table.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_Project_ForignKey_From_PaymentRequest_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_Projects_ProjectId",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_ProjectId",
+                table: "PaymentRequests");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_ProjectId",
+                table: "PaymentRequests",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaymentRequests_Projects_ProjectId",
+                table: "PaymentRequests",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251121060117_Removed_Project_ForignKey_From_RecurringPayment_Table.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_Project_ForignKey_From_RecurringPayment_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_Projects_ProjectId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_RecurringPayments_ProjectId",
+                table: "RecurringPayments");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_ProjectId",
+                table: "RecurringPayments",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_Projects_ProjectId",
+                table: "RecurringPayments",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251121063159_Removed_Project_ForignKey_From_ProjectContactMapping_Table.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Removed_Project_ForignKey_From_ProjectContactMapping_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ContactProjectMappings_Projects_ProjectId",
+                table: "ContactProjectMappings");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ContactProjectMappings_ProjectId",
+                table: "ContactProjectMappings");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_ContactProjectMappings_ProjectId",
+                table: "ContactProjectMappings",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ContactProjectMappings_Projects_ProjectId",
+                table: "ContactProjectMappings",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251125072208_Corrected_JobTicketId_Spelling_In_JobAttendance.cs

@@ -0,0 +1,106 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Corrected_JobTicketId_Spelling_In_JobAttendance : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobAttendance_JobTickets_JobTcketId",
+                table: "JobAttendance");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobAttendanceLogs_JobTickets_JobTcketId",
+                table: "JobAttendanceLogs");
+
+            migrationBuilder.RenameColumn(
+                name: "JobTcketId",
+                table: "JobAttendanceLogs",
+                newName: "JobTicketId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_JobAttendanceLogs_JobTcketId",
+                table: "JobAttendanceLogs",
+                newName: "IX_JobAttendanceLogs_JobTicketId");
+
+            migrationBuilder.RenameColumn(
+                name: "JobTcketId",
+                table: "JobAttendance",
+                newName: "JobTicketId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_JobAttendance_JobTcketId",
+                table: "JobAttendance",
+                newName: "IX_JobAttendance_JobTicketId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobAttendance_JobTickets_JobTicketId",
+                table: "JobAttendance",
+                column: "JobTicketId",
+                principalTable: "JobTickets",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobAttendanceLogs_JobTickets_JobTicketId",
+                table: "JobAttendanceLogs",
+                column: "JobTicketId",
+                principalTable: "JobTickets",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobAttendance_JobTickets_JobTicketId",
+                table: "JobAttendance");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_JobAttendanceLogs_JobTickets_JobTicketId",
+                table: "JobAttendanceLogs");
+
+            migrationBuilder.RenameColumn(
+                name: "JobTicketId",
+                table: "JobAttendanceLogs",
+                newName: "JobTcketId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_JobAttendanceLogs_JobTicketId",
+                table: "JobAttendanceLogs",
+                newName: "IX_JobAttendanceLogs_JobTcketId");
+
+            migrationBuilder.RenameColumn(
+                name: "JobTicketId",
+                table: "JobAttendance",
+                newName: "JobTcketId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_JobAttendance_JobTicketId",
+                table: "JobAttendance",
+                newName: "IX_JobAttendance_JobTcketId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobAttendance_JobTickets_JobTcketId",
+                table: "JobAttendance",
+                column: "JobTcketId",
+                principalTable: "JobTickets",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_JobAttendanceLogs_JobTickets_JobTcketId",
+                table: "JobAttendanceLogs",
+                column: "JobTcketId",
+                principalTable: "JobTickets",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.Helpers/Marco.Pms.Helpers.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
+    <PackageReference Include="Razorpay" Version="3.3.2" />
   </ItemGroup>
 
 	<ItemGroup>

Marco.Pms.Model/AppMenu/MenuItem.cs

@@ -13,7 +13,8 @@ namespace Marco.Pms.Model.AppMenu
         public string? Icon { get; set; }
         public bool Available { get; set; } = true;
 
-        public string? Link { get; set; }
+        public string Link { get; set; } = string.Empty;
+        public string MobileLink { get; set; } = string.Empty;
 
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();

Marco.Pms.Model/AppMenu/SubMenuItem.cs

@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.AppMenu
         public bool Available { get; set; } = true;
 
         public string Link { get; set; } = string.Empty;
+        public string MobileLink { get; set; } = string.Empty;
 
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();

Marco.Pms.Model/Collection/Invoice.cs

@@ -1,5 +1,5 @@
 using Marco.Pms.Model.Employees;
-using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.OrganizationModel;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -11,13 +11,14 @@ namespace Marco.Pms.Model.Collection
         public Guid Id { get; set; }
         public string Title { get; set; } = default!;
         public string Description { get; set; } = default!;
+        public Guid? BilledToId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("BilledToId")]
+        public Organization? BilledTo { get; set; }
         public string InvoiceNumber { get; set; } = default!;
         public string? EInvoiceNumber { get; set; }
         public Guid ProjectId { get; set; }
-
-        [ValidateNever]
-        [ForeignKey("ProjectId")]
-        public Project? Project { get; set; }
         public DateTime InvoiceDate { get; set; }
         public DateTime ClientSubmitedDate { get; set; }
         public DateTime ExceptedPaymentDate { get; set; }

Marco.Pms.Model/Directory/ContactProjectMapping.cs

@@ -1,7 +1,6 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Marco.Pms.Model.Projects;
-using Marco.Pms.Model.Utilities;
+using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Marco.Pms.Model.Directory
 {
@@ -9,9 +8,6 @@ namespace Marco.Pms.Model.Directory
     {
         public Guid Id { get; set; }
         public Guid ProjectId { get; set; }
-        [ValidateNever]
-        [ForeignKey("ProjectId")]
-        public Project? Project { get; set; }
         public Guid ContactId { get; set; }
         [ValidateNever]
         [ForeignKey("ContactId")]

Marco.Pms.Model/Dtos/AppMenu/CreateMenuItemDto.cs

@@ -7,6 +7,7 @@
         public bool Available { get; set; } = true;
 
         public required string Link { get; set; }
+        public string? MobileLink { get; set; }
 
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();

Marco.Pms.Model/Dtos/AppMenu/CreateSubMenuItemDto.cs

@@ -6,7 +6,7 @@
         public bool Available { get; set; } = true;
 
         public required string Link { get; set; } = string.Empty;
-
+        public string? MobileLink { get; set; }
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();
     }

Marco.Pms.Model/Dtos/AppMenu/UpdateMenuItemDto.cs

@@ -9,6 +9,7 @@
         public bool Available { get; set; } = true;
 
         public required string Link { get; set; }
+        public string? MobileLink { get; set; }
 
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();

Marco.Pms.Model/Dtos/AppMenu/UpdateSubMenuItemDto.cs

@@ -8,6 +8,7 @@
         public bool Available { get; set; } = true;
 
         public string Link { get; set; } = string.Empty;
+        public string? MobileLink { get; set; }
 
         // Changed from string → List<string>
         public List<string> PermissionIds { get; set; } = new List<string>();

Marco.Pms.Model/Dtos/Collection/InvoiceDto.cs

@@ -10,6 +10,7 @@ namespace Marco.Pms.Model.Dtos.Collection
         public required string InvoiceNumber { get; set; }
         public string? EInvoiceNumber { get; set; }
         public required Guid ProjectId { get; set; }
+        public required Guid BilledToId { get; set; }
         public required DateTime InvoiceDate { get; set; }
         public required DateTime ClientSubmitedDate { get; set; }
         public required DateTime ExceptedPaymentDate { get; set; }

Marco.Pms.Model/Dtos/Employees/BasicEmployeeDto.cs

@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Dtos.Employees
+{
+    public class BasicEmployeeDto
+    {
+        public Guid EmployeeId { get; set; }
+        public bool IsActive { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/CreateExpensesDto.cs

@@ -5,7 +5,7 @@ namespace Marco.Pms.Model.Dtos.Expenses
     public class CreateExpensesDto
     {
         public required Guid ProjectId { get; set; }
-        public required Guid ExpensesTypeId { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
         public required Guid PaymentModeId { get; set; }
         public required Guid PaidById { get; set; }
         public DateTime TransactionDate { get; set; } = DateTime.Now;
@@ -15,6 +15,7 @@ namespace Marco.Pms.Model.Dtos.Expenses
         public string? GSTNumber { get; set; }
         public required string SupplerName { get; set; }
         public required double Amount { get; set; }
+        public Guid? CurrencyId { get; set; }
         public int? NoOfPersons { get; set; } = 0;
         public bool PreApproved { get; set; } = false;
         public required List<FileUploadModel> BillAttachments { get; set; }

Marco.Pms.Model/Dtos/Expenses/CreateRecurringTemplateDto.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.TenantModels;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class CreateRecurringTemplateDto
+    {
+        public required string Title { get; set; }
+        public required string Description { get; set; }
+        public required string Payee { get; set; }
+        public required string NotifyTo { get; set; }
+        public required Guid CurrencyId { get; set; }
+        public required double Amount { get; set; }
+        public required DateTime StrikeDate { get; set; }
+        public Guid? ProjectId { get; set; }
+        public required int PaymentBufferDays { get; set; }
+        public required DateTime EndDate { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
+        public required Guid StatusId { get; set; }
+        public required PLAN_FREQUENCY Frequency { get; set; }
+        public required bool IsVariable { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/ExpenseConversionDto.cs

@@ -0,0 +1,13 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class ExpenseConversionDto
+    {
+        public required Guid PaymentRequestId { get; set; }
+        public required Guid PaymentModeId { get; set; }
+        public string? Location { get; set; }
+        public string? GSTNumber { get; set; }
+        public List<FileUploadModel>? BillAttachments { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/ExpenseRecordDto.cs

@@ -5,6 +5,9 @@
         public Guid ExpenseId { get; set; }
         public Guid StatusId { get; set; }
         public string? Comment { get; set; }
+        public double? TDSPercentage { get; set; }
+        public double? BaseAmount { get; set; }
+        public double? TaxAmount { get; set; }
         public string? ReimburseTransactionId { get; set; }
         public DateTime? ReimburseDate { get; set; }
         public Guid? ReimburseById { get; set; }

Marco.Pms.Model/Dtos/Expenses/Masters/ExpenseCategoryMasterDto.cs

@@ -0,0 +1,11 @@
+namespace Marco.Pms.Model.Dtos.Expenses.Masters
+{
+    public class ExpenseCategoryMasterDto
+    {
+        public Guid? Id { get; set; }
+        public required string Name { get; set; }
+        public required bool NoOfPersonsRequired { get; set; }
+        public required bool IsAttachmentRequried { get; set; }
+        public string? Description { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/PaymentRequestConversionDto.cs

@@ -0,0 +1,7 @@
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class PaymentRequestConversionDto
+    {
+        public required List<Guid> RecurringTemplateIds { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/PaymentRequestDto.cs

@@ -0,0 +1,19 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class PaymentRequestDto
+    {
+        public Guid? Id { get; set; }
+        public required string Title { get; set; }
+        public required string Description { get; set; }
+        public required string Payee { get; set; }
+        public required Guid CurrencyId { get; set; }
+        public required double Amount { get; set; }
+        public required DateTime DueDate { get; set; }
+        public Guid? ProjectId { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
+        public bool IsAdvancePayment { get; set; }
+        public List<FileUploadModel>? BillAttachments { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/PaymentRequestRecordDto.cs

@@ -0,0 +1,21 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class PaymentRequestRecordDto
+    {
+        public Guid PaymentRequestId { get; set; }
+        public Guid StatusId { get; set; }
+        public string? Comment { get; set; }
+        public string? PaidTransactionId { get; set; }
+        public double? TDSPercentage { get; set; }
+        public double? BaseAmount { get; set; }
+        public double? TaxAmount { get; set; }
+        public DateTime? PaidAt { get; set; }
+        public Guid? PaidById { get; set; }
+        public Guid? PaymentModeId { get; set; }
+        public string? Location { get; set; }
+        public string? GSTNumber { get; set; }
+        public List<FileUploadModel>? BillAttachments { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Expenses/UpdateExpensesDto.cs

@@ -6,7 +6,7 @@ namespace Marco.Pms.Model.Dtos.Expenses
     {
         public required Guid Id { get; set; }
         public required Guid ProjectId { get; set; }
-        public required Guid ExpensesTypeId { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
         public required Guid PaymentModeId { get; set; }
         public required Guid PaidById { get; set; }
         public DateTime TransactionDate { get; set; } = DateTime.Now;

Marco.Pms.Model/Dtos/Expenses/UpdateRecurringTemplateDto.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.TenantModels;
+
+namespace Marco.Pms.Model.Dtos.Expenses
+{
+    public class UpdateRecurringTemplateDto
+    {
+        public Guid Id { get; set; }
+        public required string Title { get; set; }
+        public required string Description { get; set; }
+        public required string Payee { get; set; }
+        public required string NotifyTo { get; set; }
+        public required Guid CurrencyId { get; set; }
+        public required double Amount { get; set; }
+        public Guid? ProjectId { get; set; }
+        public required int PaymentBufferDays { get; set; }
+        public required DateTime EndDate { get; set; }
+        public required Guid ExpenseCategoryId { get; set; }
+        public required Guid StatusId { get; set; }
+        public required PLAN_FREQUENCY Frequency { get; set; }
+        public required bool IsVariable { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Master/TagDto.cs

@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Master
+{
+    public class TagDto
+    {
+        public Guid? Id { get; set; }
+        public required string Name { get; set; }
+        public bool IsActive { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Organization/CreateOrganizationDto.cs

@@ -7,6 +7,7 @@
         public required string ContactPerson { get; set; }
         public required string Address { get; set; }
         public required string ContactNumber { get; set; }
+        public string? GSTNumber { get; set; }
         public string? logoImage { get; set; }
         public List<Guid>? ServiceIds { get; set; }
     }

Marco.Pms.Model/Dtos/Organization/OrganizationHierarchyDto.cs

@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Organization
+{
+    public class OrganizationHierarchyDto
+    {
+        public Guid ReportToId { get; set; }
+        public bool IsPrimary { get; set; }
+        public bool IsActive { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Organization/UpdateOrganizationDto.cs

@@ -7,6 +7,7 @@
         public required string ContactPerson { get; set; }
         public required string Address { get; set; }
         public required string ContactNumber { get; set; }
+        public string? GSTNumber { get; set; }
         public List<Guid>? ServiceIds { get; set; }
     }
 }

Marco.Pms.Model/Dtos/PaymentGetway/CreateOrderDto.cs

@@ -0,0 +1,7 @@
+namespace Marco.Pms.Model.Dtos.PaymentGetway
+{
+    public class CreateOrderDto
+    {
+        public double Amount { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/PaymentGetway/PaymentVerificationRequest.cs

@@ -0,0 +1,11 @@
+namespace Marco.Pms.Model.Dtos.PaymentGetway
+{
+    public class PaymentVerificationRequest
+    {
+        public required Guid TenantEnquireId { get; set; }
+        public required Guid PlanId { get; set; }
+        public required string OrderId { get; set; }
+        public required string PaymentId { get; set; }
+        public required string Signature { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/ChangeJobStatusDto.cs

@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class ChangeJobStatusDto
+    {
+        public required Guid JobTicketId { get; set; }
+        public required Guid StatusId { get; set; }
+        public required string Comment { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/CreateJobTicketDto.cs

@@ -0,0 +1,17 @@
+using Marco.Pms.Model.Dtos.Employees;
+using Marco.Pms.Model.Dtos.Master;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class CreateJobTicketDto
+    {
+        public required string Title { get; set; }
+        public required string Description { get; set; }
+        public required Guid ProjectId { get; set; }
+        public Guid? ProjectBranchId { get; set; }
+        public List<BasicEmployeeDto>? Assignees { get; set; }
+        public required DateTime StartDate { get; set; }
+        public required DateTime DueDate { get; set; }
+        public List<TagDto>? Tags { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/JobAttendanceDto.cs

@@ -0,0 +1,16 @@
+using Marco.Pms.Model.ServiceProject;
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class JobAttendanceDto
+    {
+        public required Guid JobTicketId { get; set; }
+        public required TAGGING_MARK_TYPE Action { get; set; }
+        public string? Latitude { get; set; }
+        public string? Longitude { get; set; }
+        public string? Comment { get; set; }
+        public DateTime? MarkedAt { get; set; }
+        public FileUploadModel? Attachment { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/JobCommentDto.cs

@@ -0,0 +1,12 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class JobCommentDto
+    {
+        public Guid? Id { get; set; }
+        public required Guid JobTicketId { get; set; }
+        public required string Comment { get; set; }
+        public List<FileUploadModel>? Attachments { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/ProjectBranchDto.cs

@@ -0,0 +1,13 @@
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class ProjectBranchDto
+    {
+        public Guid? Id { get; set; }
+        public required string BranchName { get; set; }
+        public required Guid ProjectId { get; set; }
+        public required string ContactInformation { get; set; }
+        public required string Address { get; set; }
+        public required string BranchType { get; set; } // HQ, ATMs, Bank Branches, Overcounter desk
+        public string? GoogleMapUrl { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/ServiceProjectAllocationDto.cs

@@ -0,0 +1,10 @@
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class ServiceProjectAllocationDto
+    {
+        public Guid ProjectId { get; set; }
+        public Guid EmployeeId { get; set; }
+        public Guid TeamRoleId { get; set; }
+        public bool IsActive { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/ServiceProjectDto.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.Dtos.Master;
+using Marco.Pms.Model.ViewModels.Master;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class ServiceProjectDto
+    {
+        public Guid? Id { get; set; }
+        public required string Name { get; set; }
+        public required string ShortName { get; set; }
+        public required Guid ClientId { get; set; }
+        public required List<BasicServiceMasterDto> Services { get; set; }
+        public required string Address { get; set; }
+        public required DateTime AssignedDate { get; set; }
+        public required Guid StatusId { get; set; }
+        public List<TagDto>? Tags { get; set; }
+        public required string ContactName { get; set; }
+        public required string ContactPhone { get; set; }
+        public required string ContactEmail { get; set; }
+        public string? GoogleMapUrl { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/TalkingPointDto.cs

@@ -0,0 +1,12 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class TalkingPointDto
+    {
+        public Guid? Id { get; set; }
+        public required Guid ServiceProjectId { get; set; }
+        public required string Comment { get; set; }
+        public List<FileUploadModel>? Attachments { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/ServiceProject/UpdateJobTicketDto.cs

@@ -0,0 +1,17 @@
+using Marco.Pms.Model.Dtos.Employees;
+using Marco.Pms.Model.Dtos.Master;
+
+namespace Marco.Pms.Model.Dtos.ServiceProject
+{
+    public class UpdateJobTicketDto
+    {
+        public string? Title { get; set; }
+        public string? Description { get; set; }
+        public Guid StatusId { get; set; }
+        public List<BasicEmployeeDto>? Assignees { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime DueDate { get; set; }
+        public List<TagDto>? Tags { get; set; }
+        public bool IsArchive { get; set; } = false;
+    }
+}

Marco.Pms.Model/Dtos/Tenant/RenewSubscriptionDto.cs

@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Dtos.Tenant
+{
+    public class RenewSubscriptionDto
+    {
+        public Guid PaymentDetailId { get; set; }
+        public Guid PlanId { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Tenant/SelfSubscriptionDto.cs

@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Tenant
+{
+    public class SelfSubscriptionDto
+    {
+        public Guid TenantEnquireId { get; set; }
+        public Guid PaymentDetailId { get; set; }
+        public Guid PlanId { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Tenant/TenantEnquireDto.cs

@@ -0,0 +1,15 @@
+namespace Marco.Pms.Model.Dtos.Tenant
+{
+    public class TenantEnquireDto
+    {
+        public required string FirstName { get; set; }
+        public required string LastName { get; set; }
+        public required string OrganizationName { get; set; }
+        public required string Email { get; set; }
+        public required string ContactNumber { get; set; }
+        public required string BillingAddress { get; set; }
+        public required string OrganizationSize { get; set; }
+        public required Guid IndustryId { get; set; }
+        public required string Reference { get; set; }
+    }
+}

Marco.Pms.Model/Entitlements/PermissionsMaster.cs

@@ -47,6 +47,10 @@
         public static readonly Guid DownloadDocument = Guid.Parse("404373d0-860f-490e-a575-1c086ffbce1d");
         public static readonly Guid VerifyDocument = Guid.Parse("13a1f30f-38d1-41bf-8e7a-b75189aab8e0");
 
+        public static readonly Guid ManageRecurring = Guid.Parse("6382ea8b-aff2-4cd2-a48f-a652b35825d8");
+        public static readonly Guid ViewAllRecurring = Guid.Parse("7ddf2fba-c44d-4fe3-b4ec-690ff70be2e3");
+        public static readonly Guid ViewSelfRecurring = Guid.Parse("e5d21efe-573d-4a16-a0f8-414d3e442e78");
+
         public static readonly Guid CollectionAdmin = Guid.Parse("dbf17591-09fe-4c93-9e1a-12db8f5cc5de");
         public static readonly Guid ViewCollection = Guid.Parse("c8d7eea5-4033-4aad-9ebe-76de49896830");
         public static readonly Guid CreateCollection = Guid.Parse("b93141fd-dbd3-4051-8f57-bf25d18e3555");

Marco.Pms.Model/Expenses/AdvancePaymentTransaction.cs

@@ -0,0 +1,36 @@
+using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Expenses
+{
+    public class AdvancePaymentTransaction : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string FinanceUIdPrefix { get; set; } = default!;
+        public int FinanceUIdPostfix { get; set; }
+        public string Title { get; set; } = default!;
+        public Guid? ProjectId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ProjectId")]
+        public Project? Project { get; set; }
+        public Guid EmployeeId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("EmployeeId")]
+        public Employee? Employee { get; set; }
+        public double Amount { get; set; }
+        public double CurrentBalance { get; set; }
+        public DateTime PaidAt { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+        public bool IsActive { get; set; }
+    }
+}

Marco.Pms.Model/Expenses/Expenses.cs

@@ -1,6 +1,6 @@
 using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Expenses.Masters;
 using Marco.Pms.Model.Master;
-using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -10,16 +10,20 @@ namespace Marco.Pms.Model.Expenses
     public class Expenses : TenantRelation
     {
         public Guid Id { get; set; }
+        public string UIDPrefix { get; set; } = default!;
+        public int UIDPostfix { get; set; }
         public Guid ProjectId { get; set; }
-
-        [ValidateNever]
-        [ForeignKey("ProjectId")]
-        public Project? Project { get; set; }
         public Guid ExpensesTypeId { get; set; }
 
+        //[ValidateNever]
+        //[ForeignKey("ExpensesTypeId")]
+        //public ExpensesTypeMaster? ExpensesType { get; set; }
+
+        public Guid ExpenseCategoryId { get; set; }
+
         [ValidateNever]
-        [ForeignKey("ExpensesTypeId")]
-        public ExpensesTypeMaster? ExpensesType { get; set; }
+        [ForeignKey("ExpenseCategoryId")]
+        public ExpenseCategoryMaster? ExpenseCategory { get; set; }
         public Guid PaymentModeId { get; set; }
 
         [ValidateNever]
@@ -54,12 +58,25 @@ namespace Marco.Pms.Model.Expenses
         public DateTime CreatedAt { get; set; }
         public string? TransactionId { get; set; }
         public string Description { get; set; } = string.Empty;
-        public string ExpenseUId { get; set; } = string.Empty;
+        public string? ExpenseUId { get; set; }
         public string? Location { get; set; }
         public string? GSTNumber { get; set; }
         public string SupplerName { get; set; } = string.Empty;
+        public Guid CurrencyId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CurrencyId")]
+        public CurrencyMaster? Currency { get; set; }
         public double Amount { get; set; }
+        public double? BaseAmount { get; set; }
+        public double? TaxAmount { get; set; }
+        public double? TDSPercentage { get; set; }
         public int? NoOfPersons { get; set; }
+        public Guid? PaymentRequestId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("PaymentRequestId")]
+        public PaymentRequest? PaymentRequest { get; set; }
         public Guid StatusId { get; set; }
 
         [ValidateNever]

Marco.Pms.Model/Expenses/Masters/ExpenseCategoryMaster.cs

@@ -0,0 +1,14 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Expenses.Masters
+{
+    public class ExpenseCategoryMaster : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public bool NoOfPersonsRequired { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public bool IsActive { get; set; } = true;
+        public bool IsAttachmentRequried { get; set; } = true;
+    }
+}

Marco.Pms.Model/Expenses/Masters/ExpensesStatusMapping.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Marco.Pms.Model.Expenses
+namespace Marco.Pms.Model.Expenses.Masters
 {
     public class ExpensesStatusMapping
     {

Marco.Pms.Model/Expenses/Masters/RecurringPaymentStatus.cs

@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Expenses.Masters
+{
+    public class RecurringPaymentStatus
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+    }
+}

Marco.Pms.Model/Expenses/Masters/StatusPermissionMapping.cs

@@ -3,7 +3,7 @@ using Marco.Pms.Model.Master;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Marco.Pms.Model.Expenses
+namespace Marco.Pms.Model.Expenses.Masters
 {
     public class StatusPermissionMapping
     {