diff --git a/.version b/.version index 4c16340..cea20cc 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.21.24.41 \ No newline at end of file +0.22.24.42 \ No newline at end of file diff --git a/NetinaShop.Api/AppSettings/appsettings.Development.json b/NetinaShop.Api/AppSettings/appsettings.Development.json index b8fb720..e27f4ae 100644 --- a/NetinaShop.Api/AppSettings/appsettings.Development.json +++ b/NetinaShop.Api/AppSettings/appsettings.Development.json @@ -23,10 +23,10 @@ "StorageBaseUrl": "https://storage.vesmeh.com", "KaveNegarApiKey": "3735494B4143727A794346457461576A2B4B6668414973424E333561505A694B", "UserSetting": { - "Username": "netinashop", - "Email": "info@netinashop.io", + "Username": "09214802813", + "Email": "avvampier@gmail.com", "Password": "eF79o4P4BopCUbUK", - "Phone": "09211111111", + "Phone": "09214802813", "RoleName": "RootAdmin", "FirstName": "همه کاره", "LastName": "سیستم" diff --git a/NetinaShop.Api/Controller/DiscountController.cs b/NetinaShop.Api/Controller/DiscountController.cs index 974e689..80b5869 100644 --- a/NetinaShop.Api/Controller/DiscountController.cs +++ b/NetinaShop.Api/Controller/DiscountController.cs @@ -10,12 +10,12 @@ public class DiscountController : ICarterModule group.MapGet("", GetAllAsync) .WithDisplayName("GetAllDiscounts") - .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDashboard,ApplicationPermission.ViewDiscounts)) + .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDiscounts, ApplicationPermission.ViewDiscounts)) .HasApiVersion(1.0); group.MapGet("{id}", GetAsync) .WithDisplayName("GetDiscount") - .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDashboard, ApplicationPermission.ViewDiscounts)) + .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDiscounts, ApplicationPermission.ViewDiscounts)) .HasApiVersion(1.0); group.MapGet("corporate", GetCorporateDiscountAsync) @@ -24,15 +24,15 @@ public class DiscountController : ICarterModule group.MapPost("", Post) .HasApiVersion(1.0) - .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDashboard)); + .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDiscounts)); group.MapPut("", Put) .HasApiVersion(1.0) - .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDashboard)); + .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDiscounts)); group.MapDelete("{id}", Delete) .HasApiVersion(1.0) - .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDashboard)); + .RequireAuthorization(builder => builder.AddAuthenticationSchemes("Bearer").RequireAuthenticatedUser().RequireClaim(CustomClaimType.Permission, ApplicationPermission.ManageDiscounts)); } private async Task GetCorporateDiscountAsync([FromQuery] Guid? corporateUserId, [FromServices] IMediator mediator, CancellationToken cancellationToken) diff --git a/NetinaShop.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs b/NetinaShop.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs index d0c284e..e3b555f 100644 --- a/NetinaShop.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs +++ b/NetinaShop.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs @@ -15,5 +15,5 @@ public class ApplicationUserSDto : BaseDto public string RoleName { get; set; } = string.Empty; public List RoleIds { get; set; } = new(); - public long BirthDateTimeStamp => DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate); + public long BirthDateTimeStamp => BirthDate.Year > 1970 ? DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate) : 0; } \ No newline at end of file diff --git a/NetinaShop.Domain/Dtos/SmallDtos/CustomerSDto.cs b/NetinaShop.Domain/Dtos/SmallDtos/CustomerSDto.cs index e33ebe2..a9bab79 100644 --- a/NetinaShop.Domain/Dtos/SmallDtos/CustomerSDto.cs +++ b/NetinaShop.Domain/Dtos/SmallDtos/CustomerSDto.cs @@ -16,5 +16,5 @@ public class CustomerSDto : BaseDto public string FullName => FirstName + " " + LastName; public List RoleIds { get; set; } = new(); - public long BirthDateTimeStamp => DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate); + public long BirthDateTimeStamp => BirthDate.Year > 1970 ? DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate) : 0; } \ No newline at end of file diff --git a/NetinaShop.Domain/Dtos/SmallDtos/ManagerSDto.cs b/NetinaShop.Domain/Dtos/SmallDtos/ManagerSDto.cs index fb42a34..2bdca1a 100644 --- a/NetinaShop.Domain/Dtos/SmallDtos/ManagerSDto.cs +++ b/NetinaShop.Domain/Dtos/SmallDtos/ManagerSDto.cs @@ -17,5 +17,5 @@ public class ManagerSDto : BaseDto public string FullName => FirstName + " " + LastName; public List RoleIds { get; set; } = new(); - public long BirthDateTimeStamp => DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate); + public long BirthDateTimeStamp => BirthDate.Year > 1970 ? DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate) : 0; } \ No newline at end of file diff --git a/NetinaShop.Domain/Dtos/SmallDtos/MarketerSDto.cs b/NetinaShop.Domain/Dtos/SmallDtos/MarketerSDto.cs index 523ab3f..6e08037 100644 --- a/NetinaShop.Domain/Dtos/SmallDtos/MarketerSDto.cs +++ b/NetinaShop.Domain/Dtos/SmallDtos/MarketerSDto.cs @@ -18,5 +18,5 @@ public class MarketerSDto : BaseDto public string FullName => FirstName + " " + LastName; public List RoleIds { get; set; } = new(); - public long BirthDateTimeStamp => DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate); + public long BirthDateTimeStamp => BirthDate.Year > 1970 ? DateTimeExtensions.DateTimeToUnixTimeStamp(BirthDate) : 0; } \ No newline at end of file