diff --git a/0_Framework/Excel/ExcelGenerator.cs b/0_Framework/Excel/ExcelGenerator.cs index 23d6382b..fb172b1f 100644 --- a/0_Framework/Excel/ExcelGenerator.cs +++ b/0_Framework/Excel/ExcelGenerator.cs @@ -17,7 +17,7 @@ public class ExcelGenerator { public ExcelGenerator() { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); } public static byte[] GenerateExcel(List obj, string date = "") where T : class { diff --git a/CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs index 4d27f8bc..9a828e93 100644 --- a/CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs @@ -26,7 +26,7 @@ public class CustomizeWorkshopGroupSettingExcelGenerator { public static byte[] Generate(List groups) { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using (var package = new ExcelPackage()) { var worksheet = package.Workbook.Worksheets.Add("GroupsAndEmployees"); diff --git a/CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs index 1387a76a..17d3ad48 100644 --- a/CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs @@ -24,7 +24,7 @@ public class CaseManagementExcelGenerator }; public static byte[] GenerateCheckoutTempExcelInfo(List data) { - OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new ExcelPackage(); CreateSheet(data, package,"همه"); CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال"); diff --git a/CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs index 313b456a..68c3f6e4 100644 --- a/CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs @@ -46,7 +46,7 @@ public class CustomizeCheckoutExcelGenerator }; public static byte[] GenerateCheckoutTempExcelInfo(List data, List selectedParameters) { - OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new ExcelPackage(); var worksheet = package.Workbook.Worksheets.Add("Sheet1"); diff --git a/CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs index 9e71b3b3..ec3f14ea 100644 --- a/CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs @@ -7,7 +7,7 @@ public class EmployeeBankInfoExcelGenerator { public static byte[] Generate(List list) { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new ExcelPackage(); var worksheet = package.Workbook.Worksheets.Add("EmployeeBankInfo"); @@ -166,7 +166,7 @@ public class EmployeeBankInfoExcelGenerator public static byte[] Generate2(List list) { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new ExcelPackage(); foreach (var employee in list) { @@ -220,4 +220,4 @@ public class EmployeeBankInfoExcelGenerator cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center; cell.Style.Fill.PatternType = ExcelFillStyle.Solid; } -} \ No newline at end of file +} diff --git a/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs index 67098ba7..e17f21df 100644 --- a/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs @@ -13,7 +13,7 @@ public class InstitutionContractExcelGenerator public static byte[] GenerateExcel(List institutionContractViewModels) { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new ExcelPackage(); var allWorksheet = package.Workbook.Worksheets.Add("همه"); diff --git a/CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs b/CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs index b7455351..8c749dd4 100644 --- a/CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs +++ b/CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs @@ -8,7 +8,7 @@ public class RollCallExcelGenerator : ExcelGenerator { public static byte[] CaseHistoryExcelForEmployee(CaseHistoryRollCallExcelForEmployeeViewModel data) { - OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new OfficeOpenXml.ExcelPackage(); var worksheet = package.Workbook.Worksheets.Add("Sheet1"); var rollCalls = data.RollCalls; @@ -181,7 +181,7 @@ public class RollCallExcelGenerator : ExcelGenerator public static byte[] CaseHistoryExcelForOneDay(CaseHistoryRollCallForOneDayViewModel data) { - OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using var package = new OfficeOpenXml.ExcelPackage(); var worksheet = package.Workbook.Worksheets.Add("Sheet1"); var rollCalls = data.RollCalls; diff --git a/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs b/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs index fe393695..fc45ab9b 100644 --- a/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs +++ b/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs @@ -43,7 +43,7 @@ public class SalaryAidImportExcel ValidData = [] }; - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); if (file == null || file.Length == 0) { diff --git a/CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs b/CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs index 86676126..23032db6 100644 --- a/CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs +++ b/CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs @@ -9,7 +9,7 @@ public class WorkshopRollCallExcelExporter { public static byte[] Export(List workshops) { - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; + ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization"); using (var package = new ExcelPackage()) { var ws = package.Workbook.Worksheets.Add("Workshops"); diff --git a/ServiceHost/Controllers/GeneralController.cs b/ServiceHost/Controllers/GeneralController.cs index 59027f37..37371877 100644 --- a/ServiceHost/Controllers/GeneralController.cs +++ b/ServiceHost/Controllers/GeneralController.cs @@ -21,6 +21,8 @@ using System.Security.Cryptography; using System.Threading; using CompanyManagment.App.Contracts.FinancialInvoice; using CompanyManagment.App.Contracts.InstitutionContract; +using GozareshgirProgramManager.Application._Common.Constants; +using GozareshgirProgramManager.Infrastructure.Persistence.Context; namespace ServiceHost.Controllers; @@ -65,6 +67,12 @@ public class GeneralController : GeneralBaseController }); } + [HttpGet("pm-permissions")] + public IActionResult GetPMPermissions() + { + var permissions = ProgramManagerPermissionCode.GetAllCodes(); + return new JsonResult(permissions); + } [HttpGet("/api/callback"), HttpPost("/api/callback")] public async Task Verify(SepehrGatewayPayResponse payResponse)