Merge branch 'kub-stage' into production

Co-authored-by: Cursor <cursoragent@cursor.com>

.gitea/workflows/bo-stage.yml

@@ -1,46 +0,0 @@
-
-name: Push nuget and docker image Actions Workflow
-
-on:
-  push:
-    branches:        
-      - stage-new
-jobs:
-  Deploy:
-    runs-on: windows
-    steps:
-      - name: Checkout
-        uses: https://git.afrino.co/actions/checkout@v3
-      - name: Setup dotnet
-        uses: https://git.afrino.co/actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
-      
-      - name: Remove Package Source
-        run: dotnet nuget remove source FourSat
-        continue-on-error: true
-      - name: Add Package Source
-        run: dotnet nuget add source --name FourSat --username systemuser --password sZSA7PTiv3pUSQZ https://git.afrino.co/api/packages/FourSat/nuget/index.json --store-password-in-clear-text
-
-      - name: Install dependencies
-        run: dotnet restore ".\src\BackOffice\BackOffice.csproj"
-      - name: Build
-        run: dotnet build ".\src\BackOffice\BackOffice.csproj" --configuration Release --no-restore
-      - name: Test
-        run: dotnet test ".\src\BackOffice\BackOffice.csproj" --no-restore --verbosity normal
-      - name: Recycle Apppool
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" recycle apppool /apppool.name:admin.kbs1.ir
-        shell: powershell
-      - name: Stop Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" stop site /site.name:admin.kbs1.ir
-        shell: powershell
-      - name: Publish
-        run: dotnet publish ".\src\BackOffice\BackOffice.csproj" -c Release -o publish
-      - name: Copy Publish To IIS Directory
-        run: Get-ChildItem -Path "publish\*" | Copy-Item -Destination "E:\kbs1.ir\admin.kbs1.ir\" -Recurse -Force
-      - name: Start Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" start site /site.name:admin.kbs1.ir
-        shell: powershell

.gitea/workflows/kub-deploy.yml

@@ -6,15 +6,15 @@ on:
       - kub-stage
 
 env:
-  REGISTRY: 194.5.195.53:30080
+  REGISTRY: 185.252.31.44:30080
   IMAGE_NAME: admin/backoffice
-  K8S_SERVER: 194.5.195.53
+  K8S_SERVER: 185.252.31.44
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: 194.5.195.53:32082/docker-sshpass:latest
+      image: 185.252.31.44:32082/docker-sshpass:latest
       options: --privileged
     steps:
       - name: Start Docker daemon
@@ -22,7 +22,7 @@ jobs:
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
+            "insecure-registries": ["185.252.31.44:30080", "185.252.31.44:32500", "185.252.31.44:32082"]
           }
           DAEMON
           echo "🚀 Starting Docker daemon..."
@@ -52,7 +52,7 @@ jobs:
 
       - name: Login to Docker registries
         run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 185.252.31.44:32082 -u admin --password-stdin
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
 
       - name: Build Docker Image
@@ -73,9 +73,9 @@ jobs:
           
           # Apply manifests and restart
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl apply -f /tmp/backoffice-deployment.yaml &&
+            kubectl apply -n kbs-stage -f /tmp/backoffice-deployment.yaml &&
-            kubectl rollout restart deployment/backoffice &&
+            kubectl -n kbs-stage rollout restart deployment/backoffice &&
-            kubectl rollout status deployment/backoffice --timeout=180s &&
+            kubectl -n kbs-stage rollout status deployment/backoffice --timeout=180s &&
             rm -f /tmp/backoffice-deployment.yaml
           "
           echo "✅ Deployed!"

.gitea/workflows/prod-deploy.yml

@@ -6,7 +6,7 @@ on:
       - production
 
 env:
-  REGISTRY: 194.5.195.53:30080
+  REGISTRY: 185.252.31.44:30080
   IMAGE_NAME: admin/backoffice
   K8S_SERVER: 45.149.79.127
 
@@ -14,7 +14,7 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: 194.5.195.53:32082/docker-sshpass:latest
+      image: 185.252.31.44:32082/docker-sshpass:latest
       options: --privileged
     steps:
       - name: Start Docker daemon
@@ -22,7 +22,7 @@ jobs:
           mkdir -p /etc/docker
           cat > /etc/docker/daemon.json << 'DAEMON'
           {
-            "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"]
+            "insecure-registries": ["185.252.31.44:30080", "185.252.31.44:32500", "185.252.31.44:32082"]
           }
           DAEMON
           echo "🚀 Starting Docker daemon..."
@@ -40,7 +40,7 @@ jobs:
           done
           
           if ! docker info >/dev/null 2>&1; then
-            echo "❌ Docker daemon failed to start after 3 minutes"
+            echo "❌ Docker daemon failed to start"
             exit 1
           fi
 
@@ -50,15 +50,16 @@ jobs:
 
       - name: Login to Docker registries
         run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 185.252.31.44:32082 -u admin --password-stdin
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
 
       - name: Build Docker Image
         run: |
           cd src
-          DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
+          DOCKER_BUILDKIT=0 docker build --network host -f BackOffice/Dockerfile \
+                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
                        -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
-                       -f BackOffice/Dockerfile .
+                       .
 
       - name: Push to Registry
         run: |

k8s/staging/backoffice-deployment.yaml

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: backoffice
-  namespace: default
+  namespace: kbs-stage
   labels:
     app: backoffice
 spec:
@@ -19,8 +19,8 @@ spec:
     spec:
       containers:
       - name: backoffice
-        image: 194.5.195.53:30080/admin/backoffice:latest
+        image: 185.252.31.44:30080/admin/backoffice:latest
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80
           name: http
@@ -43,7 +43,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: backoffice-svc
-  namespace: default
+  namespace: kbs-stage
 spec:
   selector:
     app: backoffice
@@ -58,7 +58,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: backoffice-ingress
-  namespace: default
+  namespace: kbs-stage
   annotations:
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"

src/BackOffice/BackOffice.csproj

@@ -143,7 +143,7 @@
         <ProjectReference Include="../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj" />
     </ItemGroup>
     <ItemGroup Condition="!Exists('../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj')">
-        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.208" />
+        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.214" />
     </ItemGroup>
     
     <!-- ============================================================ -->

src/BackOffice/Common/BaseComponents/DateRangePicker.razor.cs

@@ -8,21 +8,46 @@ namespace BackOffice.Common.BaseComponents;
 public partial class DateRangePicker
 {
     private DateRange _dateRange = new();
+    private MudDateRangePicker _picker = default!;
+    private DateTime? _lastSyncedFrom;
+    private DateTime? _lastSyncedTo;
 
-    private MudDateRangePicker _picker;
     [Parameter] public string Label { get; set; } = "انتخاب بازه زمانی";
     [Parameter] public DateTime? DefaultStart { get; set; }
     [Parameter] public DateTime? DefaultEnd { get; set; }
     [Parameter] public EventCallback<DateRange> OnChanged { get; set; }
+
+    [Parameter] public DateTime? From { get; set; }
+    [Parameter] public EventCallback<DateTime?> FromChanged { get; set; }
+    [Parameter] public DateTime? To { get; set; }
+    [Parameter] public EventCallback<DateTime?> ToChanged { get; set; }
+
     protected override void OnInitialized()
     {
         base.OnInitialized();
-        if (DefaultStart.HasValue)
+        var start = From ?? DefaultStart;
-            _dateRange.Start = DefaultStart.Value.Date;
+        var end = To ?? DefaultEnd;
-
+        ApplyExternalRange(start, end);
-        if (DefaultEnd.HasValue)
+        _lastSyncedFrom = From;
-            _dateRange.End = DefaultEnd.Value.Date;
+        _lastSyncedTo = To;
     }
+
+    protected override void OnParametersSet()
+    {
+        // فقط وقتی والد From/To را عوض کرده (مثلاً پاک کردن فیلتر)، نه هنگام انتخاب داخل پیکر
+        if (From == _lastSyncedFrom && To == _lastSyncedTo)
+            return;
+
+        _lastSyncedFrom = From;
+        _lastSyncedTo = To;
+        ApplyExternalRange(From, To);
+    }
+
+    private void ApplyExternalRange(DateTime? start, DateTime? end)
+    {
+        _dateRange = new DateRange(start?.Date, end?.Date);
+    }
+
     public CultureInfo GetPersianCulture()
     {
         var culture = new CultureInfo("fa-IR");
@@ -53,19 +78,35 @@ public partial class DateRangePicker
         culture.NumberFormat.NumberNegativePattern = 0;
         return culture;
     }
+
     private async Task OnClickOK()
     {
-        if (_picker.DateRange is not null)
+        var range = _picker.DateRange ?? _dateRange;
-        {
+        _dateRange = range ?? new DateRange();
-            await OnChanged.InvokeAsync(_picker.DateRange);
+        await NotifyRangeChangedAsync(_dateRange);
-        }
-
         await _picker.CloseAsync();
     }
+
     private async Task OnClickClear()
     {
         _dateRange = new DateRange();
-        await OnChanged.InvokeAsync(_dateRange);
+        await NotifyRangeChangedAsync(_dateRange);
         await _picker.CloseAsync();
     }
+
+    private async Task NotifyRangeChangedAsync(DateRange range)
+    {
+        var start = range.Start?.Date;
+        var end = range.End?.Date;
+
+        _lastSyncedFrom = start;
+        _lastSyncedTo = end;
+
+        if (From != start)
+            await FromChanged.InvokeAsync(start);
+        if (To != end)
+            await ToChanged.InvokeAsync(end);
+
+        await OnChanged.InvokeAsync(range);
+    }
 }

src/BackOffice/Common/Utilities/RouteConstance.cs

@@ -8,6 +8,7 @@ public static class RouteConstance
     public const string Package = "/PackagePage/";
     public const string Role = "/RolePage/";
     public const string UserPage = "/UserPage/";
+    public const string InvitationsReport = "/InvitationsReportPage/";
     public const string UserOrder = "/UserOrderPage/";
     public const string Orders = "/OrdersPage/";
     public const string OrdersSalesReports = "/OrdersSalesReportsPage/";

src/BackOffice/Dockerfile

@@ -1,4 +1,4 @@
-FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build
+FROM 185.252.31.44:32082/dotnet/sdk:9.0 AS build
 WORKDIR /src
 
 # Copy NuGet config and project file
@@ -16,7 +16,7 @@ WORKDIR "/src/BackOffice"
 RUN dotnet publish "BackOffice.csproj" -c Release -o /app/publish
 
 # Runtime stage - nginx for Blazor WebAssembly
-FROM 194.5.195.53:32082/nginx:alpine AS final
+FROM 185.252.31.44:32082/nginx:alpine AS final
 WORKDIR /usr/share/nginx/html
 
 # Remove default nginx files
@@ -32,7 +32,7 @@ RUN chmod +x /docker-entrypoint.sh
 # Default Blazor environment (override via K8s env var BLAZOR_ENVIRONMENT)
 ENV BLAZOR_ENVIRONMENT=Staging
 # Default gateway URL for gRPC calls (injected into appsettings at startup)
-ENV GW_URL=https://cms.se.kbs1.ir
+ENV GW_URL=https://cms.kbs2.ir
 
 EXPOSE 80
 CMD ["/docker-entrypoint.sh"]

src/BackOffice/NuGet.config

@@ -2,8 +2,10 @@
 <configuration>
   <packageSources>
     <clear />
+    <!-- Local packages (dev builds) -->
+    <!-- <add key="Local" value="/home/masoud/Apps/project/FourSat/nupkg" /> -->
     <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
-    <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
+    <add key="Nexus" value="http://185.252.31.44:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
   </packageSources>
   <packageSourceCredentials>
     <Nexus>

src/BackOffice/Pages/Club/ClubMembers.razor

@@ -33,12 +33,6 @@
                           StartIcon="@Icons.Material.Filled.Refresh">
                     بارگذاری
                 </MudButton>
-                <MudButton Variant="Variant.Filled" 
-                          Color="Color.Success" 
-                          OnClick="OpenActivateDialog"
-                          StartIcon="@Icons.Material.Filled.Add">
-                    فعال‌سازی عضو جدید
-                </MudButton>
                 <MudButton Variant="Variant.Outlined" 
                           Color="Color.Info" 
                           OnClick="ExportToExcel"

src/BackOffice/Pages/Club/ClubMembers.razor.cs

@@ -62,23 +62,6 @@ public partial class ClubMembers
         }
     }
 
-    private async Task OpenActivateDialog()
-    {
-        var dialog = await DialogService.ShowAsync<ActivateClubDialog>("فعال‌سازی عضویت باشگاه", new DialogOptions
-        {
-            CloseButton = true,
-            MaxWidth = MaxWidth.Small,
-            FullWidth = true
-        });
-
-        var result = await dialog.Result;
-        if (!result.Canceled)
-        {
-            Snackbar.Add("عضویت با موفقیت فعال شد", Severity.Success);
-            await ApplyFilter();
-        }
-    }
-
     private async Task ViewDetails(ClubMembershipModel member)
     {
         var parameters = new DialogParameters

src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor

@@ -1,156 +0,0 @@
-@using CMSMicroservice.Protobuf.Protos.ClubMembership
-@using CMSMicroservice.Protobuf.Protos.Package
-@using BackOffice.Pages.AutoComplete
-
-<MudDialog>
-    <DialogContent>
-        <MudForm @ref="_form" @bind-IsValid="_formValid">
-            <MudStack Spacing="3">
-                <UserAutoComplete Label="انتخاب کاربر" @bind-SelectedUserId="_model.UserId" />
-
-                @if (_isLoadingPackages)
-                {
-                    <MudSkeleton SkeletonType="SkeletonType.Rectangle" Height="56px" />
-                }
-                else
-                {
-                    <MudSelect T="long" @bind-Value="_model.PackageId"
-                               Label="انتخاب پکیج"
-                               Required="true"
-                               RequiredError="انتخاب پکیج الزامی است"
-                               Variant="Variant.Outlined"
-                               AnchorOrigin="Origin.BottomCenter">
-                        @foreach (var pkg in _packages)
-                        {
-                            <MudSelectItem T="long" Value="pkg.Id">
-                                @pkg.Title — @($"{pkg.Price:N0}") ریال
-                            </MudSelectItem>
-                        }
-                    </MudSelect>
-                }
-
-                <MudAlert Severity="Severity.Info" Dense="true">
-                    <MudText Typo="Typo.body2">
-                        با تایید، عضویت باشگاه برای کاربر فعال می‌شود.
-                        <br/>
-                        <small>عضویت باشگاه بدون محدودیت زمانی است.</small>
-                    </MudText>
-                </MudAlert>
-            </MudStack>
-        </MudForm>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">لغو</MudButton>
-        <MudButton Color="Color.Success" 
-                   Variant="Variant.Filled" 
-                   OnClick="Submit"
-                   Disabled="@(!_formValid || _isSubmitting || _isLoadingPackages)">
-            @if (_isSubmitting)
-            {
-                <MudProgressCircular Size="Size.Small" Indeterminate="true" />
-                <MudText Class="ms-2">در حال پردازش...</MudText>
-            }
-            else
-            {
-                <text>تایید و فعال‌سازی</text>
-            }
-        </MudButton>
-    </DialogActions>
-</MudDialog>
-
-@code {
-    [CascadingParameter] IMudDialogInstance MudDialog { get; set; }
-    [Inject] public ClubMembershipContract.ClubMembershipContractClient ClubContract { get; set; }
-    [Inject] public PackageContract.PackageContractClient PackageClient { get; set; }
-
-    private MudForm _form;
-    private bool _formValid;
-    private bool _isSubmitting;
-    private bool _isLoadingPackages = true;
-    private List<GetAllPackageByFilterResponseModel> _packages = new();
-    private ActivateModel _model = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadPackages();
-    }
-
-    private async Task LoadPackages()
-    {
-        _isLoadingPackages = true;
-        try
-        {
-            var request = new GetAllPackageByFilterRequest
-            {
-                PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
-                {
-                    PageNumber = 1,
-                    PageSize = 50
-                }
-            };
-            var result = await PackageClient.GetAllPackageByFilterAsync(request);
-            if (result?.Models != null)
-            {
-                _packages = result.Models.ToList();
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"خطا در بارگذاری پکیج‌ها: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _isLoadingPackages = false;
-        }
-    }
-
-    private void Cancel() => MudDialog.Cancel();
-
-    private async Task Submit()
-    {
-        await _form.Validate();
-        if (!_formValid) return;
-
-        if (!_model.UserId.HasValue || _model.UserId.Value <= 0)
-        {
-            Snackbar.Add("لطفاً کاربر را انتخاب کنید.", Severity.Warning);
-            return;
-        }
-
-        if (_model.PackageId <= 0)
-        {
-            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
-            return;
-        }
-
-        _isSubmitting = true;
-        try
-        {
-            var request = new ActivateClubMembershipRequest
-            {
-                UserId = _model.UserId.Value,
-                PackageId = _model.PackageId,
-                ForceActivation = true
-            };
-
-            var response = await ClubContract.ActivateClubMembershipAsync(request);
-            
-            Snackbar.Add("عضویت با موفقیت فعال شد.", Severity.Success);
-            MudDialog.Close(DialogResult.Ok(true));
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"خطا: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _isSubmitting = false;
-        }
-    }
-
-    private class ActivateModel
-    {
-        public long? UserId { get; set; }
-        public long PackageId { get; set; }
-    }
-}

src/BackOffice/Pages/Club/Reports/CustomerPackagePurchasesReport.razor

@@ -205,31 +205,19 @@
         _exporting = true;
         try
         {
-            var filter = BuildFilter();
+            // PageSize=0 → همهٔ ردیف‌های مطابق فیلتر، مستقل از صفحه‌بندی گرید
-            var all = new List<CustomerPackagePurchaseRollupModel>();
-            const int pageSize = 500;
-            var page = 1;
-            long totalCount;
-
-            do
-            {
             var result = await PurchaseClient.GetCustomerPackagePurchaseRollupAsync(
                 new GetCustomerPackagePurchaseRollupRequest
                 {
                     PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
                     {
-                            PageNumber = page,
+                        PageNumber = 1,
-                            PageSize = pageSize
+                        PageSize = 0
                     },
-                        Filter = filter
+                    Filter = BuildFilter()
                 });
 
-                var batch = result?.Models?.ToList() ?? new();
+            var all = result?.Models?.ToList() ?? new();
-                all.AddRange(batch);
-                totalCount = result?.MetaData?.TotalCount ?? 0;
-                page++;
-            } while (all.Count < totalCount && page <= 50);
-
             if (all.Count == 0)
             {
                 Snackbar.Add("داده‌ای برای خروجی با فیلتر فعلی وجود ندارد.", Severity.Info);

src/BackOffice/Pages/Commission/WeeklyReports.razor

@@ -65,6 +65,11 @@
                              SortMode="SortMode.Multiple">
                     <Columns>
                         <PropertyColumn Property="x => x.WeekDisplayName" Title="هفته" />
+                        <PropertyColumn Property="x => x.PackageTitle" Title="پکیج">
+                            <CellTemplate>
+                                @(string.IsNullOrEmpty(context.Item.PackageTitle) ? "—" : context.Item.PackageTitle)
+                            </CellTemplate>
+                        </PropertyColumn>
                         <PropertyColumn Property="x => x.TotalPoolAmount" Title="مبلغ کل استخر" Format="N0">
                             <CellTemplate>
                                 <MudText>@context.Item.TotalPoolAmount.ToString("N0") تومان</MudText>
@@ -203,6 +208,8 @@
             {
                 WeekDefinitionId = x.WeekDefinitionId,
                 WeekDisplayName = x.WeekDisplayName,
+                PackageId = x.PackageId,
+                PackageTitle = x.PackageTitle,
                 TotalPoolAmount = x.TotalPoolAmount,
                 TotalBalances = x.TotalBalances,
                 ValuePerBalance = x.ValuePerBalance,
@@ -249,6 +256,8 @@
     {
         public long WeekDefinitionId { get; set; }
         public string WeekDisplayName { get; set; } = "";
+        public long PackageId { get; set; }
+        public string PackageTitle { get; set; } = "";
         public long TotalPoolAmount { get; set; }
         public int TotalBalances { get; set; }
         public long ValuePerBalance { get; set; }

src/BackOffice/Pages/Commission/WeeklyReports.razor.cs

@@ -18,12 +18,13 @@ public partial class WeeklyReports
         try
         {
             var sb = new StringBuilder();
-            sb.AppendLine("هفته,مبلغ کل استخر,مجموع موجودی‌ها,ارزش هر موجودی,وضعیت,تاریخ محاسبه");
+            sb.AppendLine("هفته,پکیج,مبلغ کل استخر,مجموع موجودی‌ها,ارزش هر موجودی,وضعیت,تاریخ محاسبه");
 
             foreach (var r in _reports)
             {
                 sb.AppendLine(string.Join(",",
                     EscapeCsv(r.WeekDisplayName),
+                    EscapeCsv(r.PackageTitle),
                     r.TotalPoolAmount,
                     r.TotalBalances,
                     r.ValuePerBalance,

src/BackOffice/Pages/Payment/LedgerTransactions.razor

@@ -96,6 +96,16 @@
             </ToolBarContent>
             <Columns>
                 <PropertyColumn Property="x => x.Id" Title="شناسه" />
+                <TemplateColumn Title="کاربر">
+                    <CellTemplate>
+                        @(context.Item.UserId != null ? context.Item.UserId.ToString() : "—")
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="نام کاربر">
+                    <CellTemplate>
+                        @(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
+                    </CellTemplate>
+                </TemplateColumn>
                 <TemplateColumn Title="نوع">
                     <CellTemplate>
                         <MudChip T="string" Size="Size.Small" Variant="Variant.Text">
@@ -232,13 +242,13 @@
                 Filter = BuildFilter()
             });
             var sb = new System.Text.StringBuilder();
-            sb.AppendLine("Id,Type,Amount,Description,Status,RefId,PaymentDate,Created");
+            sb.AppendLine("Id,UserId,UserFullName,Type,Amount,Description,Status,RefId,PaymentDate,Created");
             foreach (var r in result.Models)
             {
                 var type = r.HasType ? ReportLabels.GetTransactionTypeLabel(r.Type) : "";
                 var status = r.HasPaymentStatus ? ReportLabels.GetTransactionPaymentStatusLabel(r.PaymentStatus) : "";
                 var paymentDate = r.PaymentDate != null ? r.PaymentDate.ToDateTime().ToString("yyyy-MM-dd HH:mm") : "";
-                sb.AppendLine($"{r.Id},{type},{r.Amount},\"{r.Description}\",{status},{r.RefId},{paymentDate},{r.Created.ToDateTime():yyyy-MM-dd HH:mm}");
+                sb.AppendLine($"{r.Id},{r.UserId},\"{r.UserFullName}\",{type},{r.Amount},\"{r.Description}\",{status},{r.RefId},{paymentDate},{r.Created.ToDateTime():yyyy-MM-dd HH:mm}");
             }
             await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "ledger-transactions.csv", sb.ToString());
         }

src/BackOffice/Pages/Payment/Transactions.razor

@@ -82,6 +82,11 @@
             <Columns>
                 <PropertyColumn Property="x => x.Id" Title="شناسه" />
                 <PropertyColumn Property="x => x.UserId" Title="کاربر" />
+                <TemplateColumn Title="نام کاربر">
+                    <CellTemplate>
+                        @(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
+                    </CellTemplate>
+                </TemplateColumn>
                 <PropertyColumn Property="x => x.Mobile" Title="موبایل" />
                 <PropertyColumn Property="x => x.GatewayProvider" Title="درگاه" />
                 <TemplateColumn Title="مبلغ (تومان)">
@@ -193,9 +198,9 @@
                 Filter = BuildFilter()
             });
             var sb = new System.Text.StringBuilder();
-            sb.AppendLine("Id,UserId,Mobile,Gateway,Amount,Authority,RefId,Status,OrderId,Created");
+            sb.AppendLine("Id,UserId,UserFullName,Mobile,Gateway,Amount,Authority,RefId,Status,OrderId,Created");
             foreach (var r in result.Models)
-                sb.AppendLine($"{r.Id},{r.UserId},{r.Mobile},{r.GatewayProvider},{r.Amount},{r.Authority},{r.RefId},{r.PaymentStatus},{r.OrderId},{r.CreatedAt.ToDateTime():yyyy-MM-dd HH:mm}");
+                sb.AppendLine($"{r.Id},{r.UserId},\"{r.UserFullName}\",{r.Mobile},{r.GatewayProvider},{r.Amount},{r.Authority},{r.RefId},{r.PaymentStatus},{r.OrderId},{r.CreatedAt.ToDateTime():yyyy-MM-dd HH:mm}");
             await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "payment-transactions.csv", sb.ToString());
         }
         catch (Exception ex) { Snackbar.Add($"خطا در export: {ex.Message}", Severity.Error); }

src/BackOffice/Pages/User/InvitationsReportPage.razor

@@ -0,0 +1,85 @@
+@attribute [Route(RouteConstance.InvitationsReport)]
+@using CMSMicroservice.Protobuf.Protos.User
+@using BackOffice.Common.BaseComponents
+@using DataModel = CMSMicroservice.Protobuf.Protos.User.InvitationReportModel
+
+<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit">
+    <Filters>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="موبایل دعوت‌کننده" @bind-Value="@_request.Filter.InviterMobile" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="نام دعوت‌کننده" @bind-Value="@_request.Filter.InviterFirstName" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="نام‌خانوادگی دعوت‌کننده" @bind-Value="@_request.Filter.InviterLastName" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="موبایل دعوت‌شونده" @bind-Value="@_request.Filter.InviteeMobile" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="نام دعوت‌شونده" @bind-Value="@_request.Filter.InviteeFirstName" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudTextField T="string" Clearable="true" Label="نام‌خانوادگی دعوت‌شونده" @bind-Value="@_request.Filter.InviteeLastName" Variant="Variant.Outlined" Margin="Margin.Dense" />
+        </MudItem>
+        <MudItem xs="12" sm="6" md="3">
+            <MudSelect T="string" Label="وضعیت باشگاه دعوت‌شونده" @bind-Value="_clubActiveFilter" Clearable="true" Variant="Variant.Outlined" Margin="Margin.Dense">
+                <MudSelectItem Value="@("")">همه</MudSelectItem>
+                <MudSelectItem Value="@("true")">فعال</MudSelectItem>
+                <MudSelectItem Value="@("false")">غیرفعال</MudSelectItem>
+            </MudSelect>
+        </MudItem>
+    </Filters>
+    <Content>
+        <MudDataGrid T="DataModel" ServerData="@(new Func<GridState<DataModel>, Task<GridData<DataModel>>>(ServerReload))"
+                     Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
+            <ToolBarContent>
+                <MudText>گزارش دعوت‌ها (جدیدترین اول)</MudText>
+            </ToolBarContent>
+            <Columns>
+                <PropertyColumn Property="x => x.Id" Title="شناسه" />
+                <TemplateColumn Title="دعوت‌کننده">
+                    <CellTemplate>
+                        <MudText Typo="Typo.body2">@($"{context.Item.InviterFirstName} {context.Item.InviterLastName}".Trim())</MudText>
+                        <MudText Typo="Typo.caption" Class="mud-text-secondary">@context.Item.InviterMobile</MudText>
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="دعوت‌شونده">
+                    <CellTemplate>
+                        <MudText Typo="Typo.body2">@($"{context.Item.InviteeFirstName} {context.Item.InviteeLastName}".Trim())</MudText>
+                        <MudText Typo="Typo.caption" Class="mud-text-secondary">@context.Item.InviteeMobile</MudText>
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="ثبت‌نام دعوت‌شونده">
+                    <CellTemplate>
+                        @(context.Item.InviteeRegisteredAt?.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm") ?? "—")
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="باشگاه">
+                    <CellTemplate>
+                        @if (context.Item.InviteeClubActive)
+                        {
+                            <MudChip T="string" Size="Size.Small" Color="Color.Success">فعال</MudChip>
+                        }
+                        else
+                        {
+                            <MudChip T="string" Size="Size.Small" Color="Color.Default">غیرفعال</MudChip>
+                        }
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="تاریخ دعوت">
+                    <CellTemplate>
+                        @(context.Item.InvitedAt?.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm") ?? "—")
+                    </CellTemplate>
+                </TemplateColumn>
+            </Columns>
+            <PagerContent>
+                <MudDataGridPager T="DataModel" />
+            </PagerContent>
+            <NoRecordsContent>
+                <MudText>موردی یافت نشد</MudText>
+            </NoRecordsContent>
+        </MudDataGrid>
+    </Content>
+</BackOffice.Common.BaseComponents.BasePageComponent>

src/BackOffice/Pages/User/InvitationsReportPage.razor.cs

@@ -0,0 +1,74 @@
+using CMSMicroservice.Protobuf.Protos.User;
+using BackOffice.Common.BaseComponents;
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+using DataModel = CMSMicroservice.Protobuf.Protos.User.InvitationReportModel;
+
+namespace BackOffice.Pages.User;
+
+public partial class InvitationsReportPage
+{
+    [Inject] public UserContract.UserContractClient UserContract { get; set; } = default!;
+
+    private MudDataGrid<DataModel> _gridData = default!;
+    private BasePageComponent _basePage = default!;
+    private GetInvitationsByFilterRequest _request = new() { Filter = new() };
+    private string _clubActiveFilter = string.Empty;
+
+    private async Task<GridData<DataModel>> ServerReload(GridState<DataModel> state)
+    {
+        _request.Filter ??= new();
+        ApplyClubFilter();
+        _request.PaginationState ??= new();
+        _request.PaginationState.PageNumber = state.Page + 1;
+        _request.PaginationState.PageSize = state.PageSize;
+        _request.SortBy = "newest";
+
+        var result = await UserContract.GetInvitationsByFilterAsync(_request);
+        if (result?.Models != null && result.Models.Any())
+        {
+            return new GridData<DataModel>
+            {
+                Items = result.Models.ToList(),
+                TotalItems = (int)result.MetaData.TotalCount
+            };
+        }
+
+        return new GridData<DataModel>();
+    }
+
+    private void ApplyClubFilter()
+    {
+        _request.Filter ??= new();
+        if (_clubActiveFilter == "true")
+            _request.Filter.InviteeClubActive = true;
+        else if (_clubActiveFilter == "false")
+            _request.Filter.InviteeClubActive = false;
+        else
+            _request.Filter.InviteeClubActive = null;
+    }
+
+    private void ReLoadData()
+    {
+        _ = _gridData.ReloadServerData();
+    }
+
+    public async Task OnFilterSubmit()
+    {
+        ApplyClubFilter();
+        _basePage.IsFiltered = true;
+        StateHasChanged();
+        ReLoadData();
+        await Task.CompletedTask;
+    }
+
+    public async Task OnFilterCleared()
+    {
+        _basePage.IsFiltered = false;
+        _clubActiveFilter = string.Empty;
+        _request = new() { Filter = new() };
+        StateHasChanged();
+        ReLoadData();
+        await Task.CompletedTask;
+    }
+}

src/BackOffice/Pages/User/UserMainPage.razor

@@ -28,6 +28,8 @@
                 <col />
                 <col />
                 <col />
+                <col style="min-width: 180px;" />
+                <col />
                 <col style="width: 58px;" />
             </ColGroup>
             <ToolBarContent>
@@ -46,8 +48,21 @@
                     </CellTemplate>
                 </PropertyColumn>
                 <PropertyColumn Property="x => x.NationalCode" Title="کدملی" />
-
+                <TemplateColumn Title="آدرس پیش‌فرض">
-
+                    <CellTemplate>
+                        <MudText Typo="Typo.caption" Style="max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"
+                                 Title="@(context.Item.DefaultAddress ?? "")">
+                            @(string.IsNullOrWhiteSpace(context.Item.DefaultAddress) ? "-" : context.Item.DefaultAddress)
+                        </MudText>
+                    </CellTemplate>
+                </TemplateColumn>
+                <TemplateColumn Title="کدپستی پیش‌فرض">
+                    <CellTemplate>
+                        <MudText Typo="Typo.caption">
+                            @(string.IsNullOrWhiteSpace(context.Item.DefaultPostalCode) ? "-" : context.Item.DefaultPostalCode)
+                        </MudText>
+                    </CellTemplate>
+                </TemplateColumn>
 
                 <TemplateColumn StickyLeft="true" Title="عملیات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
                     <CellTemplate>

src/BackOffice/Pages/User/UserMainPage.razor.cs

@@ -1,11 +1,10 @@
 using CMSMicroservice.Protobuf.Protos.User;
 using BackOffice.Common.BaseComponents;
+using BackOffice.Common.Utilities;
 using BackOffice.Pages.User.Components;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MudBlazor;
-using System.Text;
-using DateTimeConverterCL;
 using DataModel = CMSMicroservice.Protobuf.Protos.User.GetAllUserByFilterResponseModel;
 
 namespace BackOffice.Pages.User;
@@ -84,51 +83,63 @@ public partial class UserMainPage
     {
         try
         {
-            var exportRequest = new GetAllUserByFilterRequest
+            var filter = _request.Filter?.Clone() ?? new();
+            var all = new List<DataModel>();
+            const int pageSize = 200;
+            var page = 1;
+
+            while (page <= 500)
             {
-                Filter = _request.Filter?.Clone() ?? new(),
+                var result = await UserContract.GetAllUserByFilterAsync(new GetAllUserByFilterRequest
-                PaginationState = new() { PageNumber = 1, PageSize = 1000 }
+                {
-            };
+                    Filter = filter,
+                    PaginationState = new() { PageNumber = page, PageSize = pageSize }
+                });
 
-            var result = await UserContract.GetAllUserByFilterAsync(exportRequest);
+                var batch = result?.Models?.ToList() ?? new();
+                if (batch.Count == 0)
+                    break;
 
-            if (result?.Models == null || !result.Models.Any())
+                all.AddRange(batch);
+
+                var hasNext = result?.MetaData?.HasNext == true;
+                if (!hasNext || batch.Count < pageSize)
+                    break;
+
+                page++;
+            }
+
+            if (all.Count == 0)
             {
                 Snackbar.Add("داده‌ای برای خروجی وجود ندارد.", Severity.Info);
                 return;
             }
 
-            var sb = new StringBuilder();
+            var headers = new[]
-            sb.AppendLine("شناسه,موبایل,نام,نام خانوادگی,کدملی");
+            {
-
+                "شناسه", "موبایل", "نام", "نام خانوادگی", "کدملی",
-            foreach (var u in result.Models)
+                "آدرس پیش‌فرض", "کدپستی پیش‌فرض"
+            };
+
+            var rows = all.Select(u => new object?[]
             {
-                sb.AppendLine(string.Join(",",
                 u.Id,
-                    EscapeCsv(u.Mobile),
+                u.Mobile,
-                    EscapeCsv(u.FirstName),
+                u.FirstName,
-                    EscapeCsv(u.LastName),
+                u.LastName,
-                    EscapeCsv(u.NationalCode)));
+                u.NationalCode,
-            }
+                u.DefaultAddress,
+                u.DefaultPostalCode
+            });
 
-            var bytes = Encoding.UTF8.GetPreamble().Concat(Encoding.UTF8.GetBytes(sb.ToString())).ToArray();
+            var filename = $"users-{DateTime.Now:yyyyMMddHHmmss}.xls";
-            var base64 = Convert.ToBase64String(bytes);
+            await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename,
-            var filename = $"users-{DateTime.Now:yyyyMMddHHmmss}.csv";
+                CsvExportHelper.ToExcelXmlBase64("کاربران", headers, rows));
-
+            Snackbar.Add($"خروجی Excel آماده شد ({all.Count} کاربر).", Severity.Success);
-            await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename, base64);
-            Snackbar.Add("خروجی Excel (CSV) آماده شد.", Severity.Success);
         }
         catch (Exception ex)
         {
             Snackbar.Add($"خطا در خروجی Excel: {ex.Message}", Severity.Error);
         }
     }
-
-    private static string EscapeCsv(string value)
-    {
-        if (string.IsNullOrEmpty(value)) return "";
-        if (value.Contains(',') || value.Contains('"') || value.Contains('\n'))
-            return $"\"{value.Replace("\"", "\"\"")}\"";
-        return value;
-    }
 }

src/BackOffice/Shared/NavMenu.razor

@@ -185,6 +185,11 @@
                             Icon="@Icons.Material.Filled.People">
                     کاربران
                 </MudNavLink>
+                <MudNavLink Match="NavLinkMatch.Prefix"
+                            Href="@(RouteConstance.InvitationsReport)"
+                            Icon="@Icons.Material.Filled.GroupAdd">
+                    گزارش دعوت‌ها
+                </MudNavLink>
             }
 
             @if (CanManageRoles)

src/BackOffice/wwwroot/appsettings.Production.json

@@ -1,5 +1,5 @@
 {
-  "GwUrl": "https://cms.kbs1.ir",
+  "GwUrl": "https://cms.kbs2.ir",
   "Authentication": {
     "Authority": "https://ids.afrino.co/",
     "ClientId": "client_backoffice_spa"