diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs index c01668f..cc01da9 100644 --- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs +++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs @@ -404,7 +404,7 @@ namespace Marco.Pms.DataAccess.Data { Id = Guid.Parse("6537018f-f4e9-4cb3-a210-6c3b2da999d7"), Name = "Review Pending", - DisplayName = "Review", + DisplayName = "Submit", Description = "Reviewer is currently reviewing the expense.", Color = "#696cff", IsSystem = true, @@ -415,7 +415,7 @@ namespace Marco.Pms.DataAccess.Data { Id = Guid.Parse("4068007f-c92f-4f37-a907-bc15fe57d4d8"), Name = "Approval Pending", - DisplayName = "Approve", + DisplayName = "Reviewed", Description = "Review is completed, waiting for action of approver.", Color = "#03c3ec", IsSystem = true, @@ -447,7 +447,7 @@ namespace Marco.Pms.DataAccess.Data new ExpensesStatusMaster { Id = Guid.Parse("61578360-3a49-4c34-8604-7b35a3787b95"), - Name = "Processed", + Name = "Paid", DisplayName = "Paid", Description = "Expense has been settled.", Color = "#71dd37", diff --git a/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.Designer.cs index 40fe611..f359fee 100644 --- a/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.Designer.cs +++ b/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.Designer.cs @@ -1947,7 +1947,7 @@ namespace Marco.Pms.DataAccess.Migrations Id = new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"), Color = "#696cff", Description = "Reviewer is currently reviewing the expense.", - DisplayName = "Review", + DisplayName = "Submit", IsActive = true, IsSystem = true, Name = "Review Pending", @@ -1958,7 +1958,7 @@ namespace Marco.Pms.DataAccess.Migrations Id = new Guid("4068007f-c92f-4f37-a907-bc15fe57d4d8"), Color = "#03c3ec", Description = "Review is completed, waiting for action of approver.", - DisplayName = "Approve", + DisplayName = "Reviewed", IsActive = true, IsSystem = true, Name = "Approval Pending", @@ -1994,7 +1994,7 @@ namespace Marco.Pms.DataAccess.Migrations DisplayName = "Paid", IsActive = true, IsSystem = true, - Name = "Processed", + Name = "Paid", TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }); }); diff --git a/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.cs b/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.cs index ffc5400..30ad9ce 100644 --- a/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.cs +++ b/Marco.Pms.DataAccess/Migrations/20250721124928_Added_Expense_Related_Tables.cs @@ -373,9 +373,9 @@ namespace Marco.Pms.DataAccess.Migrations values: new object[,] { { new Guid("297e0d8f-f668-41b5-bfea-e03b354251c8"), "#8592a3", "Expense has been created but not yet submitted.", "Draft", true, true, "Draft", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, - { new Guid("4068007f-c92f-4f37-a907-bc15fe57d4d8"), "#03c3ec", "Review is completed, waiting for action of approver.", "Approve", true, true, "Approval Pending", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, - { new Guid("61578360-3a49-4c34-8604-7b35a3787b95"), "#71dd37", "Expense has been settled.", "Paid", true, true, "Processed", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, - { new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"), "#696cff", "Reviewer is currently reviewing the expense.", "Review", true, true, "Review Pending", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, + { new Guid("4068007f-c92f-4f37-a907-bc15fe57d4d8"), "#03c3ec", "Review is completed, waiting for action of approver.", "Reviewed", true, true, "Approval Pending", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, + { new Guid("61578360-3a49-4c34-8604-7b35a3787b95"), "#71dd37", "Expense has been settled.", "Paid", true, true, "Paid", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, + { new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"), "#696cff", "Reviewer is currently reviewing the expense.", "Submit", true, true, "Review Pending", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, { new Guid("d1ee5eec-24b6-4364-8673-a8f859c60729"), "#ff3e1d", "Expense was declined, often with a reason(either review rejected or approval rejected.", "Reject", true, true, "Rejected", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }, { new Guid("f18c5cfd-7815-4341-8da2-2c2d65778e27"), "#ffab00", "Approved expense is awaiting final payment.", "Process", true, true, "Process Pending", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") } }); diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs index ed3710f..83218db 100644 --- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1944,7 +1944,7 @@ namespace Marco.Pms.DataAccess.Migrations Id = new Guid("6537018f-f4e9-4cb3-a210-6c3b2da999d7"), Color = "#696cff", Description = "Reviewer is currently reviewing the expense.", - DisplayName = "Review", + DisplayName = "Submit", IsActive = true, IsSystem = true, Name = "Review Pending", @@ -1955,7 +1955,7 @@ namespace Marco.Pms.DataAccess.Migrations Id = new Guid("4068007f-c92f-4f37-a907-bc15fe57d4d8"), Color = "#03c3ec", Description = "Review is completed, waiting for action of approver.", - DisplayName = "Approve", + DisplayName = "Reviewed", IsActive = true, IsSystem = true, Name = "Approval Pending", @@ -1991,7 +1991,7 @@ namespace Marco.Pms.DataAccess.Migrations DisplayName = "Paid", IsActive = true, IsSystem = true, - Name = "Processed", + Name = "Paid", TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }); });