fix: rename wallet labels — اصلی، اعتباری، پاداش تیمی

- عادی → اصلی (کیف پول اصلی) - شبکه → پاداش تیمی - پورسانت → پاداش تیمی - موجودی کیف پول → موجودی کیف پول اصلی Files: Wallet.razor, WalletService.cs, MagicWallet.razor, Profile/Index.razor, PaymentCallback.razor
chore: prevent appsettings.Production.json from merging — keep ours strategy
2026-02-23 23:26:52 +03:30 · 2026-02-23 00:03:00 +03:30 · 2026-02-22 22:29:17 +03:30 · 2026-02-22 22:22:43 +03:30 · 2026-02-22 10:25:35 +00:00 · 2026-02-21 20:38:23 +03:30
11 changed files with 28 additions and 142 deletions
@@ -0,0 +1,2 @@
+# Keep production config from current branch during merges — never overwrite
+src/FrontOffice.Main/appsettings.Production.json merge=ours
@@ -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\FrontOffice.Main\FrontOffice.Main.csproj"
-      - name: Build
-        run: dotnet build ".\src\FrontOffice.Main\FrontOffice.Main.csproj" --configuration Release --no-restore
-      - name: Test
-        run: dotnet test ".\src\FrontOffice.Main\FrontOffice.Main.csproj" --no-restore --verbosity normal
-      - name: Recycle Apppool
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" recycle apppool /apppool.name:kbs1.ir
-        shell: powershell
-      - name: Stop Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" stop site /site.name:kbs1.ir
-        shell: powershell
-      - name: Publish
-        run: dotnet publish ".\src\FrontOffice.Main\FrontOffice.Main.csproj" -c Release -o publish
-      - name: Copy Publish To IIS Directory
-        run: Get-ChildItem -Path "publish\*" | Copy-Item -Destination "E:\kbs1.ir\kbs1.ir\" -Recurse -Force
-      - name: Start Website
-        run: |
-          & "C:\Windows\System32\inetsrv\appcmd.exe" start site /site.name:kbs1.ir
-        shell: powershell
@@ -1,74 +0,0 @@
-name: Build and Deploy to Kubernetes
-
-on:
-  push:
-    branches:
-      - kub-stage
-
-env:
-  REGISTRY: 194.5.195.53:30080
-  IMAGE_NAME: admin/frontoffice
-  K8S_SERVER: 194.5.195.53
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    container:
-      image: 194.5.195.53:32082/docker-sshpass:latest
-      options: --privileged
-    steps:
-      - name: Start Docker daemon
-        run: |
-          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"]
-          }
-          DAEMON
-          echo "🚀 Starting Docker daemon..."
-          dockerd --iptables=false --ip6tables=false --bridge=none --storage-driver=vfs &
-          
-          # Wait up to 3 minutes for Docker to be ready
-          for i in $(seq 1 90); do 
-            if docker info >/dev/null 2>&1; then
-              echo "✅ Docker daemon is ready (attempt $i)"
-              docker version
-              break
-            else
-              echo "⏳ Waiting for Docker daemon... (attempt $i/90)"
-              sleep 2
-            fi
-          done
-          
-          # Final check
-          if ! docker info >/dev/null 2>&1; then
-            echo "❌ Docker daemon failed to start after 3 minutes"
-            exit 1
-          fi
-
-      - name: Checkout code
-        run: |
-          git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/FrontOffice.git .
-
-      - 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 ${{ 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 }}:latest -f FrontOffice.Main/Dockerfile .
-
-      - name: Push to Registry
-        run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-
-      - name: Deploy to Kubernetes
-        run: |
-          export SSHPASS="${{ secrets.SERVER_PASSWORD }}"
-          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl rollout restart deployment/frontoffice
-            kubectl rollout status deployment/frontoffice --timeout=180s
-          "
-          echo "✅ Deployed!"
@@ -8,7 +8,7 @@ on:
 env:
  REGISTRY: 194.5.195.53:30080
  IMAGE_NAME: admin/frontoffice
-  K8S_SERVER: 194.5.195.53
+  K8S_SERVER: 45.149.79.127

 jobs:
  build-and-deploy:
@@ -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

@@ -56,9 +56,10 @@ jobs:
      - 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 FrontOffice.Main/Dockerfile \
+                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
                       -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
-                       -f FrontOffice.Main/Dockerfile .
+                       .

      - name: Push to Registry
        run: |
@@ -69,7 +70,7 @@ jobs:
        run: |
          export SSHPASS="${{ secrets.SERVER_PASSWORD }}"
          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl rollout restart deployment/frontoffice
+            kubectl set image deployment/frontoffice frontoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
            kubectl rollout status deployment/frontoffice --timeout=300s
          "
          echo "✅ Deployed to Production!"
@@ -45,7 +45,7 @@
                    <div class="wallet-strip-item">
                        <div class="wallet-strip-label">
                            <MudIcon Icon="@Icons.Material.Outlined.CreditCard" Size="Size.Small" Color="Color.Primary" />
-                            <MudText Typo="Typo.caption" Class="mud-text-secondary">اعتباری</MudText>
+                            <MudText Typo="Typo.caption" Class="mud-text-secondary">اصلی</MudText>
                        </div>
                        <MudText Typo="Typo.subtitle2" Color="Color.Primary">@_walletCredit</MudText>
                    </div>
@@ -22,7 +22,7 @@
                <MudText Typo="Typo.h5" Class="mt-4">کیف‌پول جادویی فعال نیست</MudText>
                <MudText Typo="Typo.body1" Class="mt-2 mud-text-secondary">
                    برای فعال شدن کیف‌پول جادویی، ابتدا پکیج پایه را خریداری کنید و سپس 
-                    تمام موجودی عادی خود را از فروشگاه خرج کنید. وقتی موجودی عادی به صفر برسد، 
+                    تمام موجودی اصلی خود را از فروشگاه خرج کنید. وقتی موجودی اصلی به صفر برسد، 
                    کیف‌پول جادویی فعال می‌شود.
                </MudText>
                <MudButton Variant="Variant.Filled" Color="Color.Primary" Class="mt-4 rounded-pill"
@@ -180,7 +180,7 @@
                            حداکثر اعتبار: ۲۵۰ میلیون تومان (سود ۱۵۰٪)
                        </MudListItem>
                        <MudListItem T="string" Icon="@Icons.Material.Filled.Warning" IconColor="Color.Warning">
-                            در حالت جادویی، کمیسیون و پورسانت غیرفعال است
+                            در حالت جادویی، کمیسیون و پاداش تیمی غیرفعال است
                        </MudListItem>
                        <MudListItem T="string" Icon="@Icons.Material.Filled.Info" IconColor="Color.Info">
                            بعد از اتمام سقف و خرج موجودی، با خرید مجدد پکیج دور جدید شروع می‌شود
@@ -31,7 +31,7 @@
            <MudDivider Class="my-4" />
            
            <MudText Typo="Typo.body2" Color="Color.Secondary">
-                موجودی کیف پول: @FormatPrice(_walletBalance)
+                موجودی کیف پول اصلی: @FormatPrice(_walletBalance)
            </MudText>
            <MudText Typo="Typo.body2" Color="Color.Secondary">
                موجودی کیف پول اعتباری: @FormatPrice(_discountBalance)
@@ -9,13 +9,13 @@
        <MudGrid Spacing="2">
            <MudItem xs="12" sm="6" md="4">
                <MudPaper Elevation="2" Class="pa-4 rounded-lg">
-                    <MudText Typo="Typo.subtitle2" Class="mud-text-secondary">موجودی عادی</MudText>
+                    <MudText Typo="Typo.subtitle2" Class="mud-text-secondary">موجودی اصلی</MudText>
                    <MudText Typo="Typo.h4" Color="Color.Primary">@_balances.Credit</MudText>
                </MudPaper>
            </MudItem>
            <MudItem xs="12" sm="6" md="4">
                <MudPaper Elevation="2" Class="pa-4 rounded-lg">
-                    <MudText Typo="Typo.subtitle2" Class="mud-text-secondary">موجودی شبکه</MudText>
+                    <MudText Typo="Typo.subtitle2" Class="mud-text-secondary">پاداش تیمی</MudText>
                    <MudText Typo="Typo.h4" Color="Color.Success">@_balances.Network</MudText>
                </MudPaper>
            </MudItem>
@@ -82,8 +82,8 @@
                <MudTable Items="_txs" Dense="true" Hover="true" Striped="true">
                    <HeaderContent>
                        <MudTh>تاریخ</MudTh>
-                        <MudTh>عادی (تغییرات / مانده)</MudTh>
-                        <MudTh>شبکه (تغییرات / مانده)</MudTh>
+                        <MudTh>اصلی (تغییرات / مانده)</MudTh>
+                        <MudTh>پاداش تیمی (تغییرات / مانده)</MudTh>
                        <MudTh>اعتباری (تغییرات / مانده)</MudTh>
                        <MudTh>شناسه ارجاع</MudTh>
                        <MudTh>توضیحات</MudTh>
@@ -92,7 +92,7 @@
                        <MudTd DataLabel="تاریخ">
                            <MudText Typo="Typo.caption">@context.Date</MudText>
                        </MudTd>
-                        <MudTd DataLabel="عادی">
+                        <MudTd DataLabel="اصلی">
                            <MudStack Spacing="0">
                                <MudText Color="@(context.CreditChange > 0 ? Color.Success : context.CreditChange < 0 ? Color.Error : Color.Default)" Typo="Typo.body2">
                                    @(context.CreditChange != 0 ? (context.CreditChange > 0 ? "+" : "") + FormatPrice(context.CreditChange) : "-")
@@ -100,7 +100,7 @@
                                <MudText Typo="Typo.caption" Class="mud-text-secondary">@FormatPrice(context.CreditBalance)</MudText>
                            </MudStack>
                        </MudTd>
-                        <MudTd DataLabel="شبکه">
+                        <MudTd DataLabel="پاداش تیمی">
                            <MudStack Spacing="0">
                                <MudText Color="@(context.NetworkChange > 0 ? Color.Success : context.NetworkChange < 0 ? Color.Error : Color.Default)" Typo="Typo.body2">
                                    @(context.NetworkChange != 0 ? (context.NetworkChange > 0 ? "+" : "") + FormatPrice(context.NetworkChange) : "-")
@@ -136,10 +136,10 @@
                                <MudDivider />
                                
                                <MudStack Row="true" Spacing="2" Justify="Justify.SpaceBetween">
-                                    <!-- کیف پول عادی -->
+                                    <!-- کیف پول اصلی -->
                                    <MudPaper Class="pa-2 flex-grow-1" Outlined="true">
                                        <MudStack Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudText Typo="Typo.caption" Color="Color.Primary">عادی</MudText>
+                                            <MudText Typo="Typo.caption" Color="Color.Primary">اصلی</MudText>
                                            <MudText Color="@(tx.CreditChange > 0 ? Color.Success : tx.CreditChange < 0 ? Color.Error : Color.Default)" Style="font-weight: 600; font-size: 0.75rem;">
                                                @(tx.CreditChange != 0 ? (tx.CreditChange > 0 ? "+" : "") + FormatPrice(tx.CreditChange) : "-")
                                            </MudText>
@@ -147,10 +147,10 @@
                                        </MudStack>
                                    </MudPaper>
                                    
-                                    <!-- کیف پول شبکه -->
+                                    <!-- پاداش تیمی -->
                                    <MudPaper Class="pa-2 flex-grow-1" Outlined="true">
                                        <MudStack Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudText Typo="Typo.caption" Color="Color.Success">شبکه</MudText>
+                                            <MudText Typo="Typo.caption" Color="Color.Success">پاداش تیمی</MudText>
                                            <MudText Color="@(tx.NetworkChange > 0 ? Color.Success : tx.NetworkChange < 0 ? Color.Error : Color.Default)" Style="font-weight: 600; font-size: 0.75rem;">
                                                @(tx.NetworkChange != 0 ? (tx.NetworkChange > 0 ? "+" : "") + FormatPrice(tx.NetworkChange) : "-")
                                            </MudText>
@@ -45,6 +45,9 @@
                                       Href="https://wa.me/989123456789" 
                                       Target="_blank" />
                    </MudStack>
+                     <MudStack Row="true" Spacing="2" Class="enamad">
+                     <a referrerpolicy='origin' target='_blank' href='https://trustseal.enamad.ir/?id=688255&Code=uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX'><img referrerpolicy='origin' src='https://trustseal.enamad.ir/logo.aspx?id=688255&Code=uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX' alt='' style='cursor:pointer' code='uoMRGkyUYHAtMxkpBLB0KyPL5Ac66ACX'></a>
+                     </MudStack>
                </MudStack>
            </MudItem>

@@ -119,10 +119,10 @@ public class WalletService
        var parts = new List<string>();
        
        if (model.ChangeValue != 0)
-            parts.Add(model.ChangeValue > 0 ? "شارژ عادی" : "برداشت عادی");
+            parts.Add(model.ChangeValue > 0 ? "شارژ اصلی" : "برداشت اصلی");
            
        if (model.ChangeNerworkValue != 0)
-            parts.Add(model.ChangeNerworkValue > 0 ? "دریافت شبکه" : "برداشت شبکه");
+            parts.Add(model.ChangeNerworkValue > 0 ? "دریافت پاداش تیمی" : "برداشت پاداش تیمی");
            
        if (model.ChangeDiscountValue != 0)
            parts.Add(model.ChangeDiscountValue > 0 ? "شارژ اعتباری" : "خرید اعتباری");
@@ -1,5 +1,5 @@
 {
-  "GwUrl": "https://cms.kbs1.ir",
+  "GwUrl": "https://cms.kbs2.ir",
  "DownloadUrl": "",
  "EncryptionSettings": {
    "Key": "kmcQ3XTmH4mrdh8VHziuscyf8LLYjG//Kyni81nH/0E=",
Author	SHA1	Message	Date
masoodafar-web	a606cd93cd	fix: rename wallet labels — اصلی، اعتباری، پاداش تیمی Build and Deploy to Production / build-and-deploy (push) Successful in 6m19s Details - عادی → اصلی (کیف پول اصلی) - شبکه → پاداش تیمی - پورسانت → پاداش تیمی - موجودی کیف پول → موجودی کیف پول اصلی Files: Wallet.razor, WalletService.cs, MagicWallet.razor, Profile/Index.razor, PaymentCallback.razor	2026-02-23 23:26:52 +03:30
masoodafar-web	8b78235ef5	chore: prevent appsettings.Production.json from merging — keep ours strategy Build and Deploy to Production / build-and-deploy (push) Successful in 6m27s Details	2026-02-23 00:03:00 +03:30
masoodafar-web	f02d082d7b	fix: correct GwUrl in Production config to cms.kbs2.ir Build and Deploy to Production / build-and-deploy (push) Successful in 6m23s Details	2026-02-22 22:29:17 +03:30
masoodafar-web	a11a3765b8	Merge branch 'kub-stage' into production Build and Deploy to Production / build-and-deploy (push) Has been cancelled Details	2026-02-22 22:22:43 +03:30
admin	3cf5ad429d	Update src/FrontOffice.Main/Shared/Footer.razor Build and Deploy to Production / build-and-deploy (push) Successful in 6m39s Details	2026-02-22 10:25:35 +00:00
masoodafar-web	710ddbe261	Merge branch 'kub-stage' into production Build and Deploy to Production / build-and-deploy (push) Successful in 6m2s Details	2026-02-21 20:38:23 +03:30
masoodafar-web	e2ca65ed98	Merge branch 'kub-stage' into production Build and Deploy to Production / build-and-deploy (push) Successful in 6m42s Details	2026-02-18 01:19:34 +03:30
masoodafar-web	ae9b448a64	merge: kub-stage → production (1:1 square images + site pages + landing animation fix) Build and Deploy to Production / build-and-deploy (push) Has been cancelled Details	2026-02-18 01:01:44 +03:30
Masoud	1ea928118d	fix: update references from تخفیفی to اعتباری across multiple files Build and Deploy to Production / build-and-deploy (push) Successful in 5m46s Details	2026-02-17 15:26:09 +03:30
Masoud	8f2d739d1f	fix: update references from تخفیفی to اعتباری across multiple files Build and Deploy to Production / build-and-deploy (push) Has been cancelled Details	2026-02-17 15:24:13 +03:30
masoodafar-web	8e89d5e064	Merge branch 'kub-stage' into production Build and Deploy to Production / build-and-deploy (push) Successful in 5m43s Details	2026-02-17 01:59:40 +03:30
masoodafar-web	8bd961ade1	Fix production workflow: use SERVER_PASSWORD, add docker login, use set image for deploy Build and Deploy to Production / build-and-deploy (push) Successful in 5m39s Details	2026-02-17 01:24:06 +03:30
masoodafar-web	750d4c6b97	Remove staging workflow files from production branch to prevent cross-deployment	2026-02-17 01:15:59 +03:30
masoodafar-web	276a4c20f2	Merge branch 'kub-stage' into production Build and Deploy to Production / build-and-deploy (push) Successful in 1m12s Details Features merged: - Discount store UI improvements (100% auto-discount, VAT breakdown) - PaymentStatus display on orders (Pending/Success/Failed/Refunded) - Failed payment UX with re-order link - Product discount badges show actual percent - Various UI and bug fixes Production workflow preserved.	2026-02-17 00:55:52 +03:30
masoodafar-web	98a68074bc	chore: Update production workflow to use Nexus registry (no proxy needed) Build and Deploy to Production / build-and-deploy (push) Failing after 0s Details - Changed Dockerfile base images to use 194.5.195.53:32082 (Nexus) - Updated workflow to use docker-sshpass image from Nexus - Removed HTTP_PROXY/HTTPS_PROXY dependencies - Changed deploy method to SSH instead of kubeconfig - Registry: 194.5.195.53:30080 (Gitea internal) - K8S Server: 45.149.79.127 (Production)	2026-01-29 22:04:31 +03:30