Merge branch 'kub-stage' into production

- Added IbanNormalizer to validate and normalize IBAN numbers in RequestWithdrawalCommandHandler and UserWalletService.
- Implemented error handling for invalid IBAN formats, ensuring compliance with expected standards.
- Updated relevant methods to handle normalized IBANs for cash withdrawal requests.

.gitea/workflows/kub-deploy.yml

@@ -95,6 +95,7 @@ jobs:
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
             kubectl apply -f /tmp/cms-config.yaml &&
             kubectl apply -f /tmp/cms-deployment.yaml &&
+            crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
             kubectl rollout restart deployment/cms &&
             kubectl rollout status deployment/cms --timeout=180s &&
             rm -f /tmp/cms-config.yaml /tmp/cms-deployment.yaml

README.md

@@ -1,3 +1,4 @@
 # CMS Microservice
 
 Documentation moved to [totalDoc/INDEX.md](../totalDoc/INDEX.md).
+   

k8s/staging/cms-config.yaml

@@ -24,6 +24,8 @@ stringData:
         "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
         "UseSandbox": true
       },
+      "CmsBaseUrl": "https://cms.se.kbs1.ir",
+      "FrontOfficeBaseUrl": "https://frontoffice.se.kbs1.ir",
       "FMS": {
         "Address": "https://dl.afrino.co"
       },

src/CMSMicroservice.Application/BlogPostCQ/Commands/CreateBlogPost/CreateBlogPostCommandHandler.cs

@@ -1,3 +1,4 @@
+using CMSMicroservice.Application.Common;
 using CMSMicroservice.Application.Common.FileManager;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Domain.Entities.Blog;
@@ -32,12 +33,13 @@ public class CreateBlogPostCommandHandler : IRequestHandler<CreateBlogPostComman
         if (string.IsNullOrEmpty(currentUserId) || !long.TryParse(currentUserId, out var authorUserId))
             throw new UnauthorizedAccessException("کاربر احراز هویت نشده است");
 
+        var slug = BlogSlugHelper.ResolveForCreate(request.Slug, request.Title.Trim());
+        slug = await BlogSlugHelper.EnsureUniquePostSlugAsync(_context, slug, cancellationToken: cancellationToken);
+
         var post = new BlogPost
         {
             Title = request.Title.Trim(),
-            Slug = string.IsNullOrWhiteSpace(request.Slug)
+            Slug = slug,
-                ? $"post-{Guid.NewGuid():N}".Substring(0, 20)
-                : request.Slug.Trim().ToLower(),
             Summary = request.Summary?.Trim(),
             HtmlContent = request.HtmlContent,
             FeaturedImagePath = request.FeaturedImagePath,

src/CMSMicroservice.Application/BlogPostCQ/Commands/CreateBlogPost/CreateBlogPostCommandValidator.cs

@@ -11,9 +11,9 @@ public class CreateBlogPostCommandValidator : AbstractValidator<CreateBlogPostCo
             .MaximumLength(200).WithMessage("عنوان نمی‌تواند بیشتر از 200 کاراکتر باشد");
 
         RuleFor(x => x.Slug)
-            .NotEmpty().WithMessage("نشانی یکتا (slug) الزامی است")
             .MaximumLength(200).WithMessage("نشانی نمی‌تواند بیشتر از 200 کاراکتر باشد")
-            .Matches(@"^[a-z0-9\-]+$").WithMessage("نشانی فقط می‌تواند شامل حروف کوچک انگلیسی، اعداد و خط تیره باشد");
+            .Matches(@"^[a-z0-9\-]+$").WithMessage("نشانی فقط می‌تواند شامل حروف کوچک انگلیسی، اعداد و خط تیره باشد")
+            .When(x => !string.IsNullOrWhiteSpace(x.Slug));
 
         RuleFor(x => x.Summary)
             .MaximumLength(500).WithMessage("خلاصه نمی‌تواند بیشتر از 500 کاراکتر باشد")

src/CMSMicroservice.Application/BlogPostCQ/Commands/UpdateBlogPost/UpdateBlogPostCommandHandler.cs

@@ -1,3 +1,4 @@
+using CMSMicroservice.Application.Common;
 using CMSMicroservice.Application.Common.FileManager;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Domain.Entities.Blog;
@@ -29,9 +30,21 @@ public class UpdateBlogPostCommandHandler : IRequestHandler<UpdateBlogPostComman
             ?? throw new KeyNotFoundException($"مقاله با شناسه {request.Id} یافت نشد");
 
         post.Title = request.Title.Trim();
-        // حفظ slug قبلی اگر مقدار جدید خالی باشد
+
         if (!string.IsNullOrWhiteSpace(request.Slug))
-            post.Slug = request.Slug.Trim().ToLower();
+        {
+            post.Slug = await BlogSlugHelper.EnsureUniquePostSlugAsync(
+                _context,
+                BlogSlugHelper.NormalizeOptional(request.Slug)!,
+                post.Id,
+                cancellationToken);
+        }
+        else if (string.IsNullOrWhiteSpace(post.Slug))
+        {
+            var slug = BlogSlugHelper.ResolveForCreate(null, post.Title);
+            post.Slug = await BlogSlugHelper.EnsureUniquePostSlugAsync(
+                _context, slug, post.Id, cancellationToken);
+        }
         post.Summary = request.Summary?.Trim();
         post.HtmlContent = request.HtmlContent;
         post.FeaturedImagePath = request.FeaturedImagePath;

src/CMSMicroservice.Application/BlogPostCQ/Commands/UpdateBlogPost/UpdateBlogPostCommandValidator.cs

@@ -13,9 +13,9 @@ public class UpdateBlogPostCommandValidator : AbstractValidator<UpdateBlogPostCo
             .MaximumLength(200).WithMessage("عنوان نمی‌تواند بیشتر از 200 کاراکتر باشد");
 
         RuleFor(x => x.Slug)
-            .NotEmpty().WithMessage("نشانی یکتا (slug) الزامی است")
             .MaximumLength(200).WithMessage("نشانی نمی‌تواند بیشتر از 200 کاراکتر باشد")
-            .Matches(@"^[a-z0-9\-]+$").WithMessage("نشانی فقط می‌تواند شامل حروف کوچک انگلیسی، اعداد و خط تیره باشد");
+            .Matches(@"^[a-z0-9\-]+$").WithMessage("نشانی فقط می‌تواند شامل حروف کوچک انگلیسی، اعداد و خط تیره باشد")
+            .When(x => !string.IsNullOrWhiteSpace(x.Slug));
 
         RuleFor(x => x.HtmlContent)
             .NotEmpty().WithMessage("محتوای مقاله الزامی است");

src/CMSMicroservice.Application/ClubMembershipCQ/Commands/ActivateClubMembership/ActivateClubMembershipCommandHandler.cs

@@ -1,4 +1,5 @@
 using CMSMicroservice.Application.Common.Exceptions;
+using CMSMicroservice.Application.Common.Helpers;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.Common.Models;
 using CMSMicroservice.Domain.Common;
@@ -162,10 +163,10 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
                     request.UserId
                 );
 
-                // در فعال‌سازی اجباری، اگر PackagePurchaseMethod تنظیم نشده، مقدار DirectPurchase بگذار
+                // در فعال‌سازی اجباری ادمین، اگر روش خرید تنظیم نشده، دستی در نظر بگیر
                 if (user.PackagePurchaseMethod == PackagePurchaseMethod.None)
                 {
-                    user.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;
+                    user.PackagePurchaseMethod = PackagePurchaseMethod.Manual;
                     _context.Users.Update(user);
                     await _context.SaveChangesAsync(cancellationToken);
                 }
@@ -272,6 +273,7 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
             foreach (var prevCycle in previousCycles)
             {
                 prevCycle.IsCurrentCycle = false;
+                ClubMembershipCycleHistoryWriter.WriteCycleClosed(_context, prevCycle, reason: "شروع دوره جدید");
             }
 
             var maxCycleNumber = await _context.ClubMembershipCycles
@@ -293,6 +295,9 @@ public class ActivateClubMembershipCommandHandler : IRequestHandler<ActivateClub
             _context.ClubMembershipCycles.Add(newCycle);
             await _context.SaveChangesAsync(cancellationToken);
 
+            ClubMembershipCycleHistoryWriter.WriteCycleStarted(_context, newCycle, reason: "فعال‌سازی عضویت باشگاه");
+            await _context.SaveChangesAsync(cancellationToken);
+
             _logger.LogInformation(
                 "Created ClubMembershipCycle #{CycleNumber} for UserId {UserId}, MembershipId {MembershipId}",
                 newCycle.CycleNumber,

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetAllClubMemberships/GetAllClubMembershipsQueryHandler.cs

@@ -13,6 +13,7 @@ public class GetAllClubMembershipsQueryHandler : IRequestHandler<GetAllClubMembe
     {
         var query = _context.ClubMemberships
             .Include(x => x.User)
+            .Include(x => x.LastPackage)
             .ApplyOrder(sortBy: request.SortBy)
             .AsNoTracking()
             .AsQueryable();
@@ -35,8 +36,10 @@ public class GetAllClubMembershipsQueryHandler : IRequestHandler<GetAllClubMembe
                 Id = x.Id,
                 UserId = x.UserId,
                 UserName = x.User != null ? $"{x.User.FirstName} {x.User.LastName}" : string.Empty,
+                PackageId = x.LastPackageId ?? 0,
+                PackageName = x.LastPackage != null ? x.LastPackage.Title : string.Empty,
                 IsActive = x.IsActive,
-                ActivatedAt = x.ActivatedAt,
+                ActivatedAt = x.LastActivationDate ?? x.ActivatedAt,
                 InitialContribution = x.InitialContribution,
                 TotalEarned = x.TotalEarned,
                 Created = x.Created,

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetAllClubMemberships/GetAllClubMembershipsResponseDto.cs

@@ -11,6 +11,8 @@ public class GetAllClubMembershipsResponseModel
     public long Id { get; set; }
     public long UserId { get; set; }
     public string UserName { get; set; } = string.Empty;
+    public long PackageId { get; set; }
+    public string PackageName { get; set; } = string.Empty;
     public bool IsActive { get; set; }
     public DateTime? ActivatedAt { get; set; }
     public long InitialContribution { get; set; }

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubMembershipHistory/GetClubMembershipHistoryQuery.cs

@@ -1,27 +1,17 @@
 namespace CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory;
 
-/// <summary>
-/// Query برای دریافت تاریخچه تغییرات عضویت باشگاه
-/// </summary>
 public record GetClubMembershipHistoryQuery : IRequest<GetClubMembershipHistoryResponseDto>
 {
-    /// <summary>
-    /// شناسه عضویت (اختیاری)
-    /// </summary>
-    public long? MembershipId { get; init; }
-
-    /// <summary>
-    /// شناسه کاربر (اختیاری)
-    /// </summary>
-    public long? UserId { get; init; }
-
-    /// <summary>
-    /// موقعیت صفحه‌بندی
-    /// </summary>
     public PaginationState? PaginationState { get; init; }
-
-    /// <summary>
-    /// مرتب‌سازی بر اساس
-    /// </summary>
     public string? SortBy { get; init; }
+    public GetClubMembershipHistoryFilter? Filter { get; init; }
+}
+
+public class GetClubMembershipHistoryFilter
+{
+    public long? UserId { get; set; }
+    public long? ClubMembershipId { get; set; }
+    public ClubMembershipAction? Action { get; set; }
+    public DateTime? CreatedFrom { get; set; }
+    public DateTime? CreatedTo { get; set; }
 }

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubMembershipHistory/GetClubMembershipHistoryQueryHandler.cs

@@ -12,20 +12,30 @@ public class GetClubMembershipHistoryQueryHandler : IRequestHandler<GetClubMembe
     public async Task<GetClubMembershipHistoryResponseDto> Handle(GetClubMembershipHistoryQuery request, CancellationToken cancellationToken)
     {
         var query = _context.ClubMembershipHistories
+            .Include(x => x.ClubMembership)
+                .ThenInclude(m => m!.User)
             .AsNoTracking()
             .AsQueryable();
 
-        if (request.MembershipId.HasValue)
+        if (request.Filter != null)
         {
-            query = query.Where(x => x.ClubMembershipId == request.MembershipId.Value);
+            if (request.Filter.ClubMembershipId.HasValue)
+                query = query.Where(x => x.ClubMembershipId == request.Filter.ClubMembershipId.Value);
+
+            if (request.Filter.UserId.HasValue)
+                query = query.Where(x => x.UserId == request.Filter.UserId.Value);
+
+            if (request.Filter.Action.HasValue)
+                query = query.Where(x => x.Action == request.Filter.Action.Value);
+
+            if (request.Filter.CreatedFrom.HasValue)
+                query = query.Where(x => x.Created >= request.Filter.CreatedFrom.Value);
+
+            if (request.Filter.CreatedTo.HasValue)
+                query = query.Where(x => x.Created <= request.Filter.CreatedTo.Value);
         }
 
-        if (request.UserId.HasValue)
+        query = query.ApplyOrder(sortBy: request.SortBy ?? "-Created");
-        {
-            query = query.Where(x => x.UserId == request.UserId.Value);
-        }
-
-        query = query.ApplyOrder(sortBy: request.SortBy ?? "Created"); // پیش‌فرض: جدیدترین اول
 
         var meta = await query.GetMetaData(request.PaginationState, cancellationToken);
 
@@ -36,6 +46,9 @@ public class GetClubMembershipHistoryQueryHandler : IRequestHandler<GetClubMembe
                 Id = x.Id,
                 ClubMembershipId = x.ClubMembershipId,
                 UserId = x.UserId,
+                UserName = x.ClubMembership != null && x.ClubMembership.User != null
+                    ? $"{x.ClubMembership.User.FirstName} {x.ClubMembership.User.LastName}"
+                    : string.Empty,
                 OldIsActive = x.OldIsActive,
                 NewIsActive = x.NewIsActive,
                 OldInitialContribution = x.OldInitialContribution,

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubMembershipHistory/GetClubMembershipHistoryQueryValidator.cs

@@ -4,31 +4,6 @@ public class GetClubMembershipHistoryQueryValidator : AbstractValidator<GetClubM
 {
     public GetClubMembershipHistoryQueryValidator()
     {
-        RuleFor(x => x.MembershipId)
+        // Admin report: filters are all optional
-            .GreaterThan(0)
-            .WithMessage("شناسه عضویت معتبر نیست")
-            .When(x => x.MembershipId.HasValue);
-
-        RuleFor(x => x.UserId)
-            .GreaterThan(0)
-            .WithMessage("شناسه کاربر معتبر نیست")
-            .When(x => x.UserId.HasValue);
-
-        RuleFor(x => x)
-            .Must(x => x.MembershipId.HasValue || x.UserId.HasValue)
-            .WithMessage("حداقل یکی از MembershipId یا UserId باید مقداردهی شود");
     }
-
-    public Func<object, string, Task<IEnumerable<string>>> ValidateValue => async (model, propertyName) =>
-    {
-        var result = await ValidateAsync(
-            ValidationContext<GetClubMembershipHistoryQuery>.CreateWithOptions(
-                (GetClubMembershipHistoryQuery)model, 
-                x => x.IncludeProperties(propertyName)));
-        
-        if (result.IsValid)
-            return Array.Empty<string>();
-        
-        return result.Errors.Select(e => e.ErrorMessage);
-    };
 }

src/CMSMicroservice.Application/ClubMembershipCQ/Queries/GetClubMembershipHistory/GetClubMembershipHistoryResponseDto.cs

@@ -11,6 +11,7 @@ public class GetClubMembershipHistoryResponseModel
     public long Id { get; set; }
     public long ClubMembershipId { get; set; }
     public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
     public bool OldIsActive { get; set; }
     public bool NewIsActive { get; set; }
     public long? OldInitialContribution { get; set; }

src/CMSMicroservice.Application/ClubMembershipCycleCQ/Queries/GetAllClubMembershipCycleByFilter/ClubMembershipCycleFilterExtensions.cs

@@ -0,0 +1,46 @@
+using CMSMicroservice.Domain.Entities.Club;
+
+namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
+
+public static class ClubMembershipCycleFilterExtensions
+{
+    public static IQueryable<ClubMembershipCycle> ApplyClubMembershipCycleFilter(
+        this IQueryable<ClubMembershipCycle> query,
+        GetAllClubMembershipCycleByFilterFilter? filter)
+    {
+        if (filter == null) return query;
+
+        if (filter.UserId.HasValue)
+            query = query.Where(x => x.UserId == filter.UserId.Value);
+
+        if (filter.IsCurrentCycle.HasValue)
+            query = query.Where(x => x.IsCurrentCycle == filter.IsCurrentCycle.Value);
+
+        if (filter.PackageId.HasValue)
+            query = query.Where(x => x.PackageId == filter.PackageId.Value);
+
+        if (filter.CycleNumber.HasValue)
+            query = query.Where(x => x.CycleNumber == filter.CycleNumber.Value);
+
+        if (filter.PurchaseMethod.HasValue)
+            query = query.Where(x => x.PurchaseMethod == filter.PurchaseMethod.Value);
+
+        if (filter.MagicState.HasValue)
+        {
+            query = filter.MagicState.Value switch
+            {
+                1 => query.Where(x => x.MagicStartedAt != null && x.MagicCompletedAt == null),
+                2 => query.Where(x => x.MagicCompletedAt != null),
+                _ => query.Where(x => x.MagicStartedAt == null && x.MagicCompletedAt == null)
+            };
+        }
+
+        if (filter.PackagePurchasedFrom.HasValue)
+            query = query.Where(x => x.PackagePurchasedAt >= filter.PackagePurchasedFrom.Value);
+
+        if (filter.PackagePurchasedTo.HasValue)
+            query = query.Where(x => x.PackagePurchasedAt <= filter.PackagePurchasedTo.Value);
+
+        return query;
+    }
+}

src/CMSMicroservice.Application/ClubMembershipCycleCQ/Queries/GetAllClubMembershipCycleByFilter/GetAllClubMembershipCycleByFilterQuery.cs

@@ -0,0 +1,47 @@
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
+
+public record GetAllClubMembershipCycleByFilterQuery : IRequest<GetAllClubMembershipCycleByFilterResponseDto>
+{
+    public PaginationState? PaginationState { get; init; }
+    public string? SortBy { get; init; }
+    public GetAllClubMembershipCycleByFilterFilter? Filter { get; init; }
+}
+
+public class GetAllClubMembershipCycleByFilterFilter
+{
+    public long? UserId { get; set; }
+    public bool? IsCurrentCycle { get; set; }
+    public long? PackageId { get; set; }
+    public int? CycleNumber { get; set; }
+    public PackagePurchaseMethod? PurchaseMethod { get; set; }
+    /// <summary>0=none, 1=active magic, 2=completed magic</summary>
+    public int? MagicState { get; set; }
+    public DateTime? PackagePurchasedFrom { get; set; }
+    public DateTime? PackagePurchasedTo { get; set; }
+}
+
+public class GetAllClubMembershipCycleByFilterResponseDto
+{
+    public MetaData MetaData { get; set; }
+    public List<GetAllClubMembershipCycleByFilterResponseModel>? Models { get; set; }
+}
+
+public class GetAllClubMembershipCycleByFilterResponseModel
+{
+    public long Id { get; set; }
+    public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
+    public long ClubMembershipId { get; set; }
+    public int CycleNumber { get; set; }
+    public long PackageId { get; set; }
+    public string PackageName { get; set; } = string.Empty;
+    public long PackageAmount { get; set; }
+    public PackagePurchaseMethod PurchaseMethod { get; set; }
+    public DateTime PackagePurchasedAt { get; set; }
+    public DateTime? MagicStartedAt { get; set; }
+    public DateTime? MagicCompletedAt { get; set; }
+    public bool IsCurrentCycle { get; set; }
+    public DateTimeOffset Created { get; set; }
+}

src/CMSMicroservice.Application/ClubMembershipCycleCQ/Queries/GetAllClubMembershipCycleByFilter/GetAllClubMembershipCycleByFilterQueryHandler.cs

@@ -0,0 +1,49 @@
+namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
+
+public class GetAllClubMembershipCycleByFilterQueryHandler
+    : IRequestHandler<GetAllClubMembershipCycleByFilterQuery, GetAllClubMembershipCycleByFilterResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetAllClubMembershipCycleByFilterQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAllClubMembershipCycleByFilterResponseDto> Handle(
+        GetAllClubMembershipCycleByFilterQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.ClubMembershipCycles
+            .Include(x => x.User)
+            .Include(x => x.Package)
+            .AsNoTracking()
+            .ApplyClubMembershipCycleFilter(request.Filter)
+            .ApplyOrder(sortBy: request.SortBy ?? "-PackagePurchasedAt");
+
+        return new GetAllClubMembershipCycleByFilterResponseDto
+        {
+            MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllClubMembershipCycleByFilterResponseModel
+                {
+                    Id = x.Id,
+                    UserId = x.UserId,
+                    UserName = x.User != null ? $"{x.User.FirstName} {x.User.LastName}" : string.Empty,
+                    ClubMembershipId = x.ClubMembershipId,
+                    CycleNumber = x.CycleNumber,
+                    PackageId = x.PackageId,
+                    PackageName = x.Package != null ? x.Package.Title : string.Empty,
+                    PackageAmount = x.PackageAmount,
+                    PurchaseMethod = x.PurchaseMethod,
+                    PackagePurchasedAt = x.PackagePurchasedAt,
+                    MagicStartedAt = x.MagicStartedAt,
+                    MagicCompletedAt = x.MagicCompletedAt,
+                    IsCurrentCycle = x.IsCurrentCycle,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
+        };
+    }
+}

src/CMSMicroservice.Application/ClubMembershipCycleCQ/Queries/GetClubMembershipCycleSummary/GetClubMembershipCycleSummaryQuery.cs

@@ -0,0 +1,13 @@
+namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershipCycleSummary;
+
+public record GetClubMembershipCycleSummaryQuery : IRequest<GetClubMembershipCycleSummaryResponseDto>
+{
+    public GetAllClubMembershipCycleByFilter.GetAllClubMembershipCycleByFilterFilter? Filter { get; init; }
+}
+
+public class GetClubMembershipCycleSummaryResponseDto
+{
+    public long TotalCount { get; set; }
+    public long CurrentCycleCount { get; set; }
+    public long MagicActiveCount { get; set; }
+}

src/CMSMicroservice.Application/ClubMembershipCycleCQ/Queries/GetClubMembershipCycleSummary/GetClubMembershipCycleSummaryQueryHandler.cs

@@ -0,0 +1,36 @@
+using CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
+
+namespace CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershipCycleSummary;
+
+public class GetClubMembershipCycleSummaryQueryHandler
+    : IRequestHandler<GetClubMembershipCycleSummaryQuery, GetClubMembershipCycleSummaryResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetClubMembershipCycleSummaryQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetClubMembershipCycleSummaryResponseDto> Handle(
+        GetClubMembershipCycleSummaryQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.ClubMembershipCycles
+            .AsNoTracking()
+            .ApplyClubMembershipCycleFilter(request.Filter);
+
+        var totalCount = await query.LongCountAsync(cancellationToken);
+        var currentCycleCount = await query.LongCountAsync(x => x.IsCurrentCycle, cancellationToken);
+        var magicActiveCount = await query.LongCountAsync(
+            x => x.MagicStartedAt != null && x.MagicCompletedAt == null,
+            cancellationToken);
+
+        return new GetClubMembershipCycleSummaryResponseDto
+        {
+            TotalCount = totalCount,
+            CurrentCycleCount = currentCycleCount,
+            MagicActiveCount = magicActiveCount
+        };
+    }
+}

src/CMSMicroservice.Application/ClubMembershipCycleHistoryCQ/Queries/GetAllClubMembershipCycleHistoryByFilter/ClubMembershipCycleHistoryFilterExtensions.cs

@@ -0,0 +1,33 @@
+using CMSMicroservice.Domain.Entities.History;
+
+namespace CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter;
+
+public static class ClubMembershipCycleHistoryFilterExtensions
+{
+    public static IQueryable<ClubMembershipCycleHistory> ApplyClubMembershipCycleHistoryFilter(
+        this IQueryable<ClubMembershipCycleHistory> query,
+        GetAllClubMembershipCycleHistoryByFilterFilter? filter)
+    {
+        if (filter == null) return query;
+
+        if (filter.UserId.HasValue)
+            query = query.Where(x => x.UserId == filter.UserId.Value);
+
+        if (filter.ClubMembershipCycleId.HasValue)
+            query = query.Where(x => x.ClubMembershipCycleId == filter.ClubMembershipCycleId.Value);
+
+        if (filter.CycleNumber.HasValue)
+            query = query.Where(x => x.CycleNumber == filter.CycleNumber.Value);
+
+        if (filter.Action.HasValue)
+            query = query.Where(x => x.Action == filter.Action.Value);
+
+        if (filter.CreatedFrom.HasValue)
+            query = query.Where(x => x.Created >= filter.CreatedFrom.Value);
+
+        if (filter.CreatedTo.HasValue)
+            query = query.Where(x => x.Created <= filter.CreatedTo.Value);
+
+        return query;
+    }
+}

src/CMSMicroservice.Application/ClubMembershipCycleHistoryCQ/Queries/GetAllClubMembershipCycleHistoryByFilter/GetAllClubMembershipCycleHistoryByFilterQuery.cs

@@ -0,0 +1,45 @@
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter;
+
+public record GetAllClubMembershipCycleHistoryByFilterQuery : IRequest<GetAllClubMembershipCycleHistoryByFilterResponseDto>
+{
+    public PaginationState? PaginationState { get; init; }
+    public string? SortBy { get; init; }
+    public GetAllClubMembershipCycleHistoryByFilterFilter? Filter { get; init; }
+}
+
+public class GetAllClubMembershipCycleHistoryByFilterFilter
+{
+    public long? UserId { get; set; }
+    public long? ClubMembershipCycleId { get; set; }
+    public int? CycleNumber { get; set; }
+    public ClubMembershipCycleAction? Action { get; set; }
+    public DateTime? CreatedFrom { get; set; }
+    public DateTime? CreatedTo { get; set; }
+}
+
+public class GetAllClubMembershipCycleHistoryByFilterResponseDto
+{
+    public MetaData MetaData { get; set; }
+    public List<GetAllClubMembershipCycleHistoryByFilterResponseModel>? Models { get; set; }
+}
+
+public class GetAllClubMembershipCycleHistoryByFilterResponseModel
+{
+    public long Id { get; set; }
+    public long ClubMembershipCycleId { get; set; }
+    public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
+    public int CycleNumber { get; set; }
+    public bool OldIsCurrentCycle { get; set; }
+    public bool NewIsCurrentCycle { get; set; }
+    public DateTime? OldMagicStartedAt { get; set; }
+    public DateTime? NewMagicStartedAt { get; set; }
+    public DateTime? OldMagicCompletedAt { get; set; }
+    public DateTime? NewMagicCompletedAt { get; set; }
+    public ClubMembershipCycleAction Action { get; set; }
+    public string? PerformedBy { get; set; }
+    public string? Reason { get; set; }
+    public DateTimeOffset Created { get; set; }
+}

src/CMSMicroservice.Application/ClubMembershipCycleHistoryCQ/Queries/GetAllClubMembershipCycleHistoryByFilter/GetAllClubMembershipCycleHistoryByFilterQueryHandler.cs

@@ -0,0 +1,52 @@
+namespace CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter;
+
+public class GetAllClubMembershipCycleHistoryByFilterQueryHandler
+    : IRequestHandler<GetAllClubMembershipCycleHistoryByFilterQuery, GetAllClubMembershipCycleHistoryByFilterResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetAllClubMembershipCycleHistoryByFilterQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAllClubMembershipCycleHistoryByFilterResponseDto> Handle(
+        GetAllClubMembershipCycleHistoryByFilterQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.ClubMembershipCycleHistories
+            .Include(x => x.ClubMembershipCycle)
+                .ThenInclude(c => c!.User)
+            .AsNoTracking()
+            .ApplyClubMembershipCycleHistoryFilter(request.Filter)
+            .ApplyOrder(sortBy: request.SortBy ?? "-Created");
+
+        return new GetAllClubMembershipCycleHistoryByFilterResponseDto
+        {
+            MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllClubMembershipCycleHistoryByFilterResponseModel
+                {
+                    Id = x.Id,
+                    ClubMembershipCycleId = x.ClubMembershipCycleId,
+                    UserId = x.UserId,
+                    UserName = x.ClubMembershipCycle != null && x.ClubMembershipCycle.User != null
+                        ? $"{x.ClubMembershipCycle.User.FirstName} {x.ClubMembershipCycle.User.LastName}"
+                        : string.Empty,
+                    CycleNumber = x.CycleNumber,
+                    OldIsCurrentCycle = x.OldIsCurrentCycle,
+                    NewIsCurrentCycle = x.NewIsCurrentCycle,
+                    OldMagicStartedAt = x.OldMagicStartedAt,
+                    NewMagicStartedAt = x.NewMagicStartedAt,
+                    OldMagicCompletedAt = x.OldMagicCompletedAt,
+                    NewMagicCompletedAt = x.NewMagicCompletedAt,
+                    Action = x.Action,
+                    PerformedBy = x.PerformedBy,
+                    Reason = x.Reason,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
+        };
+    }
+}

src/CMSMicroservice.Application/CommissionCQ/Commands/BulkCreditPayouts/BulkCreditPayoutsCommandHandler.cs

@@ -1,5 +1,4 @@
 using CMSMicroservice.Application.Common.Interfaces;
-using CMSMicroservice.Domain.Entities;
 using CMSMicroservice.Domain.Entities.Commission;
 using CMSMicroservice.Domain.Entities.History;
 using CMSMicroservice.Domain.Enums;
@@ -25,7 +24,6 @@ public class BulkCreditPayoutsCommandHandler : IRequestHandler<BulkCreditPayouts
 
     public async Task<BulkCreditPayoutsResult> Handle(BulkCreditPayoutsCommand request, CancellationToken cancellationToken)
     {
-        // بارگذاری همه پرداخت‌های Pending این هفته
         var pendingPayouts = await _context.UserCommissionPayouts
             .Where(p => p.WeekDefinitionId == request.WeekDefinitionId
                      && p.Status == CommissionPayoutStatus.Pending
@@ -37,72 +35,37 @@ public class BulkCreditPayoutsCommandHandler : IRequestHandler<BulkCreditPayouts
             return new BulkCreditPayoutsResult { CreditedCount = 0, TotalCredited = 0 };
         }
 
-        // بارگذاری کیف پول همه کاربران مربوطه (یک query)
-        var userIds = pendingPayouts.Select(p => p.UserId).Distinct().ToList();
-        var wallets = await _context.UserWallets
-            .Where(w => userIds.Contains(w.UserId) && !w.IsDeleted)
-            .ToDictionaryAsync(w => w.UserId, cancellationToken);
-
         var performedBy = _currentUser.GetPerformedBy() ?? "System";
         var now = DateTime.UtcNow;
 
-        var walletHistories = new List<UserWalletHistory>();
         var payoutHistories = new List<CommissionPayoutHistory>();
         var creditedCount = 0;
         long totalCredited = 0;
 
         foreach (var payout in pendingPayouts)
         {
-            if (!wallets.TryGetValue(payout.UserId, out var wallet))
-            {
-                _logger.LogWarning(
-                    "Wallet not found for UserId={UserId}, PayoutId={PayoutId} — skipping",
-                    payout.UserId, payout.Id);
-                continue;
-            }
-
-            var oldBalance = wallet.Balance;
-
-            // واریز مبلغ به کیف پول
-            wallet.Balance += payout.TotalAmount;
-
-            walletHistories.Add(new UserWalletHistory
-            {
-                WalletId = wallet.Id,
-                CurrentBalance = wallet.Balance,
-                CurrentNetworkBalance = wallet.NetworkBalance,
-                CurrentDiscountBalance = wallet.DiscountBalance,
-                ChangeValue = payout.TotalAmount,
-                ChangeNerworkValue = 0,
-                ChangeDiscountValue = 0,
-                IsIncrease = true,
-                RefrenceId = payout.Id
-            });
-
-            // به‌روزرسانی وضعیت پرداخت
             payout.Status = CommissionPayoutStatus.Paid;
             payout.PaidAt = now;
             payout.LastModified = now;
 
             payoutHistories.Add(new CommissionPayoutHistory
             {
-                UserCommissionPayoutId = payout.Id,
+                UserCommissionPayoutId = payout.Id, 
                 UserId = payout.UserId,
                 WeekDefinitionId = payout.WeekDefinitionId,
-                AmountBefore = 0,
+                AmountBefore = payout.TotalAmount,
                 AmountAfter = payout.TotalAmount,
                 OldStatus = CommissionPayoutStatus.Pending,
                 NewStatus = CommissionPayoutStatus.Paid,
                 Action = CommissionPayoutAction.Paid,
                 PerformedBy = performedBy,
-                Reason = $"واریز دسته‌جمعی کمیسیون هفته {payout.WeekDefinitionId} توسط {performedBy}"
+                Reason = $"تایید پرداخت دسته‌جمعی کمیسیون هفته {payout.WeekDefinitionId} توسط {performedBy}"
             });
 
             creditedCount++;
             totalCredited += payout.TotalAmount;
         }
 
-        await _context.UserWalletHistories.AddRangeAsync(walletHistories, cancellationToken);
         await _context.CommissionPayoutHistories.AddRangeAsync(payoutHistories, cancellationToken);
         await _context.SaveChangesAsync(cancellationToken);
 

src/CMSMicroservice.Application/CommissionCQ/Commands/RequestWithdrawal/RequestWithdrawalCommandHandler.cs

@@ -1,3 +1,5 @@
+using CMSMicroservice.Application.Common;
+
 namespace CMSMicroservice.Application.CommissionCQ.Commands.RequestWithdrawal;
 
 public class RequestWithdrawalCommandHandler : IRequestHandler<RequestWithdrawalCommand, Unit>
@@ -37,7 +39,10 @@ public class RequestWithdrawalCommandHandler : IRequestHandler<RequestWithdrawal
 
         if (request.Method == WithdrawalMethod.Cash)
         {
-            payout.IbanNumber = request.IbanNumber;
+            var normalizedIban = IbanNormalizer.TryNormalize(request.IbanNumber);
+            if (normalizedIban is null)
+                throw new InvalidOperationException("فرمت شماره شبا معتبر نیست. باید IR و ۲۴ رقم باشد.");
+            payout.IbanNumber = normalizedIban;
         }
 
         _context.UserCommissionPayouts.Update(payout);

src/CMSMicroservice.Application/Common/BlogSlugHelper.cs

@@ -0,0 +1,85 @@
+using CMSMicroservice.Application.Common.Interfaces;
+using Microsoft.EntityFrameworkCore;
+
+namespace CMSMicroservice.Application.Common;
+
+public static class BlogSlugHelper
+{
+    private const int MaxSlugLength = 200;
+
+    public static string? NormalizeOptional(string? slug)
+    {
+        if (string.IsNullOrWhiteSpace(slug))
+            return null;
+
+        return slug.Trim().ToLowerInvariant();
+    }
+
+    /// <summary>
+    /// Builds a URL slug from title (ASCII letters/digits). Persian-only titles yield empty string.
+    /// </summary>
+    public static string GenerateFromTitle(string title)
+    {
+        if (string.IsNullOrWhiteSpace(title))
+            return string.Empty;
+
+        var sb = new System.Text.StringBuilder();
+        var lastWasHyphen = false;
+
+        foreach (var c in title.Trim().ToLowerInvariant())
+        {
+            if (c is >= 'a' and <= 'z' or >= '0' and <= '9')
+            {
+                sb.Append(c);
+                lastWasHyphen = false;
+            }
+            else if (c is ' ' or '_' or '-')
+            {
+                if (sb.Length > 0 && !lastWasHyphen)
+                {
+                    sb.Append('-');
+                    lastWasHyphen = true;
+                }
+            }
+        }
+
+        var result = sb.ToString().Trim('-');
+        return result.Length > MaxSlugLength ? result[..MaxSlugLength].TrimEnd('-') : result;
+    }
+
+    public static string CreateFallbackSlug() =>
+        $"post-{Guid.NewGuid():N}"[..Math.Min(20, MaxSlugLength)];
+
+    public static string ResolveForCreate(string? requestedSlug, string title)
+    {
+        var normalized = NormalizeOptional(requestedSlug);
+        if (!string.IsNullOrEmpty(normalized))
+            return normalized;
+
+        var fromTitle = GenerateFromTitle(title);
+        return !string.IsNullOrEmpty(fromTitle) ? fromTitle : CreateFallbackSlug();
+    }
+
+    public static async Task<string> EnsureUniquePostSlugAsync(
+        IApplicationDbContext context,
+        string slug,
+        long? excludePostId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var candidate = slug;
+        var suffix = 2;
+
+        while (await context.BlogPosts.AnyAsync(
+            p => p.Slug == candidate && !p.IsDeleted && (excludePostId == null || p.Id != excludePostId.Value),
+            cancellationToken))
+        {
+            var suffixStr = $"-{suffix}";
+            var maxBase = MaxSlugLength - suffixStr.Length;
+            var basePart = slug.Length > maxBase ? slug[..maxBase].TrimEnd('-') : slug;
+            candidate = basePart + suffixStr;
+            suffix++;
+        }
+
+        return candidate;
+    }
+}

src/CMSMicroservice.Application/Common/Extensions/SortByExtensions.cs

@@ -1,3 +1,4 @@
+using System.Linq.Expressions;
 using System.Linq.Dynamic.Core;
 using CMSMicroservice.Domain.Common;
 
@@ -8,16 +9,46 @@ public static class SortByExtensions
     public static IQueryable<TSource> ApplyOrder<TSource>(this IQueryable<TSource> source,
         string? sortBy) where TSource : BaseAuditableEntity
     {
-        // default sort approach
         if (sortBy is null or "")
         {
-            source = source.OrderByDescending(p => p.Created);
+            return source.OrderByDescending(p => p.Created);
-            return source;
         }
 
-        // sort using dynamic linq
+        return source.OrderBy(NormalizeSortBy(sortBy));
-        source = source.OrderBy(sortBy);
+    }
 
-        return source;
+    /// <summary>
+    /// موجودی‌دارها اول، سپس سورت درخواستی کاربر (یا Created desc اگر SortBy خالی باشد).
+    /// </summary>
+    public static IQueryable<TSource> ApplyOrderWithInStockPriority<TSource>(
+        this IQueryable<TSource> source,
+        string? sortBy,
+        Expression<Func<TSource, bool>> isInStock) where TSource : BaseAuditableEntity
+    {
+        var ordered = source.OrderByDescending(isInStock);
+        if (string.IsNullOrWhiteSpace(sortBy))
+            return ordered.ThenByDescending(p => p.Created);
+
+        return ordered.ThenBy(NormalizeSortBy(sortBy));
+    }
+
+    /// <summary>
+    /// Dynamic LINQ treats "-Created" as unary minus on DateTime (invalid).
+    /// Project convention: leading '-' means descending sort.
+    /// </summary>
+    private static string NormalizeSortBy(string sortBy)
+    {
+        sortBy = sortBy.Trim();
+        if (sortBy.StartsWith('-') && sortBy.Length > 1)
+        {
+            return $"{sortBy[1..]} descending";
+        }
+
+        if (sortBy.StartsWith('+') && sortBy.Length > 1)
+        {
+            return $"{sortBy[1..]} ascending";
+        }
+
+        return sortBy;
     }
 }

src/CMSMicroservice.Application/Common/Helpers/ClubMembershipCycleHistoryWriter.cs

@@ -0,0 +1,54 @@
+using CMSMicroservice.Domain.Entities.Club;
+using CMSMicroservice.Domain.Entities.History;
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.Common.Helpers;
+
+public static class ClubMembershipCycleHistoryWriter
+{
+    public static void WriteCycleStarted(
+        IApplicationDbContext context,
+        ClubMembershipCycle cycle,
+        string? performedBy = "System",
+        string? reason = null)
+    {
+        context.ClubMembershipCycleHistories.Add(new ClubMembershipCycleHistory
+        {
+            ClubMembershipCycleId = cycle.Id,
+            UserId = cycle.UserId,
+            CycleNumber = cycle.CycleNumber,
+            OldIsCurrentCycle = false,
+            NewIsCurrentCycle = cycle.IsCurrentCycle,
+            OldMagicStartedAt = null,
+            NewMagicStartedAt = cycle.MagicStartedAt,
+            OldMagicCompletedAt = null,
+            NewMagicCompletedAt = cycle.MagicCompletedAt,
+            Action = ClubMembershipCycleAction.Started,
+            PerformedBy = performedBy,
+            Reason = reason
+        });
+    }
+
+    public static void WriteCycleClosed(
+        IApplicationDbContext context,
+        ClubMembershipCycle cycle,
+        string? performedBy = "System",
+        string? reason = null)
+    {
+        context.ClubMembershipCycleHistories.Add(new ClubMembershipCycleHistory
+        {
+            ClubMembershipCycleId = cycle.Id,
+            UserId = cycle.UserId,
+            CycleNumber = cycle.CycleNumber,
+            OldIsCurrentCycle = true,
+            NewIsCurrentCycle = false,
+            OldMagicStartedAt = cycle.MagicStartedAt,
+            NewMagicStartedAt = cycle.MagicStartedAt,
+            OldMagicCompletedAt = cycle.MagicCompletedAt,
+            NewMagicCompletedAt = cycle.MagicCompletedAt,
+            Action = ClubMembershipCycleAction.Completed,
+            PerformedBy = performedBy,
+            Reason = reason ?? "دوره جدید جایگزین شد"
+        });
+    }
+}

src/CMSMicroservice.Application/Common/IbanNormalizer.cs

@@ -0,0 +1,34 @@
+using System.Text.RegularExpressions;
+
+namespace CMSMicroservice.Application.Common;
+
+/// <summary>
+/// نرمال‌سازی و اعتبارسنجی شماره شبا ایران (IR + 24 رقم).
+/// </summary>
+public static class IbanNormalizer
+{
+    private static readonly Regex IranianIbanRegex = new(@"^IR\d{24}$", RegexOptions.Compiled);
+
+    /// <summary>
+    /// فاصله و خط تیره را حذف می‌کند، به حروف بزرگ تبدیل می‌کند و یک پیشوند IR می‌گذارد.
+    /// در صورت نامعتبر بودن، null برمی‌گرداند.
+    /// </summary>
+    public static string? TryNormalize(string? iban)
+    {
+        if (string.IsNullOrWhiteSpace(iban))
+            return null;
+
+        var normalized = iban.Trim().ToUpperInvariant()
+            .Replace(" ", "", StringComparison.Ordinal)
+            .Replace("-", "", StringComparison.Ordinal);
+
+        if (normalized.StartsWith("IR", StringComparison.Ordinal))
+            normalized = normalized[2..];
+
+        normalized = "IR" + normalized;
+
+        return IranianIbanRegex.IsMatch(normalized) ? normalized : null;
+    }
+
+    public static bool IsValid(string? iban) => TryNormalize(iban) is not null;
+}

src/CMSMicroservice.Application/Common/UserDisplayName.cs

@@ -0,0 +1,29 @@
+namespace CMSMicroservice.Application.Common;
+
+/// <summary>
+/// نام نمایشی کاربر برای گزارش‌ها؛ اگر نام خالی باشد موبایل یا شناسه.
+/// </summary>
+public static class UserDisplayName
+{
+    public static string From(string? firstName, string? lastName, string? mobile, long userId)
+    {
+        var name = string.Join(" ",
+            new[] { firstName, lastName }.Where(s => !string.IsNullOrWhiteSpace(s)));
+
+        if (!string.IsNullOrWhiteSpace(name))
+            return name;
+
+        if (!string.IsNullOrWhiteSpace(mobile))
+            return mobile.Trim();
+
+        return userId > 0 ? $"کاربر {userId}" : "—";
+    }
+
+    public static string From(Domain.Entities.User? user)
+    {
+        if (user is null)
+            return string.Empty;
+
+        return From(user.FirstName, user.LastName, user.Mobile, user.Id);
+    }
+}

src/CMSMicroservice.Application/DiscountShopCQ/Commands/UpdateOrderStatus/UpdateOrderStatusCommandHandler.cs

@@ -35,6 +35,11 @@ public class UpdateOrderStatusCommandHandler : IRequestHandler<UpdateOrderStatus
             order.TrackingCode = request.TrackingCode;
         }
 
+        if (!string.IsNullOrEmpty(request.AdminNotes))
+        {
+            order.DeliveryDescription = request.AdminNotes;
+        }
+
         await _context.SaveChangesAsync(cancellationToken);
 
         return new UpdateOrderStatusResponseDto

src/CMSMicroservice.Application/DiscountShopCQ/Queries/GetAllDiscountOrders/GetAllDiscountOrdersQueryHandler.cs

@@ -1,3 +1,4 @@
+using CMSMicroservice.Application.Common;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.Common.Models;
 using MediatR;
@@ -80,35 +81,58 @@ public class GetAllDiscountOrdersQueryHandler : IRequestHandler<GetAllDiscountOr
         // Apply pagination
         var pagination = request.PaginationQuery ?? new PaginationState { PageNumber = 1, PageSize = 20 };
 
-        var orders = await query
+        var rows = await query
             .OrderByDescending(o => o.Created)
             .Skip((pagination.PageNumber - 1) * pagination.PageSize)
             .Take(pagination.PageSize)
-            .Select(o => new AdminOrderDto
+            .Select(o => new
             {
-                Id = o.Id,
+                o.Id,
-                UserId = o.UserId,
+                o.UserId,
-                UserFullName = (o.User.FirstName ?? "") + " " + (o.User.LastName ?? ""),
+                FirstName = o.User.FirstName,
-                UserMobile = o.User.Mobile,
+                LastName = o.User.LastName,
-                TotalAmount = o.TotalAmount,
+                Mobile = o.User.Mobile,
-                DiscountBalanceUsed = o.DiscountBalanceUsed,
+                o.TotalAmount,
-                GatewayAmountPaid = o.GatewayAmountPaid,
+                o.DiscountBalanceUsed,
-                VatAmount = o.VatAmount,
+                o.GatewayAmountPaid,
-                PaymentStatus = o.PaymentStatus,
+                o.VatAmount,
-                PaymentDate = o.PaymentDate,
+                o.PaymentStatus,
-                DeliveryStatus = o.DeliveryStatus,
+                o.PaymentDate,
-                DeliveryDate = null, // TODO: Add DeliveryDate to DiscountOrder if needed
+                o.DeliveryStatus,
                 ShippingAddress = o.UserAddress.Address,
                 ReceiverName = o.UserAddress.Title,
-                ReceiverMobile = o.User.Mobile,
+                o.TrackingCode,
-                TrackingCode = o.TrackingCode,
                 AdminNote = o.DeliveryDescription,
-                Created = o.Created,
+                o.Created,
-                LastModified = o.LastModified,
+                o.LastModified,
                 ItemsCount = o.OrderDetails.Count
             })
             .ToListAsync(cancellationToken);
 
+        var orders = rows.Select(o => new AdminOrderDto
+        {
+            Id = o.Id,
+            UserId = o.UserId,
+            UserFullName = UserDisplayName.From(o.FirstName, o.LastName, o.Mobile, o.UserId),
+            UserMobile = o.Mobile,
+            TotalAmount = o.TotalAmount,
+            DiscountBalanceUsed = o.DiscountBalanceUsed,
+            GatewayAmountPaid = o.GatewayAmountPaid,
+            VatAmount = o.VatAmount,
+            PaymentStatus = o.PaymentStatus,
+            PaymentDate = o.PaymentDate,
+            DeliveryStatus = o.DeliveryStatus,
+            DeliveryDate = null,
+            ShippingAddress = o.ShippingAddress,
+            ReceiverName = o.ReceiverName,
+            ReceiverMobile = o.Mobile,
+            TrackingCode = o.TrackingCode,
+            AdminNote = o.AdminNote,
+            Created = o.Created,
+            LastModified = o.LastModified,
+            ItemsCount = o.ItemsCount
+        }).ToList();
+
         return new GetAllDiscountOrdersResponseDto
         {
             MetaData = new MetaData

src/CMSMicroservice.Application/DiscountShopCQ/Queries/GetDiscountProducts/GetDiscountProductsQuery.cs

@@ -8,6 +8,10 @@ public class GetDiscountProductsQuery : IRequest<GetDiscountProductsResponseDto>
     public PaginationState? PaginationQuery { get; set; }
     public long? CategoryId { get; set; }
     public string? SearchTerm { get; set; }
+    /// <summary>
+    /// true = فقط موجود (RemainingCount &gt; 0)، false = فقط ناموجود
+    /// </summary>
+    public bool? InStock { get; set; }
     public bool? IsActive { get; set; }
     public int? MinPrice { get; set; }
     public int? MaxPrice { get; set; }

src/CMSMicroservice.Application/DiscountShopCQ/Queries/GetDiscountProducts/GetDiscountProductsQueryHandler.cs

@@ -42,6 +42,11 @@ public class GetDiscountProductsQueryHandler : IRequestHandler<GetDiscountProduc
             query = query.Where(p => p.IsActive == request.IsActive.Value);
         }
 
+        if (request.InStock == true)
+            query = query.Where(p => p.RemainingCount > 0);
+        else if (request.InStock == false)
+            query = query.Where(p => p.RemainingCount <= 0);
+
         if (request.MinPrice.HasValue)
         {
             query = query.Where(p => p.Price >= request.MinPrice.Value);
@@ -52,10 +57,8 @@ public class GetDiscountProductsQueryHandler : IRequestHandler<GetDiscountProduc
             query = query.Where(p => p.Price <= request.MaxPrice.Value);
         }
 
-        if (!string.IsNullOrEmpty(request.SortBy))
+        // موجودی‌دارها اول، سپس سورت درخواستی
-            query = query.ApplyOrder(request.SortBy);
+        query = query.ApplyOrderWithInStockPriority(request.SortBy, p => p.RemainingCount > 0);
-        else
-            query = query.OrderByDescending(p => p.Created);
 
         var totalCount = await query.CountAsync(cancellationToken);
 

src/CMSMicroservice.Application/DiscountShopCQ/Queries/GetOrderById/GetOrderByIdQuery.cs

@@ -32,6 +32,8 @@ public class UserAddressDto
     public string Title { get; set; }
     public string Address { get; set; }
     public string PostalCode { get; set; }
+    /// <summary>شماره تماس سفارش‌دهنده (موبایل کاربر) برای برچسب پست</summary>
+    public string? Phone { get; set; }
 }
 
 public class OrderItemDto

src/CMSMicroservice.Application/DiscountShopCQ/Queries/GetOrderById/GetOrderByIdQueryHandler.cs

@@ -25,6 +25,7 @@ public class GetOrderByIdQueryHandler : IRequestHandler<GetOrderByIdQuery, Order
 
         var order = await query
             .Include(o => o.UserAddress)
+            .Include(o => o.User)
             .Include(o => o.OrderDetails)
                 .ThenInclude(od => od.Product)
             .FirstOrDefaultAsync(cancellationToken);
@@ -50,7 +51,8 @@ public class GetOrderByIdQueryHandler : IRequestHandler<GetOrderByIdQuery, Order
             {
                 Title = order.UserAddress.Title,
                 Address = order.UserAddress.Address,
-                PostalCode = order.UserAddress.PostalCode
+                PostalCode = order.UserAddress.PostalCode,
+                Phone = order.User?.Mobile
             },
             Items = order.OrderDetails.Select(od => new OrderItemDto
             {

src/CMSMicroservice.Application/ManualPaymentCQ/Commands/CreateManualPayment/CreateManualPaymentCommandHandler.cs

@@ -150,8 +150,18 @@ public class CreateManualPaymentCommandHandler : IRequestHandler<CreateManualPay
 
             await _context.UserWalletHistories.AddAsync(walletLog, cancellationToken);
 
-            // 9. تنظیم روش خرید پکیج
+            // 9. تنظیم روش خرید پکیج + ثبت ledger خرید دستی
-            user.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;
+            user.PackagePurchaseMethod = PackagePurchaseMethod.Manual;
+
+            _context.UserPackagePurchases.Add(new UserPackagePurchase
+            {
+                UserId = request.UserId,
+                PackageId = package.Id,
+                PurchaseMethod = PackagePurchaseMethod.Manual,
+                PurchasedAt = DateTime.Now,
+                Amount = balanceAmount,
+                TransactionId = transaction.Id
+            });
 
             // 10. ذخیره همه تغییرات
             await _context.SaveChangesAsync(cancellationToken);

src/CMSMicroservice.Application/ManualPaymentCQ/Commands/ProcessManualMembershipPayment/ProcessManualMembershipPaymentCommandHandler.cs

@@ -118,7 +118,7 @@ public class ProcessManualMembershipPaymentCommandHandler : IRequestHandler<Proc
             };
             await _context.UserWalletHistories.AddAsync(balanceLog, cancellationToken);
 
-            user.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;
+            user.PackagePurchaseMethod = PackagePurchaseMethod.Manual;
             // 10. به‌روزرسانی ManualPayment با TransactionId
             manualPayment.TransactionId = transaction.Id;
             await _context.SaveChangesAsync(cancellationToken);

src/CMSMicroservice.Application/PackageCQ/Commands/VerifyUserPackagePurchasePayment/VerifyUserPackagePurchasePaymentCommand.cs

@@ -0,0 +1,26 @@
+using MediatR;
+
+namespace CMSMicroservice.Application.PackageCQ.Commands.VerifyUserPackagePurchasePayment;
+
+/// <summary>
+/// Shared verify + wallet credit path for package IPG payments (callback UI and reconciliation job).
+/// </summary>
+public class VerifyUserPackagePurchasePaymentCommand : IRequest<VerifyUserPackagePurchasePaymentResult>
+{
+    public long PurchaseId { get; set; }
+    public string Authority { get; set; } = string.Empty;
+    public string Status { get; set; } = "OK";
+}
+
+public class VerifyUserPackagePurchasePaymentResult
+{
+    public bool Success { get; init; }
+    public bool AlreadyPaid { get; init; }
+    public string Message { get; init; } = string.Empty;
+    public long TransactionId { get; init; }
+    public string ReferenceCode { get; init; } = string.Empty;
+    public long PackageId { get; init; }
+    public string PackageName { get; init; } = string.Empty;
+    public long AmountPaid { get; init; }
+    public DateTime PurchasedAt { get; init; }
+}

src/CMSMicroservice.Application/PackageCQ/Commands/VerifyUserPackagePurchasePayment/VerifyUserPackagePurchasePaymentCommandHandler.cs

@@ -0,0 +1,303 @@
+using System.Data;
+using CMSMicroservice.Application.ClubMembershipCQ.Commands.ActivateClubMembership;
+using CMSMicroservice.Application.Common;
+using CMSMicroservice.Application.Common.Exceptions;
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Domain.Entities;
+using CMSMicroservice.Domain.Entities.Payment;
+using CMSMicroservice.Domain.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace CMSMicroservice.Application.PackageCQ.Commands.VerifyUserPackagePurchasePayment;
+
+public class VerifyUserPackagePurchasePaymentCommandHandler
+    : IRequestHandler<VerifyUserPackagePurchasePaymentCommand, VerifyUserPackagePurchasePaymentResult>
+{
+    private readonly IApplicationDbContext _context;
+    private readonly IPaymentGatewayService _paymentGateway;
+    private readonly ISender _sender;
+    private readonly IUserPaymentLock _paymentLock;
+    private readonly ILogger<VerifyUserPackagePurchasePaymentCommandHandler> _logger;
+
+    public VerifyUserPackagePurchasePaymentCommandHandler(
+        IApplicationDbContext context,
+        IPaymentGatewayService paymentGateway,
+        ISender sender,
+        IUserPaymentLock paymentLock,
+        ILogger<VerifyUserPackagePurchasePaymentCommandHandler> logger)
+    {
+        _context = context;
+        _paymentGateway = paymentGateway;
+        _sender = sender;
+        _paymentLock = paymentLock;
+        _logger = logger;
+    }
+
+    public async Task<VerifyUserPackagePurchasePaymentResult> Handle(
+        VerifyUserPackagePurchasePaymentCommand request,
+        CancellationToken cancellationToken)
+    {
+        var purchaseUserId = await _context.UserPackagePurchases
+            .Where(p => p.Id == request.PurchaseId && !p.IsDeleted)
+            .Select(p => (long?)p.UserId)
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (purchaseUserId is null or 0)
+            throw new NotFoundException("سفارش یافت نشد");
+
+        var verifyKey = !string.IsNullOrEmpty(request.Authority)
+            ? request.Authority
+            : request.PurchaseId.ToString();
+
+        return await _paymentLock.ExecuteAsync(
+            PaymentLockScopes.Verify(purchaseUserId.Value, verifyKey),
+            PaymentLockStrategy.WaitForRelease,
+            ct => HandleCoreAsync(request, ct),
+            cancellationToken);
+    }
+
+    private async Task<VerifyUserPackagePurchasePaymentResult> HandleCoreAsync(
+        VerifyUserPackagePurchasePaymentCommand request,
+        CancellationToken ct)
+    {
+        var purchase = await _context.UserPackagePurchases
+            .Include(p => p.Package)
+            .Where(p => p.Id == request.PurchaseId && !p.IsDeleted)
+            .FirstOrDefaultAsync(ct);
+
+        if (purchase == null)
+            throw new NotFoundException("سفارش یافت نشد");
+
+        var transaction = purchase.TransactionId.HasValue
+            ? await _context.Transactions
+                .FirstOrDefaultAsync(t => t.Id == purchase.TransactionId.Value, ct)
+            : null;
+
+        var paymentTx = !string.IsNullOrEmpty(request.Authority)
+            ? await _context.PaymentTransactions
+                .FirstOrDefaultAsync(pt => pt.Authority == request.Authority, ct)
+            : null;
+
+        if (IsPaymentAlreadyCompleted(transaction, paymentTx))
+        {
+            return BuildResult(purchase, transaction, paymentTx, alreadyPaid: true);
+        }
+
+        if (!string.Equals(request.Status, "OK", StringComparison.OrdinalIgnoreCase))
+        {
+            if (transaction != null && transaction.PaymentStatus != PaymentStatus.Success)
+            {
+                transaction.PaymentStatus = PaymentStatus.Reject;
+                await _context.SaveChangesAsync(ct);
+            }
+
+            return new VerifyUserPackagePurchasePaymentResult
+            {
+                Success = false,
+                Message = "پرداخت توسط کاربر لغو شد",
+                PackageId = purchase.PackageId,
+                PackageName = purchase.Package?.Title ?? string.Empty,
+                AmountPaid = purchase.Amount,
+                PurchasedAt = purchase.PurchasedAt
+            };
+        }
+
+        var amountInToman = paymentTx?.Amount ?? purchase.Amount;
+        var verifyResult = await _paymentGateway.VerifyPaymentAsync(
+            request.Authority, request.Status, (decimal)amountInToman, ct);
+
+        if (!verifyResult.IsSuccess)
+        {
+            if (paymentTx != null)
+            {
+                paymentTx.PaymentStatus = false;
+                paymentTx.VerificationStatusCode = verifyResult.VerificationCode;
+                paymentTx.VerificationStatusMessage = verifyResult.Message;
+            }
+
+            if (transaction != null)
+                transaction.PaymentStatus = PaymentStatus.Reject;
+
+            await _context.SaveChangesAsync(ct);
+
+            return new VerifyUserPackagePurchasePaymentResult
+            {
+                Success = false,
+                Message = verifyResult.Message ?? "خرید پکیج ناموفق بود",
+                TransactionId = transaction?.Id ?? 0,
+                PackageId = purchase.PackageId,
+                PackageName = purchase.Package?.Title ?? string.Empty,
+                AmountPaid = purchase.Amount,
+                PurchasedAt = purchase.PurchasedAt
+            };
+        }
+
+        await using var dbTx = await _context.Database.BeginTransactionAsync(IsolationLevel.Serializable, ct);
+        try
+        {
+            if (purchase.TransactionId.HasValue)
+            {
+                transaction = await _context.Transactions
+                    .FirstOrDefaultAsync(t => t.Id == purchase.TransactionId.Value, ct);
+            }
+
+            if (!string.IsNullOrEmpty(request.Authority))
+            {
+                paymentTx = await _context.PaymentTransactions
+                    .FirstOrDefaultAsync(pt => pt.Authority == request.Authority, ct);
+            }
+
+            if (IsPaymentAlreadyCompleted(transaction, paymentTx))
+            {
+                await dbTx.CommitAsync(ct);
+                return BuildResult(purchase, transaction, paymentTx, alreadyPaid: true);
+            }
+
+            if (transaction == null)
+                throw new InvalidOperationException("تراکنش سفارش یافت نشد");
+
+            var alreadyCredited = await _context.UserWalletHistories
+                .AnyAsync(h => h.RefrenceId == transaction.Id && !h.IsDeleted, ct);
+
+            if (alreadyCredited)
+            {
+                transaction.PaymentStatus = PaymentStatus.Success;
+                transaction.PaymentDate ??= DateTime.UtcNow;
+                UpdatePaymentTransaction(paymentTx, verifyResult, markSuccess: true);
+                await _context.SaveChangesAsync(ct);
+                await dbTx.CommitAsync(ct);
+                return BuildResult(purchase, transaction, paymentTx, alreadyPaid: true);
+            }
+
+            UpdatePaymentTransaction(paymentTx, verifyResult, markSuccess: true);
+
+            transaction.PaymentStatus = PaymentStatus.Success;
+            transaction.PaymentDate = DateTime.UtcNow;
+            transaction.RefId = verifyResult.RefId;
+
+            var wallet = await _context.UserWallets
+                .FirstOrDefaultAsync(w => w.UserId == purchase.UserId, ct);
+
+            if (wallet == null)
+            {
+                wallet = new UserWallet
+                {
+                    UserId = purchase.UserId,
+                    Balance = 0,
+                    DiscountBalance = 0,
+                    NetworkBalance = 0
+                };
+                _context.UserWallets.Add(wallet);
+                await _context.SaveChangesAsync(ct);
+            }
+
+            var discountMultiplier = purchase.Package?.DiscountMultiplier
+                ?? throw new InvalidOperationException("پکیج سفارش یافت نشد");
+            var discountAmount = (long)(purchase.Amount * (double)discountMultiplier);
+            wallet.Balance += purchase.Amount;
+            wallet.DiscountBalance += discountAmount;
+
+            _context.UserWalletHistories.Add(new UserWalletHistory
+            {
+                WalletId = wallet.Id,
+                CurrentBalance = wallet.Balance,
+                ChangeValue = purchase.Amount,
+                CurrentNetworkBalance = wallet.NetworkBalance,
+                ChangeNerworkValue = 0,
+                CurrentDiscountBalance = wallet.DiscountBalance,
+                ChangeDiscountValue = discountAmount,
+                IsIncrease = true,
+                RefrenceId = transaction.Id,
+                PackageId = purchase.PackageId
+            });
+
+            var user = await _context.Users
+                .FirstOrDefaultAsync(u => u.Id == purchase.UserId, ct);
+            if (user != null)
+                user.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;
+
+            await _context.SaveChangesAsync(ct);
+            await dbTx.CommitAsync(ct);
+        }
+        catch
+        {
+            await dbTx.RollbackAsync(ct);
+            throw;
+        }
+
+        try
+        {
+            await _sender.Send(new ActivateClubMembershipCommand
+            {
+                UserId = purchase.UserId,
+                ForceActivation = false
+            }, ct);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(
+                ex,
+                "Auto club activation failed after package verify. UserId={UserId}, PurchaseId={PurchaseId}",
+                purchase.UserId,
+                purchase.Id);
+        }
+
+        _logger.LogInformation(
+            "Package purchase verified. PurchaseId={PurchaseId}, UserId={UserId}, Authority={Authority}",
+            purchase.Id,
+            purchase.UserId,
+            request.Authority);
+
+        return BuildResult(
+            purchase, transaction, paymentTx, alreadyPaid: false, verifyResult.RefId);
+    }
+
+    private static bool IsPaymentAlreadyCompleted(Transaction? transaction, PaymentTransaction? paymentTx)
+    {
+        return transaction?.PaymentStatus == PaymentStatus.Success
+            || paymentTx?.PaymentStatus == true;
+    }
+
+    private static void UpdatePaymentTransaction(
+        PaymentTransaction? paymentTx,
+        PaymentVerificationResult verifyResult,
+        bool markSuccess)
+    {
+        if (paymentTx == null) return;
+
+        paymentTx.PaymentStatus = markSuccess && verifyResult.IsSuccess;
+        paymentTx.VerificationStatusCode = verifyResult.VerificationCode;
+        paymentTx.VerificationStatusMessage = verifyResult.Message;
+        paymentTx.CardPan = verifyResult.CardPan;
+        paymentTx.CardHash = verifyResult.CardHash;
+        paymentTx.RefId = verifyResult.TrackingCode;
+    }
+
+    private static VerifyUserPackagePurchasePaymentResult BuildResult(
+        UserPackagePurchase purchase,
+        Transaction? transaction,
+        PaymentTransaction? paymentTx,
+        bool alreadyPaid,
+        string? referenceCode = null)
+    {
+        var refCode = referenceCode
+            ?? paymentTx?.RefId
+            ?? transaction?.RefId
+            ?? string.Empty;
+
+        return new VerifyUserPackagePurchasePaymentResult
+        {
+            Success = true,
+            AlreadyPaid = alreadyPaid,
+            Message = alreadyPaid ? "پرداخت قبلاً تأیید شده بود" : "خرید پکیج با موفقیت تایید شد",
+            TransactionId = transaction?.Id ?? 0,
+            ReferenceCode = refCode,
+            PackageId = purchase.PackageId,
+            PackageName = purchase.Package?.Title ?? string.Empty,
+            AmountPaid = purchase.Amount,
+            PurchasedAt = purchase.PurchasedAt
+        };
+    }
+}

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetAllPaymentTransactionByFilter/GetAllPaymentTransactionByFilterQuery.cs

@@ -0,0 +1,46 @@
+namespace CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter;
+
+public record GetAllPaymentTransactionByFilterQuery : IRequest<GetAllPaymentTransactionByFilterResponseDto>
+{
+    public PaginationState? PaginationState { get; init; }
+    public string? SortBy { get; init; }
+    public GetAllPaymentTransactionByFilterFilter? Filter { get; init; }
+}
+
+public class GetAllPaymentTransactionByFilterFilter
+{
+    public long? UserId { get; set; }
+    public string? Mobile { get; set; }
+    public string? GatewayProvider { get; set; }
+    public bool? PaymentStatus { get; set; }
+    public string? Authority { get; set; }
+    public string? RefId { get; set; }
+    public string? OrderId { get; set; }
+    public DateTime? CreatedFrom { get; set; }
+    public DateTime? CreatedTo { get; set; }
+}
+
+public class GetAllPaymentTransactionByFilterResponseDto
+{
+    public MetaData MetaData { get; set; }
+    public List<GetAllPaymentTransactionByFilterResponseModel>? Models { get; set; }
+}
+
+public class GetAllPaymentTransactionByFilterResponseModel
+{
+    public long Id { get; set; }
+    public long? UserId { get; set; }
+    public string? Mobile { get; set; }
+    public string GatewayProvider { get; set; } = string.Empty;
+    public long Amount { get; set; }
+    public string? Authority { get; set; }
+    public bool PaymentStatus { get; set; }
+    public int? VerificationStatusCode { get; set; }
+    public string? VerificationStatusMessage { get; set; }
+    public string? RefId { get; set; }
+    public string? CardPan { get; set; }
+    public string? OrderId { get; set; }
+    public long? TransactionId { get; set; }
+    public string? Description { get; set; }
+    public DateTimeOffset Created { get; set; }
+}

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetAllPaymentTransactionByFilter/GetAllPaymentTransactionByFilterQueryHandler.cs

@@ -0,0 +1,48 @@
+namespace CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter;
+
+public class GetAllPaymentTransactionByFilterQueryHandler
+    : IRequestHandler<GetAllPaymentTransactionByFilterQuery, GetAllPaymentTransactionByFilterResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetAllPaymentTransactionByFilterQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAllPaymentTransactionByFilterResponseDto> Handle(
+        GetAllPaymentTransactionByFilterQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.PaymentTransactions
+            .AsNoTracking()
+            .ApplyPaymentTransactionFilter(request.Filter)
+            .ApplyOrder(sortBy: request.SortBy ?? "-Created");
+
+        return new GetAllPaymentTransactionByFilterResponseDto
+        {
+            MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllPaymentTransactionByFilterResponseModel
+                {
+                    Id = x.Id,
+                    UserId = x.UserId,
+                    Mobile = x.Mobile,
+                    GatewayProvider = x.GatewayProvider,
+                    Amount = x.Amount,
+                    Authority = x.Authority,
+                    PaymentStatus = x.PaymentStatus,
+                    VerificationStatusCode = x.VerificationStatusCode,
+                    VerificationStatusMessage = x.VerificationStatusMessage,
+                    RefId = x.RefId,
+                    CardPan = x.CardPan,
+                    OrderId = x.OrderId,
+                    TransactionId = x.TransactionId,
+                    Description = x.Description,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
+        };
+    }
+}

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetAllPaymentTransactionByFilter/PaymentTransactionFilterExtensions.cs

@@ -0,0 +1,42 @@
+using CMSMicroservice.Domain.Entities.Payment;
+
+namespace CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter;
+
+public static class PaymentTransactionFilterExtensions
+{
+    public static IQueryable<PaymentTransaction> ApplyPaymentTransactionFilter(
+        this IQueryable<PaymentTransaction> query,
+        GetAllPaymentTransactionByFilterFilter? filter)
+    {
+        if (filter == null) return query;
+
+        if (filter.UserId.HasValue)
+            query = query.Where(x => x.UserId == filter.UserId.Value);
+
+        if (!string.IsNullOrWhiteSpace(filter.Mobile))
+            query = query.Where(x => x.Mobile != null && x.Mobile.Contains(filter.Mobile));
+
+        if (!string.IsNullOrWhiteSpace(filter.GatewayProvider))
+            query = query.Where(x => x.GatewayProvider == filter.GatewayProvider);
+
+        if (filter.PaymentStatus.HasValue)
+            query = query.Where(x => x.PaymentStatus == filter.PaymentStatus.Value);
+
+        if (!string.IsNullOrWhiteSpace(filter.Authority))
+            query = query.Where(x => x.Authority != null && x.Authority.Contains(filter.Authority));
+
+        if (!string.IsNullOrWhiteSpace(filter.RefId))
+            query = query.Where(x => x.RefId != null && x.RefId.Contains(filter.RefId));
+
+        if (!string.IsNullOrWhiteSpace(filter.OrderId))
+            query = query.Where(x => x.OrderId != null && x.OrderId.Contains(filter.OrderId));
+
+        if (filter.CreatedFrom.HasValue)
+            query = query.Where(x => x.Created >= filter.CreatedFrom.Value);
+
+        if (filter.CreatedTo.HasValue)
+            query = query.Where(x => x.Created <= filter.CreatedTo.Value);
+
+        return query;
+    }
+}

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetPaymentTransactionSummary/GetPaymentTransactionSummaryQuery.cs

@@ -0,0 +1,14 @@
+namespace CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetPaymentTransactionSummary;
+
+public record GetPaymentTransactionSummaryQuery : IRequest<GetPaymentTransactionSummaryResponseDto>
+{
+    public GetAllPaymentTransactionByFilter.GetAllPaymentTransactionByFilterFilter? Filter { get; init; }
+}
+
+public class GetPaymentTransactionSummaryResponseDto
+{
+    public long TotalCount { get; set; }
+    public long TotalAmount { get; set; }
+    public long SuccessfulCount { get; set; }
+    public long PendingCount { get; set; }
+}

src/CMSMicroservice.Application/PaymentTransactionCQ/Queries/GetPaymentTransactionSummary/GetPaymentTransactionSummaryQueryHandler.cs

@@ -0,0 +1,36 @@
+using CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetAllPaymentTransactionByFilter;
+
+namespace CMSMicroservice.Application.PaymentTransactionCQ.Queries.GetPaymentTransactionSummary;
+
+public class GetPaymentTransactionSummaryQueryHandler
+    : IRequestHandler<GetPaymentTransactionSummaryQuery, GetPaymentTransactionSummaryResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetPaymentTransactionSummaryQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetPaymentTransactionSummaryResponseDto> Handle(
+        GetPaymentTransactionSummaryQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.PaymentTransactions
+            .AsNoTracking()
+            .ApplyPaymentTransactionFilter(request.Filter);
+
+        var totalCount = await query.LongCountAsync(cancellationToken);
+        var totalAmount = totalCount > 0 ? await query.SumAsync(x => x.Amount, cancellationToken) : 0;
+        var successfulCount = await query.LongCountAsync(x => x.PaymentStatus, cancellationToken);
+        var pendingCount = await query.LongCountAsync(x => !x.PaymentStatus, cancellationToken);
+
+        return new GetPaymentTransactionSummaryResponseDto
+        {
+            TotalCount = totalCount,
+            TotalAmount = totalAmount,
+            SuccessfulCount = successfulCount,
+            PendingCount = pendingCount
+        };
+    }
+}

src/CMSMicroservice.Application/ProductsCQ/Queries/GetCustomerProductsByFilter/GetCustomerProductsByFilterQuery.cs

@@ -21,6 +21,10 @@ public class GetCustomerProductsByFilterQuery : IRequest<GetCustomerProductsByFi
     public int? SaleCount { get; set; }
     public int? ViewCount { get; set; }
     public int? RemainingCount { get; set; }
+    /// <summary>
+    /// true = فقط موجود (RemainingCount &gt; 0)، false = فقط ناموجود
+    /// </summary>
+    public bool? InStock { get; set; }
     public bool? IsActive { get; set; }
     public List<long>? CategoryIds { get; set; }
 }

src/CMSMicroservice.Application/ProductsCQ/Queries/GetCustomerProductsByFilter/GetCustomerProductsByFilterQueryHandler.cs

@@ -56,17 +56,19 @@ public class GetCustomerProductsByFilterQueryHandler : IRequestHandler<GetCustom
         if (request.RemainingCount.HasValue)
             query = query.Where(x => x.RemainingCount == request.RemainingCount.Value);
 
+        if (request.InStock == true)
+            query = query.Where(x => x.RemainingCount > 0);
+        else if (request.InStock == false)
+            query = query.Where(x => x.RemainingCount <= 0);
+
         if (request.CategoryIds != null && request.CategoryIds.Any())
             query = query.Where(x => x.ProductCategories.Any(pc => request.CategoryIds.Contains(pc.CategoryId)));
 
         if (request.IsActive.HasValue)
             query = query.Where(x => x.IsDeleted != request.IsActive.Value);
 
-        // Apply sorting
+        // موجودی‌دارها اول، سپس سورت درخواستی
-        if (!string.IsNullOrEmpty(request.SortBy))
+        query = query.ApplyOrderWithInStockPriority(request.SortBy, x => x.RemainingCount > 0);
-            query = query.ApplyOrder(request.SortBy);
-        else
-            query = query.OrderByDescending(x => x.Created);
 
         // Pagination
         var totalCount = await query.CountAsync(cancellationToken);

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs

@@ -26,4 +26,8 @@ public record GetAllTransactionsByFilterQuery : IRequest<GetAllTransactionsByFil
     public string? RefId { get; set; }
     // 
     public TransactionType? Type { get; set; }
+    public DateTime? CreatedFrom { get; set; }
+    public DateTime? CreatedTo { get; set; }
+    public DateTime? PaymentDateFrom { get; set; }
+    public DateTime? PaymentDateTo { get; set; }
 }

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQueryHandler.cs

@@ -1,4 +1,5 @@
 namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
+
 public class GetAllTransactionsByFilterQueryHandler : IRequestHandler<GetAllTransactionsByFilterQuery, GetAllTransactionsByFilterResponseDto>
 {
     private readonly IApplicationDbContext _context;
@@ -11,26 +12,27 @@ public class GetAllTransactionsByFilterQueryHandler : IRequestHandler<GetAllTran
     public async Task<GetAllTransactionsByFilterResponseDto> Handle(GetAllTransactionsByFilterQuery request, CancellationToken cancellationToken)
     {
         var query = _context.Transactions
-            .ApplyOrder(sortBy: request.SortBy)
             .AsNoTracking()
-            .AsQueryable();
+            .ApplyTransactionFilter(request.Filter)
-        if (request.Filter is not null)
+            .ApplyOrder(sortBy: request.SortBy ?? "-Created");
-        {
+
-            query = query
-                .Where(x => request.Filter.Id == null || x.Id == request.Filter.Id)
-                .Where(x => request.Filter.Amount == null || x.Amount == request.Filter.Amount)
-                .Where(x => request.Filter.Description == null || x.Description.Contains(request.Filter.Description))
-                .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus== request.Filter.PaymentStatus)
-                .Where(x => request.Filter.PaymentDate == null || x.PaymentDate == request.Filter.PaymentDate)
-                .Where(x => request.Filter.RefId == null || x.RefId.Contains(request.Filter.RefId))
-                .Where(x => request.Filter.Type == null || x.Type == request.Filter.Type)
-;
-        }
         return new GetAllTransactionsByFilterResponseDto
         {
             MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
-            Models = await query.PaginatedListAsync(paginationState: request.PaginationState)
+            Models = await query
-                .ProjectToType<GetAllTransactionsByFilterResponseModel>().ToListAsync(cancellationToken)
+                .PaginatedListAsync(paginationState: request.PaginationState)
-        };        
+                .Select(x => new GetAllTransactionsByFilterResponseModel
+                {
+                    Id = x.Id,
+                    Amount = x.Amount,
+                    Description = x.Description,
+                    PaymentStatus = x.PaymentStatus,
+                    PaymentDate = x.PaymentDate,
+                    RefId = x.RefId,
+                    Type = x.Type,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
+        };
     }
 }

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs

@@ -24,4 +24,5 @@ public class GetAllTransactionsByFilterResponseDto
     public string? RefId { get; set; }
     // 
     public TransactionType Type { get; set; }
+    public DateTime Created { get; set; }
 }

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/TransactionFilterExtensions.cs

@@ -0,0 +1,48 @@
+using CMSMicroservice.Domain.Entities;
+
+namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
+
+public static class TransactionFilterExtensions
+{
+    public static IQueryable<Transaction> ApplyTransactionFilter(
+        this IQueryable<Transaction> query,
+        GetAllTransactionsByFilterFilter? filter)
+    {
+        if (filter == null) return query;
+
+        if (filter.Id.HasValue)
+            query = query.Where(x => x.Id == filter.Id.Value);
+
+        if (filter.Amount.HasValue)
+            query = query.Where(x => x.Amount == filter.Amount.Value);
+
+        if (!string.IsNullOrWhiteSpace(filter.Description))
+            query = query.Where(x => x.Description.Contains(filter.Description));
+
+        if (filter.PaymentStatus.HasValue)
+            query = query.Where(x => x.PaymentStatus == filter.PaymentStatus.Value);
+
+        if (filter.PaymentDate.HasValue)
+            query = query.Where(x => x.PaymentDate == filter.PaymentDate.Value);
+
+        if (!string.IsNullOrWhiteSpace(filter.RefId))
+            query = query.Where(x => x.RefId != null && x.RefId.Contains(filter.RefId));
+
+        if (filter.Type.HasValue)
+            query = query.Where(x => x.Type == filter.Type.Value);
+
+        if (filter.CreatedFrom.HasValue)
+            query = query.Where(x => x.Created >= filter.CreatedFrom.Value);
+
+        if (filter.CreatedTo.HasValue)
+            query = query.Where(x => x.Created <= filter.CreatedTo.Value);
+
+        if (filter.PaymentDateFrom.HasValue)
+            query = query.Where(x => x.PaymentDate >= filter.PaymentDateFrom.Value);
+
+        if (filter.PaymentDateTo.HasValue)
+            query = query.Where(x => x.PaymentDate <= filter.PaymentDateTo.Value);
+
+        return query;
+    }
+}

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactionSummary/GetTransactionSummaryQuery.cs

@@ -0,0 +1,17 @@
+using CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
+
+namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetTransactionSummary;
+
+public record GetTransactionSummaryQuery : IRequest<GetTransactionSummaryResponseDto>
+{
+    public GetAllTransactionsByFilterFilter? Filter { get; init; }
+}
+
+public class GetTransactionSummaryResponseDto
+{
+    public long TotalCount { get; set; }
+    public long TotalAmount { get; set; }
+    public long SuccessCount { get; set; }
+    public long PendingCount { get; set; }
+    public long RejectCount { get; set; }
+}

src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactionSummary/GetTransactionSummaryQueryHandler.cs

@@ -0,0 +1,39 @@
+using CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetTransactionSummary;
+
+public class GetTransactionSummaryQueryHandler
+    : IRequestHandler<GetTransactionSummaryQuery, GetTransactionSummaryResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetTransactionSummaryQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetTransactionSummaryResponseDto> Handle(
+        GetTransactionSummaryQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.Transactions
+            .AsNoTracking()
+            .ApplyTransactionFilter(request.Filter);
+
+        var totalCount = await query.LongCountAsync(cancellationToken);
+        var totalAmount = totalCount > 0 ? await query.SumAsync(x => x.Amount, cancellationToken) : 0;
+        var successCount = await query.LongCountAsync(x => x.PaymentStatus == PaymentStatus.Success, cancellationToken);
+        var pendingCount = await query.LongCountAsync(x => x.PaymentStatus == PaymentStatus.Pending, cancellationToken);
+        var rejectCount = await query.LongCountAsync(x => x.PaymentStatus == PaymentStatus.Reject, cancellationToken);
+
+        return new GetTransactionSummaryResponseDto
+        {
+            TotalCount = totalCount,
+            TotalAmount = totalAmount,
+            SuccessCount = successCount,
+            PendingCount = pendingCount,
+            RejectCount = rejectCount
+        };
+    }
+}

src/CMSMicroservice.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQueryHandler.cs

@@ -17,7 +17,7 @@ public class GetAllUserByFilterQueryHandler : IRequestHandler<GetAllUserByFilter
         if (request.Filter is not null)
         {
             query = query
-                .Where(x => request.Filter.SearchText == null || 
+                .Where(x => request.Filter.SearchText == null ||
                             x.FirstName.Contains(request.Filter.SearchText) ||
                             x.LastName.Contains(request.Filter.SearchText) ||
                             x.Mobile.Contains(request.Filter.SearchText) ||
@@ -34,14 +34,39 @@ public class GetAllUserByFilterQueryHandler : IRequestHandler<GetAllUserByFilter
                 .Where(x => request.Filter.SmsNotifications == null || x.SmsNotifications == request.Filter.SmsNotifications)
                 .Where(x => request.Filter.EmailNotifications == null || x.EmailNotifications == request.Filter.EmailNotifications)
                 .Where(x => request.Filter.PushNotifications == null || x.PushNotifications == request.Filter.PushNotifications)
-                .Where(x => request.Filter.BirthDate == null || x.BirthDate == request.Filter.BirthDate)
+                .Where(x => request.Filter.BirthDate == null || x.BirthDate == request.Filter.BirthDate);
-;
         }
+
         return new GetAllUserByFilterResponseDto
         {
             MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
             Models = await query.PaginatedListAsync(paginationState: request.PaginationState)
-                .ProjectToType<GetAllUserByFilterResponseModel>().ToListAsync(cancellationToken)
+                .Select(x => new GetAllUserByFilterResponseModel
-        };        
+                {
+                    Id = x.Id,
+                    FirstName = x.FirstName,
+                    LastName = x.LastName,
+                    Mobile = x.Mobile,
+                    NationalCode = x.NationalCode,
+                    AvatarPath = x.AvatarPath,
+                    NetworkParentId = x.NetworkParentId,
+                    ReferralCode = x.ReferralCode,
+                    IsMobileVerified = x.IsMobileVerified,
+                    MobileVerifiedAt = x.MobileVerifiedAt,
+                    EmailNotifications = x.EmailNotifications,
+                    SmsNotifications = x.SmsNotifications,
+                    PushNotifications = x.PushNotifications,
+                    BirthDate = x.BirthDate,
+                    DefaultAddress = x.UserAddresses
+                        .Where(a => a.IsDefault && !a.IsDeleted)
+                        .Select(a => a.Address)
+                        .FirstOrDefault() ?? string.Empty,
+                    DefaultPostalCode = x.UserAddresses
+                        .Where(a => a.IsDefault && !a.IsDeleted)
+                        .Select(a => a.PostalCode)
+                        .FirstOrDefault() ?? string.Empty
+                })
+                .ToListAsync(cancellationToken)
+        };
     }
 }

src/CMSMicroservice.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterResponseDto.cs

@@ -36,4 +36,8 @@ public class GetAllUserByFilterResponseDto
     public bool PushNotifications { get; set; }
     //تاریخ تولد 
     public DateTime? BirthDate { get; set; }
+    //آدرس پیش‌فرض
+    public string DefaultAddress { get; set; } = string.Empty;
+    //کدپستی پیش‌فرض
+    public string DefaultPostalCode { get; set; } = string.Empty;
 }

src/CMSMicroservice.Application/UserOrderCQ/Queries/GetCustomerOrder/GetCustomerOrderQueryHandler.cs

@@ -1,3 +1,4 @@
+using CMSMicroservice.Application.Common;
 using CMSMicroservice.Application.Common.Exceptions;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Domain.Entities;
@@ -50,8 +51,10 @@ public class GetCustomerOrderQueryHandler : IRequestHandler<GetCustomerOrderQuer
             DeliveryStatus = order.DeliveryStatus,
             TrackingCode = order.TrackingCode ?? "",
             DeliveryDescription = order.DeliveryDescription ?? "",
-            UserFullName = $"{order.User?.FirstName ?? ""} {order.User?.LastName ?? ""}".Trim(),
+            UserFullName = UserDisplayName.From(order.User),
             UserNationalCode = order.User?.NationalCode ?? "",
+            PostalCode = order.UserAddress?.PostalCode ?? "",
+            UserMobile = order.User?.Mobile ?? "",
             VatAmount = order.OrderVAT?.VATAmount ?? 0,
             VatPercentage = order.OrderVAT != null ? (double)order.OrderVAT.VATRate * 100 : 0,
             FactorDetails = order.FactorDetails?.Select(fd => new FactorDetailDto

src/CMSMicroservice.Application/UserOrderCQ/Queries/GetCustomerOrder/GetCustomerOrderResponseDto.cs

@@ -20,6 +20,8 @@ public class GetCustomerOrderResponseDto
     public string DeliveryDescription { get; set; }
     public string UserFullName { get; set; }
     public string UserNationalCode { get; set; }
+    public string PostalCode { get; set; } = string.Empty;
+    public string UserMobile { get; set; } = string.Empty;
     public long VatAmount { get; set; }
     public double VatPercentage { get; set; }
 }

src/CMSMicroservice.Application/UserOrderCQ/Queries/GetCustomerOrderHistory/GetCustomerOrderHistoryQueryHandler.cs

@@ -113,6 +113,7 @@ public class GetCustomerOrderHistoryQueryHandler : IRequestHandler<GetCustomerOr
             DeliveryStatus.Delivered => 4,
             DeliveryStatus.Cancelled => 5,
             DeliveryStatus.Returned => 6,
+            DeliveryStatus.ReadyForOfficePickup => 7,
             _ => 0
         };
     }
@@ -127,6 +128,7 @@ public class GetCustomerOrderHistoryQueryHandler : IRequestHandler<GetCustomerOr
             DeliveryStatus.Delivered => "تحویل داده شد",
             DeliveryStatus.Cancelled => "لغو شده",
             DeliveryStatus.Returned => "مرجوع شده",
+            DeliveryStatus.ReadyForOfficePickup => "آماده تحویل در دفتر",
             _ => "نامشخص"
         };
     }

src/CMSMicroservice.Application/UserOrderCQ/Queries/GetCustomerOrders/GetCustomerOrdersQueryHandler.cs

@@ -1,3 +1,4 @@
+using CMSMicroservice.Application.Common;
 using CMSMicroservice.Application.Common.Extensions;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.Common.Models;
@@ -72,7 +73,7 @@ public class GetCustomerOrdersQueryHandler : IRequestHandler<GetCustomerOrdersQu
             DeliveryStatus = order.DeliveryStatus,
             TrackingCode = order.TrackingCode ?? "",
             DeliveryDescription = order.DeliveryDescription ?? "",
-            UserFullName = $"{order.User?.FirstName ?? ""} {order.User?.LastName ?? ""}".Trim(),
+            UserFullName = UserDisplayName.From(order.User),
             UserNationalCode = order.User?.NationalCode ?? "",
             VatAmount = order.OrderVAT?.VATAmount ?? 0,
             VatPercentage = order.OrderVAT != null ? (double)order.OrderVAT.VATRate * 100 : 0,

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetAllUserPackagePurchaseByFilter/GetAllUserPackagePurchaseByFilterQuery.cs

@@ -0,0 +1,43 @@
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter;
+
+public record GetAllUserPackagePurchaseByFilterQuery : IRequest<GetAllUserPackagePurchaseByFilterResponseDto>
+{
+    public PaginationState? PaginationState { get; init; }
+    public string? SortBy { get; init; }
+    public GetAllUserPackagePurchaseByFilterFilter? Filter { get; init; }
+}
+
+public class GetAllUserPackagePurchaseByFilterFilter
+{
+    public long? UserId { get; set; }
+    public long? PackageId { get; set; }
+    public PackagePurchaseMethod? PurchaseMethod { get; set; }
+    public DateTime? PurchasedFrom { get; set; }
+    public DateTime? PurchasedTo { get; set; }
+    public long? MinAmount { get; set; }
+    public long? MaxAmount { get; set; }
+}
+
+public class GetAllUserPackagePurchaseByFilterResponseDto
+{
+    public MetaData MetaData { get; set; }
+    public List<GetAllUserPackagePurchaseByFilterResponseModel>? Models { get; set; }
+}
+
+public class GetAllUserPackagePurchaseByFilterResponseModel
+{
+    public long Id { get; set; }
+    public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
+    public string UserMobile { get; set; } = string.Empty;
+    public long PackageId { get; set; }
+    public string PackageName { get; set; } = string.Empty;
+    public PackagePurchaseMethod PurchaseMethod { get; set; }
+    public DateTime PurchasedAt { get; set; }
+    public long Amount { get; set; }
+    public long? OrderId { get; set; }
+    public long? TransactionId { get; set; }
+    public DateTimeOffset Created { get; set; }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetAllUserPackagePurchaseByFilter/GetAllUserPackagePurchaseByFilterQueryHandler.cs

@@ -0,0 +1,47 @@
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter;
+
+public class GetAllUserPackagePurchaseByFilterQueryHandler
+    : IRequestHandler<GetAllUserPackagePurchaseByFilterQuery, GetAllUserPackagePurchaseByFilterResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetAllUserPackagePurchaseByFilterQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetAllUserPackagePurchaseByFilterResponseDto> Handle(
+        GetAllUserPackagePurchaseByFilterQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.UserPackagePurchases
+            .Include(x => x.User)
+            .Include(x => x.Package)
+            .AsNoTracking()
+            .ApplyUserPackagePurchaseFilter(request.Filter)
+            .ApplyOrder(sortBy: request.SortBy ?? "-PurchasedAt");
+
+        return new GetAllUserPackagePurchaseByFilterResponseDto
+        {
+            MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .Select(x => new GetAllUserPackagePurchaseByFilterResponseModel
+                {
+                    Id = x.Id,
+                    UserId = x.UserId,
+                    UserName = x.User != null ? $"{x.User.FirstName} {x.User.LastName}" : string.Empty,
+                    UserMobile = x.User != null ? x.User.Mobile : string.Empty,
+                    PackageId = x.PackageId,
+                    PackageName = x.Package != null ? x.Package.Title : string.Empty,
+                    PurchaseMethod = x.PurchaseMethod,
+                    PurchasedAt = x.PurchasedAt,
+                    Amount = x.Amount,
+                    OrderId = x.OrderId,
+                    TransactionId = x.TransactionId,
+                    Created = x.Created
+                })
+                .ToListAsync(cancellationToken)
+        };
+    }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetAllUserPackagePurchaseByFilter/UserPackagePurchaseFilterExtensions.cs

@@ -0,0 +1,36 @@
+using CMSMicroservice.Domain.Entities;
+
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter;
+
+public static class UserPackagePurchaseFilterExtensions
+{
+    public static IQueryable<UserPackagePurchase> ApplyUserPackagePurchaseFilter(
+        this IQueryable<UserPackagePurchase> query,
+        GetAllUserPackagePurchaseByFilterFilter? filter)
+    {
+        if (filter == null) return query;
+
+        if (filter.UserId.HasValue)
+            query = query.Where(x => x.UserId == filter.UserId.Value);
+
+        if (filter.PackageId.HasValue)
+            query = query.Where(x => x.PackageId == filter.PackageId.Value);
+
+        if (filter.PurchaseMethod.HasValue)
+            query = query.Where(x => x.PurchaseMethod == filter.PurchaseMethod.Value);
+
+        if (filter.PurchasedFrom.HasValue)
+            query = query.Where(x => x.PurchasedAt >= filter.PurchasedFrom.Value);
+
+        if (filter.PurchasedTo.HasValue)
+            query = query.Where(x => x.PurchasedAt <= filter.PurchasedTo.Value);
+
+        if (filter.MinAmount.HasValue)
+            query = query.Where(x => x.Amount >= filter.MinAmount.Value);
+
+        if (filter.MaxAmount.HasValue)
+            query = query.Where(x => x.Amount <= filter.MaxAmount.Value);
+
+        return query;
+    }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetCustomerPackagePurchaseRollup/GetCustomerPackagePurchaseRollupQuery.cs

@@ -0,0 +1,51 @@
+using CMSMicroservice.Domain.Enums;
+
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetCustomerPackagePurchaseRollup;
+
+public record GetCustomerPackagePurchaseRollupQuery : IRequest<GetCustomerPackagePurchaseRollupResponseDto>
+{
+    public PaginationState? PaginationState { get; init; }
+    public GetCustomerPackagePurchaseRollupFilter? Filter { get; init; }
+}
+
+public class GetCustomerPackagePurchaseRollupFilter
+{
+    public long? UserId { get; set; }
+    public PackagePurchaseMethod? PurchaseMethod { get; set; }
+    public DateTime? PurchasedFrom { get; set; }
+    public DateTime? PurchasedTo { get; set; }
+}
+
+public class GetCustomerPackagePurchaseRollupResponseDto
+{
+    public MetaData MetaData { get; set; } = new();
+    public List<CustomerPackagePurchaseRollupModel> Models { get; set; } = new();
+}
+
+public class CustomerPackagePurchaseRollupModel
+{
+    public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
+    public string UserMobile { get; set; } = string.Empty;
+
+    public long FirstPackageId { get; set; }
+    public string FirstPackageName { get; set; } = string.Empty;
+    public long FirstAmount { get; set; }
+    public DateTime FirstPurchasedAt { get; set; }
+
+    public long LastPackageId { get; set; }
+    public string LastPackageName { get; set; } = string.Empty;
+    public long LastAmount { get; set; }
+    public DateTime LastPurchasedAt { get; set; }
+    public PackagePurchaseMethod LastPurchaseMethod { get; set; }
+
+    public int PurchaseCount { get; set; }
+    public long TotalAmount { get; set; }
+
+    public int DayaCount { get; set; }
+    public long DayaAmount { get; set; }
+    public int ManualCount { get; set; }
+    public long ManualAmount { get; set; }
+    public int GatewayCount { get; set; }
+    public long GatewayAmount { get; set; }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetCustomerPackagePurchaseRollup/GetCustomerPackagePurchaseRollupQueryHandler.cs

@@ -0,0 +1,136 @@
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Application.Common.Models;
+using CMSMicroservice.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetCustomerPackagePurchaseRollup;
+
+public class GetCustomerPackagePurchaseRollupQueryHandler
+    : IRequestHandler<GetCustomerPackagePurchaseRollupQuery, GetCustomerPackagePurchaseRollupResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetCustomerPackagePurchaseRollupQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetCustomerPackagePurchaseRollupResponseDto> Handle(
+        GetCustomerPackagePurchaseRollupQuery request,
+        CancellationToken cancellationToken)
+    {
+        var filter = request.Filter;
+        var pagination = request.PaginationState ?? new PaginationState { PageNumber = 1, PageSize = 20 };
+        if (pagination.PageNumber < 1) pagination.PageNumber = 1;
+        // PageSize == 0 → خروجی کامل (بدون صفحه‌بندی)، مثلاً Excel
+        var exportAll = pagination.PageSize == 0;
+        if (!exportAll && pagination.PageSize < 1) pagination.PageSize = 20;
+
+        // خرید معتبر: بدون تراکنش یا تراکنش موفق
+        var purchases = _context.UserPackagePurchases
+            .AsNoTracking()
+            .Include(x => x.User)
+            .Include(x => x.Package)
+            .Include(x => x.Transaction)
+            .Where(x => x.TransactionId == null
+                        || (x.Transaction != null && x.Transaction.PaymentStatus == PaymentStatus.Success));
+
+        if (filter?.UserId is > 0)
+            purchases = purchases.Where(x => x.UserId == filter.UserId.Value);
+
+        if (filter?.PurchaseMethod != null)
+            purchases = purchases.Where(x => x.PurchaseMethod == filter.PurchaseMethod.Value);
+
+        if (filter?.PurchasedFrom != null)
+            purchases = purchases.Where(x => x.PurchasedAt >= filter.PurchasedFrom.Value);
+
+        if (filter?.PurchasedTo != null)
+            purchases = purchases.Where(x => x.PurchasedAt <= filter.PurchasedTo.Value);
+
+        var rows = await purchases
+            .Select(x => new
+            {
+                x.UserId,
+                FirstName = x.User != null ? x.User.FirstName : null,
+                LastName = x.User != null ? x.User.LastName : null,
+                Mobile = x.User != null ? x.User.Mobile : null,
+                x.PackageId,
+                PackageName = x.Package != null ? x.Package.Title : null,
+                x.Amount,
+                x.PurchasedAt,
+                x.PurchaseMethod
+            })
+            .ToListAsync(cancellationToken);
+
+        var grouped = rows
+            .GroupBy(x => x.UserId)
+            .Select(g =>
+            {
+                var ordered = g.OrderBy(x => x.PurchasedAt).ThenBy(x => x.PackageId).ToList();
+                var first = ordered.First();
+                var last = ordered.Last();
+                var userName = string.Join(" ",
+                    new[] { first.FirstName, first.LastName }.Where(s => !string.IsNullOrWhiteSpace(s))).Trim();
+
+                return new CustomerPackagePurchaseRollupModel
+                {
+                    UserId = g.Key,
+                    UserName = string.IsNullOrWhiteSpace(userName)
+                        ? (!string.IsNullOrWhiteSpace(first.Mobile) ? first.Mobile! : $"کاربر {g.Key}")
+                        : userName,
+                    UserMobile = first.Mobile ?? string.Empty,
+
+                    FirstPackageId = first.PackageId,
+                    FirstPackageName = first.PackageName ?? string.Empty,
+                    FirstAmount = first.Amount,
+                    FirstPurchasedAt = first.PurchasedAt,
+
+                    LastPackageId = last.PackageId,
+                    LastPackageName = last.PackageName ?? string.Empty,
+                    LastAmount = last.Amount,
+                    LastPurchasedAt = last.PurchasedAt,
+                    LastPurchaseMethod = last.PurchaseMethod,
+
+                    PurchaseCount = ordered.Count,
+                    TotalAmount = ordered.Sum(x => x.Amount),
+
+                    DayaCount = ordered.Count(x => x.PurchaseMethod == PackagePurchaseMethod.DayaLoan),
+                    DayaAmount = ordered.Where(x => x.PurchaseMethod == PackagePurchaseMethod.DayaLoan).Sum(x => x.Amount),
+                    ManualCount = ordered.Count(x => x.PurchaseMethod == PackagePurchaseMethod.Manual),
+                    ManualAmount = ordered.Where(x => x.PurchaseMethod == PackagePurchaseMethod.Manual).Sum(x => x.Amount),
+                    GatewayCount = ordered.Count(x => x.PurchaseMethod == PackagePurchaseMethod.DirectPurchase),
+                    GatewayAmount = ordered.Where(x => x.PurchaseMethod == PackagePurchaseMethod.DirectPurchase).Sum(x => x.Amount)
+                };
+            })
+            .OrderByDescending(x => x.LastPurchasedAt)
+            .ToList();
+
+        var totalCount = grouped.Count;
+        var pageNumber = exportAll ? 1 : pagination.PageNumber;
+        var pageSize = exportAll ? totalCount : pagination.PageSize;
+        var totalPage = exportAll || pageSize <= 0
+            ? (totalCount > 0 ? 1 : 0)
+            : (int)Math.Ceiling(totalCount / (double)pageSize);
+
+        var pageModels = exportAll
+            ? grouped
+            : grouped
+                .Skip((pageNumber - 1) * pageSize)
+                .Take(pageSize)
+                .ToList();
+
+        return new GetCustomerPackagePurchaseRollupResponseDto
+        {
+            MetaData = new MetaData
+            {
+                CurrentPage = pageNumber,
+                PageSize = pageSize,
+                TotalCount = totalCount,
+                TotalPage = totalPage,
+                HasPrevious = !exportAll && pageNumber > 1,
+                HasNext = !exportAll && pageNumber < totalPage
+            },
+            Models = pageModels
+        };
+    }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetUserPackagePurchaseSummary/GetUserPackagePurchaseSummaryQuery.cs

@@ -0,0 +1,12 @@
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetUserPackagePurchaseSummary;
+
+public record GetUserPackagePurchaseSummaryQuery : IRequest<GetUserPackagePurchaseSummaryResponseDto>
+{
+    public GetAllUserPackagePurchaseByFilter.GetAllUserPackagePurchaseByFilterFilter? Filter { get; init; }
+}
+
+public class GetUserPackagePurchaseSummaryResponseDto
+{
+    public long TotalCount { get; set; }
+    public long TotalAmount { get; set; }
+}

src/CMSMicroservice.Application/UserPackagePurchaseCQ/Queries/GetUserPackagePurchaseSummary/GetUserPackagePurchaseSummaryQueryHandler.cs

@@ -0,0 +1,32 @@
+using CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetAllUserPackagePurchaseByFilter;
+
+namespace CMSMicroservice.Application.UserPackagePurchaseCQ.Queries.GetUserPackagePurchaseSummary;
+
+public class GetUserPackagePurchaseSummaryQueryHandler
+    : IRequestHandler<GetUserPackagePurchaseSummaryQuery, GetUserPackagePurchaseSummaryResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetUserPackagePurchaseSummaryQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetUserPackagePurchaseSummaryResponseDto> Handle(
+        GetUserPackagePurchaseSummaryQuery request,
+        CancellationToken cancellationToken)
+    {
+        var query = _context.UserPackagePurchases
+            .AsNoTracking()
+            .ApplyUserPackagePurchaseFilter(request.Filter);
+
+        var totalCount = await query.LongCountAsync(cancellationToken);
+        var totalAmount = totalCount > 0 ? await query.SumAsync(x => x.Amount, cancellationToken) : 0;
+
+        return new GetUserPackagePurchaseSummaryResponseDto
+        {
+            TotalCount = totalCount,
+            TotalAmount = totalAmount
+        };
+    }
+}

src/CMSMicroservice.Application/UserWalletHistoryCQ/Queries/GetAllUserWalletHistoryByFilter/GetAllUserWalletHistoryByFilterResponseDto.cs

@@ -20,6 +20,10 @@ public class GetAllUserWalletHistoryByFilterResponseDto
     public long CurrentNetworkBalance { get; set; }
     //تغییر موجودی شبکه 
     public long ChangeNerworkValue { get; set; }
+    //موجودی جاری اعتباری
+    public long CurrentDiscountBalance { get; set; }
+    //تغییر موجودی اعتباری
+    public long ChangeDiscountValue { get; set; }
     //افزایشی؟ 
     public bool IsIncrease { get; set; }
     //شناسه ارجاع 

src/CMSMicroservice.Application/UserWalletHistoryCQ/Queries/GetUserWalletHistory/GetUserWalletHistoryResponseDto.cs

@@ -13,6 +13,10 @@ public class GetUserWalletHistoryResponseDto
     public long CurrentNetworkBalance { get; set; }
     //تغییر موجودی شبکه 
     public long ChangeNerworkValue { get; set; }
+    //موجودی جاری اعتباری
+    public long CurrentDiscountBalance { get; set; }
+    //تغییر موجودی اعتباری
+    public long ChangeDiscountValue { get; set; }
     //افزایشی؟ 
     public bool IsIncrease { get; set; }
     //شناسه ارجاع 

src/CMSMicroservice.Application/WalletCQ/Commands/AdminManualCreditCharge/AdminManualCreditChargeCommand.cs

@@ -0,0 +1,19 @@
+using MediatR;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.AdminManualCreditCharge;
+
+public class AdminManualCreditChargeCommand : IRequest<AdminManualCreditChargeResult>
+{
+    public long UserId { get; set; }
+    public long Amount { get; set; }
+    public string? Note { get; set; }
+    public string? PerformedByAdminId { get; set; }
+}
+
+public class AdminManualCreditChargeResult
+{
+    public bool Success { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public long TransactionId { get; set; }
+    public long NewBalance { get; set; }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/AdminManualCreditCharge/AdminManualCreditChargeCommandHandler.cs

@@ -0,0 +1,105 @@
+using CMSMicroservice.Application.Common;
+using CMSMicroservice.Application.Common.Exceptions;
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Domain.Entities;
+using CMSMicroservice.Domain.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.AdminManualCreditCharge;
+
+public class AdminManualCreditChargeCommandHandler
+    : IRequestHandler<AdminManualCreditChargeCommand, AdminManualCreditChargeResult>
+{
+    private readonly IApplicationDbContext _context;
+    private readonly ILogger<AdminManualCreditChargeCommandHandler> _logger;
+    private readonly IUserPaymentLock _paymentLock;
+
+    public AdminManualCreditChargeCommandHandler(
+        IApplicationDbContext context,
+        ILogger<AdminManualCreditChargeCommandHandler> logger,
+        IUserPaymentLock paymentLock)
+    {
+        _context = context;
+        _logger = logger;
+        _paymentLock = paymentLock;
+    }
+
+    public Task<AdminManualCreditChargeResult> Handle(
+        AdminManualCreditChargeCommand request,
+        CancellationToken cancellationToken) =>
+        _paymentLock.ExecuteAsync(
+            PaymentLockScopes.Initiate(request.UserId),
+            PaymentLockStrategy.FailFast,
+            ct => HandleCore(request, ct),
+            cancellationToken);
+
+    private async Task<AdminManualCreditChargeResult> HandleCore(
+        AdminManualCreditChargeCommand request,
+        CancellationToken cancellationToken)
+    {
+        var user = await _context.Users
+            .FirstOrDefaultAsync(u => u.Id == request.UserId, cancellationToken)
+            ?? throw new NotFoundException(nameof(User), request.UserId);
+
+        var wallet = await _context.UserWallets
+            .FirstOrDefaultAsync(w => w.UserId == user.Id, cancellationToken)
+            ?? throw new NotFoundException($"کیف پول کاربر با شناسه {request.UserId} یافت نشد");
+
+        var oldBalance = wallet.Balance;
+        wallet.Balance += request.Amount;
+
+        var refId = $"MANUAL-{Guid.NewGuid():N}";
+        var notePart = string.IsNullOrWhiteSpace(request.Note)
+            ? string.Empty
+            : $" — {request.Note.Trim()}";
+        var adminPart = string.IsNullOrWhiteSpace(request.PerformedByAdminId)
+            ? string.Empty
+            : $" (ادمین: {request.PerformedByAdminId})";
+
+        var transaction = new Transaction
+        {
+            Amount = request.Amount,
+            Description = $"شارژ دستی کیف پول اصلی - کاربر {user.Id}{notePart}{adminPart}",
+            PaymentStatus = PaymentStatus.Success,
+            PaymentDate = DateTime.Now,
+            RefId = refId,
+            Type = TransactionType.ManualCreditWalletCharge
+        };
+
+        _context.Transactions.Add(transaction);
+        await _context.SaveChangesAsync(cancellationToken);
+
+        _context.UserWalletHistories.Add(new UserWalletHistory
+        {
+            WalletId = wallet.Id,
+            CurrentBalance = wallet.Balance,
+            ChangeValue = request.Amount,
+            CurrentNetworkBalance = wallet.NetworkBalance,
+            ChangeNerworkValue = 0,
+            CurrentDiscountBalance = wallet.DiscountBalance,
+            ChangeDiscountValue = 0,
+            IsIncrease = true,
+            RefrenceId = transaction.Id
+        });
+        await _context.SaveChangesAsync(cancellationToken);
+
+        _logger.LogInformation(
+            "Manual credit charge: UserId={UserId}, Amount={Amount}, OldBalance={Old}, NewBalance={New}, TxId={TxId}, Admin={Admin}",
+            user.Id,
+            request.Amount,
+            oldBalance,
+            wallet.Balance,
+            transaction.Id,
+            request.PerformedByAdminId);
+
+        return new AdminManualCreditChargeResult
+        {
+            Success = true,
+            Message = "شارژ دستی کیف پول اصلی با موفقیت انجام شد",
+            TransactionId = transaction.Id,
+            NewBalance = wallet.Balance
+        };
+    }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/AdminManualCreditCharge/AdminManualCreditChargeCommandValidator.cs

@@ -0,0 +1,20 @@
+using CMSMicroservice.Domain.Common;
+using FluentValidation;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.AdminManualCreditCharge;
+
+public class AdminManualCreditChargeCommandValidator : AbstractValidator<AdminManualCreditChargeCommand>
+{
+    public AdminManualCreditChargeCommandValidator()
+    {
+        RuleFor(x => x.UserId)
+            .GreaterThan(0)
+            .WithMessage("شناسه کاربر باید بزرگتر از صفر باشد");
+
+        RuleFor(x => x.Amount)
+            .GreaterThanOrEqualTo(SystemConstants.DiscountWalletMinCharge)
+            .WithMessage("حداقل مبلغ شارژ ۱۰,۰۰۰ تومان است")
+            .LessThanOrEqualTo(SystemConstants.WalletMaxSafeAmount)
+            .WithMessage("مبلغ وارد شده بیش از حد مجاز است");
+    }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/ChargeCreditWallet/ChargeCreditWalletCommand.cs

@@ -0,0 +1,13 @@
+using CMSMicroservice.Application.Common.Models;
+using MediatR;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.ChargeCreditWallet;
+
+/// <summary>
+/// دستور شارژ کیف پول اصلی از طریق درگاه
+/// </summary>
+public class ChargeCreditWalletCommand : IRequest<PaymentInitiateResult>
+{
+    public long UserId { get; set; }
+    public long Amount { get; set; }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/ChargeCreditWallet/ChargeCreditWalletCommandHandler.cs

@@ -0,0 +1,130 @@
+using CMSMicroservice.Application.Common;
+using CMSMicroservice.Application.Common.Exceptions;
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Application.Common.Models;
+using CMSMicroservice.Domain.Entities;
+using CMSMicroservice.Domain.Entities.Payment;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.ChargeCreditWallet;
+
+public class ChargeCreditWalletCommandHandler
+    : IRequestHandler<ChargeCreditWalletCommand, PaymentInitiateResult>
+{
+    private readonly IApplicationDbContext _context;
+    private readonly IPaymentGatewayService _paymentGateway;
+    private readonly IConfiguration _configuration;
+    private readonly ILogger<ChargeCreditWalletCommandHandler> _logger;
+    private readonly IUserPaymentLock _paymentLock;
+
+    public ChargeCreditWalletCommandHandler(
+        IApplicationDbContext context,
+        IPaymentGatewayService paymentGateway,
+        IConfiguration configuration,
+        ILogger<ChargeCreditWalletCommandHandler> logger,
+        IUserPaymentLock paymentLock)
+    {
+        _context = context;
+        _paymentGateway = paymentGateway;
+        _configuration = configuration;
+        _logger = logger;
+        _paymentLock = paymentLock;
+    }
+
+    public Task<PaymentInitiateResult> Handle(
+        ChargeCreditWalletCommand request,
+        CancellationToken cancellationToken) =>
+        _paymentLock.ExecuteAsync(
+            PaymentLockScopes.Initiate(request.UserId),
+            PaymentLockStrategy.FailFast,
+            ct => HandleCore(request, ct),
+            cancellationToken);
+
+    private async Task<PaymentInitiateResult> HandleCore(
+        ChargeCreditWalletCommand request,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            _logger.LogInformation(
+                "Charging credit wallet for UserId: {UserId}, Amount: {Amount}",
+                request.UserId,
+                request.Amount);
+
+            var user = await _context.Users
+                .Include(u => u.ClubMembership)
+                .FirstOrDefaultAsync(u => u.Id == request.UserId, cancellationToken)
+                ?? throw new NotFoundException(nameof(User), request.UserId);
+
+            if (user.ClubMembership?.IsActive != true)
+            {
+                throw new BadRequestException(
+                    "برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.");
+            }
+
+            var wallet = await _context.UserWallets
+                .FirstOrDefaultAsync(w => w.UserId == request.UserId, cancellationToken)
+                ?? throw new NotFoundException("کیف پول کاربر یافت نشد");
+
+            var frontOfficeBaseUrl = _configuration["FrontOfficeBaseUrl"] ?? "https://localhost:5268";
+            var callbackUrl = $"{frontOfficeBaseUrl}/profile/payment-callback?type=credit-wallet";
+
+            var paymentRequest = new PaymentRequest
+            {
+                Amount = request.Amount,
+                UserId = user.Id,
+                Mobile = user.Mobile ?? "",
+                CallbackUrl = callbackUrl,
+                Description = $"شارژ کیف پول اصلی - کاربر {user.Id}"
+            };
+
+            var paymentResult = await _paymentGateway.InitiatePaymentAsync(paymentRequest);
+
+            if (!paymentResult.IsSuccess)
+            {
+                _logger.LogError(
+                    "Payment gateway failed for UserId {UserId}: {ErrorMessage}",
+                    user.Id,
+                    paymentResult.ErrorMessage);
+
+                throw new Exception($"خطا در ارتباط با درگاه پرداخت: {paymentResult.ErrorMessage}");
+            }
+
+            var paymentTx = new PaymentTransaction
+            {
+                GatewayProvider = _configuration["PaymentProvider"] ?? "zarinpal",
+                MerchantId = _configuration["ZarinPal:MerchantId"] ?? "",
+                Amount = request.Amount,
+                CallbackUrl = callbackUrl,
+                Description = $"شارژ کیف پول اصلی - کاربر {user.Id}",
+                Mobile = user.Mobile,
+                UserId = user.Id,
+                RequestStatusCode = 100,
+                RequestStatusMessage = "Success",
+                Authority = paymentResult.RefId,
+                PaymentStatus = false
+            };
+            _context.PaymentTransactions.Add(paymentTx);
+            await _context.SaveChangesAsync(cancellationToken);
+
+            _logger.LogInformation(
+                "Credit wallet charge initiated. UserId: {UserId}, RefId: {RefId}, PaymentTxId: {PaymentTxId}",
+                user.Id,
+                paymentResult.RefId,
+                paymentTx.Id);
+
+            return paymentResult;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(
+                ex,
+                "Error in ChargeCreditWalletCommand for UserId: {UserId}",
+                request.UserId);
+            throw;
+        }
+    }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/ChargeCreditWallet/ChargeCreditWalletCommandValidator.cs

@@ -0,0 +1,20 @@
+using CMSMicroservice.Domain.Common;
+using FluentValidation;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.ChargeCreditWallet;
+
+public class ChargeCreditWalletCommandValidator : AbstractValidator<ChargeCreditWalletCommand>
+{
+    public ChargeCreditWalletCommandValidator()
+    {
+        RuleFor(x => x.UserId)
+            .GreaterThan(0)
+            .WithMessage("شناسه کاربر باید بزرگتر از صفر باشد");
+
+        RuleFor(x => x.Amount)
+            .GreaterThanOrEqualTo(SystemConstants.DiscountWalletMinCharge)
+            .WithMessage("حداقل مبلغ شارژ ۱۰,۰۰۰ تومان است")
+            .LessThanOrEqualTo(SystemConstants.WalletMaxSafeAmount)
+            .WithMessage("مبلغ وارد شده بیش از حد مجاز است");
+    }
+}

src/CMSMicroservice.Application/WalletCQ/Commands/VerifyCreditWalletCharge/VerifyCreditWalletChargeCommand.cs

@@ -0,0 +1,13 @@
+using MediatR;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.VerifyCreditWalletCharge;
+
+/// <summary>
+/// دستور تأیید شارژ کیف پول اصلی
+/// </summary>
+public class VerifyCreditWalletChargeCommand : IRequest<bool>
+{
+    public long UserId { get; set; }
+    public long Amount { get; set; }
+    public string Authority { get; set; } = string.Empty;
+}

src/CMSMicroservice.Application/WalletCQ/Commands/VerifyCreditWalletCharge/VerifyCreditWalletChargeCommandHandler.cs

@@ -0,0 +1,164 @@
+using CMSMicroservice.Application.Common;
+using CMSMicroservice.Application.Common.Exceptions;
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Domain.Entities;
+using CMSMicroservice.Domain.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace CMSMicroservice.Application.WalletCQ.Commands.VerifyCreditWalletCharge;
+
+public class VerifyCreditWalletChargeCommandHandler
+    : IRequestHandler<VerifyCreditWalletChargeCommand, bool>
+{
+    private readonly IApplicationDbContext _context;
+    private readonly IPaymentGatewayService _paymentGateway;
+    private readonly ILogger<VerifyCreditWalletChargeCommandHandler> _logger;
+    private readonly IUserPaymentLock _paymentLock;
+
+    public VerifyCreditWalletChargeCommandHandler(
+        IApplicationDbContext context,
+        IPaymentGatewayService paymentGateway,
+        ILogger<VerifyCreditWalletChargeCommandHandler> logger,
+        IUserPaymentLock paymentLock)
+    {
+        _context = context;
+        _paymentGateway = paymentGateway;
+        _logger = logger;
+        _paymentLock = paymentLock;
+    }
+
+    public Task<bool> Handle(
+        VerifyCreditWalletChargeCommand request,
+        CancellationToken cancellationToken) =>
+        _paymentLock.ExecuteAsync(
+            PaymentLockScopes.Verify(request.UserId, request.Authority),
+            PaymentLockStrategy.WaitForRelease,
+            ct => HandleCore(request, ct),
+            cancellationToken);
+
+    private async Task<bool> HandleCore(
+        VerifyCreditWalletChargeCommand request,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            _logger.LogInformation(
+                "Verifying credit wallet charge. UserId: {UserId}, Amount: {Amount}, Authority: {Authority}",
+                request.UserId,
+                request.Amount,
+                request.Authority);
+
+            var user = await _context.Users
+                .Include(u => u.ClubMembership)
+                .FirstOrDefaultAsync(u => u.Id == request.UserId, cancellationToken)
+                ?? throw new NotFoundException(nameof(User), request.UserId);
+
+            if (user.ClubMembership?.IsActive != true)
+            {
+                throw new BadRequestException(
+                    "برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.");
+            }
+
+            var paymentTx = await _context.PaymentTransactions
+                .FirstOrDefaultAsync(pt => pt.Authority == request.Authority, cancellationToken);
+
+            if (paymentTx?.PaymentStatus == true)
+            {
+                _logger.LogWarning("PaymentTransaction already verified: {Authority}", request.Authority);
+                return true;
+            }
+
+            var amountInToman = (decimal)(paymentTx?.Amount ?? 0);
+
+            var verifyResult = await _paymentGateway.VerifyPaymentAsync(
+                request.Authority,
+                "OK",
+                amountInToman,
+                cancellationToken);
+
+            if (paymentTx != null)
+            {
+                paymentTx.PaymentStatus = verifyResult.IsSuccess;
+                paymentTx.VerificationStatusCode = verifyResult.VerificationCode;
+                paymentTx.VerificationStatusMessage = verifyResult.Message;
+                paymentTx.CardPan = verifyResult.CardPan;
+                paymentTx.CardHash = verifyResult.CardHash;
+                paymentTx.RefId = verifyResult.TrackingCode;
+            }
+
+            if (!verifyResult.IsSuccess)
+            {
+                _logger.LogWarning(
+                    "Credit wallet charge verification failed for UserId {UserId}: {Message}",
+                    request.UserId,
+                    verifyResult.Message);
+
+                throw new Exception($"تراکنش ناموفق: {verifyResult.Message}");
+            }
+
+            var wallet = await _context.UserWallets
+                .FirstOrDefaultAsync(w => w.UserId == user.Id, cancellationToken)
+                ?? throw new NotFoundException($"کیف پول کاربر با شناسه {request.UserId} یافت نشد");
+
+            var oldBalance = wallet.Balance;
+            wallet.Balance += request.Amount;
+
+            _logger.LogInformation(
+                "Charging credit balance for UserId {UserId}: {OldBalance} -> {NewBalance}",
+                request.UserId,
+                oldBalance,
+                wallet.Balance);
+
+            var transaction = new Transaction
+            {
+                Amount = request.Amount,
+                Description = $"شارژ کیف پول اصلی - کاربر {user.Id}",
+                PaymentStatus = PaymentStatus.Success,
+                PaymentDate = DateTime.Now,
+                RefId = verifyResult.RefId,
+                Type = TransactionType.CreditWalletCharge
+            };
+
+            _context.Transactions.Add(transaction);
+            await _context.SaveChangesAsync(cancellationToken);
+
+            _context.UserWalletHistories.Add(new Domain.Entities.UserWalletHistory
+            {
+                WalletId = wallet.Id,
+                CurrentBalance = wallet.Balance,
+                ChangeValue = request.Amount,
+                CurrentNetworkBalance = wallet.NetworkBalance,
+                ChangeNerworkValue = 0,
+                CurrentDiscountBalance = wallet.DiscountBalance,
+                ChangeDiscountValue = 0,
+                IsIncrease = true,
+                RefrenceId = transaction.Id
+            });
+            await _context.SaveChangesAsync(cancellationToken);
+
+            if (paymentTx != null)
+            {
+                paymentTx.TransactionId = transaction.Id;
+                await _context.SaveChangesAsync(cancellationToken);
+            }
+
+            _logger.LogInformation(
+                "Credit wallet charged successfully. UserId: {UserId}, TransactionId: {TransactionId}, RefId: {RefId}",
+                user.Id,
+                transaction.Id,
+                verifyResult.RefId);
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(
+                ex,
+                "Error in VerifyCreditWalletChargeCommand for UserId: {UserId}",
+                request.UserId);
+            throw;
+        }
+    }
+}

src/CMSMicroservice.Application/WalletCQ/Queries/GetManualCreditCharges/GetManualCreditChargesQuery.cs

@@ -0,0 +1,39 @@
+using CMSMicroservice.Application.Common.Models;
+using MediatR;
+
+namespace CMSMicroservice.Application.WalletCQ.Queries.GetManualCreditCharges;
+
+public class GetManualCreditChargesQuery : IRequest<GetManualCreditChargesResponseDto>
+{
+    public PaginationState? PaginationState { get; set; }
+    public string? SortBy { get; set; }
+    public GetManualCreditChargesFilter? Filter { get; set; }
+}
+
+public class GetManualCreditChargesFilter
+{
+    public long? UserId { get; set; }
+    public long? TransactionId { get; set; }
+    public string? RefId { get; set; }
+    public DateTime? CreatedFrom { get; set; }
+    public DateTime? CreatedTo { get; set; }
+}
+
+public class GetManualCreditChargesResponseDto
+{
+    public MetaData MetaData { get; set; } = new();
+    public List<ManualCreditChargeModelDto> Models { get; set; } = new();
+}
+
+public class ManualCreditChargeModelDto
+{
+    public long TransactionId { get; set; }
+    public long UserId { get; set; }
+    public string UserName { get; set; } = string.Empty;
+    public long Amount { get; set; }
+    public string Description { get; set; } = string.Empty;
+    public string? RefId { get; set; }
+    public long NewBalance { get; set; }
+    public DateTime Created { get; set; }
+    public DateTime? PaymentDate { get; set; }
+}

src/CMSMicroservice.Application/WalletCQ/Queries/GetManualCreditCharges/GetManualCreditChargesQueryHandler.cs

@@ -0,0 +1,69 @@
+using CMSMicroservice.Application.Common.Extensions;
+using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Domain.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace CMSMicroservice.Application.WalletCQ.Queries.GetManualCreditCharges;
+
+public class GetManualCreditChargesQueryHandler
+    : IRequestHandler<GetManualCreditChargesQuery, GetManualCreditChargesResponseDto>
+{
+    private readonly IApplicationDbContext _context;
+
+    public GetManualCreditChargesQueryHandler(IApplicationDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<GetManualCreditChargesResponseDto> Handle(
+        GetManualCreditChargesQuery request,
+        CancellationToken cancellationToken)
+    {
+        var filter = request.Filter;
+
+        var query =
+            from t in _context.Transactions.AsNoTracking()
+            where t.Type == TransactionType.ManualCreditWalletCharge
+            join h in _context.UserWalletHistories.AsNoTracking() on t.Id equals h.RefrenceId
+            join w in _context.UserWallets.AsNoTracking() on h.WalletId equals w.Id
+            join u in _context.Users.AsNoTracking() on w.UserId equals u.Id
+            select new ManualCreditChargeModelDto
+            {
+                TransactionId = t.Id,
+                UserId = w.UserId,
+                UserName = ((u.FirstName ?? "") + " " + (u.LastName ?? "")).Trim(),
+                Amount = t.Amount,
+                Description = t.Description ?? string.Empty,
+                RefId = t.RefId,
+                NewBalance = h.CurrentBalance,
+                Created = t.Created,
+                PaymentDate = t.PaymentDate
+            };
+
+        if (filter?.UserId is long userId)
+            query = query.Where(x => x.UserId == userId);
+
+        if (filter?.TransactionId is long txId)
+            query = query.Where(x => x.TransactionId == txId);
+
+        if (!string.IsNullOrWhiteSpace(filter?.RefId))
+            query = query.Where(x => x.RefId != null && x.RefId.Contains(filter.RefId));
+
+        if (filter?.CreatedFrom is DateTime from)
+            query = query.Where(x => x.Created >= from);
+
+        if (filter?.CreatedTo is DateTime to)
+            query = query.Where(x => x.Created <= to);
+
+        query = query.OrderByDescending(x => x.Created);
+
+        return new GetManualCreditChargesResponseDto
+        {
+            MetaData = await query.GetMetaData(request.PaginationState, cancellationToken),
+            Models = await query
+                .PaginatedListAsync(paginationState: request.PaginationState)
+                .ToListAsync(cancellationToken)
+        };
+    }
+}

src/CMSMicroservice.Domain/Enums/DeliveryStatus.cs

@@ -15,5 +15,7 @@ public enum DeliveryStatus
     Returned = 4,
     // لغو شده
     Cancelled = 5,
+    // آماده تحویل حضوری در دفتر
+    ReadyForOfficePickup = 6,
 }
 

src/CMSMicroservice.Domain/Enums/PackagePurchaseMethod.cs

@@ -18,5 +18,10 @@ public enum PackagePurchaseMethod
     /// <summary>
     /// از طریق پرداخت مستقیم درگاه بانکی
     /// </summary>
-    DirectPurchase = 2
+    DirectPurchase = 2,
+
+    /// <summary>
+    /// ثبت دستی توسط ادمین
+    /// </summary>
+    Manual = 3
 }

src/CMSMicroservice.Domain/Enums/TransactionType.cs

@@ -36,4 +36,14 @@ public enum TransactionType
     /// بونوس داخلی کیف‌پول جادویی (مبلغ × 1.5)
     /// </summary>
     MagicWalletBonus = 15,
+
+    /// <summary>
+    /// شارژ کیف پول اصلی از درگاه
+    /// </summary>
+    CreditWalletCharge = 16,
+
+    /// <summary>
+    /// شارژ دستی کیف پول اصلی توسط ادمین
+    /// </summary>
+    ManualCreditWalletCharge = 17,
 }

src/CMSMicroservice.Infrastructure/BackgroundJobs/ZarinpalReconciliationJob.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
-using CMSMicroservice.Application.ClubMembershipCQ.Commands.ActivateClubMembership;
+using CMSMicroservice.Application.PackageCQ.Commands.VerifyUserPackagePurchasePayment;
 using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Application.DiscountShopCQ.Commands.CompleteOrderPayment;
 using CMSMicroservice.Application.WalletCQ.Commands.VerifyDiscountWalletCharge;
+using CMSMicroservice.Application.WalletCQ.Commands.VerifyCreditWalletCharge;
 using CMSMicroservice.Application.WalletCQ.Commands.VerifyMagicWalletCharge;
 using CMSMicroservice.Domain.Entities;
 using CMSMicroservice.Domain.Entities.Payment;
@@ -174,6 +175,19 @@ public class ZarinpalReconciliationJob
                 }, ct);
                 break;
 
+            case "credit-wallet":
+                if (!paymentTx.UserId.HasValue)
+                    throw new InvalidOperationException(
+                        $"UserId is null for credit-wallet authority {authority}");
+
+                await _sender.Send(new VerifyCreditWalletChargeCommand
+                {
+                    Authority = authority,
+                    UserId = paymentTx.UserId.Value,
+                    Amount = paymentTx.Amount
+                }, ct);
+                break;
+
             case "discount-order":
                 await ReconcileDiscountOrderAsync(paymentTx, ct);
                 break;
@@ -194,6 +208,8 @@ public class ZarinpalReconciliationJob
             return "magic-wallet";
         if (callbackUrl.Contains("type=discount-wallet", StringComparison.OrdinalIgnoreCase))
             return "discount-wallet";
+        if (callbackUrl.Contains("type=credit-wallet", StringComparison.OrdinalIgnoreCase))
+            return "credit-wallet";
         if (callbackUrl.Contains("type=discount-order", StringComparison.OrdinalIgnoreCase))
             return "discount-order";
         // Package callbacks have orderId= but no type= parameter
@@ -251,94 +267,25 @@ public class ZarinpalReconciliationJob
             throw new InvalidOperationException(
                 $"Cannot parse OrderId '{paymentTx.OrderId}' for package purchase {paymentTx.Id}");
 
-        var purchase = await _context.UserPackagePurchases
+        var result = await _sender.Send(new VerifyUserPackagePurchasePaymentCommand
-            .Include(p => p.Package)
-            .FirstOrDefaultAsync(p => p.Id == purchaseId && !p.IsDeleted, ct)
-            ?? throw new InvalidOperationException($"UserPackagePurchase #{purchaseId} not found");
-
-        var transaction = purchase.TransactionId.HasValue
-            ? await _context.Transactions.FirstOrDefaultAsync(t => t.Id == purchase.TransactionId.Value, ct)
-            : null;
-
-        var amountInToman = paymentTx.Amount != 0 ? paymentTx.Amount : purchase.Amount;
-
-        var verifyResult = await _paymentGateway.VerifyPaymentAsync(
-            paymentTx.Authority!, "OK", (decimal)amountInToman, ct);
-
-        paymentTx.PaymentStatus = verifyResult.IsSuccess;
-        paymentTx.VerificationStatusCode = verifyResult.VerificationCode;
-        paymentTx.VerificationStatusMessage = verifyResult.Message;
-        paymentTx.CardPan = verifyResult.CardPan;
-        paymentTx.CardHash = verifyResult.CardHash;
-        paymentTx.RefId = verifyResult.TrackingCode;
-
-        if (verifyResult.IsSuccess && transaction != null)
         {
-            transaction.PaymentStatus = PaymentStatus.Success;
+            PurchaseId = purchaseId,
-            transaction.PaymentDate = DateTime.UtcNow;
+            Authority = paymentTx.Authority ?? string.Empty,
-            transaction.RefId = verifyResult.RefId;
+            Status = "OK"
+        }, ct);
 
-            var wallet = await _context.UserWallets
+        if (!result.Success)
-                .FirstOrDefaultAsync(w => w.UserId == purchase.UserId, ct);
-
-            if (wallet == null)
-            {
-                wallet = new UserWallet { UserId = purchase.UserId };
-                _context.UserWallets.Add(wallet);
-                await _context.SaveChangesAsync(ct);
-            }
-
-            var discountMultiplier = purchase.Package?.DiscountMultiplier
-                ?? throw new InvalidOperationException(
-                    $"Package not loaded for UserPackagePurchase #{purchaseId}");
-
-            var discountAmount = (long)(purchase.Amount * (double)discountMultiplier);
-            wallet.Balance += purchase.Amount;
-            wallet.DiscountBalance += discountAmount;
-
-            _context.UserWalletHistories.Add(new UserWalletHistory
-            {
-                WalletId = wallet.Id,
-                CurrentBalance = wallet.Balance,
-                ChangeValue = purchase.Amount,
-                CurrentNetworkBalance = wallet.NetworkBalance,
-                ChangeNerworkValue = 0,
-                CurrentDiscountBalance = wallet.DiscountBalance,
-                ChangeDiscountValue = discountAmount,
-                IsIncrease = true,
-                RefrenceId = transaction.Id,
-                PackageId = purchase.PackageId
-            });
-
-            var user = await _context.Users
-                .FirstOrDefaultAsync(u => u.Id == purchase.UserId, ct);
-            if (user != null)
-                user.PackagePurchaseMethod = PackagePurchaseMethod.DirectPurchase;
-        }
-        else if (transaction != null)
         {
-            transaction.PaymentStatus = PaymentStatus.Reject;
+            throw new InvalidOperationException(
+                $"Package verify failed for purchase #{purchaseId}, authority={paymentTx.Authority}: {result.Message}");
         }
 
-        await _context.SaveChangesAsync(ct);
+        if (result.AlreadyPaid)
-
-        if (verifyResult.IsSuccess)
         {
-            try
+            _logger.LogInformation(
-            {
+                "ZarinpalReconciliation: package purchase #{PurchaseId} already verified (authority={Authority})",
-                await _sender.Send(new ActivateClubMembershipCommand
+                purchaseId,
-                {
+                paymentTx.Authority);
-                    UserId = purchase.UserId,
-                    ForceActivation = false
-                }, ct);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(
-                    ex,
-                    "ZarinpalReconciliation: club activation failed for userId={UserId} (purchase #{PurchaseId})",
-                    purchase.UserId, purchaseId);
-            }
         }
     }
 

src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs

@@ -1,5 +1,6 @@
-using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 using System.Collections.Generic;
@@ -13,10 +14,12 @@ namespace CMSMicroservice.Infrastructure.Services;
 public class GenerateJwtTokenService : IGenerateJwtToken
 {
     private readonly IConfiguration _configuration;
+    private readonly IApplicationDbContext _context;
 
-    public GenerateJwtTokenService(IConfiguration configuration)
+    public GenerateJwtTokenService(IConfiguration configuration, IApplicationDbContext context)
     {
         _configuration = configuration;
+        _context = context;
     }
 
     public async Task<string> GenerateJwtToken(User user, int? expiryDays = null)
@@ -58,6 +61,10 @@ public class GenerateJwtTokenService : IGenerateJwtToken
         claims.Add(new Claim("HasPurchasedPackage", 
             (user.PackagePurchaseMethod != PackagePurchaseMethod.None).ToString()));
 
+        var hasAddress = await _context.UserAddresses
+            .AnyAsync(a => a.UserId == user.Id && !a.IsDeleted);
+        claims.Add(new Claim("HasAddress", hasAddress.ToString()));
+
         if (user.UserRoles != null && user.UserRoles.Any())
         {
             foreach (var userRole in user.UserRoles)

src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.199</Version>
+    <Version>0.0.209</Version>
     <DebugType>None</DebugType>
     <DebugSymbols>False</DebugSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -74,6 +74,11 @@
     <Protobuf Include="Protos\sitepagesettings.proto" ProtoRoot="Protos\" GrpcServices="Both" />
     <!-- Image Resolver Service -->
     <Protobuf Include="Protos\imageresolver.proto" ProtoRoot="Protos\" GrpcServices="Both" />
+    <!-- Admin Report APIs -->
+    <Protobuf Include="Protos\paymenttransaction.proto" ProtoRoot="Protos\" GrpcServices="Both" />
+    <Protobuf Include="Protos\userpackagepurchase.proto" ProtoRoot="Protos\" GrpcServices="Both" />
+    <Protobuf Include="Protos\clubmembershipcycle.proto" ProtoRoot="Protos\" GrpcServices="Both" />
+    <Protobuf Include="Protos\clubmembershipcyclehistory.proto" ProtoRoot="Protos\" GrpcServices="Both" />
   </ItemGroup>
 
   <Target Name="PushToFoursatNuget" AfterTargets="Pack" Condition="'$(CI)' != 'true'">

src/CMSMicroservice.Protobuf/Protos/clubmembership.proto

@@ -164,11 +164,19 @@ message ClubMembershipModel
 
 // GetHistory Query
 message GetClubMembershipHistoryRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetClubMembershipHistoryFilter filter = 3;
+}
+
+message GetClubMembershipHistoryFilter
 {
     google.protobuf.Int64Value user_id = 1;
-    google.protobuf.Int64Value package_id = 2;
+    google.protobuf.Int64Value club_membership_id = 2;
-    int32 page_index = 3;
+    google.protobuf.Int32Value action = 3;
-    int32 page_size = 4;
+    google.protobuf.Timestamp created_from = 4;
+    google.protobuf.Timestamp created_to = 5;
 }
 
 message GetClubMembershipHistoryResponse
@@ -182,16 +190,15 @@ message ClubMembershipHistoryModel
     int64 id = 1;
     int64 club_membership_id = 2;
     int64 user_id = 3;
-    google.protobuf.Int64Value old_package_id = 4;
+    string user_name = 4;
-    google.protobuf.Int64Value new_package_id = 5;
+    bool old_is_active = 5;
-    google.protobuf.Timestamp old_activated_at = 6;
+    bool new_is_active = 6;
-    google.protobuf.Timestamp new_activated_at = 7;
+    google.protobuf.Int64Value old_initial_contribution = 7;
-    google.protobuf.Timestamp old_expires_at = 8;
+    google.protobuf.Int64Value new_initial_contribution = 8;
-    google.protobuf.Timestamp new_expires_at = 9;
+    int32 action = 9; // ClubMembershipAction enum
-    int32 action = 10; // ClubMembershipAction enum
+    string performed_by = 10;
-    string performed_by = 11;
+    string reason = 11;
-    string reason = 12;
+    google.protobuf.Timestamp created_at = 12;
-    google.protobuf.Timestamp created = 13;
 }
 
 // GetClubStatistics Query

src/CMSMicroservice.Protobuf/Protos/clubmembershipcycle.proto

@@ -0,0 +1,79 @@
+syntax = "proto3";
+
+package clubmembershipcycle;
+
+import "public_messages.proto";
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
+
+option csharp_namespace = "CMSMicroservice.Protobuf.Protos.ClubMembershipCycle";
+
+service ClubMembershipCycleContract
+{
+    rpc GetAllClubMembershipCycleByFilter(GetAllClubMembershipCycleByFilterRequest) returns (GetAllClubMembershipCycleByFilterResponse){
+        option (google.api.http) = {
+            get: "/ClubMembershipCycle/GetAllByFilter"
+        };
+    };
+    rpc GetClubMembershipCycleSummary(GetClubMembershipCycleSummaryRequest) returns (GetClubMembershipCycleSummaryResponse){
+        option (google.api.http) = {
+            get: "/ClubMembershipCycle/GetSummary"
+        };
+    };
+}
+
+message GetAllClubMembershipCycleByFilterRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetAllClubMembershipCycleByFilterFilter filter = 3;
+}
+
+message GetAllClubMembershipCycleByFilterFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.BoolValue is_current_cycle = 2;
+    google.protobuf.Int64Value package_id = 3;
+    google.protobuf.Int32Value cycle_number = 4;
+    google.protobuf.Int32Value purchase_method = 5;
+    google.protobuf.Int32Value magic_state = 6; // 0=none, 1=active, 2=completed
+    google.protobuf.Timestamp package_purchased_from = 7;
+    google.protobuf.Timestamp package_purchased_to = 8;
+}
+
+message GetAllClubMembershipCycleByFilterResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated ClubMembershipCycleModel models = 2;
+}
+
+message ClubMembershipCycleModel
+{
+    int64 id = 1;
+    int64 user_id = 2;
+    string user_name = 3;
+    int64 club_membership_id = 4;
+    int32 cycle_number = 5;
+    int64 package_id = 6;
+    string package_name = 7;
+    int64 package_amount = 8;
+    int32 purchase_method = 9;
+    google.protobuf.Timestamp package_purchased_at = 10;
+    google.protobuf.Timestamp magic_started_at = 11;
+    google.protobuf.Timestamp magic_completed_at = 12;
+    bool is_current_cycle = 13;
+    google.protobuf.Timestamp created_at = 14;
+}
+
+message GetClubMembershipCycleSummaryRequest
+{
+    GetAllClubMembershipCycleByFilterFilter filter = 1;
+}
+
+message GetClubMembershipCycleSummaryResponse
+{
+    int64 total_count = 1;
+    int64 current_cycle_count = 2;
+    int64 magic_active_count = 3;
+}

src/CMSMicroservice.Protobuf/Protos/clubmembershipcyclehistory.proto

@@ -0,0 +1,61 @@
+syntax = "proto3";
+
+package clubmembershipcyclehistory;
+
+import "public_messages.proto";
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
+
+option csharp_namespace = "CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory";
+
+service ClubMembershipCycleHistoryContract
+{
+    rpc GetAllClubMembershipCycleHistoryByFilter(GetAllClubMembershipCycleHistoryByFilterRequest) returns (GetAllClubMembershipCycleHistoryByFilterResponse){
+        option (google.api.http) = {
+            get: "/ClubMembershipCycleHistory/GetAllByFilter"
+        };
+    };
+}
+
+message GetAllClubMembershipCycleHistoryByFilterRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetAllClubMembershipCycleHistoryByFilterFilter filter = 3;
+}
+
+message GetAllClubMembershipCycleHistoryByFilterFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.Int64Value club_membership_cycle_id = 2;
+    google.protobuf.Int32Value cycle_number = 3;
+    google.protobuf.Int32Value action = 4;
+    google.protobuf.Timestamp created_from = 5;
+    google.protobuf.Timestamp created_to = 6;
+}
+
+message GetAllClubMembershipCycleHistoryByFilterResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated ClubMembershipCycleHistoryModel models = 2;
+}
+
+message ClubMembershipCycleHistoryModel
+{
+    int64 id = 1;
+    int64 club_membership_cycle_id = 2;
+    int64 user_id = 3;
+    string user_name = 4;
+    int32 cycle_number = 5;
+    bool old_is_current_cycle = 6;
+    bool new_is_current_cycle = 7;
+    google.protobuf.Timestamp old_magic_started_at = 8;
+    google.protobuf.Timestamp new_magic_started_at = 9;
+    google.protobuf.Timestamp old_magic_completed_at = 10;
+    google.protobuf.Timestamp new_magic_completed_at = 11;
+    int32 action = 12;
+    string performed_by = 13;
+    string reason = 14;
+    google.protobuf.Timestamp created_at = 15;
+}

src/CMSMicroservice.Protobuf/Protos/discountorder.proto

@@ -118,6 +118,8 @@ enum DeliveryStatus
     DELIVERY_SHIPPED = 2;
     DELIVERY_DELIVERED = 3;
     DELIVERY_CANCELLED = 4;
+    DELIVERY_READY_FOR_OFFICE = 5;
+    DELIVERY_RETURNED = 6;
 }
 
 // Get Order By Id

src/CMSMicroservice.Protobuf/Protos/paymenttransaction.proto

@@ -0,0 +1,82 @@
+syntax = "proto3";
+
+package paymenttransaction;
+
+import "public_messages.proto";
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
+
+option csharp_namespace = "CMSMicroservice.Protobuf.Protos.PaymentTransaction";
+
+service PaymentTransactionContract
+{
+    rpc GetAllPaymentTransactionByFilter(GetAllPaymentTransactionByFilterRequest) returns (GetAllPaymentTransactionByFilterResponse){
+        option (google.api.http) = {
+            get: "/PaymentTransaction/GetAllByFilter"
+        };
+    };
+    rpc GetPaymentTransactionSummary(GetPaymentTransactionSummaryRequest) returns (GetPaymentTransactionSummaryResponse){
+        option (google.api.http) = {
+            get: "/PaymentTransaction/GetSummary"
+        };
+    };
+}
+
+message GetAllPaymentTransactionByFilterRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetAllPaymentTransactionByFilterFilter filter = 3;
+}
+
+message GetAllPaymentTransactionByFilterFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.StringValue mobile = 2;
+    google.protobuf.StringValue gateway_provider = 3;
+    google.protobuf.BoolValue payment_status = 4;
+    google.protobuf.StringValue authority = 5;
+    google.protobuf.StringValue ref_id = 6;
+    google.protobuf.StringValue order_id = 7;
+    google.protobuf.Timestamp created_from = 8;
+    google.protobuf.Timestamp created_to = 9;
+}
+
+message GetAllPaymentTransactionByFilterResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated PaymentTransactionModel models = 2;
+}
+
+message PaymentTransactionModel
+{
+    int64 id = 1;
+    int64 user_id = 2;
+    string mobile = 3;
+    string gateway_provider = 4;
+    int64 amount = 5;
+    string authority = 6;
+    bool payment_status = 7;
+    google.protobuf.Int32Value verification_status_code = 8;
+    string verification_status_message = 9;
+    string ref_id = 10;
+    string card_pan = 11;
+    string order_id = 12;
+    google.protobuf.Int64Value transaction_id = 13;
+    string description = 14;
+    google.protobuf.Timestamp created_at = 15;
+}
+
+message GetPaymentTransactionSummaryRequest
+{
+    GetAllPaymentTransactionByFilterFilter filter = 1;
+}
+
+message GetPaymentTransactionSummaryResponse
+{
+    int64 total_count = 1;
+    int64 total_amount = 2;
+    int64 successful_count = 3;
+    int64 pending_count = 4;
+}

src/CMSMicroservice.Protobuf/Protos/products.proto

@@ -229,6 +229,7 @@ message GetAllProductsByFilterFilter
     google.protobuf.Int32Value remaining_count = 13;
     google.protobuf.Int64Value category_id = 14;
     google.protobuf.BoolValue is_active = 15;
+    google.protobuf.BoolValue in_stock = 16;
 }
 message GetAllProductsByFilterResponse
 {

src/CMSMicroservice.Protobuf/Protos/public_messages.proto

@@ -102,6 +102,10 @@ enum DeliveryStatus
   DeliveryStatus_Delivered = 3;
   // مرجوع شده
   DeliveryStatus_Returned = 4;
+  // لغو شده
+  DeliveryStatus_Cancelled = 5;
+  // آماده تحویل حضوری در دفتر
+  DeliveryStatus_ReadyForOfficePickup = 6;
 }
 enum TransactionType
 {
@@ -109,6 +113,14 @@ enum TransactionType
   DepositIpg = 1;
   DepositExternal1 = 2;
   Withdraw = 3;
+  NetworkCommission = 10;
+  ClubActivation = 11;
+  DiscountWalletCharge = 12;
+  DiscountShopPurchase = 13;
+  MagicWalletDeposit = 14;
+  MagicWalletBonus = 15;
+  CreditWalletCharge = 16;
+  ManualCreditWalletCharge = 17;
 }
 enum ContractType
 {

src/CMSMicroservice.Protobuf/Protos/transactions.proto

@@ -43,6 +43,11 @@ service TransactionsContract
             
         };
     };
+    rpc GetTransactionSummary(GetTransactionSummaryRequest) returns (GetTransactionSummaryResponse){
+        option (google.api.http) = {
+            get: "/GetTransactionSummary"
+        };
+    };
     rpc VerifyTransaction(VerifyTransactionRequest) returns (VerifyTransactionResponse){
         option (google.api.http) = {
             post: "/VerifyTransaction"
@@ -161,6 +166,10 @@ message GetAllTransactionsByFilterFilter
     {
         messages.TransactionType type = 7;
     }
+    google.protobuf.Timestamp created_from = 8;
+    google.protobuf.Timestamp created_to = 9;
+    google.protobuf.Timestamp payment_date_from = 10;
+    google.protobuf.Timestamp payment_date_to = 11;
 }
 message GetAllTransactionsByFilterResponse
 {
@@ -182,6 +191,21 @@ message GetAllTransactionsByFilterResponseModel
     {
         messages.TransactionType type = 7;
     }
+    google.protobuf.Timestamp created = 8;
+}
+
+message GetTransactionSummaryRequest
+{
+    GetAllTransactionsByFilterFilter filter = 1;
+}
+
+message GetTransactionSummaryResponse
+{
+    int64 total_count = 1;
+    int64 total_amount = 2;
+    int64 success_count = 3;
+    int64 pending_count = 4;
+    int64 reject_count = 5;
 }
 
 // VerifyTransaction Messages

src/CMSMicroservice.Protobuf/Protos/user.proto

@@ -238,6 +238,8 @@ message GetAllUserByFilterResponseModel
     bool sms_notifications = 12;
     bool push_notifications = 13;
     google.protobuf.Timestamp birth_date = 14;
+    string default_address = 15;
+    string default_postal_code = 16;
 }
 message GetJwtTokenRequest
 {

src/CMSMicroservice.Protobuf/Protos/userorder.proto

@@ -220,6 +220,9 @@ message GetUserOrderResponse
     google.protobuf.StringValue user_national_code = 16;
     // اطلاعات مالیات بر ارزش افزوده
     OrderVATInfo vat_info = 17;
+    // اطلاعات پستی برای برچسب کارتن
+    google.protobuf.StringValue postal_code = 18;
+    google.protobuf.StringValue user_mobile = 19;
 }
 
 // اطلاعات مالیات بر ارزش افزوده

src/CMSMicroservice.Protobuf/Protos/userpackagepurchase.proto

@@ -0,0 +1,128 @@
+syntax = "proto3";
+
+package userpackagepurchase;
+
+import "public_messages.proto";
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/timestamp.proto";
+import "google/api/annotations.proto";
+
+option csharp_namespace = "CMSMicroservice.Protobuf.Protos.UserPackagePurchase";
+
+service UserPackagePurchaseContract
+{
+    rpc GetAllUserPackagePurchaseByFilter(GetAllUserPackagePurchaseByFilterRequest) returns (GetAllUserPackagePurchaseByFilterResponse){
+        option (google.api.http) = {
+            get: "/UserPackagePurchase/GetAllByFilter"
+        };
+    };
+    rpc GetUserPackagePurchaseSummary(GetUserPackagePurchaseSummaryRequest) returns (GetUserPackagePurchaseSummaryResponse){
+        option (google.api.http) = {
+            get: "/UserPackagePurchase/GetSummary"
+        };
+    };
+    rpc GetCustomerPackagePurchaseRollup(GetCustomerPackagePurchaseRollupRequest) returns (GetCustomerPackagePurchaseRollupResponse){
+        option (google.api.http) = {
+            get: "/UserPackagePurchase/GetCustomerRollup"
+        };
+    };
+}
+
+message GetAllUserPackagePurchaseByFilterRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetAllUserPackagePurchaseByFilterFilter filter = 3;
+}
+
+message GetAllUserPackagePurchaseByFilterFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.Int64Value package_id = 2;
+    google.protobuf.Int32Value purchase_method = 3;
+    google.protobuf.Timestamp purchased_from = 4;
+    google.protobuf.Timestamp purchased_to = 5;
+    google.protobuf.Int64Value min_amount = 6;
+    google.protobuf.Int64Value max_amount = 7;
+}
+
+message GetAllUserPackagePurchaseByFilterResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated UserPackagePurchaseModel models = 2;
+}
+
+message UserPackagePurchaseModel
+{
+    int64 id = 1;
+    int64 user_id = 2;
+    string user_name = 3;
+    string user_mobile = 4;
+    int64 package_id = 5;
+    string package_name = 6;
+    int32 purchase_method = 7;
+    google.protobuf.Timestamp purchased_at = 8;
+    int64 amount = 9;
+    google.protobuf.Int64Value order_id = 10;
+    google.protobuf.Int64Value transaction_id = 11;
+    google.protobuf.Timestamp created_at = 12;
+}
+
+message GetUserPackagePurchaseSummaryRequest
+{
+    GetAllUserPackagePurchaseByFilterFilter filter = 1;
+}
+
+message GetUserPackagePurchaseSummaryResponse
+{
+    int64 total_count = 1;
+    int64 total_amount = 2;
+}
+
+message GetCustomerPackagePurchaseRollupRequest
+{
+    messages.PaginationState pagination_state = 1;
+    GetCustomerPackagePurchaseRollupFilter filter = 2;
+}
+
+message GetCustomerPackagePurchaseRollupFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.Int32Value purchase_method = 2;
+    google.protobuf.Timestamp purchased_from = 3;
+    google.protobuf.Timestamp purchased_to = 4;
+}
+
+message GetCustomerPackagePurchaseRollupResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated CustomerPackagePurchaseRollupModel models = 2;
+}
+
+message CustomerPackagePurchaseRollupModel
+{
+    int64 user_id = 1;
+    string user_name = 2;
+    string user_mobile = 3;
+
+    int64 first_package_id = 4;
+    string first_package_name = 5;
+    int64 first_amount = 6;
+    google.protobuf.Timestamp first_purchased_at = 7;
+
+    int64 last_package_id = 8;
+    string last_package_name = 9;
+    int64 last_amount = 10;
+    google.protobuf.Timestamp last_purchased_at = 11;
+    int32 last_purchase_method = 12;
+
+    int32 purchase_count = 13;
+    int64 total_amount = 14;
+
+    int32 daya_count = 15;
+    int64 daya_amount = 16;
+    int32 manual_count = 17;
+    int64 manual_amount = 18;
+    int32 gateway_count = 19;
+    int64 gateway_amount = 20;
+}

src/CMSMicroservice.Protobuf/Protos/userwallet.proto

@@ -110,6 +110,35 @@ service UserWalletContract
             body: "*"
         };
     };
+
+    // ============= Credit (Main) Wallet Methods =============
+
+    rpc InitiateCreditCharge(InitiateCreditChargeRequest) returns (InitiateCreditChargeResponse){
+        option (google.api.http) = {
+            post: "/Customer/InitiateCreditCharge"
+            body: "*"
+        };
+    };
+    rpc VerifyCreditCharge(VerifyWalletChargeRequest) returns (VerifyWalletChargeResponse){
+        option (google.api.http) = {
+            post: "/Customer/VerifyCreditCharge"
+            body: "*"
+        };
+    };
+
+    // ============= Admin Manual Credit Charge =============
+
+    rpc AdminManualCreditCharge(AdminManualCreditChargeRequest) returns (AdminManualCreditChargeResponse){
+        option (google.api.http) = {
+            post: "/Admin/ManualCreditCharge"
+            body: "*"
+        };
+    };
+    rpc GetManualCreditCharges(GetManualCreditChargesRequest) returns (GetManualCreditChargesResponse){
+        option (google.api.http) = {
+            get: "/Admin/GetManualCreditCharges"
+        };
+    };
 }
 message CreateNewUserWalletRequest
 {
@@ -283,6 +312,20 @@ message InitiateDiscountChargeResponse
     string error_message = 3;
 }
 
+// ============= Credit (Main) Wallet Messages =============
+
+message InitiateCreditChargeRequest
+{
+    int64 amount = 1; // مبلغ واریزی (تومان)
+}
+
+message InitiateCreditChargeResponse
+{
+    bool is_success = 1;
+    string gateway_url = 2;
+    string error_message = 3;
+}
+
 // ============= Wallet Verify Messages =============
 
 message VerifyWalletChargeRequest
@@ -295,4 +338,56 @@ message VerifyWalletChargeResponse
 {
     bool success = 1;
     string message = 2;
+}
+
+// ============= Admin Manual Credit Charge Messages =============
+
+message AdminManualCreditChargeRequest
+{
+    int64 user_id = 1;
+    int64 amount = 2; // تومان
+    google.protobuf.StringValue note = 3;
+}
+
+message AdminManualCreditChargeResponse
+{
+    bool success = 1;
+    string message = 2;
+    int64 transaction_id = 3;
+    int64 new_balance = 4;
+}
+
+message GetManualCreditChargesRequest
+{
+    messages.PaginationState pagination_state = 1;
+    google.protobuf.StringValue sort_by = 2;
+    GetManualCreditChargesFilter filter = 3;
+}
+
+message GetManualCreditChargesFilter
+{
+    google.protobuf.Int64Value user_id = 1;
+    google.protobuf.Int64Value transaction_id = 2;
+    google.protobuf.StringValue ref_id = 3;
+    google.protobuf.Timestamp created_from = 4;
+    google.protobuf.Timestamp created_to = 5;
+}
+
+message GetManualCreditChargesResponse
+{
+    messages.MetaData meta_data = 1;
+    repeated ManualCreditChargeModel models = 2;
+}
+
+message ManualCreditChargeModel
+{
+    int64 transaction_id = 1;
+    int64 user_id = 2;
+    string user_name = 3;
+    int64 amount = 4;
+    string description = 5;
+    string ref_id = 6;
+    int64 new_balance = 7;
+    google.protobuf.Timestamp created = 8;
+    google.protobuf.Timestamp payment_date = 9;
 }

src/CMSMicroservice.Protobuf/Protos/userwallethistory.proto

@@ -88,6 +88,8 @@ message GetUserWalletHistoryResponse
     bool is_increase = 7;
     google.protobuf.Int64Value refrence_id = 8;
     google.protobuf.Timestamp created_at = 9;
+    int64 current_discount_balance = 10;
+    int64 change_discount_value = 11;
 }
 message GetAllUserWalletHistoryByFilterRequest
 {
@@ -121,4 +123,6 @@ message GetAllUserWalletHistoryByFilterResponseModel
     bool is_increase = 7;
     google.protobuf.Int64Value refrence_id = 8;
     google.protobuf.Timestamp created_at = 9;
+    int64 current_discount_balance = 10;
+    int64 change_discount_value = 11;
 }

src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleHistoryProfile.cs

@@ -0,0 +1,47 @@
+using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Domain.Enums;
+using Mapster;
+using AppHistory = CMSMicroservice.Application.ClubMembershipCycleHistoryCQ.Queries.GetAllClubMembershipCycleHistoryByFilter;
+using ProtoHistory = CMSMicroservice.Protobuf.Protos.ClubMembershipCycleHistory;
+
+namespace CMSMicroservice.WebApi.Common.Mappings;
+
+public class ClubMembershipCycleHistoryProfile : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.NewConfig<ProtoHistory.GetAllClubMembershipCycleHistoryByFilterRequest, AppHistory.GetAllClubMembershipCycleHistoryByFilterQuery>()
+            .Map(dest => dest.PaginationState, src => src.PaginationState)
+            .Map(dest => dest.SortBy, src => src.SortBy)
+            .Map(dest => dest.Filter, src => src.Filter);
+
+        config.NewConfig<ProtoHistory.GetAllClubMembershipCycleHistoryByFilterFilter, AppHistory.GetAllClubMembershipCycleHistoryByFilterFilter>()
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.ClubMembershipCycleId, src => src.ClubMembershipCycleId)
+            .Map(dest => dest.CycleNumber, src => src.CycleNumber)
+            .Map(dest => dest.Action, src => src.Action == null ? null : (ClubMembershipCycleAction?)src.Action)
+            .Map(dest => dest.CreatedFrom, src => src.CreatedFrom != null ? src.CreatedFrom.ToDateTime() : (DateTime?)null)
+            .Map(dest => dest.CreatedTo, src => src.CreatedTo != null ? src.CreatedTo.ToDateTime() : (DateTime?)null);
+
+        config.NewConfig<AppHistory.GetAllClubMembershipCycleHistoryByFilterResponseDto, ProtoHistory.GetAllClubMembershipCycleHistoryByFilterResponse>()
+            .Map(dest => dest.MetaData, src => src.MetaData)
+            .Map(dest => dest.Models, src => src.Models);
+
+        config.NewConfig<AppHistory.GetAllClubMembershipCycleHistoryByFilterResponseModel, ProtoHistory.ClubMembershipCycleHistoryModel>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.ClubMembershipCycleId, src => src.ClubMembershipCycleId)
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserName, src => src.UserName)
+            .Map(dest => dest.CycleNumber, src => src.CycleNumber)
+            .Map(dest => dest.OldIsCurrentCycle, src => src.OldIsCurrentCycle)
+            .Map(dest => dest.NewIsCurrentCycle, src => src.NewIsCurrentCycle)
+            .Map(dest => dest.OldMagicStartedAt, src => src.OldMagicStartedAt)
+            .Map(dest => dest.NewMagicStartedAt, src => src.NewMagicStartedAt)
+            .Map(dest => dest.OldMagicCompletedAt, src => src.OldMagicCompletedAt)
+            .Map(dest => dest.NewMagicCompletedAt, src => src.NewMagicCompletedAt)
+            .Map(dest => dest.Action, src => (int)src.Action)
+            .Map(dest => dest.PerformedBy, src => src.PerformedBy ?? string.Empty)
+            .Map(dest => dest.Reason, src => src.Reason ?? string.Empty)
+            .Map(dest => dest.CreatedAt, src => Timestamp.FromDateTimeOffset(src.Created));
+    }
+}

src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipCycleProfile.cs

@@ -0,0 +1,57 @@
+using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Domain.Enums;
+using Mapster;
+using AppCycle = CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetAllClubMembershipCycleByFilter;
+using AppCycleSummary = CMSMicroservice.Application.ClubMembershipCycleCQ.Queries.GetClubMembershipCycleSummary;
+using ProtoCycle = CMSMicroservice.Protobuf.Protos.ClubMembershipCycle;
+
+namespace CMSMicroservice.WebApi.Common.Mappings;
+
+public class ClubMembershipCycleProfile : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config.NewConfig<ProtoCycle.GetAllClubMembershipCycleByFilterRequest, AppCycle.GetAllClubMembershipCycleByFilterQuery>()
+            .Map(dest => dest.PaginationState, src => src.PaginationState)
+            .Map(dest => dest.SortBy, src => src.SortBy)
+            .Map(dest => dest.Filter, src => src.Filter);
+
+        config.NewConfig<ProtoCycle.GetAllClubMembershipCycleByFilterFilter, AppCycle.GetAllClubMembershipCycleByFilterFilter>()
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.IsCurrentCycle, src => src.IsCurrentCycle)
+            .Map(dest => dest.PackageId, src => src.PackageId)
+            .Map(dest => dest.CycleNumber, src => src.CycleNumber)
+            .Map(dest => dest.PurchaseMethod, src => src.PurchaseMethod == null ? null : (PackagePurchaseMethod?)src.PurchaseMethod)
+            .Map(dest => dest.MagicState, src => src.MagicState)
+            .Map(dest => dest.PackagePurchasedFrom, src => src.PackagePurchasedFrom != null ? src.PackagePurchasedFrom.ToDateTime() : (DateTime?)null)
+            .Map(dest => dest.PackagePurchasedTo, src => src.PackagePurchasedTo != null ? src.PackagePurchasedTo.ToDateTime() : (DateTime?)null);
+
+        config.NewConfig<AppCycle.GetAllClubMembershipCycleByFilterResponseDto, ProtoCycle.GetAllClubMembershipCycleByFilterResponse>()
+            .Map(dest => dest.MetaData, src => src.MetaData)
+            .Map(dest => dest.Models, src => src.Models);
+
+        config.NewConfig<AppCycle.GetAllClubMembershipCycleByFilterResponseModel, ProtoCycle.ClubMembershipCycleModel>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserName, src => src.UserName)
+            .Map(dest => dest.ClubMembershipId, src => src.ClubMembershipId)
+            .Map(dest => dest.CycleNumber, src => src.CycleNumber)
+            .Map(dest => dest.PackageId, src => src.PackageId)
+            .Map(dest => dest.PackageName, src => src.PackageName)
+            .Map(dest => dest.PackageAmount, src => src.PackageAmount)
+            .Map(dest => dest.PurchaseMethod, src => (int)src.PurchaseMethod)
+            .Map(dest => dest.PackagePurchasedAt, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.PackagePurchasedAt, DateTimeKind.Utc)))
+            .Map(dest => dest.MagicStartedAt, src => src.MagicStartedAt)
+            .Map(dest => dest.MagicCompletedAt, src => src.MagicCompletedAt)
+            .Map(dest => dest.IsCurrentCycle, src => src.IsCurrentCycle)
+            .Map(dest => dest.CreatedAt, src => Timestamp.FromDateTimeOffset(src.Created));
+
+        config.NewConfig<ProtoCycle.GetClubMembershipCycleSummaryRequest, AppCycleSummary.GetClubMembershipCycleSummaryQuery>()
+            .Map(dest => dest.Filter, src => src.Filter);
+
+        config.NewConfig<AppCycleSummary.GetClubMembershipCycleSummaryResponseDto, ProtoCycle.GetClubMembershipCycleSummaryResponse>()
+            .Map(dest => dest.TotalCount, src => src.TotalCount)
+            .Map(dest => dest.CurrentCycleCount, src => src.CurrentCycleCount)
+            .Map(dest => dest.MagicActiveCount, src => src.MagicActiveCount);
+    }
+}

src/CMSMicroservice.WebApi/Common/Mappings/ClubMembershipProfile.cs

@@ -1,7 +1,9 @@
 using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetAllClubMemberships;
 using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembership;
 using CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubStatistics;
-using CMSMicroservice.Protobuf.Protos.ClubMembership;
+using CMSMicroservice.Domain.Enums;
+using AppHistory = CMSMicroservice.Application.ClubMembershipCQ.Queries.GetClubMembershipHistory;
+using ProtoClub = CMSMicroservice.Protobuf.Protos.ClubMembership;
 using Google.Protobuf.WellKnownTypes;
 using Mapster;
 using System.Linq;
@@ -17,15 +19,15 @@ public class ClubMembershipProfile : IRegister
         // =====================
         
         // GetClubMembershipRequest -> GetClubMembershipQuery
-        config.NewConfig<GetClubMembershipRequest, GetClubMembershipQuery>()
+        config.NewConfig<ProtoClub.GetClubMembershipRequest, GetClubMembershipQuery>()
             .MapWith(src => new GetClubMembershipQuery
             {
                 UserId = src.UserId
             });
 
         // ClubMembershipDto -> GetClubMembershipResponse
-        config.NewConfig<ClubMembershipDto, GetClubMembershipResponse>()
+        config.NewConfig<ClubMembershipDto, ProtoClub.GetClubMembershipResponse>()
-            .MapWith(src => new GetClubMembershipResponse
+            .MapWith(src => new ProtoClub.GetClubMembershipResponse
             {
                 Id = src.Id,
                 UserId = src.UserId,
@@ -48,7 +50,7 @@ public class ClubMembershipProfile : IRegister
         // =====================
         
         // GetAllClubMembershipsRequest -> GetAllClubMembershipsQuery
-        config.NewConfig<GetAllClubMembershipsRequest, GetAllClubMembershipsQuery>()
+        config.NewConfig<ProtoClub.GetAllClubMembershipsRequest, GetAllClubMembershipsQuery>()
             .MapWith(src => new GetAllClubMembershipsQuery
             {
                 PaginationState = new Application.Common.Models.PaginationState
@@ -64,8 +66,8 @@ public class ClubMembershipProfile : IRegister
             });
 
         // GetAllClubMembershipsResponseDto -> GetAllClubMembershipsResponse
-        config.NewConfig<GetAllClubMembershipsResponseDto, GetAllClubMembershipsResponse>()
+        config.NewConfig<GetAllClubMembershipsResponseDto, ProtoClub.GetAllClubMembershipsResponse>()
-            .MapWith(src => new GetAllClubMembershipsResponse
+            .MapWith(src => new ProtoClub.GetAllClubMembershipsResponse
             {
                 MetaData = new CMSMicroservice.Protobuf.Protos.MetaData
                 {
@@ -82,12 +84,12 @@ public class ClubMembershipProfile : IRegister
         // =====================
 
         // GetClubStatisticsRequest -> GetClubStatisticsQuery
-        config.NewConfig<GetClubStatisticsRequest, GetClubStatisticsQuery>()
+        config.NewConfig<ProtoClub.GetClubStatisticsRequest, GetClubStatisticsQuery>()
             .MapWith(src => new GetClubStatisticsQuery());
 
         // GetClubStatisticsResponseDto -> GetClubStatisticsResponse
-        config.NewConfig<GetClubStatisticsResponseDto, GetClubStatisticsResponse>()
+        config.NewConfig<GetClubStatisticsResponseDto, ProtoClub.GetClubStatisticsResponse>()
-            .MapWith(src => new GetClubStatisticsResponse
+            .MapWith(src => new ProtoClub.GetClubStatisticsResponse
             {
                 TotalMembers = src.TotalMembers,
                 ActiveMembers = src.ActiveMembers,
@@ -97,14 +99,14 @@ public class ClubMembershipProfile : IRegister
                 TotalRevenue = src.TotalRevenue,
                 AverageMembershipDurationDays = src.AverageMembershipDurationDays,
                 ExpiringSoonCount = src.ExpiringSoonCount,
-                PackageDistribution = { src.PackageDistribution.Select(p => new PackageLevelDistribution
+                PackageDistribution = { src.PackageDistribution.Select(p => new ProtoClub.PackageLevelDistribution
                 {
                     PackageId = p.PackageId,
                     PackageName = p.PackageName ?? string.Empty,
                     MemberCount = p.MemberCount,
                     Percentage = p.Percentage
                 }) },
-                MonthlyTrend = { src.MonthlyTrend.Select(t => new MonthlyMembershipTrend
+                MonthlyTrend = { src.MonthlyTrend.Select(t => new ProtoClub.MonthlyMembershipTrend
                 {
                     Month = t.Month ?? string.Empty,
                     Activations = t.Activations,
@@ -112,24 +114,55 @@ public class ClubMembershipProfile : IRegister
                     NetChange = t.NetChange
                 }) }
             });
+
+        // GetClubMembershipHistory
+        config.NewConfig<ProtoClub.GetClubMembershipHistoryRequest, AppHistory.GetClubMembershipHistoryQuery>()
+            .Map(dest => dest.PaginationState, src => src.PaginationState)
+            .Map(dest => dest.SortBy, src => src.SortBy)
+            .Map(dest => dest.Filter, src => src.Filter);
+
+        config.NewConfig<ProtoClub.GetClubMembershipHistoryFilter, AppHistory.GetClubMembershipHistoryFilter>()
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.ClubMembershipId, src => src.ClubMembershipId)
+            .Map(dest => dest.Action, src => src.Action == null ? null : (ClubMembershipAction?)src.Action)
+            .Map(dest => dest.CreatedFrom, src => src.CreatedFrom != null ? src.CreatedFrom.ToDateTime() : (DateTime?)null)
+            .Map(dest => dest.CreatedTo, src => src.CreatedTo != null ? src.CreatedTo.ToDateTime() : (DateTime?)null);
+
+        config.NewConfig<AppHistory.GetClubMembershipHistoryResponseDto, ProtoClub.GetClubMembershipHistoryResponse>()
+            .Map(dest => dest.MetaData, src => src.MetaData)
+            .Map(dest => dest.Models, src => src.Models);
+
+        config.NewConfig<AppHistory.GetClubMembershipHistoryResponseModel, ProtoClub.ClubMembershipHistoryModel>()
+            .Map(dest => dest.Id, src => src.Id)
+            .Map(dest => dest.ClubMembershipId, src => src.ClubMembershipId)
+            .Map(dest => dest.UserId, src => src.UserId)
+            .Map(dest => dest.UserName, src => src.UserName ?? string.Empty)
+            .Map(dest => dest.OldIsActive, src => src.OldIsActive)
+            .Map(dest => dest.NewIsActive, src => src.NewIsActive)
+            .Map(dest => dest.OldInitialContribution, src => src.OldInitialContribution)
+            .Map(dest => dest.NewInitialContribution, src => src.NewInitialContribution)
+            .Map(dest => dest.Action, src => (int)src.Action)
+            .Map(dest => dest.PerformedBy, src => src.PerformedBy ?? string.Empty)
+            .Map(dest => dest.Reason, src => src.Reason ?? string.Empty)
+            .Map(dest => dest.CreatedAt, src => Timestamp.FromDateTimeOffset(src.Created));
     }
 
-    private static ClubMembershipModel MapToModel(GetAllClubMembershipsResponseModel src)
+    private static ProtoClub.ClubMembershipModel MapToModel(GetAllClubMembershipsResponseModel src)
     {
-        return new ClubMembershipModel
+        return new ProtoClub.ClubMembershipModel
         {
             Id = src.Id,
             UserId = src.UserId,
             UserName = src.UserName ?? string.Empty,
-            PackageId = 0, // Not available in current entity
+            PackageId = src.PackageId,
-            PackageName = string.Empty, // Not available in current entity
+            PackageName = src.PackageName ?? string.Empty,
-            ActivationCode = string.Empty, // Not available in current entity
+            ActivationCode = string.Empty,
             ActivatedAt = src.ActivatedAt.HasValue 
                 ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.ActivatedAt.Value, DateTimeKind.Utc)) 
                 : null,
-            ExpiresAt = null, // Not available in current entity
+            ExpiresAt = null,
             IsActive = src.IsActive,
-            IsExpired = false, // Calculate based on ExpiresAt if available
+            IsExpired = false,
             Created = Timestamp.FromDateTime(src.Created.UtcDateTime)
         };
     }

src/CMSMicroservice.WebApi/Common/Mappings/DiscountProductProfile.cs

@@ -19,6 +19,8 @@ public class DiscountProductProfile : IRegister
                 src => src.CategoryId != null ? src.CategoryId.Value : (long?)null)
             .Map(dest => dest.IsActive,
                 src => src.IsActive != null ? src.IsActive.Value : (bool?)null)
+            .Map(dest => dest.InStock,
+                src => src.InStock != null ? src.InStock.Value : (bool?)null)
             .Map(dest => dest.MinPrice,
                 src => src.MinPrice != null ? (int?)src.MinPrice.Value : null)
             .Map(dest => dest.MaxPrice,