Searching the expense using ExpenseUID

Reviewed-on: #149

Marco.Pms.DataAccess/Data/ApplicationDbContext.cs

@@ -1,6 +1,7 @@
 using Marco.Pms.Model.Activities;
 using Marco.Pms.Model.AttendanceModule;
 using Marco.Pms.Model.Authentication;
+using Marco.Pms.Model.Collection;
 using Marco.Pms.Model.Directory;
 using Marco.Pms.Model.DocumentManager;
 using Marco.Pms.Model.Employees;
@@ -10,6 +11,7 @@ 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.TenantModels;
@@ -104,6 +106,7 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<Expenses> Expenses { get; set; }
         public DbSet<ExpenseLog> ExpenseLogs { get; set; }
         public DbSet<ExpensesTypeMaster> ExpensesTypeMaster { get; set; }
+        public DbSet<ExpenseCategoryMaster> ExpenseCategoryMasters { get; set; }
         public DbSet<PaymentModeMatser> PaymentModeMatser { get; set; }
         public DbSet<ExpensesStatusMaster> ExpensesStatusMaster { get; set; }
         public DbSet<BillAttachments> BillAttachments { get; set; }
@@ -111,6 +114,13 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<ExpensesReimburseMapping> ExpensesReimburseMapping { get; set; }
         public DbSet<StatusPermissionMapping> StatusPermissionMapping { get; set; }
         public DbSet<ExpensesStatusMapping> ExpensesStatusMapping { get; set; }
+        public DbSet<PaymentRequest> PaymentRequests { get; set; }
+        public DbSet<PaymentRequestAttachment> PaymentRequestAttachments { get; set; }
+        public DbSet<RecurringPayment> RecurringPayments { get; set; }
+        public DbSet<AdvancePaymentTransaction> AdvancePaymentTransactions { get; set; }
+
+        public DbSet<StatusUpdateLog> StatusUpdateLogs { get; set; }
+        public DbSet<RecurringPaymentStatus> RecurringPaymentStatus { get; set; }
 
         public DbSet<FCMTokenMapping> FCMTokenMappings { get; set; }
 
@@ -133,6 +143,16 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<ProjectServiceMapping> ProjectServiceMappings { get; set; }
         public DbSet<ProjectOrgMapping> ProjectOrgMappings { get; set; }
 
+        // 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; }
+
+        public DbSet<PaymentDetail> PaymentDetails { get; set; }
+        public DbSet<TenantEnquire> TenantEnquires { get; set; }
+
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
@@ -473,6 +493,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
@@ -489,7 +567,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,
@@ -657,8 +735,8 @@ namespace Marco.Pms.DataAccess.Data
                     StatusId = Guid.Parse("61578360-3a49-4c34-8604-7b35a3787b95")
                 });
 
-            modelBuilder.Entity<ExpensesTypeMaster>().HasData(
+            modelBuilder.Entity<ExpenseCategoryMaster>().HasData(
-                new ExpensesTypeMaster
+                new ExpenseCategoryMaster
                 {
                     Id = Guid.Parse("5e0c6227-d49d-41ff-9f1f-781f0aee2469"),
                     Name = "Procurement",
@@ -668,7 +746,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",
@@ -678,7 +756,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",
@@ -688,7 +766,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",
@@ -698,7 +776,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",
@@ -708,7 +786,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",
@@ -718,7 +796,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",
@@ -728,7 +806,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",
@@ -746,30 +824,106 @@ 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,
+                    IsActive = true
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
                 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,
+                    IsActive = true
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
                 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,
+                    IsActive = true
-                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 },
                 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
+                },
+                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
+                }
+                );
+
+            modelBuilder.Entity<PaymentAdjustmentHead>().HasData(
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("dbdc047f-a2d2-4db0-b0e6-b9d9f923a0f1"),
+                    Name = "Advance payment",
+                    Description = "An advance payment is a sum paid before receiving goods or services, often to secure a transaction or cover initial costs.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("66c3c241-8b52-4327-a5ad-c1faf102583e"),
+                    Name = "Base Amount",
+                    Description = "The base amount refers to the principal sum or original value used as a reference in financial calculations, excluding taxes, fees, or additional charges.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("0d70cb2e-827e-44fc-90a5-c2c55ba51ba9"),
+                    Name = "Tax Deducted at Source (TDS)",
+                    Description = "TDS, or Tax Deducted at Source, is a system under the Indian Income Tax Act where tax is deducted at the point of income generation—such as salary, interest, or rent—and remitted to the government to prevent tax evasion and ensure timely collection.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("95f35acd-d979-4177-91ea-fd03a00e49ff"),
+                    Name = "Retention",
+                    Description = "Retention refers to a company's ability to keep customers, employees, or profits over time, commonly measured as a percentage and critical for long-term business sustainability and growth.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("3f09b19a-8d45-4cf2-be27-f4f09b38b9f7"),
+                    Name = "Tax",
+                    Description = "Tax is a mandatory financial charge imposed by a government on individuals or entities to fund public services and government operations, without direct benefit to the taxpayer.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("ec5e6a5f-ce62-44e5-8911-8426bbb4dde8"),
+                    Name = "Penalty",
+                    Description = "A penalty in the context of taxation is a financial sanction imposed by the government on individuals or entities for non-compliance with tax laws, such as late filing, underreporting income, or failure to pay taxes, and is typically calculated as a percentage of the tax due or a fixed amount.",
+                    IsActive = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new PaymentAdjustmentHead
+                {
+                    Id = Guid.Parse("50584332-1cb7-4359-9721-c8ea35040881"),
+                    Name = "Utility fees",
+                    Description = "Utility fees are recurring charges for essential services such as electricity, water, gas, sewage, waste disposal, internet, and telecommunications, typically based on usage and necessary for operating a home or business.",
                     IsActive = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 }
@@ -1005,6 +1159,29 @@ 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<Module>().HasData(
                 new Module
                 {
@@ -1039,6 +1216,8 @@ namespace Marco.Pms.DataAccess.Data
                 // 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("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("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 },
+                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 },
 
                 // Employee Module
@@ -1110,71 +1289,24 @@ namespace Marco.Pms.DataAccess.Data
                 new FeaturePermission { Id = new Guid("ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"), FeatureId = new Guid("a4e25142-449b-4334-a6e5-22f70e4732d7"), IsEnabled = true, Name = "Process", Description = "Allows a user to handle post-approval actions such as recording payments, updating financial records, or marking expenses as reimbursed or settled." },
                 new FeaturePermission { Id = new Guid("bdee29a2-b73b-402d-8dd1-c4b1f81ccbc3"), FeatureId = new Guid("a4e25142-449b-4334-a6e5-22f70e4732d7"), IsEnabled = true, Name = "Manage", Description = "Allows a user to configure and control system settings, such as managing expense types, payment modes, permissions, and overall workflow rules." },
 
+                // 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." },
+
+                // Collection Management Feature
+                new FeaturePermission { Id = new Guid("dbf17591-09fe-4c93-9e1a-12db8f5cc5de"), FeatureId = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), IsEnabled = true, Name = "Collection Admin", Description = "Collection Admin is a permission that grants a user full administrative control over collections, including creating, editing, managing access, and deleting collections within a system." },
+                new FeaturePermission { Id = new Guid("c8d7eea5-4033-4aad-9ebe-76de49896830"), FeatureId = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), IsEnabled = true, Name = "View Collection", Description = "View Collection is a permission that allows users to see and browse assets or items within a collection without making any modifications or edits to its contents." },
+                new FeaturePermission { Id = new Guid("b93141fd-dbd3-4051-8f57-bf25d18e3555"), FeatureId = new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), IsEnabled = true, Name = "Create Collection", Description = "Authorizes users to create new collections for organizing related resources and managing access" },
+                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." },
+
                 // 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" },
                 new FeaturePermission { Id = new Guid("7a6cf830-0008-4e03-b31d-0d050cb634f4"), FeatureId = new Guid("6d4c82d6-dbce-48ab-b8b8-f785f4d8c914"), IsEnabled = true, Name = "View Organization", Description = "Allow the user to view information of the organization" }
 
             );
-
-            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/20251003093145_Added_ExpenceUID_In_Expense_Table.cs

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

Marco.Pms.DataAccess/Migrations/20251008121556_Added_Requested_In_Attendance_Table.cs

@@ -0,0 +1,70 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Requested_In_Attendance_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ApprovedAt",
+                table: "Attendes",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "RequestedAt",
+                table: "Attendes",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "RequestedById",
+                table: "Attendes",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Attendes_RequestedById",
+                table: "Attendes",
+                column: "RequestedById");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Attendes_Employees_RequestedById",
+                table: "Attendes",
+                column: "RequestedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Attendes_Employees_RequestedById",
+                table: "Attendes");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Attendes_RequestedById",
+                table: "Attendes");
+
+            migrationBuilder.DropColumn(
+                name: "ApprovedAt",
+                table: "Attendes");
+
+            migrationBuilder.DropColumn(
+                name: "RequestedAt",
+                table: "Attendes");
+
+            migrationBuilder.DropColumn(
+                name: "RequestedById",
+                table: "Attendes");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251029065544_Added_Payment_Related_Tables.cs

@@ -0,0 +1,469 @@
+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_Payment_Related_Tables : 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.CreateTable(
+                name: "Invoices",
+                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"),
+                    InvoiceNumber = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EInvoiceNumber = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    InvoiceDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    ClientSubmitedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    ExceptedPaymentDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    BasicAmount = table.Column<double>(type: "double", nullable: false),
+                    TaxAmount = table.Column<double>(type: "double", nullable: false),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    MarkAsCompleted = 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_Invoices", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Invoices_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Invoices_Employees_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_Invoices_Projects_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Projects",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Invoices_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "PaymentAdjustmentHeads",
+                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: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    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_PaymentAdjustmentHeads", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_PaymentAdjustmentHeads_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            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");
+
+            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.CreateTable(
+                name: "InvoiceAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    InvoiceId = 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_InvoiceAttachments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InvoiceAttachments_Documents_DocumentId",
+                        column: x => x.DocumentId,
+                        principalTable: "Documents",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InvoiceAttachments_Invoices_InvoiceId",
+                        column: x => x.InvoiceId,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InvoiceAttachments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "InvoiceComments",
+                columns: table => new
+                {
+                    Id = 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"),
+                    InvoiceId = 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_InvoiceComments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InvoiceComments_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InvoiceComments_Invoices_InvoiceId",
+                        column: x => x.InvoiceId,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InvoiceComments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "ReceivedInvoicePayments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    InvoiceId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    PaymentReceivedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    TransactionId = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Amount = table.Column<double>(type: "double", nullable: false),
+                    Comment = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsActive = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    PaymentAdjustmentHeadId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    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_ReceivedInvoicePayments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ReceivedInvoicePayments_Employees_CreatedById",
+                        column: x => x.CreatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ReceivedInvoicePayments_Invoices_InvoiceId",
+                        column: x => x.InvoiceId,
+                        principalTable: "Invoices",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ReceivedInvoicePayments_PaymentAdjustmentHeads_PaymentAdjust~",
+                        column: x => x.PaymentAdjustmentHeadId,
+                        principalTable: "PaymentAdjustmentHeads",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ReceivedInvoicePayments_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.InsertData(
+                table: "Features",
+                columns: new[] { "Id", "Description", "IsActive", "ModuleId", "Name" },
+                values: new object[] { new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), "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.", true, new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), "Collection Management" });
+
+            migrationBuilder.InsertData(
+                table: "PaymentAdjustmentHeads",
+                columns: new[] { "Id", "Description", "IsActive", "Name", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("0d70cb2e-827e-44fc-90a5-c2c55ba51ba9"), "TDS, or Tax Deducted at Source, is a system under the Indian Income Tax Act where tax is deducted at the point of income generation—such as salary, interest, or rent—and remitted to the government to prevent tax evasion and ensure timely collection.", true, "Tax Deducted at Source (TDS)", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("3f09b19a-8d45-4cf2-be27-f4f09b38b9f7"), "Tax is a mandatory financial charge imposed by a government on individuals or entities to fund public services and government operations, without direct benefit to the taxpayer.", true, "Tax", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("50584332-1cb7-4359-9721-c8ea35040881"), "Utility fees are recurring charges for essential services such as electricity, water, gas, sewage, waste disposal, internet, and telecommunications, typically based on usage and necessary for operating a home or business.", true, "Utility fees", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("66c3c241-8b52-4327-a5ad-c1faf102583e"), "The base amount refers to the principal sum or original value used as a reference in financial calculations, excluding taxes, fees, or additional charges.", true, "Base Amount", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("95f35acd-d979-4177-91ea-fd03a00e49ff"), "Retention refers to a company's ability to keep customers, employees, or profits over time, commonly measured as a percentage and critical for long-term business sustainability and growth.", true, "Retention", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("dbdc047f-a2d2-4db0-b0e6-b9d9f923a0f1"), "An advance payment is a sum paid before receiving goods or services, often to secure a transaction or cover initial costs.", true, "Advance payment", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("ec5e6a5f-ce62-44e5-8911-8426bbb4dde8"), "A penalty in the context of taxation is a financial sanction imposed by the government on individuals or entities for non-compliance with tax laws, such as late filing, underreporting income, or failure to pay taxes, and is typically calculated as a percentage of the tax due or a fixed amount.", true, "Penalty", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.InsertData(
+                table: "FeaturePermissions",
+                columns: new[] { "Id", "Description", "FeatureId", "IsEnabled", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("061d9ccd-85b4-4cb0-be06-2f9f32cebb72"), " Enables entry and processing of payment transactions.", new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), true, "Add Payment" },
+                    { new Guid("455187b4-fef1-41f9-b3d0-025d0b6302c3"), "Ability to modify collection properties, content, and access rights.", new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), true, "Edit Collection" },
+                    { new Guid("b93141fd-dbd3-4051-8f57-bf25d18e3555"), "Authorizes users to create new collections for organizing related resources and managing access", new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), true, "Create Collection" },
+                    { new Guid("c8d7eea5-4033-4aad-9ebe-76de49896830"), "View Collection is a permission that allows users to see and browse assets or items within a collection without making any modifications or edits to its contents.", new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), true, "View Collection" },
+                    { new Guid("dbf17591-09fe-4c93-9e1a-12db8f5cc5de"), "Collection Admin is a permission that grants a user full administrative control over collections, including creating, editing, managing access, and deleting collections within a system.", new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"), true, "Collection Admin" }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TenantSubscriptions_PaymentDetailId",
+                table: "TenantSubscriptions",
+                column: "PaymentDetailId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceAttachments_DocumentId",
+                table: "InvoiceAttachments",
+                column: "DocumentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceAttachments_InvoiceId",
+                table: "InvoiceAttachments",
+                column: "InvoiceId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceAttachments_TenantId",
+                table: "InvoiceAttachments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceComments_CreatedById",
+                table: "InvoiceComments",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceComments_InvoiceId",
+                table: "InvoiceComments",
+                column: "InvoiceId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InvoiceComments_TenantId",
+                table: "InvoiceComments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_CreatedById",
+                table: "Invoices",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_ProjectId",
+                table: "Invoices",
+                column: "ProjectId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_TenantId",
+                table: "Invoices",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Invoices_UpdatedById",
+                table: "Invoices",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentAdjustmentHeads_TenantId",
+                table: "PaymentAdjustmentHeads",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReceivedInvoicePayments_CreatedById",
+                table: "ReceivedInvoicePayments",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReceivedInvoicePayments_InvoiceId",
+                table: "ReceivedInvoicePayments",
+                column: "InvoiceId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReceivedInvoicePayments_PaymentAdjustmentHeadId",
+                table: "ReceivedInvoicePayments",
+                column: "PaymentAdjustmentHeadId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReceivedInvoicePayments_TenantId",
+                table: "ReceivedInvoicePayments",
+                column: "TenantId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TenantEnquires_IndustryId",
+                table: "TenantEnquires",
+                column: "IndustryId");
+
+            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.DropTable(
+                name: "InvoiceAttachments");
+
+            migrationBuilder.DropTable(
+                name: "InvoiceComments");
+
+            migrationBuilder.DropTable(
+                name: "PaymentDetails");
+
+            migrationBuilder.DropTable(
+                name: "ReceivedInvoicePayments");
+
+            migrationBuilder.DropTable(
+                name: "TenantEnquires");
+
+            migrationBuilder.DropTable(
+                name: "Invoices");
+
+            migrationBuilder.DropTable(
+                name: "PaymentAdjustmentHeads");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TenantSubscriptions_PaymentDetailId",
+                table: "TenantSubscriptions");
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("061d9ccd-85b4-4cb0-be06-2f9f32cebb72"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("455187b4-fef1-41f9-b3d0-025d0b6302c3"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("b93141fd-dbd3-4051-8f57-bf25d18e3555"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("c8d7eea5-4033-4aad-9ebe-76de49896830"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("dbf17591-09fe-4c93-9e1a-12db8f5cc5de"));
+
+            migrationBuilder.DeleteData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("fc586e7d-ed1a-45e5-bb51-9f34af98ec13"));
+
+            migrationBuilder.DropColumn(
+                name: "PaymentDetailId",
+                table: "TenantSubscriptions");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251101053846_Added_PaymentRequest_RecurringPayment_AdvancePayment_Related_Tables.cs

@@ -0,0 +1,438 @@
+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_PaymentRequest_RecurringPayment_AdvancePayment_Related_Tables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentModeMatser_Tenants_TenantId",
+                table: "PaymentModeMatser");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentModeMatser_TenantId",
+                table: "PaymentModeMatser");
+
+            migrationBuilder.DropColumn(
+                name: "TenantId",
+                table: "PaymentModeMatser");
+
+            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),
+                    EmployeeId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Amount = table.Column<double>(type: "double", 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_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: false),
+                    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"),
+                    ExpenseStatusId = 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"),
+                    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: 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_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",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_ExpensesStatusMaster_ExpenseStatusId",
+                        column: x => x.ExpenseStatusId,
+                        principalTable: "ExpensesStatusMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_ExpensesStatusMaster_StatusId",
+                        column: x => x.StatusId,
+                        principalTable: "ExpensesStatusMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RecurringPayments_ExpensesTypeMaster_ExpenseCategoryId",
+                        column: x => x.ExpenseCategoryId,
+                        principalTable: "ExpensesTypeMaster",
+                        principalColumn: "Id");
+                    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: "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"),
+                    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: "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"),
+                    CurrencyId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Amount = table.Column<double>(type: "double", nullable: false),
+                    DueDate = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    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"),
+                    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: 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_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_UpdatedById",
+                        column: x => x.UpdatedById,
+                        principalTable: "Employees",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_ExpensesStatusMaster_ExpenseStatusId",
+                        column: x => x.ExpenseStatusId,
+                        principalTable: "ExpensesStatusMaster",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PaymentRequests_ExpensesTypeMaster_ExpenseCategoryId",
+                        column: x => x.ExpenseCategoryId,
+                        principalTable: "ExpensesTypeMaster",
+                        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.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.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_CreatedById",
+                table: "AdvancePaymentTransactions",
+                column: "CreatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_EmployeeId",
+                table: "AdvancePaymentTransactions",
+                column: "EmployeeId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_TenantId",
+                table: "AdvancePaymentTransactions",
+                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_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_ExpenseStatusId",
+                table: "RecurringPayments",
+                column: "ExpenseStatusId");
+
+            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");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropTable(
+                name: "PaymentRequests");
+
+            migrationBuilder.DropTable(
+                name: "StatusUpdateLogs");
+
+            migrationBuilder.DropTable(
+                name: "RecurringPayments");
+
+            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.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: "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.AddForeignKey(
+                name: "FK_PaymentModeMatser_Tenants_TenantId",
+                table: "PaymentModeMatser",
+                column: "TenantId",
+                principalTable: "Tenants",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251101063254_Added_ProjectId_In_PaymentRequest_RecurringPayment_Tables.cs

@@ -0,0 +1,81 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_ProjectId_In_PaymentRequest_RecurringPayment_Tables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ProjectId",
+                table: "RecurringPayments",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ProjectId",
+                table: "PaymentRequests",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_ProjectId",
+                table: "RecurringPayments",
+                column: "ProjectId");
+
+            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");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_Projects_ProjectId",
+                table: "RecurringPayments",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_Projects_ProjectId",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_Projects_ProjectId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_RecurringPayments_ProjectId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_ProjectId",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "ProjectId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropColumn(
+                name: "ProjectId",
+                table: "PaymentRequests");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251101070254_Added_CurrentBalance_In_AdvancePayment_Tables.cs

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

Marco.Pms.DataAccess/Migrations/20251101085801_Made_UpdatedBy_And_UpdateAt_As_Nullable.cs

@@ -0,0 +1,145 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Made_UpdatedBy_And_UpdateAt_As_Nullable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_Employees_UpdatedById",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_Employees_UpdatedById",
+                table: "RecurringPayments");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "UpdatedById",
+                table: "RecurringPayments",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "UpdatedById",
+                table: "PaymentRequests",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "PaymentRequests",
+                type: "datetime(6)",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaymentRequests_Employees_UpdatedById",
+                table: "PaymentRequests",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_Employees_UpdatedById",
+                table: "RecurringPayments",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_Employees_UpdatedById",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_Employees_UpdatedById",
+                table: "RecurringPayments");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "UpdatedById",
+                table: "RecurringPayments",
+                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");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)",
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "UpdatedById",
+                table: "PaymentRequests",
+                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");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "PaymentRequests",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)",
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaymentRequests_Employees_UpdatedById",
+                table: "PaymentRequests",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_Employees_UpdatedById",
+                table: "RecurringPayments",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251101101344_Added_PaymentRequestAttachmnets_Table.cs

@@ -0,0 +1,209 @@
+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_PaymentRequestAttachmnets_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_ExpensesTypeMaster_ExpenseCategoryId",
+                table: "PaymentRequests");
+
+            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.AddColumn<bool>(
+                name: "IsAdvancePayment",
+                table: "PaymentRequests",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+
+            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: "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.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.AddForeignKey(
+                name: "FK_PaymentRequests_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "PaymentRequests",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpenseCategoryMasters",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropTable(
+                name: "ExpenseCategoryMasters");
+
+            migrationBuilder.DropTable(
+                name: "PaymentRequestAttachments");
+
+            migrationBuilder.DropColumn(
+                name: "IsAdvancePayment",
+                table: "PaymentRequests");
+
+            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.AddForeignKey(
+                name: "FK_PaymentRequests_ExpensesTypeMaster_ExpenseCategoryId",
+                table: "PaymentRequests",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpensesTypeMaster",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251103100115_Added_Changed_ExpensesType_To_ExpenseCategory.cs

@@ -0,0 +1,107 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Changed_ExpensesType_To_ExpenseCategory : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_ExpensesTypeMaster_ExpensesTypeId",
+                table: "Expenses");
+
+            migrationBuilder.RenameColumn(
+                name: "ExpensesTypeId",
+                table: "Expenses",
+                newName: "ExpenseCategoryId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_Expenses_ExpensesTypeId",
+                table: "Expenses",
+                newName: "IX_Expenses_ExpenseCategoryId");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ProjectId",
+                table: "AdvancePaymentTransactions",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Title",
+                table: "AdvancePaymentTransactions",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AdvancePaymentTransactions_ProjectId",
+                table: "AdvancePaymentTransactions",
+                column: "ProjectId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "Expenses",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpenseCategoryMasters",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "Expenses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_AdvancePaymentTransactions_ProjectId",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropColumn(
+                name: "ProjectId",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropColumn(
+                name: "Title",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.RenameColumn(
+                name: "ExpenseCategoryId",
+                table: "Expenses",
+                newName: "ExpensesTypeId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_Expenses_ExpenseCategoryId",
+                table: "Expenses",
+                newName: "IX_Expenses_ExpensesTypeId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_ExpensesTypeMaster_ExpensesTypeId",
+                table: "Expenses",
+                column: "ExpensesTypeId",
+                principalTable: "ExpensesTypeMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251103111955_Added_Payment_Infromation_In_Payment_request_Table.cs

@@ -0,0 +1,83 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Payment_Infromation_In_Payment_request_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "NextStatusId",
+                table: "StatusUpdateLogs",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "PaidAt",
+                table: "PaymentRequests",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "PaidById",
+                table: "PaymentRequests",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PaidTransactionId",
+                table: "PaymentRequests",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_PaidById",
+                table: "PaymentRequests",
+                column: "PaidById");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaymentRequests_Employees_PaidById",
+                table: "PaymentRequests",
+                column: "PaidById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_PaymentRequests_Employees_PaidById",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_PaidById",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "NextStatusId",
+                table: "StatusUpdateLogs");
+
+            migrationBuilder.DropColumn(
+                name: "PaidAt",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "PaidById",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "PaidTransactionId",
+                table: "PaymentRequests");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251103133736_Added_UIDPerfix_In_Expense_Table.cs

@@ -0,0 +1,86 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_UIDPerfix_In_Expense_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions");
+
+            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.AlterColumn<Guid>(
+                name: "ProjectId",
+                table: "AdvancePaymentTransactions",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.DropColumn(
+                name: "UIDPostfix",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "UIDPrefix",
+                table: "Expenses");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "ProjectId",
+                table: "AdvancePaymentTransactions",
+                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");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_AdvancePaymentTransactions_Projects_ProjectId",
+                table: "AdvancePaymentTransactions",
+                column: "ProjectId",
+                principalTable: "Projects",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251104063606_Added_TDSPercentage_Field_In_Expense_Table.cs

@@ -0,0 +1,191 @@
+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_TDSPercentage_Field_In_Expense_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_ExpensesStatusMaster_ExpenseStatusId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_ExpensesStatusMaster_StatusId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_RecurringPayments_ExpenseStatusId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropColumn(
+                name: "ExpenseStatusId",
+                table: "RecurringPayments");
+
+            migrationBuilder.AddColumn<double>(
+                name: "TDSPercentage",
+                table: "PaymentRequests",
+                type: "double",
+                nullable: true);
+
+            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.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.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: "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"), "Activated" }
+                });
+
+            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.CreateIndex(
+                name: "IX_Expenses_PaymentRequestId",
+                table: "Expenses",
+                column: "PaymentRequestId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_PaymentRequests_PaymentRequestId",
+                table: "Expenses",
+                column: "PaymentRequestId",
+                principalTable: "PaymentRequests",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_RecurringPaymentStatus_StatusId",
+                table: "RecurringPayments",
+                column: "StatusId",
+                principalTable: "RecurringPaymentStatus",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_PaymentRequests_PaymentRequestId",
+                table: "Expenses");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_RecurringPaymentStatus_StatusId",
+                table: "RecurringPayments");
+
+            migrationBuilder.DropTable(
+                name: "RecurringPaymentStatus");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_PaymentRequestId",
+                table: "Expenses");
+
+            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: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("86e80017-0698-4efe-93d0-806de67266e0"));
+
+            migrationBuilder.DropColumn(
+                name: "TDSPercentage",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "PaymentRequestId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "TDSPercentage",
+                table: "Expenses");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ExpenseStatusId",
+                table: "RecurringPayments",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RecurringPayments_ExpenseStatusId",
+                table: "RecurringPayments",
+                column: "ExpenseStatusId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_ExpensesStatusMaster_ExpenseStatusId",
+                table: "RecurringPayments",
+                column: "ExpenseStatusId",
+                principalTable: "ExpensesStatusMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_ExpensesStatusMaster_StatusId",
+                table: "RecurringPayments",
+                column: "StatusId",
+                principalTable: "ExpensesStatusMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251104095438_Added_IsExpenseCreated_In_Payment_Request_Table.cs

@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_IsExpenseCreated_In_Payment_Request_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "LatestPRGeneratedAt",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: true,
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsExpenseCreated",
+                table: "PaymentRequests",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExpenseUId",
+                table: "Expenses",
+                type: "longtext",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsExpenseCreated",
+                table: "PaymentRequests");
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "LatestPRGeneratedAt",
+                table: "RecurringPayments",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                oldClrType: typeof(DateTime),
+                oldType: "datetime(6)",
+                oldNullable: true);
+
+            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");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251104115408_Changed_Forgin_Table_To_Category.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Changed_Forgin_Table_To_Category : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_ExpensesTypeMaster_ExpenseCategoryId",
+                table: "RecurringPayments");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "RecurringPayments",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpenseCategoryMasters",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_RecurringPayments_ExpenseCategoryMasters_ExpenseCategoryId",
+                table: "RecurringPayments");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_RecurringPayments_ExpensesTypeMaster_ExpenseCategoryId",
+                table: "RecurringPayments",
+                column: "ExpenseCategoryId",
+                principalTable: "ExpensesTypeMaster",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251105093429_Added_BaseAmount_In_Expense_And_PaymentRequest_Tables.cs

@@ -0,0 +1,91 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_BaseAmount_In_Expense_And_PaymentRequest_Tables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "BaseAmount",
+                table: "PaymentRequests",
+                type: "double",
+                nullable: true);
+
+            migrationBuilder.AddColumn<double>(
+                name: "TaxAmount",
+                table: "PaymentRequests",
+                type: "double",
+                nullable: true);
+
+            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<double>(
+                name: "TaxAmount",
+                table: "Expenses",
+                type: "double",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Expenses_CurrencyId",
+                table: "Expenses",
+                column: "CurrencyId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Expenses_CurrencyMaster_CurrencyId",
+                table: "Expenses",
+                column: "CurrencyId",
+                principalTable: "CurrencyMaster",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Expenses_CurrencyMaster_CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Expenses_CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "BaseAmount",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "TaxAmount",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "BaseAmount",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "CurrencyId",
+                table: "Expenses");
+
+            migrationBuilder.DropColumn(
+                name: "TaxAmount",
+                table: "Expenses");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251106033822_Added_CreatedAt_In_Advance_Payment_Table.cs

@@ -0,0 +1,58 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_CreatedAt_In_Advance_Payment_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "PaidAt",
+                table: "AdvancePaymentTransactions",
+                type: "datetime(6)",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.UpdateData(
+                table: "ExpensesStatusMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"),
+                column: "DisplayName",
+                value: "Submit for Review");
+
+            migrationBuilder.UpdateData(
+                table: "RecurringPaymentStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("da462422-13b2-45cc-a175-910a225f6fc8"),
+                column: "Name",
+                value: "Active");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PaidAt",
+                table: "AdvancePaymentTransactions");
+
+            migrationBuilder.UpdateData(
+                table: "ExpensesStatusMaster",
+                keyColumn: "Id",
+                keyValue: new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"),
+                column: "DisplayName",
+                value: "Submit");
+
+            migrationBuilder.UpdateData(
+                table: "RecurringPaymentStatus",
+                keyColumn: "Id",
+                keyValue: new Guid("da462422-13b2-45cc-a175-910a225f6fc8"),
+                column: "Name",
+                value: "Activated");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/20251108094424_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.Helpers/CacheHelper/EmployeeCache.cs

@@ -234,6 +234,27 @@ namespace Marco.Pms.Helpers.CacheHelper
                 return false;
             }
         }
+        public async Task<bool> ClearAllEmployeesFromCacheByTenantId(Guid tenantId)
+        {
+            var tenantIdString = tenantId.ToString();
+
+            try
+            {
+                var filter = Builders<EmployeePermissionMongoDB>.Filter.Eq(e => e.TenantId, tenantIdString);
+
+                var result = await _collection.DeleteManyAsync(filter);
+
+                if (result.DeletedCount == 0)
+                    return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error occured while deleting employee profile");
+                return false;
+            }
+        }
 
         // A private method to handle the one-time setup of the collection's indexes.
         private async Task InitializeCollectionAsync()

Marco.Pms.Model/AttendanceModule/Attendance.cs

@@ -19,6 +19,8 @@ namespace Marco.Pms.Model.AttendanceModule
         public Guid ProjectID { get; set; }
 
         public DateTime AttendanceDate { get; set; }
+        public DateTime? RequestedAt { get; set; }
+        public DateTime? ApprovedAt { get; set; }
         public DateTime? InTime { get; set; }
         public DateTime? OutTime { get; set; }
         public bool IsApproved { get; set; }
@@ -29,5 +31,10 @@ namespace Marco.Pms.Model.AttendanceModule
         [ForeignKey("ApprovedById")]
         [ValidateNever]
         public Employee? Approver { get; set; }
+        public Guid? RequestedById { get; set; }
+
+        [ForeignKey("RequestedById")]
+        [ValidateNever]
+        public Employee? RequestedBy { get; set; }
     }
 }

Marco.Pms.Model/Collection/Invoice.cs

@@ -0,0 +1,41 @@
+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.Collection
+{
+    public class Invoice : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        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; }
+        public double BasicAmount { get; set; }
+        public double TaxAmount { get; set; }
+        public bool IsActive { get; set; } = true;
+        public bool MarkAsCompleted { get; set; } = true;
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
+    }
+}

Marco.Pms.Model/Collection/InvoiceAttachment.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.DocumentManager;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Collection
+{
+    public class InvoiceAttachment : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public Guid InvoiceId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("InvoiceId")]
+        public Invoice? Invoice { get; set; }
+        public Guid DocumentId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("DocumentId")]
+        public Document? Document { get; set; }
+    }
+}

Marco.Pms.Model/Collection/InvoiceComment.cs

@@ -0,0 +1,24 @@
+using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Collection
+{
+    public class InvoiceComment : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Comment { get; set; } = default!;
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+        public Guid InvoiceId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("InvoiceId")]
+        public Invoice? Invoice { get; set; }
+    }
+}

Marco.Pms.Model/Collection/PaymentAdjustmentHead.cs

@@ -0,0 +1,12 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Collection
+{
+    public class PaymentAdjustmentHead : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = default!;
+        public string? Description { get; set; }
+        public bool IsActive { get; set; } = true;
+    }
+}

Marco.Pms.Model/Collection/ReceivedInvoicePayment.cs

@@ -0,0 +1,33 @@
+using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Collection
+{
+    public class ReceivedInvoicePayment : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public Guid InvoiceId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("InvoiceId")]
+        public Invoice? Invoice { get; set; }
+        public DateTime PaymentReceivedDate { get; set; }
+        public string TransactionId { get; set; } = default!;
+        public double Amount { get; set; }
+        public string Comment { get; set; } = default!;
+        public bool IsActive { get; set; } = true;
+        public Guid PaymentAdjustmentHeadId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("PaymentAdjustmentHeadId")]
+        public PaymentAdjustmentHead? PaymentAdjustmentHead { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+    }
+}

Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateWorkStatusMasterDto
     {
-        public string? Name { get; set; }
+        public required string Name { get; set; }
-        public string? Description { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs

@@ -3,7 +3,7 @@
     public class UpdateWorkStatusMasterDto
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
+        public required string Name { get; set; }
-        public string? Description { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Authentication/VerifyMPINDto.cs

@@ -5,6 +5,5 @@
         public required Guid EmployeeId { get; set; }
         public required string MPIN { get; set; }
         public required string MPINToken { get; set; }
-        public required string FcmToken { get; set; }
     }
 }

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

@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Dtos.Collection
+{
+    public class InvoiceCommentDto
+    {
+        public required string Comment { get; set; }
+        public required Guid InvoiceId { get; set; }
+    }
+}

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

@@ -0,0 +1,20 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Collection
+{
+    public class InvoiceDto
+    {
+        public Guid? Id { get; set; }
+        public required string Title { get; set; }
+        public string? Description { get; set; }
+        public required string InvoiceNumber { get; set; }
+        public string? EInvoiceNumber { get; set; }
+        public required Guid ProjectId { get; set; }
+        public required DateTime InvoiceDate { get; set; }
+        public required DateTime ClientSubmitedDate { get; set; }
+        public required DateTime ExceptedPaymentDate { get; set; }
+        public double BasicAmount { get; set; }
+        public double TaxAmount { get; set; }
+        public List<FileUploadModel>? Attachments { get; set; }
+    }
+}

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

@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Collection
+{
+    public class PaymentAdjustmentHeadDto
+    {
+        public Guid? Id { get; set; }
+        public required string Name { get; set; }
+        public string? Description { get; set; }
+    }
+}

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

@@ -0,0 +1,13 @@
+namespace Marco.Pms.Model.Dtos.Collection
+{
+    public class ReceivedInvoicePaymentDto
+    {
+        public Guid? Id { get; set; }
+        public required Guid InvoiceId { get; set; }
+        public required DateTime PaymentReceivedDate { get; set; }
+        public required string TransactionId { get; set; }
+        public required Guid PaymentAdjustmentHeadId { get; set; }
+        public required double Amount { get; set; }
+        public required string Comment { get; set; }
+    }
+}

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

@@ -19,7 +19,7 @@
         public string? EmergencyPhoneNumber { get; set; }
         public string? EmergencyContactPerson { get; set; }
         public Guid JobRoleId { get; set; }
-        public required Guid OrganizationId { get; set; }
+        public Guid? OrganizationId { get; set; }
         public required bool HasApplicationAccess { get; set; }
     }
     public class MobileUserManageDto
@@ -33,7 +33,7 @@
         public required string Gender { get; set; }
         public Guid JobRoleId { get; set; }
         public string? ProfileImage { get; set; }
-        public required Guid OrganizationId { get; set; }
+        public Guid? OrganizationId { get; set; }
         public required bool HasApplicationAccess { 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 int NumberOfIteration { 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/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,17 @@
+using Marco.Pms.Model.Master;
+
+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; }
+    }
+}

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;
@@ -16,6 +16,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 List<FileUploadModel>? BillAttachments { get; set; }

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 int NumberOfIteration { 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/CreateContactCategoryDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateContactCategoryDto
     {
-        public string? Name { get; set; }
+        public required string Name { get; set; }
-        public string? Description { get; set; }
+        public required string Description { get; set; }
     }
 }

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

@@ -2,7 +2,7 @@
 {
     public class CreateContactTagDto
     {
-        public string? Name { get; set; }
+        public required string Name { get; set; }
         public string? Description { get; set; }
     }
 }

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

@@ -3,7 +3,7 @@
     public class UpdateContactCategoryDto
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
+        public required string Name { get; set; }
-        public string? Description { get; set; }
+        public required string Description { 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/Projects/CreateProjectDto.cs

@@ -27,7 +27,7 @@ namespace Marco.Pms.Model.Dtos.Project
         [DisplayName("Project Status")]
         [Required(ErrorMessage = "Project Status is required!")]
         public required Guid ProjectStatusId { get; set; }
-        public required Guid PromoterId { get; set; }
+        public Guid? PromoterId { get; set; }
-        public required Guid PMCId { get; set; }
+        public Guid? PMCId { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Projects/UpdateProjectDto.cs

@@ -27,7 +27,7 @@ namespace Marco.Pms.Model.Dtos.Project
         [DisplayName("Project Status")]
         [Required(ErrorMessage = "Project Status is required!")]
         public required Guid ProjectStatusId { get; set; }
-        public required Guid PromoterId { get; set; }
+        public Guid? PromoterId { get; set; }
-        public required Guid PMCId { get; set; }
+        public Guid? PMCId { get; set; }
     }
 }

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,16 @@
         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");
+        public static readonly Guid EditCollection = Guid.Parse("455187b4-fef1-41f9-b3d0-025d0b6302c3");
+        public static readonly Guid AddPayment = Guid.Parse("061d9ccd-85b4-4cb0-be06-2f9f32cebb72");
+
         public static readonly Guid AddOrganization = Guid.Parse("068cb3c1-49c5-4746-9f29-1fce16e820ac");
         public static readonly Guid EditOrganization = Guid.Parse("c1ae1363-ab8a-4bd9-a9d1-8c2c6083873a");
         public static readonly Guid ViewOrganization = Guid.Parse("7a6cf830-0008-4e03-b31d-0d050cb634f4");

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/ExpenseCategoryMaster.cs

@@ -0,0 +1,14 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Expenses
+{
+    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/Expenses.cs

@@ -10,16 +10,18 @@ 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; }
+        public Guid ExpenseCategoryId { get; set; }
 
         [ValidateNever]
-        [ForeignKey("ExpensesTypeId")]
+        [ForeignKey("ExpenseCategoryId")]
-        public ExpensesTypeMaster? ExpensesType { get; set; }
+        public ExpenseCategoryMaster? ExpenseCategory { get; set; }
         public Guid PaymentModeId { get; set; }
 
         [ValidateNever]
@@ -54,11 +56,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; }
         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/PaymentRequest.cs

@@ -0,0 +1,71 @@
+using Marco.Pms.Model.Employees;
+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;
+
+namespace Marco.Pms.Model.Expenses
+{
+    public class PaymentRequest : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public string UIDPrefix { get; set; } = default!;
+        public int UIDPostfix { get; set; }
+        public string Payee { get; set; } = default!;
+        public bool IsAdvancePayment { get; set; }
+        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 DateTime DueDate { get; set; }
+        public Guid? ProjectId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ProjectId")]
+        public Project? Project { get; set; }
+        public Guid? RecurringPaymentId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("RecurringPaymentId")]
+        public RecurringPayment? RecurringPayment { get; set; }
+        public Guid? ExpenseCategoryId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ExpenseCategoryId")]
+        public ExpenseCategoryMaster? ExpenseCategory { get; set; }
+        public Guid ExpenseStatusId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ExpenseStatusId")]
+        public ExpensesStatusMaster? ExpenseStatus { get; set; }
+        public string? PaidTransactionId { get; set; }
+        public DateTime? PaidAt { get; set; }
+        public Guid? PaidById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("PaidById")]
+        public Employee? PaidBy { get; set; }
+        public bool IsExpenseCreated { get; set; } = false;
+        public bool IsActive { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
+    }
+}

Marco.Pms.Model/Expenses/PaymentRequestAttachment.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.DocumentManager;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Expenses
+{
+    public class PaymentRequestAttachment : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public Guid PaymentRequestId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("PaymentRequestId")]
+        public PaymentRequest? PaymentRequest { get; set; }
+        public Guid DocumentId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("DocumentId")]
+        public Document? Document { get; set; }
+    }
+}

Marco.Pms.Model/Expenses/RecurringPayment.cs

@@ -0,0 +1,61 @@
+using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.TenantModels;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Expenses
+{
+    public class RecurringPayment : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public string UIDPrefix { get; set; } = default!;
+        public int UIDPostfix { get; set; }
+        public string Payee { get; set; } = default!;
+        public string NotifyTo { get; set; } = default!;
+        public Guid CurrencyId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CurrencyId")]
+        public CurrencyMaster? Currency { get; set; }
+        public double Amount { get; set; }
+        public DateTime StrikeDate { get; set; }
+        public DateTime? LatestPRGeneratedAt { get; set; }
+        public Guid? ProjectId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ProjectId")]
+        public Project? Project { get; set; }
+        public int PaymentBufferDays { get; set; }
+        public int NumberOfIteration { get; set; }
+        public Guid? ExpenseCategoryId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("ExpenseCategoryId")]
+        public ExpenseCategoryMaster? ExpenseCategory { get; set; }
+        public Guid StatusId { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("StatusId")]
+        public RecurringPaymentStatus? Status { get; set; }
+        public PLAN_FREQUENCY Frequency { get; set; }
+        public bool IsVariable { get; set; }
+        public bool IsActive { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public Guid CreatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("CreatedById")]
+        public Employee? CreatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
+    }
+}

Marco.Pms.Model/Expenses/RecurringPaymentStatus.cs

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

Marco.Pms.Model/Filters/ExpensesFilter.cs

@@ -6,6 +6,7 @@
         public List<Guid>? StatusIds { get; set; }
         public List<Guid>? CreatedByIds { get; set; }
         public List<Guid>? PaidById { get; set; }
+        public List<Guid>? ExpenseCategoryIds { get; set; }
         public bool IsTransactionDate { get; set; } = false;
         public DateTime? StartDate { get; set; }
         public DateTime? EndDate { get; set; }

Marco.Pms.Model/Filters/PaymentRequestFilter.cs

@@ -0,0 +1,14 @@
+namespace Marco.Pms.Model.Filters
+{
+    public class PaymentRequestFilter
+    {
+        public List<Guid>? ProjectIds { get; set; }
+        public List<Guid>? StatusIds { get; set; }
+        public List<Guid>? CreatedByIds { get; set; }
+        public List<Guid>? CurrencyIds { get; set; }
+        public List<Guid>? ExpenseCategoryIds { get; set; }
+        public List<string>? Payees { get; set; }
+        public DateTime? StartDate { get; set; }
+        public DateTime? EndDate { get; set; }
+    }
+}

Marco.Pms.Model/Filters/RecurringPaymentFilter.cs

@@ -0,0 +1,14 @@
+namespace Marco.Pms.Model.Filters
+{
+    public class RecurringPaymentFilter
+    {
+        public List<Guid>? ProjectIds { get; set; }
+        public List<Guid>? StatusIds { get; set; }
+        public List<Guid>? CreatedByIds { get; set; }
+        public List<Guid>? CurrencyIds { get; set; }
+        public List<Guid>? ExpenseCategoryIds { get; set; }
+        public List<string>? Payees { get; set; }
+        public DateTime? StartDate { get; set; }
+        public DateTime? EndDate { get; set; }
+    }
+}

Marco.Pms.Model/Filters/TaskFilter.cs

@@ -5,6 +5,7 @@
         public List<Guid>? BuildingIds { get; set; }
         public List<Guid>? FloorIds { get; set; }
         public List<Guid>? ActivityIds { get; set; }
+        public List<Guid>? ServiceIds { get; set; }
         public DateTime? dateFrom { get; set; }
         public DateTime? dateTo { get; set; }
     }

Marco.Pms.Model/Master/PaymentModeMatser.cs

@@ -1,8 +1,6 @@
-using Marco.Pms.Model.Utilities;
+namespace Marco.Pms.Model.Master
-
-namespace Marco.Pms.Model.Master
 {
-    public class PaymentModeMatser : TenantRelation
+    public class PaymentModeMatser
     {
         public Guid Id { get; set; }
         public string Name { get; set; } = string.Empty;

Marco.Pms.Model/Master/StatusUpdateLog.cs

@@ -0,0 +1,22 @@
+using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Utilities;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.Master
+{
+    public class StatusUpdateLog : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public Guid? StatusId { get; set; }
+        public Guid NextStatusId { get; set; }
+        public Guid EntityId { get; set; }
+        public string? Comment { get; set; }
+        public DateTime UpdatedAt { get; set; }
+        public Guid UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
+    }
+}

Marco.Pms.Model/MongoDBModels/DocumentMongoDB.cs

@@ -7,5 +7,6 @@
         public string ContentType { get; set; } = string.Empty;
         public string S3Key { get; set; } = string.Empty;
         public string ThumbS3Key { get; set; } = string.Empty;
+        public long FileSize { get; set; }
     }
 }

Marco.Pms.Model/MongoDBModels/Expenses/ExpenseDetailsMongoDB.cs

@@ -1,4 +1,5 @@
-using Marco.Pms.Model.MongoDBModels.Employees;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.MongoDBModels.Employees;
 using Marco.Pms.Model.MongoDBModels.Masters;
 using Marco.Pms.Model.MongoDBModels.Project;
 
@@ -8,7 +9,7 @@ namespace Marco.Pms.Model.MongoDBModels.Expenses
     {
         public string Id { get; set; } = string.Empty;
         public ProjectBasicMongoDB Project { get; set; } = new ProjectBasicMongoDB();
-        public ExpensesTypeMasterMongoDB ExpensesType { get; set; } = new ExpensesTypeMasterMongoDB();
+        public ExpenseCategoryMasterMongoDB ExpenseCategory { get; set; } = new ExpenseCategoryMasterMongoDB();
         public PaymentModeMatserMongoDB PaymentMode { get; set; } = new PaymentModeMatserMongoDB();
         public BasicEmployeeMongoDB PaidBy { get; set; } = new BasicEmployeeMongoDB();
         public BasicEmployeeMongoDB CreatedBy { get; set; } = new BasicEmployeeMongoDB();
@@ -20,6 +21,12 @@ namespace Marco.Pms.Model.MongoDBModels.Expenses
         public DateTime ExpireAt { get; set; } = DateTime.UtcNow.Date.AddDays(1);
         public string SupplerName { get; set; } = string.Empty;
         public double Amount { get; set; }
+        public CurrencyMaster? Currency { get; set; }
+        public double? BaseAmount { get; set; }
+        public double? TaxAmount { get; set; }
+        public double? TDSPercentage { get; set; }
+        public string? PaymentRequestUID { get; set; }
+        public string? ExpenseUId { get; set; }
         public ExpensesStatusMasterMongoDB Status { get; set; } = new ExpensesStatusMasterMongoDB();
         public List<ExpensesStatusMasterMongoDB> NextStatus { get; set; } = new List<ExpensesStatusMasterMongoDB>();
         public bool PreApproved { get; set; } = false;

Marco.Pms.Model/MongoDBModels/Masters/ExpenseCategoryMasterMongoDB.cs

@@ -0,0 +1,11 @@
+namespace Marco.Pms.Model.MongoDBModels.Masters
+{
+    public class ExpenseCategoryMasterMongoDB
+    {
+        public string Id { get; set; } = string.Empty;
+        public string Name { get; set; } = string.Empty;
+        public bool NoOfPersonsRequired { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public string TenantId { get; set; } = string.Empty;
+    }
+}

Marco.Pms.Model/MongoDBModels/Masters/PaymentModeMatserMongoDB.cs

@@ -5,6 +5,5 @@
         public string Id { get; set; } = string.Empty;
         public string Name { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
-        public string TenantId { get; set; } = string.Empty;
     }
 }

Marco.Pms.Model/PaymentGetway/PaymentDetail.cs

@@ -0,0 +1,16 @@
+namespace Marco.Pms.Model.PaymentGetway
+{
+    public class PaymentDetail
+    {
+        public Guid Id { get; set; }
+        public string PaymentId { get; set; } = string.Empty;
+        public string OrderId { get; set; } = string.Empty;
+        public string Status { get; set; } = string.Empty; // created, authorized, captured, refunded, failed
+        public string Method { get; set; } = string.Empty;
+        public byte[]? EncryptedDetails { get; set; }
+        public byte[]? Nonce { get; set; }
+        public byte[]? Tag { get; set; }
+        public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+
+    }
+}

Marco.Pms.Model/TenantModels/SubscriptionPlan.cs

@@ -10,6 +10,6 @@
 
     public enum PLAN_FREQUENCY
     {
-        MONTHLY = 0, QUARTERLY = 1, HALF_YEARLY = 2, YEARLY = 3
+        MONTHLY = 0, QUARTERLY = 1, HALF_YEARLY = 2, YEARLY = 3, DAILY = 4, WEEKLY = 5
     }
 }

Marco.Pms.Model/TenantModels/TenantEnquire.cs

@@ -0,0 +1,24 @@
+using Marco.Pms.Model.Master;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Marco.Pms.Model.TenantModels
+{
+    public class TenantEnquire
+    {
+        public Guid Id { get; set; }
+        public string FirstName { get; set; } = default!;
+        public string LastName { get; set; } = default!;
+        public string OrganizationName { get; set; } = default!;
+        public string Email { get; set; } = default!;
+        public string ContactNumber { get; set; } = default!;
+        public string BillingAddress { get; set; } = default!;
+        public string OrganizationSize { get; set; } = default!;
+        public Guid IndustryId { get; set; }
+
+        [ForeignKey("IndustryId")]
+        [ValidateNever]
+        public Industry? Industry { get; set; }
+        public string Reference { get; set; } = default!;
+    }
+}

Marco.Pms.Model/TenantModels/TenantSubscriptions.cs

@@ -1,5 +1,6 @@
 using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Master;
+using Marco.Pms.Model.PaymentGetway;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -28,6 +29,11 @@ namespace Marco.Pms.Model.TenantModels
         [ForeignKey("CurrencyId")]
         [ValidateNever]
         public CurrencyMaster? Currency { get; set; }
+        public Guid? PaymentDetailId { get; set; }
+
+        [ForeignKey("PaymentDetailId")]
+        [ValidateNever]
+        public PaymentDetail? PaymentDetail { get; set; }
         public DateTime NextBillingDate { get; set; }
         public DateTime? CancellationDate { get; set; }
         public bool AutoRenew { get; set; } = true;

Marco.Pms.Model/ViewModels/Activities/BasicEmployeeVM.cs

@@ -5,6 +5,7 @@
         public Guid Id { get; set; }
         public string? FirstName { get; set; }
         public string? LastName { get; set; }
+        public string? Email { get; set; }
         public byte[]? Photo { get; set; }
         public Guid? JobRoleId { get; set; }
         public string? JobRoleName { get; set; }

Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs

@@ -1,4 +1,5 @@
 using Marco.Pms.Model.Dtos.Attendance;
+using Marco.Pms.Model.ViewModels.Activities;
 
 namespace Marco.Pms.Model.ViewModels.AttendanceVM
 {
@@ -6,15 +7,20 @@ namespace Marco.Pms.Model.ViewModels.AttendanceVM
     {
         public Guid Id { get; set; }
         public Guid EmployeeId { get; set; }
+        public Guid ProjectId { get; set; }
         public string? FirstName { get; set; }
         public string? LastName { get; set; }
         public string? EmployeeAvatar { get; set; }
         public string? OrganizationName { get; set; }
+        public string? ProjectName { get; set; }
         public DateTime? CheckInTime { get; set; }
         public DateTime? CheckOutTime { get; set; }
+        public DateTime? RequestedAt { get; set; }
+        public DateTime? ApprovedAt { get; set; }
         public string? JobRoleName { get; set; }
         public ATTENDANCE_MARK_TYPE Activity { get; set; }
-
+        public BasicEmployeeVM? Approver { get; set; }
+        public BasicEmployeeVM? RequestedBy { get; set; }
         public Guid? DocumentId { get; set; }
         public string? ThumbPreSignedUrl { get; set; }
         public string? PreSignedUrl { get; set; }

Marco.Pms.Model/ViewModels/Collection/InvoiceAttachmentVM.cs

@@ -0,0 +1,16 @@
+using Marco.Pms.Model.ViewModels.Activities;
+
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class InvoiceAttachmentVM
+    {
+        public Guid Id { get; set; }
+        public Guid InvoiceId { get; set; }
+        public Guid DocumentId { get; set; }
+        public string? FileName { get; set; }
+        public string? ContentType { get; set; }
+        public string? PreSignedUrl { get; set; }
+        public BasicEmployeeVM? UploadedBy { get; set; }
+
+    }
+}

Marco.Pms.Model/ViewModels/Collection/InvoiceCommentVM.cs

@@ -0,0 +1,13 @@
+using Marco.Pms.Model.ViewModels.Activities;
+
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class InvoiceCommentVM
+    {
+        public Guid Id { get; set; }
+        public string Comment { get; set; } = default!;
+        public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
+        public Guid InvoiceId { get; set; }
+    }
+}

Marco.Pms.Model/ViewModels/Collection/InvoiceDetailsVM.cs

@@ -0,0 +1,31 @@
+using Marco.Pms.Model.ViewModels.Activities;
+using Marco.Pms.Model.ViewModels.Projects;
+
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class InvoiceDetailsVM
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public string InvoiceNumber { get; set; } = default!;
+        public string? EInvoiceNumber { get; set; }
+        public BasicProjectVM? Project { get; set; }
+        public DateTime InvoiceDate { get; set; }
+        public DateTime ClientSubmitedDate { get; set; }
+        public DateTime ExceptedPaymentDate { get; set; }
+        public double BasicAmount { get; set; }
+        public double TaxAmount { get; set; }
+        public double BalanceAmount { get; set; }
+        public bool IsActive { get; set; } = true;
+        public bool MarkAsCompleted { get; set; } = true;
+        public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public BasicEmployeeVM? UpdatedBy { get; set; }
+        public List<InvoiceAttachmentVM>? Attachments { get; set; }
+        public List<ReceivedInvoicePaymentVM>? ReceivedInvoicePayments { get; set; }
+        public List<InvoiceCommentVM>? Comments { get; set; }
+
+    }
+}

Marco.Pms.Model/ViewModels/Collection/InvoiceListVM.cs

@@ -0,0 +1,27 @@
+using Marco.Pms.Model.ViewModels.Activities;
+using Marco.Pms.Model.ViewModels.Projects;
+
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class InvoiceListVM
+    {
+        public Guid Id { get; set; }
+        public string Title { get; set; } = default!;
+        public string Description { get; set; } = default!;
+        public string InvoiceNumber { get; set; } = default!;
+        public string? EInvoiceNumber { get; set; }
+        public BasicProjectVM? Project { get; set; }
+        public DateTime InvoiceDate { get; set; }
+        public DateTime ClientSubmitedDate { get; set; }
+        public DateTime ExceptedPaymentDate { get; set; }
+        public double BasicAmount { get; set; }
+        public double TaxAmount { get; set; }
+        public double BalanceAmount { get; set; }
+        public bool IsActive { get; set; }
+        public bool MarkAsCompleted { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public BasicEmployeeVM? UpdatedBy { get; set; }
+    }
+}

Marco.Pms.Model/ViewModels/Collection/PaymentAdjustmentHeadVM.cs

@@ -0,0 +1,10 @@
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class PaymentAdjustmentHeadVM
+    {
+        public Guid Id { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+        public bool IsActive { get; set; } = true;
+    }
+}

Marco.Pms.Model/ViewModels/Collection/ReceivedInvoicePaymentVM.cs

@@ -0,0 +1,18 @@
+using Marco.Pms.Model.ViewModels.Activities;
+
+namespace Marco.Pms.Model.ViewModels.Collection
+{
+    public class ReceivedInvoicePaymentVM
+    {
+        public Guid Id { get; set; }
+        public Guid InvoiceId { get; set; }
+        public DateTime PaymentReceivedDate { get; set; }
+        public PaymentAdjustmentHeadVM? PaymentAdjustmentHead { get; set; }
+        public string TransactionId { get; set; } = default!;
+        public double Amount { get; set; }
+        public string? Comment { get; set; }
+        public bool IsActive { get; set; } = true;
+        public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
+    }
+}