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 rollout restart deployment/backoffice &&
-            kubectl rollout status deployment/backoffice --timeout=180s &&
+            kubectl apply -n kbs-stage -f /tmp/backoffice-deployment.yaml &&
+            kubectl -n kbs-stage rollout restart deployment/backoffice &&
+            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
-        imagePullPolicy: Always
+        image: 185.252.31.44:30080/admin/backoffice:latest
+        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.209" />
+        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.214" />
     </ItemGroup>
     
     <!-- ============================================================ -->

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/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/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"