Merge branch 'kub-stage' into production

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.

.gitattributes

@@ -1,2 +0,0 @@
-# Keep production config from current branch during merges — never overwrite
-src/FrontOffice.Main/appsettings.Production.json merge=ours

.gitea/workflows/fo-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\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

.gitea/workflows/kub-deploy.yml

@@ -1,82 +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 }}"
-
-          # Copy K8s manifests to server
-          sshpass -e scp -o StrictHostKeyChecking=no k8s/staging/frontoffice-deployment.yaml root@${{ env.K8S_SERVER }}:/tmp/frontoffice-deployment.yaml
-
-          # Apply manifests and restart
-          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl apply -f /tmp/frontoffice-deployment.yaml &&
-            crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
-            kubectl rollout restart deployment/frontoffice &&
-            kubectl rollout status deployment/frontoffice --timeout=180s &&
-            rm -f /tmp/frontoffice-deployment.yaml
-          "
-          echo "✅ Deployed!"

.gitea/workflows/prod-deploy.yml

@@ -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: |
@@ -68,15 +69,8 @@ jobs:
       - name: Deploy to Production
         run: |
           export SSHPASS="${{ secrets.SERVER_PASSWORD }}"
-
-          # Copy K8s manifests to server
-          sshpass -e scp -o StrictHostKeyChecking=no k8s/production/frontoffice-deployment.yaml root@${{ env.K8S_SERVER }}:/tmp/frontoffice-deployment.yaml
-
-          # Apply manifests and restart
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl apply -f /tmp/frontoffice-deployment.yaml &&
-            kubectl rollout restart deployment/frontoffice &&
-            kubectl rollout status deployment/frontoffice --timeout=300s &&
-            rm -f /tmp/frontoffice-deployment.yaml
+            kubectl set image deployment/frontoffice frontoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
+            kubectl rollout status deployment/frontoffice --timeout=300s
           "
           echo "✅ Deployed to Production!"

.gitignore

@@ -14,7 +14,7 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
-# Mono auto generated files 
+# Mono auto generated files
 mono_crash.*
 
 # Build results

docs/CHANGELOG.md

@@ -1,4 +1,3 @@
 # Docs moved to totalDoc
 
 See [totalDoc/INDEX.md](../../totalDoc/INDEX.md) for all documentation.
- 

docs/CUSTOMER-SERVICES.md

@@ -1,262 +0,0 @@
-# سرویس‌های FrontOffice (سمت مشتری)
-
-این سند تمام سرویس‌هایی را که **FrontOffice** (فرانت مشتری) به **CMS** از طریق gRPC Gateway (`GW_URL`) فراخوانی می‌کند، به ترتیب **Use Case** فهرست می‌کند.
-
-- **مسیر کد سرویس‌ها:** `FrontOffice/src/FrontOffice.Main/Utilities/`
-- **ثبت gRPC:** `FrontOffice/src/FrontOffice.Main/ConfigureServices.cs`
-- **تاریخ:** ۱۴۰۵/۰۳/۱۷
-
----
-
-## ۱. احراز هویت و ثبت‌نام
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 1.1 | `AuthService` — `RefreshTokenAsync` | `UserContract.RefreshToken` | `/profile` (`Profile/Index`) | تمدید JWT پس از بازگشت از درگاه پرداخت |
-| 1.2 | `AuthService` — `InitUserAuthInfo` / claims | — (local JWT parse) | سراسری | خواندن UserId، نام، کدملی، وضعیت قرارداد/پکیج/باشگاه از توکن |
-| 1.3 | `UserContract.CreateNewOtpToken` | `UserContract` | `Shared/AuthDialog` | ارسال OTP ورود/ثبت‌نام با موبایل |
-| 1.4 | `UserContract.VerifyOtpToken` | `UserContract` | `Shared/AuthDialog` | تأیید OTP و دریافت JWT |
-| 1.5 | `UserContract.CreateNewOtpToken` (Purpose=`signContract`) | `UserContract` | `/register` (`RegisterWizard`) | ارسال OTP برای امضای قرارداد اصلی |
-| 1.6 | `UserContract.AcceptContract` | `UserContract` | `/register` (`RegisterWizard`) | ثبت امضای قرارداد اصلی + دریافت توکن به‌روز |
-| 1.7 | `UserContract.GetUserForCustomer` | `UserContract` | `/register`, `/profile`, `/profile/personal`, `/profile/settings` | بارگذاری پروفایل موجود کاربر |
-| 1.8 | `UserContract.UpdateCustomerProfile` | `UserContract` | `/register`, `/profile`, `/profile/personal` | ذخیره نام، نام‌خانوادگی، کدملی و… |
-| 1.9 | `AuthDialogService.ShowAuthDialogAsync` | — (UI) | فروشگاه، سبد، checkout | نمایش دیالوگ ورود برای مهمان |
-| 1.10 | `GuestActionGate` | — (wrapper روی Auth) | `/`, `/products`, `/product/{id}`, Discount Store | جلوگیری از افزودن به سبد بدون لاگین |
-
----
-
-## ۲. پروفایل و آدرس
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 2.1 | `UserContract.GetUserForCustomer` | `UserContract` | `/profile`, `/profile/personal`, `/profile/settings` | نمایش و ویرایش اطلاعات شخصی |
-| 2.2 | `UserContract.GetUser` | `UserContract` | `/profile/hub`, `Club/ActivationSection` | اطلاعات کامل کاربر (هاب پروفایل / پس از فعال‌سازی باشگاه) |
-| 2.3 | `UserContract.UpdateUser` | `UserContract` | `/profile/settings` | به‌روزرسانی تنظیمات حساب |
-| 2.4 | `UserAddressContract.GetCustomerAddresses` | `UserAddressContract` | `/profile`, `/profile/addresses`, `/checkout`, Store/Discount checkout | لیست آدرس‌های تحویل |
-| 2.5 | `UserAddressContract.CreateCustomerAddress` | `UserAddressContract` | `Profile/Components/AddAddressDialog` | ثبت آدرس جدید |
-| 2.6 | `UserAddressContract.UpdateCustomerAddress` | `UserAddressContract` | `Profile/Components/EditAddressDialog` | ویرایش آدرس |
-| 2.7 | `UserAddressContract.DeleteCustomerAddress` / `DeleteUserAddress` | `UserAddressContract` | `/profile/addresses`, `/profile` | حذف آدرس |
-| 2.8 | `UserAddressContract.SetCustomerDefaultAddress` / `SetAddressAsDefault` | `UserAddressContract` | `/profile/addresses`, `/profile`, `/checkout` | تنظیم آدرس پیش‌فرض |
-| 2.9 | `CityContract.GetAllCitiesByFilter` | `CityContract` | `AddAddressDialog`, `EditAddressDialog` | جستجو و انتخاب شهر/استان |
-
----
-
-## ۳. پکیج و خرید عضویت
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 3.1 | `PackageService.GetAllPackagesAsync` | `PackageContract.GetCustomerPackages` | `/packages`, `/my-packages`, `/`, `/checkout`, `PackagePurchaseDialog`, `ClubMembershipContractDialog`, Commission pages | لیست پکیج‌های قابل خرید |
-| 3.2 | `PackageService.GetPackageByIdAsync` | `PackageContract.GetCustomerPackageDetails` | (از طریق wrapper؛ صفحه جزئیات مستقیم RPC دارد) | جزئیات یک پکیج |
-| 3.3 | `PackageContract.GetCustomerPackageDetails` | `PackageContract` | `/package/{id}` (`PackageDetail`) | جزئیات، ویژگی‌ها و مشخصات پکیج |
-| 3.4 | `PackageService.GetUserPackageStatusAsync` | `PackageContract.GetUserPackageStatus` | `/packages`, `/my-packages`, `/profile` | وضعیت خرید پکیج، باشگاه، موجودی کیف پول |
-| 3.5 | `PackageContract.CustomerPurchasePackage` | `PackageContract` | `/profile` (`ProcessDirectPayment`), `/checkout` | شروع پرداخت درگاهی (Zarinpal) برای خرید پکیج |
-| 3.6 | `PackageContract.CustomerVerifyPackagePurchase` | `PackageContract` | `/profile/payment-callback?type=package` | تأیید پرداخت پکیج پس از بازگشت از درگاه |
-| 3.7 | `PackagePurchaseDialog` | — (UI + `PackageService`) | `/profile`, `/my-packages` | انتخاب پکیج و روش پرداخت (درگاه / Daya) |
-| 3.8 | Daya Loan (external URL) | — | `/profile` | هدایت به `dayadiamond.ir` برای خرید اقساطی (بدون RPC) |
-
----
-
-## ۴. کیف پول، شارژ و برداشت
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 4.1 | `WalletService.GetBalancesAsync` | `UserWalletContract.GetCustomerWallet` | `/profile`, `/profile/wallet`, Store checkout, PaymentCallback | موجودی اصلی، تخفیفی و شبکه |
-| 4.2 | `WalletService.GetTransactionsAsync` | `UserWalletContract.GetCustomerWalletHistory` | `/profile/wallet` | تاریخچه تراکنش‌های کیف پول |
-| 4.3 | `WalletService.GetMagicWalletStatusAsync` | `UserWalletContract.GetMagicWalletStatus` | `/profile`, `/profile/magic-wallet`, `/my-packages` | وضعیت کیف پول جادویی (Magic) |
-| 4.4 | `WalletService.InitiateMagicChargeAsync` | `UserWalletContract.InitiateMagicCharge` | `/profile/magic-wallet` | شروع شارژ کیف پول جادویی → درگاه |
-| 4.5 | `WalletService.VerifyMagicChargeAsync` | `UserWalletContract.VerifyMagicCharge` | `/profile/payment-callback?type=magic-wallet` | تأیید شارژ Magic پس از درگاه |
-| 4.6 | `WalletService.InitiateDiscountChargeAsync` | `UserWalletContract.InitiateDiscountCharge` | `/profile/charge-discount-wallet` | شروع شارژ کیف پول تخفیفی → درگاه |
-| 4.7 | `WalletService.VerifyDiscountChargeAsync` | `UserWalletContract.VerifyDiscountCharge` | `/profile/payment-callback?type=discount-wallet` | تأیید شارژ کیف تخفیفی |
-| 4.8 | `WalletService.InitiateCreditChargeAsync` | `UserWalletContract.InitiateCreditCharge` | `/profile/charge-credit-wallet` | شروع شارژ کیف پول اصلی → درگاه |
-| 4.9 | `WalletService.VerifyCreditChargeAsync` | `UserWalletContract.VerifyCreditCharge` | `/profile/payment-callback?type=credit-wallet` | تأیید شارژ کیف اصلی |
-| 4.10 | `WalletService.GetWithdrawalsAsync` | `UserWalletContract.GetCustomerWithdrawals` | `/profile/withdrawal-requests` | لیست درخواست‌های برداشت |
-| 4.11 | `WalletService.GetWithdrawalSettingsAsync` | `UserWalletContract.GetCustomerWithdrawalSettings` | `/profile/withdrawal-requests` | حداقل مبلغ برداشت |
-| 4.12 | `WalletService.RequestWithdrawalAsync` | `UserWalletContract.CustomerWithdrawBalance` | `/profile/withdrawal-requests` | ثبت درخواست برداشت پاداش (با payoutId کمیسیون) |
-| 4.13 | `CommissionService.GetWithdrawablePayoutsAsync` | `CommissionContract.GetMyCommissionPayouts` | `/profile/withdrawal-requests` | پاداش‌های قابل برداشت برای انتخاب |
-
----
-
-## ۵. Callback پرداخت (مشترک)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 5.1 | `PackageContract.CustomerVerifyPackagePurchase` | `PackageContract` | `/profile/payment-callback` (type=package) | تأیید خرید پکیج |
-| 5.2 | `WalletService.VerifyMagicChargeAsync` | `UserWalletContract` | `/profile/payment-callback` (type=magic-wallet) | تأیید شارژ Magic |
-| 5.3 | `WalletService.VerifyDiscountChargeAsync` | `UserWalletContract` | `/profile/payment-callback` (type=discount-wallet) | تأیید شارژ تخفیفی |
-| 5.4 | `WalletService.VerifyCreditChargeAsync` | `UserWalletContract` | `/profile/payment-callback` (type=credit-wallet) | تأیید شارژ کیف اصلی |
-| 5.5 | `DiscountOrderService.VerifyDiscountOrderPaymentAsync` | `DiscountOrderContract.CustomerVerifyDiscountOrderPayment` | `/profile/payment-callback` (type=discount-order) | تأیید پرداخت سفارش فروشگاه تخفیفی |
-| 5.6 | `UserContract.GetUserForCustomer` + `AuthService.InitUserAuthInfo` | `UserContract` | `/profile/payment-callback` | به‌روزرسانی claims کاربر پس از پرداخت موفق |
-
----
-
-## ۶. فروشگاه اصلی (Store)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 6.1 | `ProductService.GetProductsPagedAsync` | `ProductsContract.GetProductsForCustomer` | `/products` | لیست محصولات با فیلتر/صفحه‌بندی |
-| 6.2 | `ProductService.GetTopSellingAsync` | `ProductsContract` | `/` (صفحه اصلی) | پرفروش‌ترین محصولات |
-| 6.3 | `ProductService.GetByIdAsync` | `ProductsContract.GetProductByIdForCustomer` | `/product/{id}` | جزئیات محصول + گالری |
-| 6.4 | `CategoryService.GetAllAsync` / `GetByIdAsync` | `CategoryContract.GetAllCategoriesForCustomer` | `/categories`, `/products` | درخت دسته‌بندی محصولات |
-| 6.5 | `CartService` — Add/Update/Remove/Get | `UserCartsContract.*ForCustomer` | `/`, `/products`, `/product/{id}`, `/cart` | مدیریت سبد خرید (AddNew, Update, Remove, GetCustomerCart) |
-| 6.6 | `UserOrderContract.SubmitShopBuyOrder` | `UserOrderContract` | `/checkout-summary` | ثبت سفارش و پرداخت از کیف پول |
-| 6.7 | `OrderService.GetOrdersAsync` | `UserOrderContract.GetCustomerOrders` | `/orders` | لیست سفارش‌های کاربر |
-| 6.8 | `OrderService.GetOrderAsync` | `UserOrderContract.GetCustomerOrder` | `/order/{id}`, `/order-tracking/{id}` | جزئیات یک سفارش |
-| 6.10 | `VATService.GetRateAsync` | `UserOrderContract` (via scope) | Store/Discount صفحات قیمت | نرخ مالیات بر ارزش افزوده (کش روزانه) |
-| 6.11 | `WalletService.GetBalancesAsync` | `UserWalletContract` | `/checkout-summary` | بررسی موجودی برای پرداخت سفارش |
-
----
-
-## ۷. فروشگاه تخفیفی (Discount Store)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 7.1 | `DiscountProductService.GetProductsAsync` | `DiscountProductContract.GetDiscountProducts` | `/discount-store` | لیست محصولات تخفیفی |
-| 7.2 | `DiscountProductService.GetTopSellingAsync` | `DiscountProductContract` | `/` | پرفروش‌های فروشگاه تخفیفی |
-| 7.3 | `DiscountProductService.GetByIdAsync` | `DiscountProductContract.GetDiscountProductById` + Images | `/discount-store/product/{id}` | جزئیات محصول تخفیفی |
-| 7.4 | `DiscountProductService.GetCategoriesAsync` | `DiscountCategoryContract.GetDiscountCategories` | `/discount-store` | دسته‌بندی‌های فروشگاه تخفیفی |
-| 7.5 | `DiscountCartService` — Add/Update/Remove/Get | `DiscountShoppingCartContract.*` | `/discount-store`, `/discount-store/cart` | سبد خرید تخفیفی |
-| 7.6 | `DiscountOrderService.PlaceOrderAsync` | `DiscountOrderContract.PlaceOrder` | `/discount-store/checkout` | ثبت سفارش (کیف تخفیفی + درگاه) |
-| 7.7 | `DiscountOrderService.GetUserOrdersAsync` | `DiscountOrderContract.GetUserOrders` | `/discount-store/orders` | لیست سفارش‌های تخفیفی |
-| 7.8 | `DiscountOrderService.GetOrderByIdAsync` | `DiscountOrderContract.GetOrderById` | `/discount-store/order/{id}` | جزئیات سفارش تخفیفی |
-| 7.9 | `UserAddressContract.GetCustomerAddresses` | `UserAddressContract` | `/discount-store/checkout` | انتخاب آدرس تحویل |
-
----
-
-## ۸. باشگاه مشتریان (Club)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 8.1 | `ClubMembershipService.GetMyMembershipAsync` | `ClubMembershipContract.GetClubMembership` | `/club/membership` | وضعیت عضویت باشگاه |
-| 8.2 | `ClubConfigurationService.GetClubConfigurationAsync` | `ConfigurationContract.GetClubConfiguration` | `/club/membership` | هزینه فعال‌سازی و هدیه عضویت |
-| 8.3 | `ClubConfigurationService.GetClubFeaturesAsync` | `ConfigurationContract.GetClubFeatures` | `/club/features` | لیست امکانات باشگاه |
-| 8.4 | `ClubMembershipService.ActivateMembershipAsync` | `ClubMembershipContract.ActivateClubMembership` | `Club/ActivationSection` | فعال‌سازی/تمدید عضویت باشگاه |
-| 8.5 | `OtpTokenContract.CreateNewOtpToken` | `OtpTokenContract` | `ClubMembershipContractDialog` | OTP برای امضای قرارداد باشگاه |
-| 8.6 | `ClubMembershipContract.AcceptClubMembershipContract` | `ClubMembershipContract` | `ClubMembershipContractDialog` | ثبت امضای قرارداد باشگاه |
-
----
-
-## ۹. شبکه فروش (Network / MLM)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 9.1 | `NetworkMembershipService.GetMyNetworkTreeAsync` | `NetworkMembershipContract.GetMyNetworkTree` | `/profile/tree` (`OrganizationChart`) | درخت سازمان فروش کاربر |
-| 9.2 | `NetworkMembershipService.GetSubordinateTreeAsync` | `NetworkMembershipContract.GetSubordinateTree` | `/profile/tree` | drill-down به زیرمجموعه |
-| 9.3 | `NetworkMembershipService.GetMyNetworkStatisticsAsync` | `NetworkMembershipContract.GetMyNetworkStatistics` | `/profile/tree`, `/network/statistics` | آمار پا چپ/راست، تعداد اعضا |
-
----
-
-## ۱۰. کمیسیون و پاداش
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 10.1 | `CommissionService.GetWeekDefinitionsAsync` | `CommissionContract.GetWeekDefinitions` | `Shared/WeekSelector`, Commission pages | لیست هفته‌های محاسبه پاداش |
-| 10.2 | `CommissionService.GetMyCommissionPayoutsAsync` | `CommissionContract.GetMyCommissionPayouts` | `/commission/dashboard` | تاریخچه پرداخت پاداش‌ها |
-| 10.3 | `CommissionService.GetMyWeeklyBalanceAsync` | `CommissionContract.GetMyWeeklyBalances` | `/commission/weekly-balance` | جزئیات بالانس هفتگی (چپ/راست) |
-| 10.4 | `PackageService.GetAllPackagesAsync` | `PackageContract` | Commission pages | فیلتر پاداش بر اساس پکیج |
-
----
-
-## ۱۱. محتوای سایت، بلاگ و صفحات ثابت
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 11.1 | `SitePageSettingsService.GetPageAsync` | `SitePageSettingsContract.GetPageSettings` | `/` (landing), `/about`, `/contact`, `/licenses` | محتوای داینامیک صفحات (hero، تصاویر، JSON تنظیمات) |
-| 11.2 | `BlogPostService.GetFeaturedPostsAsync` | `BlogPostContract.GetFeaturedBlogPosts` | `/`, `/profile` | پست‌های ویژه |
-| 11.3 | `BlogPostService.GetPublishedPostsAsync` | `BlogPostContract.GetPublishedBlogPosts` | `/`, `/blog` | لیست پست‌های منتشرشده |
-| 11.4 | `BlogPostService.GetBySlugAsync` | `BlogPostContract.GetBlogPostBySlug` | `/blog/{slug}` | محتوای کامل یک پست |
-| 11.5 | `BlogPostService.IncrementViewCountAsync` | `BlogPostContract.IncrementViewCount` | `/blog/{slug}` | افزایش شمارنده بازدید |
-| 11.6 | `BlogCategoryService.GetActiveCategoriesAsync` | `BlogCategoryContract` | `/blog` | فیلتر دسته‌بندی بلاگ |
-| 11.7 | FAQ | — (hardcoded) | `/faq` | سوالات متداول — **بدون فراخوانی API** |
-
----
-
-## ۱۲. زیرساخت مشترک (Infrastructure)
-
-| # | سرویس / متد | gRPC Contract | صفحه / کامپوننت | کاربرد |
-|---|-------------|---------------|-----------------|--------|
-| 12.1 | `ImageCacheService.ResolveAsync` | `ImageResolverContract` | `Shared/AppImage` (سراسری) | resolve مسیر تصویر CMS به data-URI |
-| 12.2 | `AppVersionService.CheckVersionAsync` | `AppVersionContract` | `App.razor`, `MainLayout` | بررسی نسخه جدید اپ |
-| 12.3 | `AppVersionService.ApplyUpdateAsync` / `SkipVersionAsync` | — (localStorage + reload) | `App.razor`, `MainLayout` | اعمال یا رد آپدیت |
-| 12.4 | `MainService.OnChangeHandler` | — (in-memory) | `/`, `AuthDialog` | اطلاع‌رسانی تغییر state سراسری (مثلاً پس از login) |
-| 12.5 | `IChromiumPdfService` | — (local endpoint `/contract/generate`) | `/register` | تولید PDF قرارداد (Chromium headless) |
-
----
-
-## ۱۳. Gateway / انتخاب‌گر
-
-| صفحه | سرویس | کاربرد |
-|------|--------|--------|
-| `/stores` | — | انتخاب بین فروشگاه اصلی و تخفیفی |
-| `/my-orders` | — | انتخاب لیست سفارش‌ها |
-| `/my-cart` | — | انتخاب سبد خرید |
-
-این صفحات فقط مسیریابی UI هستند و مستقیماً gRPC صدا نمی‌زنند.
-
----
-
-## ۱۴. سرویس‌های ثبت‌شده ولی بدون استفاده در UI
-
-| سرویس / Contract | وضعیت |
-|------------------|--------|
-| `SitePageService` (`SitePageContract`) | ثبت در DI؛ **هیچ صفحه‌ای inject نمی‌کند** (جایگزین: `SitePageSettingsService`) |
-| `TransactionsContract` | ثبت در DI؛ **استفاده نشده** |
-| `UserWalletHistoryContract` | ثبت در DI؛ **استفاده نشده** (تاریخچه از `UserWalletContract.GetCustomerWalletHistory` می‌آید) |
-| `TokenNotificationService` | ثبت در DI؛ **هنوز به Layout وصل نشده** (SignalR برای invalidation توکن) |
-
----
-
-## نمودار جریان پرداخت
-
-```mermaid
-flowchart LR
-    subgraph initiate [شروع پرداخت]
-        A1[Profile / Checkout]
-        A2[MagicWallet / ChargeDiscount]
-        A3[Discount Checkout]
-    end
-
-    subgraph gateway [Zarinpal]
-        G[درگاه پرداخت]
-    end
-
-    subgraph callback [PaymentCallback]
-        C1[Verify Package]
-        C2[Verify Magic]
-        C3[Verify Discount Wallet]
-        C4[Verify Discount Order]
-    end
-
-    A1 --> G
-    A2 --> G
-    A3 --> G
-    G --> callback
-```
-
----
-
-## فهرست gRPC Contractهای فعال
-
-| Contract | Wrapper اصلی |
-|----------|----------------|
-| `UserContract` | `AuthService`, صفحات Profile/Register |
-| `UserAddressContract` | Profile, Checkout pages |
-| `CityContract` | Address dialogs |
-| `PackageContract` | `PackageService`, PaymentCallback, Checkout |
-| `UserWalletContract` | `WalletService` |
-| `UserOrderContract` | `OrderService`, CheckoutSummary |
-| `UserCartsContract` | `CartService` |
-| `ProductsContract` | `ProductService` |
-| `CategoryContract` | `CategoryService` |
-| `DiscountProductContract` / `DiscountCategoryContract` | `DiscountProductService` |
-| `DiscountShoppingCartContract` | `DiscountCartService` |
-| `DiscountOrderContract` | `DiscountOrderService` |
-| `ClubMembershipContract` | `ClubMembershipService`, Dialog |
-| `OtpTokenContract` | Club contract dialog |
-| `ConfigurationContract` | `ClubConfigurationService` |
-| `NetworkMembershipContract` | `NetworkMembershipService` |
-| `CommissionContract` | `CommissionService` |
-| `BlogPostContract` | `BlogPostService` |
-| `BlogCategoryContract` | `BlogCategoryService` |
-| `SitePageSettingsContract` | `SitePageSettingsService` |
-| `AppVersionContract` | `AppVersionService` |
-| `ImageResolverContract` | `ImageCacheService` |

k8s/production/frontoffice-deployment.yaml

@@ -1,56 +0,0 @@
----
-# FrontOffice (Blazor Server) production.
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontoffice
-  namespace: default
-  labels:
-    app: frontoffice
-    environment: production
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontoffice
-  template:
-    metadata:
-      labels:
-        app: frontoffice
-    spec:
-      containers:
-        - name: frontoffice
-          image: 194.5.195.53:30080/admin/frontoffice:prod
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
-              name: http
-          env:
-            - name: ASPNETCORE_ENVIRONMENT
-              value: "Production"
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "250m"
-            limits:
-              memory: "512Mi"
-              cpu: "500m"
-      imagePullSecrets:
-        - name: gitea-registry-secret
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontoffice-svc
-  namespace: default
-  labels:
-    app: frontoffice
-spec:
-  selector:
-    app: frontoffice
-  ports:
-    - port: 80
-      targetPort: 80
-      name: http
-  type: ClusterIP

k8s/staging/frontoffice-deployment.yaml

@@ -1,56 +0,0 @@
----
-# FrontOffice (Blazor Server) staging.
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: frontoffice
-  namespace: default
-  labels:
-    app: frontoffice
-    environment: staging
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: frontoffice
-  template:
-    metadata:
-      labels:
-        app: frontoffice
-    spec:
-      containers:
-        - name: frontoffice
-          image: 194.5.195.53:30080/admin/frontoffice:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 80
-              name: http
-          env:
-            - name: ASPNETCORE_ENVIRONMENT
-              value: "Staging"
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "250m"
-            limits:
-              memory: "512Mi"
-              cpu: "500m"
-      imagePullSecrets:
-        - name: gitea-registry-secret
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: frontoffice-svc
-  namespace: default
-  labels:
-    app: frontoffice
-spec:
-  selector:
-    app: frontoffice
-  ports:
-    - port: 80
-      targetPort: 80
-      name: http
-  type: ClusterIP

src/FrontOffice.Main/ConfigureServices.cs

@@ -15,7 +15,7 @@ using CMSMicroservice.Protobuf.Protos.User;
 using CMSMicroservice.Protobuf.Protos.UserCarts;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
-using CMSMicroservice.Protobuf.Protos.UserWalletHistory;
+using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.Configuration;
 using CMSMicroservice.Protobuf.Protos.NetworkMembership;
@@ -30,7 +30,6 @@ using CMSMicroservice.Protobuf.Protos.DiscountCategory;
 using CMSMicroservice.Protobuf.Protos.DiscountShoppingCart;
 using CMSMicroservice.Protobuf.Protos.DiscountOrder;
 using FrontOffice.Main.Utilities;
-using FrontOffice.Main.Utilities.Seo;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -57,7 +56,6 @@ public static class ConfigureServices
         services.AddSingleton<UserAuthInfo>();
         services.AddScoped<AuthService>();
         services.AddScoped<AuthDialogService>();
-        services.AddScoped<GuestActionGate>();
         // Storefront services
         services.AddScoped<CartService>();
         services.AddScoped<ProductService>();
@@ -96,45 +94,26 @@ public static class ConfigureServices
         // SignalR Token Notification Service
         services.AddScoped<TokenNotificationService>();
 
-        // SEO
-        services.AddScoped<SeoMetadataProvider>();
-        services.AddScoped<SitemapGenerator>();
-
         return services;
     }
 
     public static IServiceCollection AddGrpcServices(this IServiceCollection services, IConfiguration configuration)
     {
-        var baseUrl = ResolveGatewayUrl(configuration)
-            ?? throw new InvalidOperationException("Gateway URL is missing. Set GW_URL or GwUrl.");
+        var baseUrl = configuration["GwUrl"];
 
-        var isHttp = baseUrl.StartsWith("http://", StringComparison.OrdinalIgnoreCase);
-
-        // When the base URL is plain HTTP (e.g. in-cluster http://cms-svc:8080), we must force HTTP/1.1
-        // so that GrpcChannel does not upgrade to h2c and trigger HTTP_1_1_REQUIRED from Kestrel.
-        // For HTTPS the default negotiation is fine.
+        // Register optimized HttpClient for gRPC
         services.AddScoped(sp =>
         {
-            HttpMessageHandler inner = isHttp
-                ? new SocketsHttpHandler
-                {
-                    MaxConnectionsPerServer = 10,
-                    AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
-                }
-                : new HttpClientHandler
-                {
-                    MaxConnectionsPerServer = 10,
-                    AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
-                };
+            var handler = new HttpClientHandler
+            {
+                MaxConnectionsPerServer = 10,
+                AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
+            };
 
-            return new HttpClient(new GrpcWebHandler(GrpcWebMode.GrpcWeb, inner))
+            return new HttpClient(new GrpcWebHandler(GrpcWebMode.GrpcWeb, handler))
             {
                 Timeout = TimeSpan.FromMinutes(10),
-                BaseAddress = new Uri(baseUrl),
-                DefaultRequestVersion = isHttp ? System.Net.HttpVersion.Version11 : System.Net.HttpVersion.Version20,
-                DefaultVersionPolicy = isHttp
-                    ? System.Net.Http.HttpVersionPolicy.RequestVersionExact
-                    : System.Net.Http.HttpVersionPolicy.RequestVersionOrHigher
+                BaseAddress = new Uri(baseUrl)
             };
         });
 
@@ -149,7 +128,7 @@ public static class ConfigureServices
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.UserCarts.UserCartsContract.UserCartsContractClient>);
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.City.CityContract.CityContractClient>);
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.UserAddress.UserAddressContract.UserAddressContractClient>);
-        services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.UserWalletHistory.UserWalletHistoryContract.UserWalletHistoryContractClient>);
+        services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.UserWalletChangeLog.UserWalletChangeLogContract.UserWalletChangeLogContractClient>);
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.ClubMembership.ClubMembershipContract.ClubMembershipContractClient>);
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.OtpToken.OtpTokenContract.OtpTokenContractClient>);
         services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.Configuration.ConfigurationContract.ConfigurationContractClient>);
@@ -172,22 +151,12 @@ public static class ConfigureServices
         return services;
     }
 
-    private static string? ResolveGatewayUrl(IConfiguration configuration)
-    {
-        var envUrl = configuration["GW_URL"];
-        if (!string.IsNullOrWhiteSpace(envUrl))
-            return envUrl.TrimEnd('/');
-
-        return configuration["GwUrl"]?.TrimEnd('/');
-    }
-
     private static TClient CreateAuthenticatedClient<TClient>(IServiceProvider sp)
         where TClient : class
     {
         var httpClient = sp.GetRequiredService<HttpClient>();
         var localStorage = sp.GetRequiredService<ILocalStorageService>();
         var baseUrl = httpClient.BaseAddress?.ToString() ?? throw new InvalidOperationException("Base URL not configured");
-        var isHttps = baseUrl.StartsWith("https://", StringComparison.OrdinalIgnoreCase);
 
         var credentials = CallCredentials.FromInterceptor(async (context, metadata) =>
         {
@@ -207,14 +176,10 @@ public static class ConfigureServices
             }
         });
 
-        var channelCredentials = isHttps
-            ? ChannelCredentials.Create(new SslCredentials(), credentials)
-            : ChannelCredentials.Create(ChannelCredentials.Insecure, credentials);
-
         var channel = GrpcChannel.ForAddress(baseUrl, new GrpcChannelOptions
         {
-            UnsafeUseInsecureChannelCallCredentials = !isHttps,
-            Credentials = channelCredentials,
+            UnsafeUseInsecureChannelCallCredentials = true,
+            Credentials = ChannelCredentials.Create(new SslCredentials(), credentials),
             HttpClient = httpClient,
             MaxReceiveMessageSize = 1000 * 1024 * 1024, // 1 GB
             MaxSendMessageSize = 1000 * 1024 * 1024     // 1 GB

src/FrontOffice.Main/Dockerfile

@@ -20,10 +20,6 @@ FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS runtime
 WORKDIR /app
 COPY --from=build /app/publish .
 
-# Trust the staging-ca so server-side gRPC calls to https://cms.se.kbs1.ir succeed without PartialChain
-COPY ["FrontOffice.Main/staging-ca.crt", "/usr/local/share/ca-certificates/staging-ca.crt"]
-RUN update-ca-certificates
-
 ENV ASPNETCORE_URLS=http://+:80
 EXPOSE 80
 

src/FrontOffice.Main/FrontOffice.Main.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="DateTimeConverterCL" Version="1.0.0" />
     <!-- Replace all FrontOffice.BFF protobuf packages with CMS protobuf -->
-    <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.210" />
+    <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.182" />
 <!--    <ProjectReference Include="../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj" />-->
     <PackageReference Include="MudBlazor" Version="8.14.0" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
@@ -56,6 +56,12 @@
     <Content Include="..\.dockerignore">
       <Link>.dockerignore</Link>
     </Content>
+    <Content Remove="Pages\Package\Packages.razor" />
+  </ItemGroup>
+    
+
+  <ItemGroup>
+    <Compile Remove="Pages\Package\Packages.razor.cs" />
   </ItemGroup>
 
 </Project>

src/FrontOffice.Main/Pages/Checkout.razor

@@ -27,11 +27,6 @@
                 <MudPaper Elevation="2" Class="pa-4 rounded-lg">
                     <MudText Typo="Typo.h5" Class="mb-4">جزئیات پکیج</MudText>
 
-                    @* ── G2: توضیح خرید پکیج (Q28) ── *@
-                    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3">
-                        با خرید این پکیج، سقف پاداش هفتگی، ضریب کیف‌پول جادویی و دسترسی به فیچرهای اختصاصی برای شما فعال می‌شود.
-                    </MudAlert>
-
                     @if (_selectedPackage != null)
                     {
                         <MudCard>
@@ -71,6 +66,80 @@
                         </MudStack>
                     }
                 </MudPaper>
+
+                <!-- Address Selection -->
+                <MudPaper Elevation="2" Class="pa-4 rounded-lg">
+                    <MudText Typo="Typo.h5" Class="mb-4">انتخاب آدرس</MudText>
+
+                    @if (_isLoadingAddresses)
+                    {
+                        <MudStack AlignItems="AlignItems.Center" Class="py-4">
+                            <MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Medium" />
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary mt-2">بارگذاری آدرس‌ها...</MudText>
+                        </MudStack>
+                    }
+                    else if (_addresses.Any())
+                    {
+                        <MudStack Spacing="2">
+                            @foreach (var address in _addresses)
+                            {
+                                <MudPaper Outlined="@(_selectedAddress?.Id != address.Id)"
+                                          Elevation="@(_selectedAddress?.Id == address.Id ? 4 : 0)"
+                                          Class="pa-3 rounded-xl cursor-pointer"
+                                          Style="@(_selectedAddress?.Id == address.Id ? "border: 2px solid var(--mud-palette-primary);" : "")"
+                                          @onclick="() => SetAddressAsDefault(address.Id)">
+                                    <MudStack Spacing="1">
+                                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                                            <MudCheckBox @bind-Value="address.IsDefault"
+                                                         Disabled="true"
+                                                         Color="Color.Primary" />
+                                            <MudText Typo="Typo.subtitle2">@(address.Title)</MudText>
+                                            @if (address.IsDefault)
+                                            {
+                                                <MudChip T="string" Color="Color.Success" Variant="Variant.Filled" Size="Size.Small">پیش‌فرض</MudChip>
+                                            }
+                                            @if (!address.IsDefault)
+                                            {
+                                                @if (_isSettingDefaultAddress && _settingDefaultAddressId == address.Id)
+                                                {
+                                                    <MudProgressCircular Size="Size.Small" Color="Color.Primary" Indeterminate="true" />
+                                                }
+                                                else
+                                                {
+                                                    <MudButton Variant="Variant.Text"
+                                                               Color="Color.Primary"
+                                                               Size="Size.Small"
+                                                               OnClick="() => SetAddressAsDefault(address.Id)">
+                                                        تنظیم به عنوان پیش‌فرض
+                                                    </MudButton>
+                                                }
+                                            }
+                                        </MudStack>
+                                        <MudStack Row="true">
+                                            <MudText Typo="Typo.body2" Class="mud-text-secondary">@(address.Address)</MudText>
+                                            <MudSpacer />
+                                            <MudText Typo="Typo.caption" Class="mud-text-secondary">کد پستی: @(address.PostalCode)</MudText>
+                                        </MudStack>
+                                    </MudStack>
+                                </MudPaper>
+                            }
+                        </MudStack>
+                    }
+                    else
+                    {
+                        <MudStack AlignItems="AlignItems.Center" Class="py-4">
+                            <MudIcon Icon="@Icons.Material.Filled.LocationOff" Size="Size.Large" Color="Color.Default" />
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary mt-2">آدرسی ثبت نشده است.</MudText>
+                            <MudButton Variant="Variant.Outlined"
+                                       Color="Color.Primary"
+                                       StartIcon="@Icons.Material.Filled.Add"
+                                       OnClick="() => Navigation.NavigateTo(RouteConstants.Profile.Index)"
+                                       Class="mt-2">
+                                افزودن آدرس
+                            </MudButton>
+                        </MudStack>
+                    }
+                </MudPaper>
             </MudStack>
         </MudItem>
 
@@ -138,36 +207,15 @@
                                        FullWidth="true"
                                        StartIcon="@Icons.Material.Filled.Payment"
                                        OnClick="ProcessPayment"
-                                       Disabled="@(!CanProceedToPayment || _isProcessingPayment || !_selectedPackage.SupportsDirectPurchase)"
+                                       Disabled="@(!CanProceedToPayment || _isProcessingPayment)"
                                        Class="mt-2">
                                 @(_isProcessingPayment ? "در حال پردازش..." : "پرداخت آنلاین")
                             </MudButton>
 
-                            @if (_selectedPackage.SupportsDayaPurchase)
-                            {
-                                <MudButton Variant="Variant.Filled"
-                                           Color="Color.Tertiary"
-                                           Size="Size.Large"
-                                           FullWidth="true"
-                                           StartIcon="@Icons.Material.Filled.Diamond"
-                                           OnClick="DayaLoanPayment"
-                                           Disabled="@(!CanProceedToPayment)"
-                                           Class="mt-2">
-                                    تأمین اعتبار الماسی دایا
-                                </MudButton>
-                            }
-
-                            @if (!_selectedPackage.SupportsDirectPurchase && !_selectedPackage.SupportsDayaPurchase)
-                            {
-                                <MudAlert Severity="Severity.Warning" Dense="true" Class="mt-2">
-                                    این پکیج در حال حاضر قابل خرید نیست.
-                                </MudAlert>
-                            }
-
                             @if (!CanProceedToPayment)
                             {
                                 <MudText Typo="Typo.caption" Color="Color.Error" Align="Align.Center">
-                                    لطفاً پکیج را انتخاب کنید.
+                                    لطفاً پکیج و آدرس را انتخاب کنید.
                                 </MudText>
                             }
                         </MudStack>

src/FrontOffice.Main/Pages/Checkout.razor.cs

@@ -1,7 +1,11 @@
+
 using CMSMicroservice.Protobuf.Protos.Package;
+using CMSMicroservice.Protobuf.Protos.Transactions;
+using CMSMicroservice.Protobuf.Protos.UserAddress;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
 using FrontOffice.Main.Utilities;
+using Google.Protobuf.WellKnownTypes;
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 using MudBlazor;
 using Severity = MudBlazor.Severity;
 
@@ -9,12 +13,17 @@ namespace FrontOffice.Main.Pages;
 
 public partial class Checkout
 {
-    [Inject] private PackageService PackageService { get; set; } = default!;
     [Inject] private PackageContract.PackageContractClient PackageClient { get; set; } = default!;
+    [Inject] private UserAddressContract.UserAddressContractClient UserAddressContract { get; set; } = default!;
+    [Inject] private UserOrderContract.UserOrderContractClient UserOrderContract { get; set; } = default!;
+    [Inject] private TransactionsContract.TransactionsContractClient TransactionContract { get; set; } = default!;
 
     [Parameter] public long? PackageId { get; set; }
 
     private Pack? _selectedPackage;
+    private List<CustomerAddressModel> _addresses = new();
+    private CustomerAddressModel? _selectedAddress;
+    private bool _isLoadingAddresses;
     private bool _isProcessingPayment;
 
     // Discount code
@@ -25,11 +34,16 @@ public partial class Checkout
     private long _discountAmount;
     private long _finalPrice;
 
-    private bool CanProceedToPayment => _selectedPackage != null;
+    // Address management
+    private bool _isSettingDefaultAddress;
+    private long? _settingDefaultAddressId;
+
+    private bool CanProceedToPayment => _selectedPackage != null && _selectedAddress != null;
 
     protected override async Task OnInitializedAsync()
     {
         await LoadPackageDetails();
+        await LoadAddresses();
     }
 
     private async Task LoadPackageDetails()
@@ -38,18 +52,15 @@ public partial class Checkout
         {
             try
             {
-                var packages = await PackageService.GetAllPackagesAsync();
-                var pkg = packages.FirstOrDefault(p => p.Id == PackageId.Value);
-                if (pkg != null)
+                var response = await PackageClient.GetPackageAsync(new() { Id = PackageId.Value });
+                if (response != null)
                 {
                     _selectedPackage = new Pack(
-                        Id: pkg.Id,
-                        Title: pkg.Title,
-                        Body: pkg.Description,
-                        Image: pkg.ImageUrl,
-                        Price: pkg.Price,
-                        SupportsDirectPurchase: pkg.SupportsDirectPurchase,
-                        SupportsDayaPurchase: pkg.SupportsDayaPurchase
+                        Id: response.Id,
+                        Title: response.Title,
+                        Body: response.Description,
+                        Image: response.ImagePath ?? string.Empty,
+                        Price: response.Price
                     );
                     _finalPrice = _selectedPackage.Price;
                 }
@@ -61,6 +72,60 @@ public partial class Checkout
         }
     }
 
+    private async Task LoadAddresses()
+    {
+        _isLoadingAddresses = true;
+        try
+        {
+            var response = await UserAddressContract.GetCustomerAddressesAsync(request: new());
+            if (response?.Models?.Any() == true)
+            {
+                _addresses = response.Models.ToList();
+                // Select default address if available
+                _selectedAddress = _addresses.FirstOrDefault(a => a.IsDefault) ?? _addresses.First();
+            }
+            else
+            {
+                _addresses = new List<CustomerAddressModel>();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"خطا در بارگذاری آدرس‌ها: {ex.Message}", Severity.Error);
+            _addresses = new List<CustomerAddressModel>();
+        }
+        finally
+        {
+            _isLoadingAddresses = false;
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
+    private async Task SetAddressAsDefault(long addressId)
+    {
+        if (_isSettingDefaultAddress) return;
+
+        _isSettingDefaultAddress = true;
+        _settingDefaultAddressId = addressId;
+
+        try
+        {
+            await UserAddressContract.SetAddressAsDefaultAsync(new() { Id = addressId });
+            await LoadAddresses(); // Reload addresses to reflect the change
+            Snackbar.Add("آدرس پیش‌فرض با موفقیت تغییر یافت.", Severity.Success);
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"خطا در تغییر آدرس پیش‌فرض: {ex.Message}", Severity.Error);
+        }
+        finally
+        {
+            _isSettingDefaultAddress = false;
+            _settingDefaultAddressId = null;
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
     private async Task ApplyDiscountCode()
     {
         if (string.IsNullOrWhiteSpace(_discountCode))
@@ -92,7 +157,7 @@ public partial class Checkout
                 _finalPrice = _selectedPackage!.Price;
             }
         }
-        catch (Exception)
+        catch (Exception ex)
         {
             _discountMessage = "خطا در اعمال کد تخفیف.";
             _discountApplied = false;
@@ -108,11 +173,12 @@ public partial class Checkout
 
     private async Task ProcessPayment()
     {
-        if (_isProcessingPayment) return;
+        Snackbar.Add("درگاه پرداخت متصل نیست! لطفا در زمان دیگری مجددا تلاش فرمایید!", Severity.Warning);
+        return;
 
-        if (!CanProceedToPayment || _selectedPackage == null)
+        if (!CanProceedToPayment || _selectedPackage == null || _selectedAddress == null)
         {
-            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
+            Snackbar.Add("لطفاً پکیج و آدرس را انتخاب کنید.", Severity.Warning);
             return;
         }
 
@@ -120,26 +186,33 @@ public partial class Checkout
 
         try
         {
-            var response = await PackageClient.CustomerPurchasePackageAsync(new CustomerPurchasePackageRequest
+            // Step 1: Create payment request
+            var paymentRequest = new CustomerPaymentRequestRequest
             {
+                Amount = _finalPrice,
+                CallbackUrl = $"{Navigation.BaseUri}checkout/callback",
+                Description = $"خرید پکیج {_selectedPackage.Title}",
+                Currency = CurrencyEnum.Irt,
+                Type = TransactionTypeEnum.Real
+            };
+
+            var paymentResponse = await TransactionContract.CustomerPaymentRequestAsync(paymentRequest);
+
+            if (string.IsNullOrEmpty(paymentResponse.PaymentGWUrl))
+                Snackbar.Add("آدرس درگاه پرداخت دریافت نشد.", Severity.Error);
+
+            // Step 2: Create user order
+            var orderRequest = new CreateNewUserOrderRequest
+            {
+                Amount = _finalPrice,
                 PackageId = _selectedPackage.Id,
-                PurchaseMethod = PurchaseMethodEnum.PurchaseMethodGateway
-            });
+                PaymentStatus = CMSMicroservice.Protobuf.Protos.PaymentStatus.Pending
+            };
 
-            if (!response.Success)
-            {
-                Snackbar.Add(response.Message ?? "خطا در آغاز فرآیند پرداخت", Severity.Error);
-                return;
-            }
+            var orderResponse = await UserOrderContract.CreateNewUserOrderAsync(orderRequest);
 
-            if (!string.IsNullOrEmpty(response.PaymentGatewayUrl))
-            {
-                Navigation.NavigateTo(response.PaymentGatewayUrl, forceLoad: true);
-            }
-            else
-            {
-                Snackbar.Add("خطا در دریافت آدرس درگاه پرداخت", Severity.Error);
-            }
+            // Step 3: Redirect to payment gateway
+            Navigation.NavigateTo(paymentResponse.PaymentGWUrl);
         }
         catch (Exception ex)
         {
@@ -152,17 +225,5 @@ public partial class Checkout
         }
     }
 
-    private async Task DayaLoanPayment()
-    {
-        if (_selectedPackage == null)
-        {
-            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
-            return;
-        }
-
-        var url = "https://dayadiamond.ir/profile/creditpurchase/?merchantcode=56146364";
-        await JSRuntime.InvokeVoidAsync("open", url, "_blank");
-    }
-
-    private record Pack(long Id, string Title, string Body, string Image, long Price, bool SupportsDirectPurchase = true, bool SupportsDayaPurchase = false);
-}
+    private record Pack(long Id, string Title, string Body, string Image, long Price);
+}

src/FrontOffice.Main/Pages/Club/Components/ActivationSection.razor

@@ -3,12 +3,7 @@
 
 <MudPaper Elevation="2" Class="pa-4 rounded-lg">
     <MudText Typo="Typo.h6" Class="mb-3">فعال‌سازی یا تمدید عضویت</MudText>
-
-    @* ── G7: راهنمای هزینه فعال‌سازی (Q28) ── *@
-    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
-        هزینه تخمینی بر اساس پکیج انتخابی محاسبه می‌شود. هر پکیج قیمت و شرایط فعال‌سازی متفاوتی دارد.
-    </MudAlert>
-
+    
     <MudForm @ref="_form" @bind-IsValid="_formIsValid">
         <MudGrid Spacing="2">
             <MudItem xs="12" sm="6">

src/FrontOffice.Main/Pages/Club/Components/ActivationSection.razor.cs

@@ -10,7 +10,6 @@ public partial class ActivationSection : ComponentBase
     [Inject] private ClubMembershipService ClubService { get; set; } = default!;
     [Inject] private AuthService AuthService { get; set; } = default!;
     [Inject] private UserContract.UserContractClient UserContract { get; set; } = default!;
-    [Inject] private PackageService PackageService { get; set; } = default!;
 
     [Parameter] public EventCallback OnActivationSuccess { get; set; }
 
@@ -22,18 +21,6 @@ public partial class ActivationSection : ComponentBase
     private long _packageId = 1;
     private int _durationMonths = 1;
     private string? _activationCode;
-    private long _basePackagePrice;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            var packages = await PackageService.GetAllPackagesAsync();
-            var basePackage = packages.FirstOrDefault(p => p.IsBasePackage) ?? packages.FirstOrDefault();
-            _basePackagePrice = basePackage?.Price ?? 0;
-        }
-        catch { /* fallback to 0 */ }
-    }
 
     private async Task HandleActivateAsync()
     {
@@ -88,8 +75,9 @@ public partial class ActivationSection : ComponentBase
 
     private string GetEstimatedCost()
     {
-        if (_basePackagePrice <= 0) return "در حال بارگذاری...";
-        var total = _basePackagePrice * _durationMonths;
+        // فرمول تقریبی: 56M per month (base amount from BFF implementation)
+        var baseAmount = 56_000_000;
+        var total = baseAmount * _durationMonths;
         return $"{total:N0} تومان";
     }
 }

src/FrontOffice.Main/Pages/Club/MembershipPage.razor

@@ -9,11 +9,6 @@
     <MudStack Spacing="3">
         <PageHeader Title="عضویت باشگاه مشتریان" BackHref="@RouteConstants.Profile.Index" />
 
-        @* ── G6: راهنمای قرارداد باشگاه (Q28) ── *@
-        <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Icon="@Icons.Material.Filled.Gavel">
-            قرارداد باشگاه مشتریان فقط یک‌بار امضا می‌شود و با هر بار خرید پکیج جدید نیازی به امضای مجدد نیست.
-        </MudAlert>
-
         @if (_isLoading)
         {
             <LoadingState Message="در حال دریافت اطلاعات عضویت..." />
@@ -70,7 +65,7 @@
                         <MudIcon Icon="@Icons.Material.Filled.AccountBalanceWallet" Color="Color.Success" Size="Size.Large" />
                         <MudStack Spacing="0">
                             <MudText Typo="Typo.subtitle1">شارژ کیف پول فروشگاه اعتباری</MudText>
-                            <MudText Typo="Typo.caption" Color="Color.Default">شارژ برابر ارزش پکیج فعال در کیف پول فروشگاه اعتباری</MudText>
+                            <MudText Typo="Typo.caption" Color="Color.Default">شارژ ۵۶ میلیون تومان کیف پول فروشگاه اعتباری</MudText>
                         </MudStack>
                     </MudStack>
                     <MudDivider />

src/FrontOffice.Main/Pages/Commission/CommissionDashboardPage.razor

@@ -10,15 +10,10 @@
     <MudStack Spacing="3">
         <PageHeader Title="پاداش‌های من" BackHref="@RouteConstants.Profile.Index" />
 
-        @* ── G5: توضیح محاسبه پاداش (Q28) ── *@
-        <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Icon="@Icons.Material.Filled.Info">
-            پاداش هفتگی بر اساس هر پکیج جداگانه محاسبه می‌شود. هر پکیج Pool پورسانت مستقل دارد و Carryover بر اساس پکیج زیرمجموعه‌هاست.
-        </MudAlert>
-
         <!-- فیلترها -->
         <MudPaper Elevation="2" Class="pa-3 rounded-lg">
             <MudGrid Spacing="2">
-                <MudItem xs="12" sm="6" md="3">
+                <MudItem xs="12" sm="6" md="4">
                     <WeekSelector @ref="_weekSelector"
                                   @bind-Value="_selectedWeekDefinition"
                                   Label="انتخاب هفته"
@@ -28,7 +23,7 @@
                                   Clearable="true"
                                   OnlyActive="false" />
                 </MudItem>
-                <MudItem xs="12" sm="6" md="3">
+                <MudItem xs="12" sm="6" md="4">
                     <MudSelect T="string" @bind-Value="_filterStatus" Label="وضعیت" Variant="Variant.Outlined">
                         <MudSelectItem T="string" Value="@string.Empty">همه</MudSelectItem>
                         <MudSelectItem T="string" Value="@("Pending")">در انتظار</MudSelectItem>
@@ -39,16 +34,7 @@
                         <MudSelectItem T="string" Value="@("Cancelled")">لغو شده</MudSelectItem>
                     </MudSelect>
                 </MudItem>
-                <MudItem xs="12" sm="6" md="3">
-                    <MudSelect T="long?" @bind-Value="_filterPackageId" Label="پکیج" Variant="Variant.Outlined" Clearable="true">
-                        <MudSelectItem T="long?" Value="@((long?)null)">همه پکیج‌ها</MudSelectItem>
-                        @foreach (var pkg in _packages)
-                        {
-                            <MudSelectItem T="long?" Value="@((long?)pkg.Id)">@pkg.Title</MudSelectItem>
-                        }
-                    </MudSelect>
-                </MudItem>
-                <MudItem xs="12" sm="6" md="3">
+                <MudItem xs="12" sm="12" md="4">
                     <MudStack Row="true" Spacing="2" Style="height: 100%;" AlignItems="AlignItems.End">
                         <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="ApplyFiltersAsync" StartIcon="@Icons.Material.Filled.FilterList" FullWidth="true">
                             اعمال فیلتر
@@ -101,7 +87,6 @@
                         <MudTable Items="_payouts" Hover="true" Striped="true" Dense="true" FixedHeader="true" Height="400px">
                             <HeaderContent>
                                 <MudTh>هفته</MudTh>
-                                <MudTh>پکیج</MudTh>
                                 <MudTh>امتیاز</MudTh>
                                 <MudTh>مبلغ (تومان)</MudTh>
                                 <MudTh>وضعیت</MudTh>
@@ -112,11 +97,6 @@
                                 <MudTd DataLabel="هفته">
                                     <MudChip T="string" Color="Color.Primary" Size="Size.Small" Variant="Variant.Outlined">@context.WeekDisplayName</MudChip>
                                 </MudTd>
-                                <MudTd DataLabel="پکیج">
-                                    <MudChip T="string" Color="Color.Tertiary" Size="Size.Small">
-                                        @(string.IsNullOrEmpty(context.PackageTitle) ? "-" : context.PackageTitle)
-                                    </MudChip>
-                                </MudTd>
                                 <MudTd DataLabel="امتیاز">@context.BalancesEarned</MudTd>
                                 <MudTd DataLabel="مبلغ">
                                     <MudText Color="Color.Success"><strong>@context.AmountFormatted</strong></MudText>
@@ -147,10 +127,6 @@
                                         <MudChip T="string" Color="Color.Primary" Size="Size.Small" Variant="Variant.Outlined">@payout.WeekDisplayName</MudChip>
                                         <MudChip T="string" Color="@GetStatusColor(payout.StatusColor)" Size="Size.Small">@payout.StatusText</MudChip>
                                     </MudStack>
-                                    @if (!string.IsNullOrEmpty(payout.PackageTitle))
-                                    {
-                                        <MudChip T="string" Color="Color.Tertiary" Size="Size.Small">@payout.PackageTitle</MudChip>
-                                    }
                                     <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
                                         <MudText Typo="Typo.h6" Color="Color.Success">@payout.AmountFormatted</MudText>
                                         <MudText Typo="Typo.caption" Class="mud-text-secondary">امتیاز: @payout.BalancesEarned</MudText>

src/FrontOffice.Main/Pages/Commission/CommissionDashboardPage.razor.cs

@@ -8,10 +8,8 @@ namespace FrontOffice.Main.Pages.Commission;
 public partial class CommissionDashboardPage : ComponentBase
 {
     [Inject] private CommissionService CommissionService { get; set; } = default!;
-    [Inject] private PackageService PackageService { get; set; } = default!;
 
     private List<CommissionPayoutDto> _payouts = new();
-    private List<PackageDto> _packages = new();
     private int _totalCount;
     private long _totalAmount;
     private int _pageNumber = 1;
@@ -21,26 +19,12 @@ public partial class CommissionDashboardPage : ComponentBase
     private WeekSelector? _weekSelector;
     private WeekDefinitionDto? _selectedWeekDefinition;
     private string _filterStatus = string.Empty;
-    private long? _filterPackageId;
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadPackagesAsync();
         await LoadPayoutsAsync();
     }
 
-    private async Task LoadPackagesAsync()
-    {
-        try
-        {
-            _packages = await PackageService.GetAllPackagesAsync();
-        }
-        catch
-        {
-            _packages = new List<PackageDto>();
-        }
-    }
-
     private async Task LoadPayoutsAsync()
     {
         try
@@ -51,8 +35,7 @@ public partial class CommissionDashboardPage : ComponentBase
                 weekDefinitionId,
                 _filterStatus,
                 _pageNumber,
-                _pageSize,
-                _filterPackageId
+                _pageSize
             );
             _payouts = result.Payouts;
             _totalCount = result.TotalCount;
@@ -78,7 +61,6 @@ public partial class CommissionDashboardPage : ComponentBase
     {
         _selectedWeekDefinition = null;
         _filterStatus = string.Empty;
-        _filterPackageId = null;
         _pageNumber = 1;
         await LoadPayoutsAsync();
     }

src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor

@@ -12,7 +12,7 @@
         <!-- انتخاب هفته -->
         <MudPaper Elevation="2" Class="pa-3 rounded-lg">
             <MudGrid Spacing="2">
-                <MudItem xs="8" sm="4" md="4">
+                <MudItem xs="8" sm="6" md="6">
                     <WeekSelector @ref="_weekSelector"
                                   @bind-Value="_selectedWeekDefinition"
                                   Label="انتخاب هفته"
@@ -21,15 +21,15 @@
                                   Dense="false"
                                   OnlyActive="true" />
                 </MudItem>
-                <MudItem xs="4" sm="4" md="4">
-                    <MudSelect T="long?" @bind-Value="_filterPackageId" Label="پکیج" Variant="Variant.Outlined" Clearable="true">
-                        <MudSelectItem T="long?" Value="@((long?)null)">همه پکیج‌ها</MudSelectItem>
-                        @foreach (var pkg in _packages)
-                        {
-                            <MudSelectItem T="long?" Value="@((long?)pkg.Id)">@pkg.Title</MudSelectItem>
-                        }
-                    </MudSelect>
-                </MudItem>
+                @* <MudItem xs="4" sm="3" md="3"> *@
+                @*     <MudButton Variant="Variant.Outlined"  *@
+                @*                OnClick="LoadCurrentWeekAsync"  *@
+                @*                StartIcon="@Icons.Material.Filled.Today" *@
+                @*                FullWidth="true" *@
+                @*                Style="height: 56px;"> *@
+                @*         هفته جاری *@
+                @*     </MudButton> *@
+                @* </MudItem> *@
                 <MudItem xs="4" sm="3" md="3" Class="pt-6">
                     <MudButton Variant="Variant.Filled" 
                                Color="Color.Primary" 
@@ -66,12 +66,6 @@
                     <MudItem xs="6" sm="4">
                         <MudText Typo="Typo.caption" Class="mud-text-secondary">پایان: <strong>@_weeklyBalance.EndDatePersian</strong></MudText>
                     </MudItem>
-                    @if (!string.IsNullOrEmpty(_weeklyBalance.PackageTitle))
-                    {
-                        <MudItem xs="12" sm="12">
-                            <MudChip T="string" Color="Color.Info" Size="Size.Small" Icon="@Icons.Material.Filled.Inventory2">@_weeklyBalance.PackageTitle</MudChip>
-                        </MudItem>
-                    }
                 </MudGrid>
             </MudPaper>
 

src/FrontOffice.Main/Pages/Commission/WeeklyBalancePage.razor.cs

@@ -8,7 +8,6 @@ namespace FrontOffice.Main.Pages.Commission;
 public partial class WeeklyBalancePage : ComponentBase
 {
     [Inject] private CommissionService CommissionService { get; set; } = default!;
-    [Inject] private PackageService PackageService { get; set; } = default!;
     [Inject] private ISnackbar SnackbarService { get; set; } = default!;
 
     [Parameter]
@@ -18,8 +17,6 @@ public partial class WeeklyBalancePage : ComponentBase
     private WeekSelector? _weekSelector;
     private WeekDefinitionDto? _selectedWeekDefinition;
     private WeeklyBalanceDto? _weeklyBalance;
-    private List<PackageDto> _packages = new();
-    private long? _filterPackageId;
     private bool _isLoading = true;
     private bool _hasError = false;
 
@@ -37,8 +34,6 @@ public partial class WeeklyBalancePage : ComponentBase
     {
         if (firstRender)
         {
-            await LoadPackagesAsync();
-
             // Wait for WeekSelector to initialize and load its cached weeks
             if (_weekSelector != null)
             {
@@ -93,7 +88,7 @@ public partial class WeeklyBalancePage : ComponentBase
             
             long? weekDefinitionId = _selectedWeekDefinition?.Id;
             
-            _weeklyBalance = await CommissionService.GetMyWeeklyBalanceAsync(weekDefinitionId, _filterPackageId);
+            _weeklyBalance = await CommissionService.GetMyWeeklyBalanceAsync(weekDefinitionId);
             
             // Update week display name from selected definition if available
             if (_selectedWeekDefinition != null && _weeklyBalance != null)
@@ -118,18 +113,6 @@ public partial class WeeklyBalancePage : ComponentBase
         }
     }
 
-    private async Task LoadPackagesAsync()
-    {
-        try
-        {
-            _packages = await PackageService.GetAllPackagesAsync();
-        }
-        catch
-        {
-            _packages = new();
-        }
-    }
-
     private async Task LoadCurrentWeekAsync()
     {
         if (_weekSelector != null)

src/FrontOffice.Main/Pages/DiscountStore/Cart.razor.cs

@@ -7,15 +7,9 @@ public partial class Cart : IDisposable
 {
     [Inject] private DiscountCartService DiscountCart { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
-        if (!await AuthService.IsAuthenticatedAsync())
-        {
-            await AuthDialogService.ShowAuthDialogAsync();
-        }
         await DiscountCart.EnsureInitializedAsync();
         DiscountCart.OnChange += StateHasChanged;
     }

src/FrontOffice.Main/Pages/DiscountStore/Checkout.razor

@@ -22,11 +22,9 @@
                 else if (_addresses.Count == 0)
                 {
                     <MudAlert Severity="Severity.Warning">
-                        هیچ آدرسی ثبت نشده است. می‌توانید همین‌جا آدرس جدید اضافه کنید.
+                        هیچ آدرسی ثبت نشده است. لطفاً از بخش پروفایل آدرس خود را اضافه کنید.
                     </MudAlert>
-                    <MudButton Class="mt-2" Variant="Variant.Outlined" Color="Color.Primary"
-                               StartIcon="@Icons.Material.Filled.Add"
-                               OnClick="OpenAddAddressDialog">افزودن آدرس</MudButton>
+                    <MudButton Class="mt-2" Variant="Variant.Outlined" Href="/profile/addresses">افزودن آدرس</MudButton>
                 }
                 else
                 {
@@ -43,25 +41,13 @@
                                         <MudText Typo="Typo.subtitle2">@address.Title</MudText>
                                         <MudText Typo="Typo.body2" Class="mud-text-secondary">@address.Address</MudText>
                                     </MudStack>
-                                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
-                                        @if (address.IsDefault)
-                                        {
-                                            <MudChip T="string" Color="Color.Success" Variant="Variant.Outlined" Size="Size.Small">پیش‌فرض</MudChip>
-                                        }
-                                        <span @onclick:stopPropagation="true">
-                                            <MudIconButton Icon="@Icons.Material.Filled.Edit"
-                                                           Size="Size.Small"
-                                                           Color="Color.Primary"
-                                                           aria-label="ویرایش آدرس"
-                                                           OnClick="@(() => OpenEditAddressDialog(address))" />
-                                        </span>
-                                    </MudStack>
+                                    @if (address.IsDefault)
+                                    {
+                                        <MudChip T="string" Color="Color.Success" Variant="Variant.Outlined">پیش‌فرض</MudChip>
+                                    }
                                 </MudStack>
                             </MudPaper>
                         }
-                        <MudButton Class="mt-2" Variant="Variant.Text" Color="Color.Primary"
-                                   StartIcon="@Icons.Material.Filled.Add"
-                                   OnClick="OpenAddAddressDialog">افزودن آدرس جدید</MudButton>
                     </MudStack>
                 }
             </MudPaper>

src/FrontOffice.Main/Pages/DiscountStore/Checkout.razor.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Components;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
-using FrontOffice.Main.Pages.Profile.Components;
 using FrontOffice.Main.Utilities;
 using MudBlazor;
 
@@ -12,8 +11,6 @@ public partial class Checkout
     [Inject] private DiscountOrderService DiscountOrderService { get; set; } = default!;
     [Inject] private UserAddressContract.UserAddressContractClient UserAddressContract { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
 
     private List<CustomerAddressModel> _addresses = new();
     private CustomerAddressModel? _selectedAddress;
@@ -35,17 +32,9 @@ public partial class Checkout
 
     protected override async Task OnInitializedAsync()
     {
-        if (!await AuthService.IsAuthenticatedAsync())
-        {
-            await AuthDialogService.ShowAuthDialogAsync();
-        }
         await VAT.LoadAsync();
         await DiscountCart.EnsureInitializedAsync();
-        var userInfo = await AuthService.GetUserAuthInfo();
-        if (userInfo.HasAddress)
-            await LoadAddresses();
-        else
-            _addresses = new();
+        await LoadAddresses();
     }
 
     private async Task LoadAddresses()
@@ -62,14 +51,12 @@ public partial class Checkout
             else
             {
                 _addresses = new();
-                _selectedAddress = null;
             }
         }
         catch (Exception ex)
         {
             Snackbar.Add($"خطا در بارگذاری آدرس‌ها: {ex.Message}", Severity.Error);
             _addresses = new();
-            _selectedAddress = null;
         }
         finally
         {
@@ -78,30 +65,6 @@ public partial class Checkout
         }
     }
 
-    private async Task OpenAddAddressDialog()
-    {
-        var dialog = await DialogService.ShowAsync<AddAddressDialog>("افزودن آدرس جدید");
-        var result = await dialog.Result;
-        if (result is { Canceled: false })
-        {
-            await AuthService.RefreshTokenAsync();
-            await LoadAddresses();
-        }
-    }
-
-    private async Task OpenEditAddressDialog(CustomerAddressModel address)
-    {
-        var dialog = await DialogService.ShowAsync<EditAddressDialog>("ویرایش آدرس", new DialogParameters<EditAddressDialog>
-        {
-            { x => x.Model, address }
-        });
-        var result = await dialog.Result;
-        if (result is { Canceled: false })
-        {
-            await LoadAddresses();
-        }
-    }
-
     private async Task PlaceOrder()
     {
         if (!CanPlaceOrder || _selectedAddress is null)

src/FrontOffice.Main/Pages/DiscountStore/ProductDetail.razor

@@ -63,58 +63,49 @@
                     }
 
                     <!-- Price & Discount -->
-                    @if (_isAuthenticated)
-                    {
-                        <MudPaper Class="pa-4 rounded-lg discount-price-box" Elevation="0">
-                            <MudStack Spacing="2">
+                    <MudPaper Class="pa-4 rounded-lg discount-price-box" Elevation="0">
+                        <MudStack Spacing="2">
+                            <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
+                                <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت محصول:</MudText>
+                                <MudText Typo="Typo.body1" Class="fw-bold">
+                                    @($"{_product.Price:N0}") تومان
+                                </MudText>
+                            </MudStack>
+                            @if (VAT.IsEnabled)
+                            {
                                 <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت محصول:</MudText>
-                                    <MudText Typo="Typo.body1" Class="fw-bold">
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات ارزش افزوده (@VAT.VatPercentage%):</MudText>
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">
+                                        @($"{VAT.CalculateVAT(_product.Price):N0}") تومان
+                                    </MudText>
+                                </MudStack>
+                                <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت با مالیات:</MudText>
+                                    <MudText Typo="Typo.h5" Color="Color.Primary" Class="fw-bold">
+                                        @($"{VAT.AddVAT(_product.Price):N0}") تومان
+                                    </MudText>
+                                </MudStack>
+                            }
+                            else
+                            {
+                                <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت نهایی:</MudText>
+                                    <MudText Typo="Typo.h5" Color="Color.Primary" Class="fw-bold">
                                         @($"{_product.Price:N0}") تومان
                                     </MudText>
                                 </MudStack>
-                                @if (VAT.IsEnabled)
-                                {
-                                    <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                        <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات ارزش افزوده (@VAT.VatPercentage%):</MudText>
-                                        <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                                            @($"{VAT.CalculateVAT(_product.Price):N0}") تومان
-                                        </MudText>
-                                    </MudStack>
-                                    <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                        <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت با مالیات:</MudText>
-                                        <MudText Typo="Typo.h5" Color="Color.Primary" Class="fw-bold">
-                                            @($"{VAT.AddVAT(_product.Price):N0}") تومان
-                                        </MudText>
-                                    </MudStack>
-                                }
-                                else
-                                {
-                                    <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                        <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت نهایی:</MudText>
-                                        <MudText Typo="Typo.h5" Color="Color.Primary" Class="fw-bold">
-                                            @($"{_product.Price:N0}") تومان
-                                        </MudText>
-                                    </MudStack>
-                                }
-                                @if (_product.MaxDiscountPercent > 0)
-                                {
-                                    <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                        <MudText Typo="Typo.body2" Class="mud-text-secondary">اعتبار از کیف اعتباری:</MudText>
-                                        <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small">
-                                            @_product.MaxDiscountPercent% (@($"{_product.Price * _product.MaxDiscountPercent / 100:N0}") تومان)
-                                        </MudChip>
-                                    </MudStack>
-                                }
-                            </MudStack>
-                        </MudPaper>
-                    }
-                    else
-                    {
-                        <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Outlined" Icon="@Icons.Material.Filled.Lock">
-                            برای مشاهده قیمت ابتدا وارد شوید
-                        </MudAlert>
-                    }
+                            }
+                            @if (_product.MaxDiscountPercent > 0)
+                            {
+                                <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">اعتبار از کیف اعتباری:</MudText>
+                                    <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small">
+                                        @_product.MaxDiscountPercent% (@($"{_product.Price * _product.MaxDiscountPercent / 100:N0}") تومان)
+                                    </MudChip>
+                                </MudStack>
+                            }
+                        </MudStack>
+                    </MudPaper>
 
                     <!-- Stock & Stats -->
                     <MudStack Row="true" Spacing="3" Class="flex-wrap">

src/FrontOffice.Main/Pages/DiscountStore/ProductDetail.razor.cs

@@ -10,10 +10,6 @@ public partial class ProductDetail
     [Inject] private DiscountProductService DiscountProductService { get; set; } = default!;
     [Inject] private DiscountCartService DiscountCartService { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private GuestActionGate GuestGate { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
-
-    private bool _isAuthenticated;
 
     private DiscountProductDetail? _product;
     private string _selectedImage = string.Empty;
@@ -23,7 +19,6 @@ public partial class ProductDetail
 
     protected override async Task OnInitializedAsync()
     {
-        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
         await LoadProductAsync();
     }
 
@@ -64,14 +59,8 @@ public partial class ProductDetail
         _addingToCart = true;
         try
         {
-            var productId = _product.Id;
-            var qty = _quantity;
-            var title = _product.Title;
-            await GuestGate.RunAsync(async () =>
-            {
-                await DiscountCartService.AddAsync(productId, qty);
-                Snackbar.Add($"{title} به سبد خرید اضافه شد", MudBlazor.Severity.Success);
-            });
+            await DiscountCartService.AddAsync(_product.Id, _quantity);
+            Snackbar.Add($"{_product.Title} به سبد خرید اضافه شد", MudBlazor.Severity.Success);
         }
         catch
         {

src/FrontOffice.Main/Pages/DiscountStore/Products.razor

@@ -76,7 +76,6 @@
             {
                 <MudItem xs="6" sm="6" md="3"
                          onclick="@(() => NavigateToProduct(p.Id))">
-                    <div id="@($"shop-product-{p.Id}")" class="h-100">
                     <MudCard Class="rounded-lg h-100 d-flex flex-column overflow-hidden"
                              Style="cursor:pointer;">
                         <MudCardContent Class="d-flex flex-column pa-1 h-100">
@@ -104,19 +103,10 @@
                             </div>
                             <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
                                 <MudText Typo="Typo.subtitle1">@p.Title</MudText>
-                                @if (_isAuthenticated)
-                                {
-                                    <div>
-                                        <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</MudText>
-                                        <MudText Typo="Typo.overline" Class="mud-text-secondary" Style="font-size:0.6rem;line-height:1;">(+ ارزش افزوده)</MudText>
-                                    </div>
-                                }
-                                else
-                                {
-                                    <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                        <MudIcon Icon="@Icons.Material.Filled.Lock" Size="Size.Small" Class="me-1"/>برای مشاهده قیمت وارد شوید
-                                    </MudText>
-                                }
+                                <div>
+                                    <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</MudText>
+                                    <MudText Typo="Typo.overline" Class="mud-text-secondary" Style="font-size:0.6rem;line-height:1;">(+ ارزش افزوده)</MudText>
+                                </div>
                             </div>
                         </MudCardContent>
                         <MudCardActions Class="mt-auto d-flex justify-space-between pa-2">
@@ -128,7 +118,6 @@
                             </MudButton>
                         </MudCardActions>
                     </MudCard>
-                    </div>
                 </MudItem>
             }
         </MudGrid>

src/FrontOffice.Main/Pages/DiscountStore/Products.razor.cs

@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
 using FrontOffice.Main.Utilities;
 
 namespace FrontOffice.Main.Pages.DiscountStore;
@@ -10,11 +8,7 @@ public partial class Products : ComponentBase, IDisposable
 {
     [Inject] private DiscountProductService ProductService { get; set; } = default!;
     [Inject] private DiscountCartService DiscountCart { get; set; } = default!;
-    [Inject] private GuestActionGate GuestGate { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
-    [Inject] private IJSRuntime Js { get; set; } = default!;
 
-    private bool _isAuthenticated;
     private string _search = string.Empty;
     private long? _selectedCategoryId;
     private int _currentPage = 1;
@@ -23,107 +17,41 @@ public partial class Products : ComponentBase, IDisposable
     private bool _hasMore = true;
     private int _totalCount;
     private const int PageSize = 12;
-    private const string DefaultSortBy = "price desc";
 
     private List<DiscountProductCard> _products = new();
     private List<DiscountCategoryNode> _categories = new();
-    private bool _ignoreNextLocationChange;
-    private bool _pendingScrollRestore;
 
     protected override async Task OnInitializedAsync()
     {
-        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
+        _loading = true;
         await DiscountCart.EnsureInitializedAsync();
         DiscountCart.OnChange += StateHasChanged;
-        Navigation.LocationChanged += HandleLocationChanged;
-
-        _categories = await ProductService.GetCategoriesAsync();
-        ApplyStateFromUri();
-        _loading = true;
-        await LoadPages(_currentPage);
+        var categoriesTask = ProductService.GetCategoriesAsync();
+        var productsTask = ProductService.GetProductsAsync(page: 1, pageSize: PageSize);
+        await Task.WhenAll(categoriesTask, productsTask);
+        _categories = categoriesTask.Result;
+        var result = productsTask.Result;
+        _products = result.Products;
+        _totalCount = result.TotalCount;
+        _hasMore = result.CurrentPage < result.TotalPages;
         _loading = false;
-        _pendingScrollRestore = true;
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (_pendingScrollRestore && !_loading && _products.Count > 0)
-        {
-            _pendingScrollRestore = false;
-            var payload = await ShopListScrollRestore.TakeAsync(Js, ShopListScrollRestore.DiscountKey);
-            if (payload is not null)
-                await ShopListScrollRestore.RestoreAsync(Js, payload);
-        }
-
-        await base.OnAfterRenderAsync(firstRender);
-    }
-
-    private void ApplyStateFromUri()
-    {
-        var state = ShopListQueryState.Parse(Navigation.ToAbsoluteUri(Navigation.Uri));
-        _search = state.Query;
-        _selectedCategoryId = state.CategoryId;
-        _currentPage = state.Pages;
-    }
-
-    private ShopListQueryState CaptureState() => new()
-    {
-        Query = _search,
-        CategoryId = _selectedCategoryId,
-        Pages = Math.Max(1, _currentPage)
-    };
-
-    private void SyncUrl()
-    {
-        var target = CaptureState().ToRelativeUrl(RouteConstants.DiscountStore.Products);
-        var currentPathAndQuery = Navigation.ToAbsoluteUri(Navigation.Uri).PathAndQuery;
-        if (string.Equals(currentPathAndQuery, target, StringComparison.OrdinalIgnoreCase))
-            return;
-
-        _ignoreNextLocationChange = true;
-        Navigation.NavigateTo(target, replace: true);
-    }
-
-    private async Task LoadPages(int pagesToLoad)
-    {
-        _products.Clear();
-        _hasMore = true;
-        pagesToLoad = Math.Max(1, pagesToLoad);
-        var search = string.IsNullOrWhiteSpace(_search) ? null : _search;
-
-        for (var page = 1; page <= pagesToLoad; page++)
-        {
-            var result = await ProductService.GetProductsAsync(
-                page: page,
-                pageSize: PageSize,
-                search: search,
-                categoryId: _selectedCategoryId,
-                sortBy: DefaultSortBy);
-
-            if (page == 1)
-            {
-                _products = result.Products;
-                _totalCount = result.TotalCount;
-            }
-            else
-            {
-                _products.AddRange(result.Products);
-            }
-
-            _currentPage = page;
-            _hasMore = result.CurrentPage < result.TotalPages;
-            if (!_hasMore)
-                break;
-        }
-    }
-
-    private async Task ReloadFromFilters()
+    private async Task LoadInitial()
     {
         _loading = true;
         _currentPage = 1;
+        _products.Clear();
         StateHasChanged();
-        await LoadPages(1);
-        SyncUrl();
+        
+        var result = await ProductService.GetProductsAsync(
+            page: 1,
+            pageSize: PageSize,
+            search: string.IsNullOrWhiteSpace(_search) ? null : _search,
+            categoryId: _selectedCategoryId);
+        _products = result.Products;
+        _totalCount = result.TotalCount;
+        _hasMore = result.CurrentPage < result.TotalPages;
         _loading = false;
         StateHasChanged();
     }
@@ -131,82 +59,53 @@ public partial class Products : ComponentBase, IDisposable
     private async Task LoadMore()
     {
         if (_loadingMore || !_hasMore) return;
-
+        
         _loadingMore = true;
         StateHasChanged();
-
+        
         _currentPage++;
         var result = await ProductService.GetProductsAsync(
             page: _currentPage,
             pageSize: PageSize,
             search: string.IsNullOrWhiteSpace(_search) ? null : _search,
-            categoryId: _selectedCategoryId,
-            sortBy: DefaultSortBy);
+            categoryId: _selectedCategoryId);
         _products.AddRange(result.Products);
         _hasMore = result.CurrentPage < result.TotalPages;
-        SyncUrl();
-
+        
         _loadingMore = false;
         StateHasChanged();
     }
 
-    private async Task SearchProducts() => await ReloadFromFilters();
+    private async Task SearchProducts() => await LoadInitial();
 
     private async Task OnSearchKeyUp(KeyboardEventArgs e)
     {
         if (e.Key == "Enter")
-            await ReloadFromFilters();
+        {
+            await LoadInitial();
+        }
     }
 
     private async Task OnCategoryChanged(long? value)
     {
         _selectedCategoryId = value;
-        await ReloadFromFilters();
+        await LoadInitial();
     }
 
     private async Task AddToCart(DiscountProductCard p)
     {
-        await GuestGate.RunAsync(() => DiscountCart.AddAsync(p.Id));
+        await DiscountCart.AddAsync(p.Id);
     }
 
-    private async Task NavigateToProduct(long id)
+    private void NavigateToProduct(long id)
     {
-        await ShopListScrollRestore.SaveAsync(Js, ShopListScrollRestore.DiscountKey, id);
         Navigation.NavigateTo($"{RouteConstants.DiscountStore.ProductDetail}{id}");
     }
 
-    private void HandleLocationChanged(object? sender, LocationChangedEventArgs args)
-    {
-        if (_ignoreNextLocationChange)
-        {
-            _ignoreNextLocationChange = false;
-            return;
-        }
-
-        var uri = Navigation.ToAbsoluteUri(args.Location);
-        if (!uri.AbsolutePath.Equals(RouteConstants.DiscountStore.Products, StringComparison.OrdinalIgnoreCase))
-            return;
-
-        var incoming = ShopListQueryState.Parse(uri);
-        if (incoming.Matches(CaptureState()))
-            return;
-
-        _ = InvokeAsync(async () =>
-        {
-            ApplyStateFromUri();
-            _loading = true;
-            await LoadPages(_currentPage);
-            _loading = false;
-            _pendingScrollRestore = true;
-            StateHasChanged();
-        });
-    }
-
     private static string FormatPrice(long price) => $"{price:N0} تومان";
 
     public void Dispose()
     {
         DiscountCart.OnChange -= StateHasChanged;
-        Navigation.LocationChanged -= HandleLocationChanged;
     }
 }

src/FrontOffice.Main/Pages/FAQ.razor.cs

@@ -55,7 +55,7 @@ public partial class FAQ
             Icon = Icons.Material.Filled.Build,
             Questions = new List<FAQQuestion>
             {
-                new() { Question = "سازمان فروش چگونه کار می‌کند؟", Answer = "سازمان فروش بصری نمایش سلسله مراتبی تیم شما را نشان می‌دهد و امکان ردیابی روابط ارجاعی را فراهم می‌کند." },
+                new() { Question = "شجره‌نامه چگونه کار می‌کند؟", Answer = "شجره‌نامه بصری نمایش سلسله مراتبی تیم شما را نشان می‌دهد و امکان ردیابی روابط ارجاعی را فراهم می‌کند." },
                 new() { Question = "گزارش‌گیری به چه صورت است؟", Answer = "سیستم گزارش‌های جامع مالی، عملکردی و آماری ارائه می‌دهد که قابل فیلتر و دانلود به فرمت Excel است." },
                 new() { Question = "آیا از موبایل قابل استفاده است؟", Answer = "بله، اپلیکیشن کاملاً responsive است و تجربه کاربری عالی در موبایل و تبلت ارائه می‌دهد." }
             }

src/FrontOffice.Main/Pages/Index.razor

@@ -11,7 +11,7 @@
         <MudStack AlignItems="AlignItems.Center" Spacing="4" Class="text-center">
             <MudChip T="string" Color="Color.Default" Variant="Variant.Filled"
                      Class="pulse-chip hero-chip-glass" Size="Size.Small">
-باشگاه مشتریان KBS کارا بازار سلامت 
+                🌿 پلتفرم سلامت‌محور فروش و تیم‌سازی
             </MudChip>
 
             <MudText Typo="Typo.h1" Class="hero-title" Style="max-width:680px;">
@@ -172,179 +172,6 @@
     </MudContainer>
 </section>
 
-@* ═══════════════════════════════════════════════
-   1c. TOP-SELLING REGULAR PRODUCTS
-   ═══════════════════════════════════════════════ *@
-@if (_loadingTopProducts)
-{
-    <section class="section-landing" style="background:var(--mud-palette-background-gray);">
-        <MudContainer MaxWidth="MaxWidth.Large">
-            <MudStack AlignItems="AlignItems.Center" Class="py-4">
-                <MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Small" />
-            </MudStack>
-        </MudContainer>
-    </section>
-}
-else
-{
-    @if (_topRegularProducts.Any())
-    {
-        <section class="section-landing" style="background:var(--mud-palette-background-gray);">
-            <MudContainer MaxWidth="MaxWidth.Large">
-                <div class="text-center mb-6 fade-in-up">
-                    <MudText Typo="Typo.h3">محصولات پرفروش فروشگاه</MudText>
-                    <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2">
-                        محبوب‌ترین محصولات کارا بازار سلامت
-                    </MudText>
-                </div>
-
-                <MudGrid Spacing="2" Justify="Justify.FlexStart">
-                    @foreach (var p in _topRegularProducts)
-                    {
-                        <MudItem xs="6" sm="6" md="4">
-                            <MudCard Class="rounded-lg h-100 d-flex flex-column overflow-hidden landing-product-card"
-                                     Style="cursor:pointer;"
-                                     @onclick="() => NavigateToRegularProduct(p.Id)">
-                                <MudCardContent Class="d-flex flex-column pa-1 h-100">
-                                    <div style="aspect-ratio:1/1;width:100%;background-image:url('@p.ImageUrl');background-size:cover;background-position:center;border-radius:0.5rem;position:relative;">
-                                        @if (p.RemainingCount <= 0)
-                                        {
-                                            <div style="position:absolute;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center;border-radius:0.5rem;">
-                                                <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small">ناموجود</MudChip>
-                                            </div>
-                                        }
-                                        else if (p.RemainingCount <= 5)
-                                        {
-                                            <MudChip T="string" Color="Color.Warning" Variant="Variant.Filled" Size="Size.Small"
-                                                     Style="position:absolute;top:8px;right:8px;">
-                                                فقط @p.RemainingCount عدد
-                                            </MudChip>
-                                        }
-                                    </div>
-                                    <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
-                                        <MudText Typo="Typo.subtitle1" Style="display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;">@p.Title</MudText>
-                                        @if (_isAuthenticated)
-                                        {
-                                            <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</MudText>
-                                        }
-                                        else
-                                        {
-                                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                                <MudIcon Icon="@Icons.Material.Filled.Lock" Size="Size.Small" Class="me-1"/>برای مشاهده قیمت وارد شوید
-                                            </MudText>
-                                        }
-                                    </div>
-                                </MudCardContent>
-                                <MudCardActions Class="mt-auto pa-2" @onclick:stopPropagation="true">
-                                    <MudButton Variant="Variant.Filled" Color="Color.Primary" FullWidth="true"
-                                               StartIcon="@Icons.Material.Filled.AddShoppingCart"
-                                               Disabled="@(p.RemainingCount <= 0)"
-                                               OnClick="@(() => AddRegularToCart(p))">
-                                        @(p.RemainingCount <= 0 ? "ناموجود" : "افزودن به سبد")
-                                    </MudButton>
-                                </MudCardActions>
-                            </MudCard>
-                        </MudItem>
-                    }
-                </MudGrid>
-
-                <div class="text-center mt-6">
-                    <MudButton Variant="Variant.Outlined" Color="Color.Primary" Class="rounded-pill"
-                               Href="@RouteConstants.Store.Products"
-                               EndIcon="@Icons.Material.Filled.ArrowBack">
-                        مشاهده همه محصولات
-                    </MudButton>
-                </div>
-            </MudContainer>
-        </section>
-    }
-
-    @* ═══════════════════════════════════════════════
-       1d. TOP-SELLING DISCOUNT STORE PRODUCTS
-       ═══════════════════════════════════════════════ *@
-    @if (_topDiscountProducts.Any())
-    {
-        <section class="section-landing">
-            <MudContainer MaxWidth="MaxWidth.Large">
-                <div class="text-center mb-6 fade-in-up">
-                    <MudText Typo="Typo.h3">محصولات پرفروش فروشگاه اعتباری</MudText>
-                    <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2">
-                        محصولات ویژه اعضای باشگاه با پرداخت اعتباری
-                    </MudText>
-                </div>
-
-                <MudGrid Spacing="2" Justify="Justify.FlexStart">
-                    @foreach (var p in _topDiscountProducts)
-                    {
-                        <MudItem xs="6" sm="6" md="4">
-                            <MudCard Class="rounded-lg h-100 d-flex flex-column overflow-hidden landing-product-card"
-                                     Style="cursor:pointer;"
-                                     @onclick="() => NavigateToDiscountProduct(p.Id)">
-                                <MudCardContent Class="d-flex flex-column pa-1 h-100">
-                                    <div style="aspect-ratio:1/1;width:100%;background-image:url('@(string.IsNullOrWhiteSpace(p.ThumbnailUrl) ? p.ImageUrl : p.ThumbnailUrl)');background-size:cover;background-position:center;border-radius:0.5rem;position:relative;">
-                                        @if (p.RemainingCount <= 0)
-                                        {
-                                            <div style="position:absolute;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center;border-radius:0.5rem;">
-                                                <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small">ناموجود</MudChip>
-                                            </div>
-                                        }
-                                        else if (p.RemainingCount <= 5)
-                                        {
-                                            <MudChip T="string" Color="Color.Warning" Variant="Variant.Filled" Size="Size.Small"
-                                                     Style="position:absolute;top:8px;right:8px;">
-                                                فقط @p.RemainingCount عدد
-                                            </MudChip>
-                                        }
-                                        @if (p.MaxDiscountPercent > 0)
-                                        {
-                                            <MudChip T="string" Color="Color.Secondary" Variant="Variant.Filled" Size="Size.Small"
-                                                     Style="position:absolute;top:8px;left:8px;">
-                                                @p.MaxDiscountPercent% اعتبار
-                                            </MudChip>
-                                        }
-                                    </div>
-                                    <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
-                                        <MudText Typo="Typo.subtitle1" Style="display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;">@p.Title</MudText>
-                                        @if (_isAuthenticated)
-                                        {
-                                            <div>
-                                                <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatDiscountPrice(p.Price)</MudText>
-                                                <MudText Typo="Typo.overline" Class="mud-text-secondary" Style="font-size:0.6rem;line-height:1;">(+ ارزش افزوده)</MudText>
-                                            </div>
-                                        }
-                                        else
-                                        {
-                                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                                <MudIcon Icon="@Icons.Material.Filled.Lock" Size="Size.Small" Class="me-1"/>برای مشاهده قیمت وارد شوید
-                                            </MudText>
-                                        }
-                                    </div>
-                                </MudCardContent>
-                                <MudCardActions Class="mt-auto pa-2" @onclick:stopPropagation="true">
-                                    <MudButton Variant="Variant.Filled" Color="Color.Secondary" FullWidth="true"
-                                               StartIcon="@Icons.Material.Filled.AddShoppingCart"
-                                               Disabled="@(p.RemainingCount <= 0)"
-                                               OnClick="@(() => AddDiscountToCart(p))">
-                                        @(p.RemainingCount <= 0 ? "ناموجود" : "افزودن به سبد")
-                                    </MudButton>
-                                </MudCardActions>
-                            </MudCard>
-                        </MudItem>
-                    }
-                </MudGrid>
-
-                <div class="text-center mt-6">
-                    <MudButton Variant="Variant.Outlined" Color="Color.Secondary" Class="rounded-pill"
-                               Href="@RouteConstants.DiscountStore.Products"
-                               EndIcon="@Icons.Material.Filled.ArrowBack">
-                        مشاهده همه محصولات اعتباری
-                    </MudButton>
-                </div>
-            </MudContainer>
-        </section>
-    }
-}
-
 @* ═══════════════════════════════════════════════
    5. LATEST BLOG POSTS
    ═══════════════════════════════════════════════ *@
@@ -429,8 +256,6 @@ else
 @* ═══════════════════════════════════════════════
    6. TESTIMONIALS
    ═══════════════════════════════════════════════ *@
-@if (_testimonials.Count > 0)
-{
 <section class="section-landing">
     <MudContainer MaxWidth="MaxWidth.Large">
         <div class="text-center mb-8 fade-in-up">
@@ -467,7 +292,6 @@ else
         </MudGrid>
     </MudContainer>
 </section>
-}
 
 @* ═══════════════════════════════════════════════
    7. FAQ

src/FrontOffice.Main/Pages/Index.razor.cs

@@ -10,26 +10,11 @@ public partial class Index : IDisposable
     [Inject] private BlogPostService BlogPostService { get; set; } = default!;
     [Inject] private AuthService AuthService { get; set; } = default!;
     [Inject] private SitePageSettingsService PageSettingsService { get; set; } = default!;
-    [Inject] private ProductService ProductService { get; set; } = default!;
-    [Inject] private DiscountProductService DiscountProductService { get; set; } = default!;
-    [Inject] private CartService Cart { get; set; } = default!;
-    [Inject] private DiscountCartService DiscountCart { get; set; } = default!;
-    [Inject] private GuestActionGate GuestGate { get; set; } = default!;
-    [Inject] private VATService VAT { get; set; } = default!;
-
-    private bool _isAuthenticated;
 
     // ── CMS page data ──
     private PageSettingsDto? _pageData;
     private LandingSettings? _settings;
 
-    // ── Top-selling product sections ──
-    private const int LandingTopProductCount = 6;
-
-    private List<Product> _topRegularProducts = new();
-    private List<DiscountProductCard> _topDiscountProducts = new();
-    private bool _loadingTopProducts = true;
-
     // ── Latest blog posts (loaded from CMS) ──
     private List<BlogPostCardDto> _latestPosts = new();
 
@@ -48,7 +33,6 @@ public partial class Index : IDisposable
     protected override async Task OnInitializedAsync()
     {
         MainService.OnChangeHandler += OnStateChanged;
-        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
 
         // Load landing page settings from CMS
         try
@@ -67,29 +51,10 @@ public partial class Index : IDisposable
         PopulateFromSettings();
         _dataLoaded = true;
 
-        // Load top-selling in-stock products and blog posts in parallel
-        var topRegTask = ProductService.GetTopSellingAsync(LandingTopProductCount, inStock: true);
-        var topDiscTask = DiscountProductService.GetTopSellingAsync(LandingTopProductCount, inStock: true);
-        var featuredPostsTask = BlogPostService.GetFeaturedPostsAsync(2);
-
-        try
-        {
-            await Task.WhenAll(topRegTask, topDiscTask, featuredPostsTask);
-            _topRegularProducts = topRegTask.Result.Products;
-            _topDiscountProducts = topDiscTask.Result.Products;
-        }
-        catch
-        {
-            // Fallback: sections remain empty
-        }
-        _loadingTopProducts = false;
-
         // Load latest published blog posts
         try
         {
-            _latestPosts = featuredPostsTask.IsCompletedSuccessfully
-                ? featuredPostsTask.Result
-                : await BlogPostService.GetFeaturedPostsAsync(2);
+            _latestPosts = await BlogPostService.GetFeaturedPostsAsync(2);
 
             if (_latestPosts.Count < 2)
             {
@@ -193,10 +158,9 @@ public partial class Index : IDisposable
         }
 
         // ── Testimonials ──
-        // اگر تنظیمات از CMS لود شده، لیست خالی یعنی ادمین عمداً حذف کرده — بدون fallback hardcode
-        if (_settings is not null)
+        if (_settings?.Testimonials?.Any() == true)
         {
-            _testimonials = (_settings.Testimonials ?? [])
+            _testimonials = _settings.Testimonials
                 .Select((t, i) => new TestimonialItem(t.Quote ?? "", t.Name ?? "", t.Role ?? "", i * 150))
                 .ToList();
         }
@@ -205,7 +169,7 @@ public partial class Index : IDisposable
             _testimonials = new()
             {
                 new("با کارا بازار سلامت، محاسبه کارمزدها و پایش تیم‌ها بدون اکسل و دردسر انجام می‌شود.", "شرکت سینا نت", "مدیر عملیات", 0),
-                new("سازمان فروش بصری و گزارش‌های دقیق باعث شد رشد تیم را لحظه‌ای ببینیم.", "هولدینگ آریانا", "مدیر فروش", 150),
+                new("شجره‌نامه بصری و گزارش‌های دقیق باعث شد رشد تیم را لحظه‌ای ببینیم.", "هولدینگ آریانا", "مدیر فروش", 150),
                 new("سادگی ثبت‌نام و شفافیت پاداش‌ها مهم‌ترین مزیت این پلتفرم است.", "گروه بهداشتی نوین", "مدیر توسعه", 300),
             };
         }
@@ -303,21 +267,6 @@ public partial class Index : IDisposable
         Navigation.NavigateTo($"/blog/{slug}");
     }
 
-    private void NavigateToRegularProduct(long id)
-        => Navigation.NavigateTo(RouteConstants.Store.ProductDetail + id);
-
-    private void NavigateToDiscountProduct(long id)
-        => Navigation.NavigateTo(RouteConstants.DiscountStore.ProductDetail + id);
-
-    private async Task AddRegularToCart(Product p)
-        => await GuestGate.RunAsync(() => Cart.Add(p, 1));
-
-    private async Task AddDiscountToCart(DiscountProductCard p)
-        => await GuestGate.RunAsync(() => DiscountCart.AddAsync(p.Id));
-
-    private string FormatPrice(long price) => $"{VAT.AddVAT(price):N0} تومان";
-    private string FormatDiscountPrice(long price) => $"{price:N0} تومان";
-
     private async void OnStateChanged()
     {
         await InvokeAsync(StateHasChanged);

src/FrontOffice.Main/Pages/Package/MyPackages.razor

@@ -20,7 +20,7 @@
                 <MudIcon Icon="@Icons.Material.Filled.CardGiftcard" Size="Size.Large" Color="Color.Primary" Style="font-size: 80px;" />
                 <MudText Typo="Typo.h5">شما هنوز پکیجی خریداری نکرده‌اید</MudText>
                 <MudText Typo="Typo.body1" Class="mud-text-secondary" Style="max-width: 500px;">
-                    با خرید پکیج، به باشگاه مشتریان بپیوندید و از مزایای ویژه مانند پاداش هفتگی و تیم‌سازی بهره‌مند شوید.
+                    با خرید پکیج طلایی، به باشگاه مشتریان بپیوندید و از مزایای ویژه مانند پاداش هفتگی و تیم‌سازی بهره‌مند شوید.
                 </MudText>
                 <MudButton Variant="Variant.Filled"
                            Color="Color.Primary"
@@ -34,76 +34,7 @@
     }
     else
     {
-        @* ── G3: راهنمای پکیج‌های من (Q28) ── *@
-        <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-2" Icon="@Icons.Material.Filled.Info">
-            بعد از تکمیل چرخه کیف‌پول جادویی، می‌توانید مجدداً پکیج خریداری کرده و دور جدیدی را آغاز کنید.
-        </MudAlert>
-
         <MudGrid Spacing="4">
-
-            @* Re-Purchase / Cycle Progress Section *@
-            @if (_canRepurchase)
-            {
-                <MudItem xs="12">
-                    <MudAlert Severity="Severity.Success" Icon="@Icons.Material.Filled.Celebration" Class="mb-0">
-                        <MudStack Row="true" AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Style="width:100%">
-                            <MudText Typo="Typo.body1">
-                                🎉 چرخه جادویی تکمیل شد! می‌توانید پکیج جدید بخرید.
-                            </MudText>
-                            <MudButton Variant="Variant.Filled"
-                                       Color="Color.Primary"
-                                       StartIcon="@Icons.Material.Filled.ShoppingCart"
-                                       OnClick="@(() => Navigation.NavigateTo(RouteConstants.Package.List))">
-                                خرید پکیج جدید
-                            </MudButton>
-                        </MudStack>
-                    </MudAlert>
-                </MudItem>
-            }
-            else if (_magicStatus != null && _magicStatus.WalletMode == 1)
-            {
-                <MudItem xs="12">
-                    <MudPaper Elevation="2" Class="pa-6">
-                        <MudStack Spacing="3">
-                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                                <MudIcon Icon="@Icons.Material.Filled.AutoAwesome" Color="Color.Warning" />
-                                <MudText Typo="Typo.h6">پیشرفت چرخه جادویی</MudText>
-                                @if (_magicStatus.PurchaseCycleCount > 0)
-                                {
-                                    <MudChip T="string" Size="Size.Small" Color="Color.Info">دور @(_magicStatus.PurchaseCycleCount + 1)</MudChip>
-                                }
-                            </MudStack>
-
-                            <MudDivider />
-
-                            <MudStack Spacing="2">
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">واریز انجام‌شده:</MudText>
-                                    <MudText Typo="Typo.body2">@FormatPrice(_magicStatus.MagicTotalDeposited)</MudText>
-                                </MudStack>
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">سقف واریز:</MudText>
-                                    <MudText Typo="Typo.body2">@FormatPrice(_magicStatus.MagicMaxDeposit)</MudText>
-                                </MudStack>
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">باقیمانده:</MudText>
-                                    <MudText Typo="Typo.body2" Color="Color.Warning">@FormatPrice(_magicStatus.MagicRemainingDeposit)</MudText>
-                                </MudStack>
-
-                                <MudProgressLinear Color="Color.Primary" Value="@GetDepositProgress()" Class="my-2" Rounded="true" Size="Size.Large">
-                                    <MudText Typo="Typo.caption"><b>@GetDepositProgress()%</b></MudText>
-                                </MudProgressLinear>
-
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">اعتبار دریافتی:</MudText>
-                                    <MudText Typo="Typo.body2" Color="Color.Success">@FormatPrice(_magicStatus.MagicTotalCredited)</MudText>
-                                </MudStack>
-                            </MudStack>
-                        </MudStack>
-                    </MudPaper>
-                </MudItem>
-            }
-
             <!-- Package Status Card -->
             <MudItem xs="12" md="6">
                 <MudPaper Elevation="2" Class="pa-6 h-100">
@@ -118,7 +49,7 @@
                         <MudStack Spacing="2">
                             <MudStack Row="true" Justify="Justify.SpaceBetween">
                                 <MudText Typo="Typo.body2" Class="mud-text-secondary">نوع پکیج:</MudText>
-                                <MudText Typo="Typo.body2">@_userStatus.PackageTitle</MudText>
+                                <MudText Typo="Typo.body2">پکیج طلایی</MudText>
                             </MudStack>
 
                             <MudStack Row="true" Justify="Justify.SpaceBetween">
@@ -215,7 +146,7 @@
                     <MudStack Spacing="3">
                         <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
                             <MudIcon Icon="@Icons.Material.Filled.Stars" Color="Color.Warning" />
-                            <MudText Typo="Typo.h6">مزایای پکیج</MudText>
+                            <MudText Typo="Typo.h6">مزایای پکیج طلایی</MudText>
                         </MudStack>
 
                         <MudDivider />

src/FrontOffice.Main/Pages/Package/MyPackages.razor.cs

@@ -9,9 +9,7 @@ public partial class MyPackages : ComponentBase
     [Inject] private PackageService PackageService { get; set; } = default!;
 
     private UserPackageStatusDto? _userStatus;
-    private MagicWalletStatus? _magicStatus;
     private bool _isLoading = true;
-    private bool _canRepurchase = false;
 
     private List<BreadcrumbItem> _breadcrumbItems = new()
     {
@@ -32,18 +30,6 @@ public partial class MyPackages : ComponentBase
         try
         {
             _userStatus = await PackageService.GetUserPackageStatusAsync();
-
-            if (_userStatus?.HasPurchasedPackage == true)
-            {
-                _magicStatus = await WalletService.GetMagicWalletStatusAsync();
-
-                // Cycle complete: wallet back to Normal mode, at least one cycle done,
-                // and deposit ceiling fully used (remaining = 0)
-                _canRepurchase = _magicStatus != null
-                    && _magicStatus.WalletMode == 0        // Normal mode
-                    && _magicStatus.PurchaseCycleCount >= 1 // At least one cycle completed
-                    && _magicStatus.MagicRemainingDeposit == 0; // Deposit ceiling used up
-            }
         }
         catch (Exception ex)
         {
@@ -81,11 +67,4 @@ public partial class MyPackages : ComponentBase
     {
         return string.Format("{0:N0} تومان", price);
     }
-
-    private int GetDepositProgress()
-    {
-        if (_magicStatus == null || _magicStatus.MagicMaxDeposit <= 0) return 0;
-        var pct = (int)((_magicStatus.MagicTotalDeposited * 100) / _magicStatus.MagicMaxDeposit);
-        return Math.Min(pct, 100);
-    }
 }

src/FrontOffice.Main/Pages/Package/Packages.razor

@@ -5,11 +5,6 @@
 <MudContainer MaxWidth="MaxWidth.Large" Class="py-8">
     <PageHeader Title="پکیج‌های سرمایه‌گذاری" BackHref="@RouteConstants.Profile.Index" />
 
-    @* ── G1: راهنمای سیستم پکیج‌بیس (Q28) ── *@
-    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-4" Icon="@Icons.Material.Filled.Info">
-        هر پکیج ویژگی‌ها و مزایای منحصربه‌فردی دارد. با انتخاب پکیج مناسب، از سقف پاداش و ضریب کیف‌پول جادویی متفاوتی بهره‌مند می‌شوید.
-    </MudAlert>
-
     @if (_isLoading)
     {
         <MudStack AlignItems="AlignItems.Center" Class="py-16">
@@ -32,7 +27,7 @@
         {
             <MudAlert Severity="Severity.Success" Class="mb-6" Icon="@Icons.Material.Filled.CheckCircle">
                 <MudText>
-                    شما قبلاً پکیج را خریداری کرده‌اید.
+                    شما قبلاً پکیج طلایی را خریداری کرده‌اید.
                     @if (_userStatus.IsClubMemberActive)
                     {
                         <span>عضویت باشگاه شما فعال است.</span>
@@ -69,43 +64,20 @@
                                     <MudText Typo="Typo.h6" Color="Color.Success">@package.FormattedPrice</MudText>
                                 </MudStack>
 
-                                <!-- Package Highlights -->
+                                <!-- Features Preview -->
                                 <MudStack Spacing="1" Class="mt-2">
-                                    @if (package.SupportsDirectPurchase)
-                                    {
-                                        <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
-                                            <MudText Typo="Typo.caption">پرداخت مستقیم</MudText>
-                                        </MudStack>
-                                    }
-                                    @if (package.SupportsDayaPurchase)
-                                    {
-                                        <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
-                                            <MudText Typo="Typo.caption">پرداخت با اعتبار دایا</MudText>
-                                        </MudStack>
-                                    }
-                                    @if (package.DiscountMultiplier > 0)
-                                    {
-                                        <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
-                                            <MudText Typo="Typo.caption">ضریب اعتبار: @package.DiscountMultiplier.ToString("F1")x</MudText>
-                                        </MudStack>
-                                    }
-                                    @if (package.MagicWalletMultiplier > 0)
-                                    {
-                                        <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
-                                            <MudText Typo="Typo.caption">کیف پول جادویی: @package.MagicWalletMultiplier.ToString("F1")x</MudText>
-                                        </MudStack>
-                                    }
-                                    @if (package.IsBasePackage)
-                                    {
-                                        <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
-                                            <MudIcon Icon="@Icons.Material.Filled.Star" Size="Size.Small" Color="Color.Warning" />
-                                            <MudText Typo="Typo.caption">پکیج پایه</MudText>
-                                        </MudStack>
-                                    }
+                                    <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
+                                        <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
+                                        <MudText Typo="Typo.caption">عضویت در باشگاه مشتریان</MudText>
+                                    </MudStack>
+                                    <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
+                                        <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
+                                        <MudText Typo="Typo.caption">دریافت پاداش هفتگی</MudText>
+                                    </MudStack>
+                                    <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
+                                        <MudIcon Icon="@Icons.Material.Filled.Check" Size="Size.Small" Color="Color.Primary" />
+                                        <MudText Typo="Typo.caption">تیم‌سازی نامحدود</MudText>
+                                    </MudStack>
                                 </MudStack>
                             </MudStack>
                         </MudCardContent>
@@ -128,9 +100,9 @@
             <MudGrid Spacing="4">
                 <MudItem xs="12" md="8">
                     <MudStack Spacing="2">
-                        <MudText Typo="Typo.h5" Style="color: white;">چرا پکیج بخریم؟</MudText>
+                        <MudText Typo="Typo.h5" Style="color: white;">چرا پکیج طلایی؟</MudText>
                         <MudText Typo="Typo.body1" Style="color: rgba(255,255,255,0.9);">
-                            با خرید پکیج، علاوه بر دسترسی به محصولات ویژه، می‌توانید تیم فروش خود را بسازید
+                            با خرید پکیج طلایی، علاوه بر دسترسی به محصولات ویژه، می‌توانید تیم فروش خود را بسازید
                             و از پاداش‌های هفتگی بهره‌مند شوید. هر چه تیم شما گسترده‌تر، درآمد شما بیشتر!
                         </MudText>
                     </MudStack>

src/FrontOffice.Main/Pages/PackageDetail.razor.cs

@@ -64,38 +64,36 @@ public partial class PackageDetail : IDisposable
 
         try
         {
-            // Load package details via Customer RPC
-            var response = await PackageClient.GetCustomerPackageDetailsAsync(
-                new GetCustomerPackageDetailsRequest { PackageId = Id },
-                cancellationToken: _loadCts.Token);
+            // Load package details
+            var packageResponse = await PackageClient.GetPackageAsync(request: new() { Id = Id}, cancellationToken: _loadCts.Token);
 
-            if (response != null)
+            if (packageResponse != null)
             {
-                // Build features from API response
-                var features = response.Features?.Select(f => f.Title).ToList() ?? new List<string>();
-
-                // Build specifications from API features (highlighted ones)
-                var specs = response.Features?
-                    .Where(f => f.IsHighlighted)
-                    .Select(f => new Specification
-                    {
-                        Name = f.Title,
-                        Value = f.Description,
-                        Icon = string.IsNullOrEmpty(f.Icon) ? Icons.Material.Filled.Star : f.Icon
-                    }).ToList() ?? new List<Specification>();
-
                 _package = new PackageDetailDto
                 {
-                    Id = response.Id,
-                    Title = response.Title,
-                    Body = response.Description,
-                    Image = response.ImagePath ?? string.Empty,
-                    Specifications = specs,
-                    Features = features,
+                    Id = packageResponse.Id,
+                    Title = packageResponse.Title,
+                    Body = packageResponse.Description,
+                    Image = packageResponse.ImagePath ?? string.Empty,
+                    Specifications = new List<Specification>
+                    {
+                        new() { Name = "ظرفیت", Value = "تا ۲۰۰ عضو", Icon = Icons.Material.Filled.Group },
+                        new() { Name = "شجره‌نامه", Value = "پیشرفته", Icon = Icons.Material.Filled.AccountTree },
+                        new() { Name = "گزارش‌گیری", Value = "جامع", Icon = Icons.Material.Filled.Analytics },
+                        new() { Name = "پشتیبانی", Value = "۲۴ ساعته", Icon = Icons.Material.Filled.Support }
+                    },
+                    Features = new List<string>
+                    {
+                        "مدیریت تیم نامحدود",
+                        "شجره‌نامه بصری",
+                        "محاسبه کارمزد خودکار",
+                        "گزارش‌های مالی",
+                        "پشتیبانی اولویت‌دار"
+                    },
                     Pricing = new PricingInfo
                     {
-                        OriginalPrice = response.Price,
-                        FinalPrice = response.Price,
+                        OriginalPrice = packageResponse.Price,
+                        FinalPrice = packageResponse.Price,
                         HasDiscount = false,
                         DiscountPercent = 0
                     }

src/FrontOffice.Main/Pages/Profile/Addresses.razor.cs

@@ -1,4 +1,4 @@
-using FrontOffice.Main.Utilities;
+using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using FrontOffice.Main.Pages.Profile.Components;
 using Microsoft.AspNetCore.Components;
@@ -9,7 +9,6 @@ namespace FrontOffice.Main.Pages.Profile;
 public partial class Addresses : ComponentBase
 {
     [Inject] private UserAddressContract.UserAddressContractClient UserAddressContract { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
 
     private List<CustomerAddressModel> _addresses = new();
     private bool _isLoadingAddresses;
@@ -43,10 +42,7 @@ public partial class Addresses : ComponentBase
         var dialog = await DialogService.ShowAsync<AddAddressDialog>("افزودن آدرس جدید");
         var result = await dialog.Result;
         if (result is not null && !result.Canceled)
-        {
             await LoadAddresses();
-            await AuthService.RefreshTokenAsync();
-        }
     }
 
     private async Task OpenEditAddressDialog(CustomerAddressModel address)
@@ -84,7 +80,6 @@ public partial class Addresses : ComponentBase
                 await UserAddressContract.DeleteCustomerAddressAsync(new() { Id = id });
                 Snackbar.Add("آدرس حذف شد.", Severity.Success);
                 await LoadAddresses();
-                await AuthService.RefreshTokenAsync();
             }
             catch (Exception ex)
             {

src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor

@@ -1,212 +0,0 @@
-@attribute [Route(RouteConstants.Profile.ChargeCreditWallet)]
-@attribute [Authorize]
-
-<PageTitle>شارژ کیف‌پول اصلی</PageTitle>
-
-<MudContainer MaxWidth="MaxWidth.Medium" Class="py-6">
-    <MudStack Spacing="3">
-        <PageHeader Title="💳 شارژ کیف‌پول اصلی" BackHref="@RouteConstants.Profile.Wallet" />
-
-        @if (_paymentResult != null)
-        {
-            <MudAlert Severity="@(_paymentResult == "success" ? MudBlazor.Severity.Success : MudBlazor.Severity.Error)"
-                      Class="rounded-lg" Variant="Variant.Filled">
-                @if (_paymentResult == "success")
-                {
-                    <MudStack Spacing="2">
-                        <span>شارژ کیف پول اصلی با موفقیت انجام شد! ✅</span>
-                        <MudButton Variant="Variant.Filled"
-                                   Color="Color.Primary"
-                                   Size="Size.Small"
-                                   StartIcon="@Icons.Material.Filled.ShoppingCart"
-                                   OnClick="ContinueShoppingAsync">
-                            ادامه خرید
-                        </MudButton>
-                    </MudStack>
-                }
-                else if (_paymentResult == "cancelled")
-                {
-                    <span>پرداخت توسط شما لغو شد.</span>
-                }
-                else
-                {
-                    <span>پرداخت ناموفق بود. لطفاً دوباره تلاش کنید.</span>
-                }
-            </MudAlert>
-        }
-
-        @if (_authLoaded && _redirectingToMagic)
-        {
-            <MudAlert Severity="MudBlazor.Severity.Info" Class="rounded-lg" Variant="Variant.Outlined">
-                <MudStack Spacing="2" AlignItems="AlignItems.Center">
-                    <MudProgressCircular Size="Size.Small" Indeterminate="true" Color="Color.Primary" />
-                    <MudText>
-                        کیف پول شما در حالت جادویی است. در حال انتقال به صفحه شارژ کیف پول جادویی...
-                    </MudText>
-                    <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                               Href="@RouteConstants.Profile.MagicWallet"
-                               StartIcon="@Icons.Material.Filled.AutoAwesome">
-                        رفتن به شارژ کیف جادویی
-                    </MudButton>
-                </MudStack>
-            </MudAlert>
-        }
-        else if (_authLoaded && !_isClubMemberActive)
-        {
-            <MudAlert Severity="MudBlazor.Severity.Warning" Class="rounded-lg" Variant="Variant.Outlined">
-                <MudStack Spacing="2">
-                    <MudText>
-                        برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.
-                    </MudText>
-                    <MudStack Row="true" Spacing="1" Class="flex-wrap">
-                        @if (!_hasPurchasedPackage)
-                        {
-                            <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                                       Href="@RouteConstants.Package.List"
-                                       StartIcon="@Icons.Material.Filled.CardGiftcard">
-                                مشاهده پکیج‌ها
-                            </MudButton>
-                        }
-                        else
-                        {
-                            <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                                       Href="@RouteConstants.Club.Membership"
-                                       StartIcon="@Icons.Material.Filled.Handshake">
-                                امضای قرارداد باشگاه
-                            </MudButton>
-                        }
-                        <MudButton Size="Size.Small" Variant="Variant.Text"
-                                   Href="@RouteConstants.Profile.Wallet">
-                            بازگشت به کیف پول
-                        </MudButton>
-                    </MudStack>
-                </MudStack>
-            </MudAlert>
-        }
-        else if (_authLoaded && _needsMagicCeilingConsent && !_allowNormalDespiteMagic && !_redirectingToMagic)
-        {
-            <MudAlert Severity="MudBlazor.Severity.Warning" Class="rounded-lg" Variant="Variant.Outlined">
-                <MudStack Spacing="3">
-                    <MudText Typo="Typo.subtitle1">
-                        سقف شارژ کیف پول جادویی در این دور پر شده است.
-                    </MudText>
-                    <MudText Typo="Typo.body2">
-                        شارژ از این صفحه بدون ضریب (۱:۱) به موجودی اضافه می‌شود و ضریب جادویی اعمال نمی‌شود.
-                        برای ادامه، تأیید کنید.
-                    </MudText>
-                    <MudStack Row="true" Spacing="1" Class="flex-wrap">
-                        <MudButton Variant="Variant.Filled"
-                                   Color="Color.Primary"
-                                   StartIcon="@Icons.Material.Filled.Check"
-                                   OnClick="AcceptMagicCeilingConsent">
-                            ادامه شارژ بدون ضریب
-                        </MudButton>
-                        <MudButton Variant="Variant.Outlined"
-                                   Color="Color.Secondary"
-                                   StartIcon="@Icons.Material.Filled.AutoAwesome"
-                                   OnClick="DeclineMagicCeilingConsent">
-                            بازگشت به کیف جادویی
-                        </MudButton>
-                    </MudStack>
-                </MudStack>
-            </MudAlert>
-        }
-        else if (ShowChargeForm)
-        {
-        <MudPaper Elevation="2" Class="pa-5 rounded-lg">
-            <MudText Typo="Typo.h6" Class="mb-3">
-                <MudIcon Icon="@Icons.Material.Filled.AccountBalanceWallet" Class="ml-1" />
-                شارژ موجودی اصلی
-            </MudText>
-
-            @if (_allowNormalDespiteMagic)
-            {
-                <MudAlert Severity="MudBlazor.Severity.Warning" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Warning">
-                    این شارژ بدون ضریب جادویی است (۱:۱). سقف واریز جادویی شما در این دور پر شده است.
-                </MudAlert>
-            }
-
-            <MudAlert Severity="MudBlazor.Severity.Info" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
-                مبلغ وارد شده (به تومان) از طریق درگاه پرداخت به موجودی اصلی شما اضافه می‌شود.
-                از موجودی اصلی برای خرید از فروشگاه عادی و پرداخت سفارش استفاده می‌شود.
-            </MudAlert>
-
-            <MudStack Spacing="2">
-                <MudNumericField @bind-Value="_chargeAmount"
-                                 Label="مبلغ (تومان)"
-                                 Variant="Variant.Outlined"
-                                 Min="10_000"
-                                 Max="1_000_000_000"
-                                 Format="N0"
-                                 Adornment="Adornment.Start"
-                                 AdornmentIcon="@Icons.Material.Filled.Payments"
-                                 HelperText="حداقل ۱۰,۰۰۰ و حداکثر ۱,۰۰۰,۰۰۰,۰۰۰ تومان" />
-
-                <MudStack Row="true" Spacing="1" Class="flex-wrap">
-                    @foreach (var preset in _presetAmounts)
-                    {
-                        <MudButton Variant="Variant.Outlined" Size="Size.Small"
-                                   Color="@(_chargeAmount == preset ? Color.Primary : Color.Default)"
-                                   OnClick="() => _chargeAmount = preset"
-                                   Class="rounded-pill">
-                            @FormatToman(preset)
-                        </MudButton>
-                    }
-                </MudStack>
-
-                @if (_chargeAmount > 0)
-                {
-                    <MudPaper Outlined="true" Class="pa-3 rounded-lg" Style="background: #eff6ff;">
-                        <MudStack Row="true" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2">مبلغ پرداخت:</MudText>
-                            <MudText Typo="Typo.body2"><strong>@FormatToman(_chargeAmount)</strong></MudText>
-                        </MudStack>
-                        <MudStack Row="true" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2">موجودی دریافتی:</MudText>
-                            <MudText Typo="Typo.body2" Color="Color.Primary"><strong>@FormatToman(_chargeAmount)</strong></MudText>
-                        </MudStack>
-                    </MudPaper>
-                }
-
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Primary"
-                           Size="Size.Large"
-                           FullWidth="true"
-                           Disabled="@(_isProcessing || _chargeAmount < 10_000)"
-                           OnClick="StartCreditCharge"
-                           StartIcon="@Icons.Material.Filled.Payment"
-                           Class="rounded-lg mt-2">
-                    @if (_isProcessing)
-                    {
-                        <MudProgressCircular Size="Size.Small" Indeterminate="true" Class="me-2" />
-                        <span>در حال انتقال به درگاه...</span>
-                    }
-                    else
-                    {
-                        <span>پرداخت با کارت بانکی</span>
-                    }
-                </MudButton>
-            </MudStack>
-        </MudPaper>
-
-        <MudExpansionPanels Elevation="1" Class="rounded-lg">
-            <MudExpansionPanel Text="قوانین شارژ کیف پول اصلی" MaxHeight="500" IsInitiallyExpanded="false">
-                <MudList T="string" Dense="true">
-                    <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                        موجودی اصلی برای خرید از فروشگاه عادی و پرداخت سفارش قابل استفاده است
-                    </MudListItem>
-                    <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                        حداقل مبلغ شارژ: ۱۰,۰۰۰ تومان
-                    </MudListItem>
-                    <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                        مبلغ واریزی بدون ضریب به موجودی اضافه می‌شود (۱:۱)
-                    </MudListItem>
-                    <MudListItem T="string" Icon="@Icons.Material.Filled.Info" IconColor="Color.Info">
-                        پرداخت از طریق درگاه بانکی انجام می‌شود
-                    </MudListItem>
-                </MudList>
-            </MudExpansionPanel>
-        </MudExpansionPanels>
-        }
-    </MudStack>
-</MudContainer>

src/FrontOffice.Main/Pages/Profile/ChargeCreditWallet.razor.cs

@@ -1,199 +0,0 @@
-using FrontOffice.Main.Utilities;
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using MudBlazor;
-
-namespace FrontOffice.Main.Pages.Profile;
-
-public partial class ChargeCreditWallet : ComponentBase
-{
-    [Inject] private AuthService AuthService { get; set; } = default!;
-
-    private bool _isProcessing;
-    private long _chargeAmount;
-    private string? _paymentResult;
-    private string? _pendingReturnUrl;
-    private bool _isClubMemberActive;
-    private bool _hasPurchasedPackage;
-    private bool _authLoaded;
-    private bool _redirectingToMagic;
-    private bool _allowNormalDespiteMagic;
-    private bool _needsMagicCeilingConsent;
-
-    private readonly long[] _presetAmounts = { 500_000, 1_000_000, 5_000_000, 10_000_000, 20_000_000, 50_000_000 };
-
-    [SupplyParameterFromQuery(Name = "payment")]
-    public string? PaymentQueryParam { get; set; }
-
-    [SupplyParameterFromQuery(Name = "amount")]
-    public long? AmountQueryParam { get; set; }
-
-    [SupplyParameterFromQuery(Name = "returnUrl")]
-    public string? ReturnUrlQueryParam { get; set; }
-
-    private bool ShowChargeForm =>
-        _authLoaded
-        && _isClubMemberActive
-        && !_redirectingToMagic
-        && (!_needsMagicCeilingConsent || _allowNormalDespiteMagic);
-
-    protected override async Task OnInitializedAsync()
-    {
-        _paymentResult = PaymentQueryParam;
-
-        if (AmountQueryParam is > 0)
-            _chargeAmount = CreditChargeNavigation.NormalizeChargeAmount(AmountQueryParam.Value);
-
-        if (CreditChargeNavigation.IsValidReturnUrl(ReturnUrlQueryParam))
-            _pendingReturnUrl = ReturnUrlQueryParam;
-
-        try
-        {
-            var userInfo = await AuthService.GetUserAuthInfo();
-            _isClubMemberActive = userInfo.IsClubMemberActive;
-            _hasPurchasedPackage = userInfo.HasPurchasedPackage;
-        }
-        catch
-        {
-            _isClubMemberActive = false;
-            _hasPurchasedPackage = false;
-        }
-        finally
-        {
-            _authLoaded = true;
-        }
-
-        if (_isClubMemberActive)
-            await EvaluateMagicWalletGateAsync();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && !string.IsNullOrEmpty(_pendingReturnUrl) && _isClubMemberActive && !_redirectingToMagic)
-            await CreditChargeNavigation.SaveReturnUrlAsync(JSRuntime, _pendingReturnUrl);
-
-        await base.OnAfterRenderAsync(firstRender);
-    }
-
-    private void AcceptMagicCeilingConsent()
-    {
-        _allowNormalDespiteMagic = true;
-        _redirectingToMagic = false;
-    }
-
-    private void DeclineMagicCeilingConsent()
-    {
-        _redirectingToMagic = true;
-        Navigation.NavigateTo(RouteConstants.Profile.MagicWallet);
-    }
-
-    private async Task StartCreditCharge()
-    {
-        if (!_isClubMemberActive)
-        {
-            Snackbar.Add(
-                "برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.",
-                Severity.Warning);
-            return;
-        }
-
-        if (await EvaluateMagicWalletGateAsync())
-            return;
-
-        if (_needsMagicCeilingConsent && !_allowNormalDespiteMagic)
-            return;
-
-        if (_chargeAmount <= 0 || _isProcessing) return;
-
-        _isProcessing = true;
-        StateHasChanged();
-
-        try
-        {
-            if (!string.IsNullOrEmpty(_pendingReturnUrl))
-                await CreditChargeNavigation.SaveReturnUrlAsync(JSRuntime, _pendingReturnUrl);
-            else
-            {
-                var storedReturnUrl = await CreditChargeNavigation.GetReturnUrlAsync(JSRuntime);
-                if (CreditChargeNavigation.IsValidReturnUrl(storedReturnUrl))
-                    _pendingReturnUrl = storedReturnUrl;
-            }
-
-            var (success, gatewayUrl, error) = await WalletService.InitiateCreditChargeAsync(_chargeAmount);
-
-            if (success && !string.IsNullOrEmpty(gatewayUrl))
-            {
-                Navigation.NavigateTo(gatewayUrl, forceLoad: true);
-            }
-            else
-            {
-                Snackbar.Add(error ?? "خطا در ایجاد درخواست پرداخت", Severity.Error);
-            }
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add($"خطا: {ex.Message}", Severity.Error);
-        }
-        finally
-        {
-            _isProcessing = false;
-            StateHasChanged();
-        }
-    }
-
-    /// <summary>
-    /// Magic با ظرفیت باقی‌مانده → ریدایرکت به MagicWallet.
-    /// Magic با سقف پر → نمایش تأیید روی صفحه برای شارژ ۱:۱.
-    /// true یعنی مسیر شارژ فعلی باید متوقف شود.
-    /// </summary>
-    private async Task<bool> EvaluateMagicWalletGateAsync()
-    {
-        if (_allowNormalDespiteMagic)
-            return false;
-
-        try
-        {
-            var status = await WalletService.GetMagicWalletStatusAsync();
-            if (status.WalletMode != 1)
-            {
-                _needsMagicCeilingConsent = false;
-                return false;
-            }
-
-            if (status.MagicRemainingDeposit > 0)
-            {
-                var multiplier = status.MagicMultiplier > 0 ? status.MagicMultiplier : 2.5;
-                var multiplierText = multiplier.ToString("0.#");
-
-                _redirectingToMagic = true;
-                _needsMagicCeilingConsent = false;
-                Snackbar.Add(
-                    $"کیف پول شما در حالت جادویی است. شارژ از این صفحه موجودی را چندبرابر نمی‌کند. برای دریافت ضریب جادویی (×{multiplierText}) به صفحه شارژ کیف پول جادویی هدایت می‌شوید.",
-                    Severity.Info);
-
-                Navigation.NavigateTo(RouteConstants.Profile.MagicWallet);
-                return true;
-            }
-
-            _needsMagicCeilingConsent = true;
-            return !_allowNormalDespiteMagic;
-        }
-        catch
-        {
-            // در صورت خطا در خواندن وضعیت، مانع شارژ عادی نشو
-            return false;
-        }
-    }
-
-    private async Task ContinueShoppingAsync()
-    {
-        var returnUrl = await CreditChargeNavigation.GetReturnUrlAsync(JSRuntime);
-        await CreditChargeNavigation.ClearReturnUrlAsync(JSRuntime);
-
-        if (CreditChargeNavigation.IsValidReturnUrl(returnUrl))
-            Navigation.NavigateTo(returnUrl!);
-    }
-
-    private static string FormatToman(long toman)
-        => string.Format("{0:N0} تومان", toman);
-}

src/FrontOffice.Main/Pages/Profile/ChargeDiscountWallet.razor

@@ -44,11 +44,11 @@
                                  Label="مبلغ (تومان)"
                                  Variant="Variant.Outlined"
                                  Min="10_000"
-                                 Max="1_000_000_000"
+                                 Max="100_000_000"
                                  Format="N0"
                                  Adornment="Adornment.Start"
                                  AdornmentIcon="@Icons.Material.Filled.Payments"
-                                 HelperText="حداقل ۱۰,۰۰۰ و حداکثر ۱,۰۰۰,۰۰۰,۰۰۰ تومان" />
+                                 HelperText="حداقل ۱۰,۰۰۰ و حداکثر ۱۰۰,۰۰۰,۰۰۰ تومان" />
 
                 @* دکمه‌های مبلغ سریع *@
                 <MudStack Row="true" Spacing="1" Class="flex-wrap">

src/FrontOffice.Main/Pages/Profile/ChargeDiscountWallet.razor.cs

@@ -29,8 +29,10 @@ public partial class ChargeDiscountWallet : ComponentBase
 
         try
         {
-            // مبلغ به تومان — CMS خودش موقع ارسال به درگاه ×۱۰ می‌کنه
-            var (success, gatewayUrl, error) = await WalletService.InitiateDiscountChargeAsync(_chargeAmount);
+            // تبدیل تومان به ریال
+            var amountInRial = _chargeAmount * 10;
+
+            var (success, gatewayUrl, error) = await WalletService.InitiateDiscountChargeAsync(amountInRial);
 
             if (success && !string.IsNullOrEmpty(gatewayUrl))
             {

src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor

@@ -61,11 +61,11 @@
                 <span class="stat-value">@_statistics.TotalMembers</span>
             </div>
             <div class="stat-item">
-                <span class="stat-label">سازمان چپ:</span>
+                <span class="stat-label">پای چپ:</span>
                 <span class="stat-value left">@_statistics.LeftLegCount</span>
             </div>
             <div class="stat-item">
-                <span class="stat-label">سازمان راست:</span>
+                <span class="stat-label">پای راست:</span>
                 <span class="stat-value right">@_statistics.RightLegCount</span>
             </div>
             <div class="stat-item">

src/FrontOffice.Main/Pages/Profile/Components/OrganizationChart.razor.cs

@@ -1,4 +1,4 @@
-using FrontOffice.Main.Utilities;
+using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
@@ -95,27 +95,7 @@ public partial class OrganizationChart : IAsyncDisposable
         try
         {
             _dotNetHelper = DotNetObjectReference.Create(this);
-            // Explicit camelCase mapping (same pattern as BackOffice admin chart)
-            var flatData = _networkTree.ToFlatArray().Select(n => new
-            {
-                id = n.Id,
-                parentId = n.ParentId,
-                fullName = n.FullName,
-                mobile = n.Mobile,
-                avatar = n.Avatar,
-                position = n.Position,
-                level = n.Level,
-                isActive = n.IsActive,
-                isClubActive = n.IsClubActive,
-                activationWeekNumber = n.ActivationWeekNumber,
-                joinedAt = n.JoinedAt,
-                referralCode = n.ReferralCode,
-                packageName = n.PackageName ?? string.Empty,
-                goldLeftLegTotal = n.GoldLeftLegTotal,
-                goldRightLegTotal = n.GoldRightLegTotal,
-                silverLeftLegTotal = n.SilverLeftLegTotal,
-                silverRightLegTotal = n.SilverRightLegTotal
-            }).ToArray();
+            var flatData = _networkTree.ToFlatArray();
             
             await JSRuntime.InvokeVoidAsync("OrgChart.init", "org-chart-container", flatData, _dotNetHelper);
         }

src/FrontOffice.Main/Pages/Profile/Index.razor

@@ -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>
@@ -61,7 +61,7 @@
                     <div class="wallet-strip-item">
                         <div class="wallet-strip-label">
                             <MudIcon Icon="@Icons.Material.Outlined.Groups" Size="Size.Small" Color="Color.Warning" />
-                            <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.Warning">@_walletNetwork</MudText>
                     </div>
@@ -119,7 +119,7 @@
                         لینک دعوت شما هنوز فعال نشده است
                     </MudText>
                     <MudText Typo="Typo.body2" Class="mud-text-secondary mb-1" Style="max-width:560px; margin:0 auto;">
-                        برای فعال‌سازی لینک دعوت، ابتدا یکی از <strong>پکیج‌ها</strong> را تهیه کنید و سپس در <strong>باشگاه مشتریان</strong> عضو شوید.
+                        برای فعال‌سازی لینک دعوت، ابتدا <strong>پکیج پایه</strong> را تهیه کنید و سپس در <strong>باشگاه مشتریان</strong> عضو شوید.
                     </MudText>
                     <MudText Typo="Typo.body2" Class="mud-text-secondary mb-4" Style="max-width:560px; margin:0 auto;">
                         از مزایای ویژه عضویت بهره‌مند شده و با فعالیت در زمینه توسعه فروشگاه‌ها پاداش دریافت کنید.
@@ -130,7 +130,7 @@
                                Class="rounded-pill"
                                StartIcon="@Icons.Material.Filled.ShoppingCart"
                                OnClick="OpenPurchaseOptions">
-                        تهیه پکیج
+                        شروع فرآیند تامین اعتبار
                     </MudButton>
                 </MudPaper>
             }
@@ -195,4 +195,88 @@
     </MudGrid>
 </MudContainer>
 
+@* ── Purchase Options Dialog ── *@
+<MudDialog @bind-Visible="_showPurchaseBottomSheet">
+    <DialogContent>
+        <MudStack Spacing="3" Class="pa-2">
+            <MudText Typo="Typo.h6" Align="Align.Center">
+                خرید پکیج پایه ۵۶ میلیون تومان
+            </MudText>
+            <MudDivider />
+            <MudText Typo="Typo.body2" Class="mud-text-secondary">
+                برای خرید پکیج پایه، یکی از روش‌های زیر را انتخاب کنید:
+            </MudText>
 
+            <MudPaper Elevation="0" Class="pa-4 rounded-lg" Style="border: 2px solid var(--mud-palette-primary);">
+                <MudStack Spacing="2">
+                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                        <MudIcon Icon="@Icons.Material.Filled.CreditCard" Color="Color.Primary" Size="Size.Medium" />
+                        <MudText Typo="Typo.subtitle1" Color="Color.Primary"><b>پرداخت مستقیم</b></MudText>
+                    </MudStack>
+                    <MudText Typo="Typo.body2" Class="mud-text-secondary">پرداخت آنی از طریق درگاه بانکی</MudText>
+                    @if (_purchaseCycleCount > 0)
+                    {
+                        <MudButton Variant="Variant.Filled" Color="Color.Primary" FullWidth="true"
+                                   Disabled="@_isProcessingPayment"
+                                   StartIcon="@Icons.Material.Filled.Payment"
+                                   OnClick="DirectPayment">
+                            @if (_isProcessingPayment)
+                            {
+                                <MudProgressCircular Size="Size.Small" Indeterminate="true" Class="me-2" />
+                                <span>در حال انتقال به درگاه...</span>
+                            }
+                            else
+                            {
+                                <span>پرداخت با کارت بانکی</span>
+                            }
+                        </MudButton>
+                    }
+                    else
+                    {
+                        <MudButton Variant="Variant.Filled" Color="Color.Primary" FullWidth="true"
+                                   Disabled="@_isProcessingPayment"
+                                   StartIcon="@Icons.Material.Filled.Payment"
+                                   OnClick="DirectPayment">
+                            @if (_isProcessingPayment)
+                            {
+                                <MudProgressCircular Size="Size.Small" Indeterminate="true" Class="me-2" />
+                                <span>در حال انتقال به درگاه...</span>
+                            }
+                            else
+                            {
+                                <span>پرداخت با کارت بانکی</span>
+                            }
+                        </MudButton>
+                    }
+                </MudStack>
+            </MudPaper>
+
+            @if (_purchaseCycleCount == 0)
+            {
+                <MudPaper Elevation="0" Class="pa-4 rounded-lg" Style="border: 2px solid var(--mud-palette-tertiary);">
+                    <MudStack Spacing="2">
+                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
+                            <MudIcon Icon="@Icons.Material.Filled.Diamond" Color="Color.Tertiary" Size="Size.Medium" />
+                            <MudText Typo="Typo.subtitle1" Color="Color.Tertiary"><b>اعتبار الماسی دایا</b></MudText>
+                        </MudStack>
+                        <MudText Typo="Typo.body2" Class="mud-text-secondary">تأمین اعتبار از طریق خرید توکن الماس و دریافت وام</MudText>
+                        <MudButton Variant="Variant.Filled" Color="Color.Tertiary" FullWidth="true"
+                                   StartIcon="@Icons.Material.Filled.AccountBalance" OnClick="DayaLoanPayment">
+                            تأمین اعتبار الماسی
+                        </MudButton>
+                    </MudStack>
+                </MudPaper>
+            }
+            else
+            {
+                <MudAlert Severity="Severity.Info" Dense="true" Class="mt-1">
+                    از دور دوم به بعد، خرید پکیج فقط از طریق درگاه بانکی امکان‌پذیر است.
+                </MudAlert>
+            }
+
+            <MudButton Variant="Variant.Text" Color="Color.Default" FullWidth="true" OnClick="ClosePurchaseOptions">
+                بستن
+            </MudButton>
+        </MudStack>
+    </DialogContent>
+</MudDialog>

src/FrontOffice.Main/Pages/Profile/Index.razor.cs

@@ -42,7 +42,8 @@ public partial class Index
     private bool _isClubMemberActive;
     private bool CanShowReferralLink => _hasPurchasedPackage && _isClubMemberActive;
 
-    // Purchase flow
+    // Purchase Options Bottom Sheet
+    private bool _showPurchaseBottomSheet;
     private bool _isProcessingPayment;
     private int _purchaseCycleCount; // تعداد دورهای خرید — اگر > 0 فقط IPG مجاز
 
@@ -51,10 +52,10 @@ public partial class Index
     {
         new(RouteConstants.Profile.Personal, Icons.Material.Filled.Person, "اطلاعات شخصی", "نمایش و ویرایش", "background:rgba(99,102,241,.12); color:#6366f1;"),
         new(RouteConstants.Profile.Addresses, Icons.Material.Filled.LocationOn, "آدرس‌ها", "مدیریت آدرس‌ها", "background:rgba(99,102,241,.12); color:#6366f1;"),
-        new(RouteConstants.Profile.Tree, Icons.Material.Filled.AccountTree, "سازمان فروش", "ساختار تیم", "background:rgba(99,102,241,.12); color:#6366f1;"),
+        new(RouteConstants.Profile.Tree, Icons.Material.Filled.AccountTree, "شجره‌نامه", "ساختار تیم", "background:rgba(99,102,241,.12); color:#6366f1;"),
         new(RouteConstants.Gateway.StoreChooser, Icons.Material.Filled.Store, "فروشگاه‌ها", "ورود به فروشگاه", "background:rgba(16,185,129,.12); color:#10b981;"),
         new(RouteConstants.Profile.Wallet, Icons.Material.Filled.AccountBalanceWallet, "کیف پول", "مدیریت و تاریخچه", "background:rgba(16,185,129,.12); color:#10b981;"),
-        new(RouteConstants.Profile.MagicWallet, Icons.Material.Filled.AutoAwesome, "کیف‌پول جادویی", "شارژ چند‌برابری", "background:rgba(168,85,247,.12); color:#a855f7;"),
+        new(RouteConstants.Profile.MagicWallet, Icons.Material.Filled.AutoAwesome, "کیف‌پول جادویی", "شارژ ×2.5", "background:rgba(168,85,247,.12); color:#a855f7;"),
         new(RouteConstants.Profile.WithdrawalRequests, Icons.Material.Filled.RequestPage, "درخواست برداشت", "ثبت و پیگیری", "background:rgba(245,158,11,.12); color:#f59e0b;"),
         new(RouteConstants.Club.Membership, Icons.Material.Filled.CardMembership, "باشگاه مشتریان", "عضویت و مزایا", "background:rgba(168,85,247,.12); color:#a855f7;"),
         new(RouteConstants.Network.Statistics, Icons.Material.Filled.Groups, "آمار باشگاه", "جزئیات باشگاه", "background:rgba(59,130,246,.12); color:#3b82f6;"),
@@ -333,7 +334,6 @@ public partial class Index
         if (!result.Canceled)
         {
             await LoadAddresses();
-            await AuthService.RefreshTokenAsync();
         }
     }
 
@@ -386,7 +386,6 @@ public partial class Index
                 });
                 Snackbar.Add("آدرس با موفقیت حذف شد.", Severity.Success);
                 await LoadAddresses();
-                await AuthService.RefreshTokenAsync();
             }
             catch (Exception ex)
             {
@@ -395,62 +394,41 @@ public partial class Index
         }
     }
 
-    private async Task OpenPurchaseOptions()
+    private void OpenPurchaseOptions()
     {
-        var options = new DialogOptions
-        {
-            MaxWidth = MaxWidth.Small,
-            FullWidth = true,
-            CloseOnEscapeKey = true,
-            BackdropClick = true
-        };
-
-        var parameters = new DialogParameters<Shared.PackagePurchaseDialog>
-        {
-            { x => x.PurchaseCycleCount, _purchaseCycleCount }
-        };
-
-        var dialog = await DialogService.ShowAsync<Shared.PackagePurchaseDialog>(
-            string.Empty, parameters, options);
-        var result = await dialog.Result;
-
-        if (result.Canceled) return;
-
-        if (result.Data is Shared.PackagePurchaseDialog.PackagePurchaseResult purchase)
-        {
-            switch (purchase.Method)
-            {
-                case Shared.PackagePurchaseDialog.PaymentMethodType.DirectPayment:
-                    await ProcessDirectPayment(purchase.Package.Id);
-                    break;
-                case Shared.PackagePurchaseDialog.PaymentMethodType.DayaLoan:
-                    await ProcessDayaLoanPayment();
-                    break;
-            }
-        }
+        _showPurchaseBottomSheet = true;
     }
 
-    private async Task ProcessDirectPayment(long packageId)
+    private void ClosePurchaseOptions()
+    {
+        _showPurchaseBottomSheet = false;
+    }
+
+    private async Task DirectPayment()
     {
         if (_isProcessingPayment) return;
-
+        
         _isProcessingPayment = true;
-        StateHasChanged();
-
+        _showPurchaseBottomSheet = false;
+        
         try
         {
-            var response = await PackageContract.CustomerPurchasePackageAsync(new CustomerPurchasePackageRequest
+            // Create callback URL for payment verification
+            var callbackUrl = $"{Navigation.BaseUri}profile/payment-callback";
+            
+            // Call BFF to initiate payment (UserId is taken from JWT token in BFF)
+            var response = await PackageContract.InitiateBasePackagePaymentAsync(new InitiateBasePackagePaymentRequest
             {
-                PackageId = packageId,
-                PurchaseMethod = PurchaseMethodEnum.PurchaseMethodGateway
+                CallbackUrl = callbackUrl
             });
-
+            
             if (!response.Success)
             {
                 Snackbar.Add(response.Message ?? "خطا در آغاز فرآیند پرداخت", Severity.Error);
                 return;
             }
-
+            
+            // Redirect to payment gateway
             if (!string.IsNullOrEmpty(response.PaymentGatewayUrl))
             {
                 Navigation.NavigateTo(response.PaymentGatewayUrl, forceLoad: true);
@@ -471,29 +449,41 @@ public partial class Index
         }
     }
 
-    private async Task ProcessDayaLoanPayment()
+    private async Task DayaLoanPayment()
     {
+        // Validate user info before redirecting
         if (string.IsNullOrWhiteSpace(_updateUserRequest.FirstName))
         {
-            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (نام وارد نشده)", Severity.Error);
+            _showPurchaseBottomSheet = false;
+            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (نام وارد نشده)", Severity.Error);
             return;
         }
         if (string.IsNullOrWhiteSpace(_updateUserRequest.LastName))
         {
-            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (نام خانوادگی وارد نشده)", Severity.Error);
+            _showPurchaseBottomSheet = false;
+            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (نام خانوادگی وارد نشده)", Severity.Error);
             return;
         }
         if (string.IsNullOrWhiteSpace(_updateUserRequest.NationalCode))
         {
-            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (کدملی وارد نشده)", Severity.Error);
+            _showPurchaseBottomSheet = false;
+            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (کدملی وارد نشده)", Severity.Error);
             return;
         }
         if (_updateUserRequest.BirthDate == null)
         {
-            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (تاریخ تولد وارد نشده)", Severity.Error);
+            _showPurchaseBottomSheet = false;
+            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (تاریخ تولد وارد نشده)", Severity.Error);
             return;
         }
-
+        if (!_addresses.Any())
+        {
+            _showPurchaseBottomSheet = false;
+            Snackbar.Add($"آدرس محل سکونت شما الزامی است!", Severity.Error);
+            return;
+        }
+        
+        _showPurchaseBottomSheet = false;
         var url = "https://dayadiamond.ir/profile/creditpurchase/?merchantcode=56146364";
         await JSRuntime.InvokeVoidAsync("open", url, "_blank");
     }

src/FrontOffice.Main/Pages/Profile/MagicWallet.razor

@@ -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"
@@ -36,11 +36,6 @@
         {
             @* ═══ حالت جادویی فعال ═══ *@
 
-            @* ── G4: هشدار تنظیمات پکیج‌بیس (Q28) ── *@
-            <MudAlert Severity="Severity.Warning" Variant="Variant.Text" Dense="true" Icon="@Icons.Material.Filled.Warning">
-                سقف واریز و ضریب اعتبار کیف‌پول جادویی بر اساس پکیج شما تنظیم شده است. پکیج‌های بالاتر سقف و ضریب بیشتری دارند.
-            </MudAlert>
-
             @* ─── وضعیت و پیشرفت ─── *@
             <MudPaper Elevation="2" Class="pa-5 rounded-xl" Style="background: linear-gradient(135deg, #7c3aed 0%, #a855f7 100%); color: white;">
                 <MudStack Spacing="2">
@@ -97,8 +92,8 @@
                     </MudText>
 
                     <MudAlert Severity="MudBlazor.Severity.Info" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
-                        مبلغ واریزی شما <strong>×@_status.MagicMultiplier.ToString("0.#")</strong> به موجودی اضافه می‌شود.
-                        مثلاً ۱۰ میلیون واریز = @FormatToman((long)(10_000_000 * (decimal)_status.MagicMultiplier)) اعتبار.
+                        مبلغ واریزی شما <strong>×۲.۵</strong> به موجودی اضافه می‌شود.
+                        مثلاً ۱۰ میلیون واریز = ۲۵ میلیون اعتبار.
                     </MudAlert>
 
                     <MudStack Spacing="2">
@@ -106,7 +101,7 @@
                                          Label="مبلغ واریز (تومان)"
                                          Variant="Variant.Outlined"
                                          Min="10_000"
-                                         Max="@_status.MagicRemainingDeposit"
+                                         Max="@(_status.MagicRemainingDeposit / 10)"
                                          Format="N0"
                                          Adornment="Adornment.Start"
                                          AdornmentIcon="@Icons.Material.Filled.Payments"
@@ -120,8 +115,8 @@
                                     <MudText Typo="Typo.body2">@FormatToman(_chargeAmount)</MudText>
                                 </MudStack>
                                 <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2" Color="Color.Success"><strong>اعتبار دریافتی (×@_status.MagicMultiplier.ToString("0.#")):</strong></MudText>
-                                    <MudText Typo="Typo.body2" Color="Color.Success"><strong>@FormatToman((long)(_chargeAmount * (decimal)_status.MagicMultiplier))</strong></MudText>
+                                    <MudText Typo="Typo.body2" Color="Color.Success"><strong>اعتبار دریافتی (×۲.۵):</strong></MudText>
+                                    <MudText Typo="Typo.body2" Color="Color.Success"><strong>@FormatToman((long)(_chargeAmount * 2.5m))</strong></MudText>
                                 </MudStack>
                             </MudPaper>
                         }
@@ -130,7 +125,7 @@
                         <MudStack Row="true" Spacing="1" Class="flex-wrap">
                             @foreach (var preset in _presetAmounts)
                             {
-                                if (preset <= _status.MagicRemainingDeposit)
+                                if (preset * 10 <= _status.MagicRemainingDeposit)
                                 {
                                     <MudButton Variant="Variant.Outlined" Size="Size.Small"
                                                Color="@(_chargeAmount == preset ? Color.Primary : Color.Default)"
@@ -166,23 +161,8 @@
             else
             {
                 <MudAlert Severity="MudBlazor.Severity.Warning" Class="rounded-lg">
-                    <MudStack Spacing="2">
-                        <MudText>
-                            سقف شارژ جادویی در این دور پر شده است.
-                            با خرج کردن موجودی و خرید مجدد پکیج، سقف ریست می‌شود.
-                        </MudText>
-                        <MudText Typo="Typo.body2">
-                            اگر برای تکمیل خرید به موجودی بیشتری نیاز دارید، می‌توانید به‌صورت استثنایی کیف اصلی را بدون ضریب (۱:۱) شارژ کنید.
-                        </MudText>
-                        <MudButton Variant="Variant.Filled"
-                                   Color="Color.Primary"
-                                   Size="Size.Small"
-                                   StartIcon="@Icons.Material.Filled.AccountBalanceWallet"
-                                   Href="@RouteConstants.Profile.ChargeCreditWallet"
-                                   Class="rounded-lg align-self-start">
-                            شارژ عادی بدون ضریب
-                        </MudButton>
-                    </MudStack>
+                    سقف شارژ جادویی در این دور پر شده است.
+                    با خرج کردن موجودی و خرید مجدد پکیج، سقف ریست می‌شود.
                 </MudAlert>
             }
 
@@ -191,16 +171,16 @@
                 <MudExpansionPanel Text="قوانین کیف‌پول جادویی" MaxHeight="500" IsInitiallyExpanded="false">
                     <MudList T="string" Dense="true">
                         <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                            هر مبلغ واریزی ×@_status.MagicMultiplier.ToString("0.#") به موجودی اضافه می‌شود
+                            هر مبلغ واریزی ×۲.۵ به موجودی اضافه می‌شود
                         </MudListItem>
                         <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                            سقف واریز در هر دور: @FormatPrice(_status.MagicMaxDeposit)
+                            سقف واریز در هر دور: ۱۰۰ میلیون تومان
                         </MudListItem>
                         <MudListItem T="string" Icon="@Icons.Material.Filled.CheckCircle" IconColor="Color.Success">
-                            حداکثر اعتبار: @FormatPrice(_status.MagicMaxCredit)
+                            حداکثر اعتبار: ۲۵۰ میلیون تومان (سود ۱۵۰٪)
                         </MudListItem>
                         <MudListItem T="string" Icon="@Icons.Material.Filled.Warning" IconColor="Color.Warning">
-                            در حالت جادویی، کمیسیون و پاداش های دریافتی غیرفعال است
+                            در حالت جادویی، کمیسیون و پورسانت غیرفعال است
                         </MudListItem>
                         <MudListItem T="string" Icon="@Icons.Material.Filled.Info" IconColor="Color.Info">
                             بعد از اتمام سقف و خرج موجودی، با خرید مجدد پکیج دور جدید شروع می‌شود

src/FrontOffice.Main/Pages/Profile/MagicWallet.razor.cs

@@ -46,8 +46,10 @@ public partial class MagicWallet : ComponentBase
 
         try
         {
-            // مبلغ به تومان — CMS خودش موقع ارسال به درگاه ×۱۰ می‌کنه
-            var (success, gatewayUrl, error) = await WalletService.InitiateMagicChargeAsync(_chargeAmount);
+            // تبدیل تومان به ریال
+            var amountInRial = _chargeAmount * 10;
+
+            var (success, gatewayUrl, error) = await WalletService.InitiateMagicChargeAsync(amountInRial);
 
             if (success && !string.IsNullOrEmpty(gatewayUrl))
             {
@@ -69,8 +71,8 @@ public partial class MagicWallet : ComponentBase
         }
     }
 
-    private static string FormatPrice(long price)
-        => string.Format("{0:N0} تومان", price);
+    private static string FormatPrice(long priceInRial)
+        => string.Format("{0:N0} تومان", priceInRial / 10);
 
     private static string FormatToman(long toman)
         => string.Format("{0:N0} تومان", toman);

src/FrontOffice.Main/Pages/Profile/PaymentCallback.razor

@@ -3,7 +3,7 @@
 @using Blazored.LocalStorage
 @using CMSMicroservice.Protobuf.Protos.Package
 @using CMSMicroservice.Protobuf.Protos.User
-@using FrontOffice.Main.Utilities
+@inject IJSRuntime JS
 
 
 <PageTitle>نتیجه پرداخت | کارا بازار سلامت</PageTitle>
@@ -21,10 +21,10 @@
             <MudText Typo="Typo.h5" Color="Color.Success" Class="mt-4">پرداخت موفق</MudText>
             <MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
             
-            @if (_transactionId > 0)
+            @if (!string.IsNullOrEmpty(_refId))
             {
                 <MudText Typo="Typo.body2" Class="mt-3">
-                    <strong>کد ارجاعی:</strong> @_transactionId
+                    <strong>کد پیگیری:</strong> @_refId
                 </MudText>
             }
             
@@ -33,10 +33,13 @@
             <MudText Typo="Typo.body2" Color="Color.Secondary">
                 موجودی کیف پول: @FormatPrice(_walletBalance)
             </MudText>
+            <MudText Typo="Typo.body2" Color="Color.Secondary">
+                موجودی کیف پول اعتباری: @FormatPrice(_discountBalance)
+            </MudText>
             
             <MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
-                       Href="@_successReturnUrl">
-                @_successReturnText
+                       OnClick="GoBack">
+                بازگشت به پروفایل
             </MudButton>
         }
         else
@@ -46,8 +49,8 @@
             <MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
             
             <MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
-                       Href="@_failReturnUrl">
-                @_failReturnText
+                       OnClick="GoBack">
+                بازگشت به پروفایل
             </MudButton>
             
             <MudButton Color="Color.Secondary" Variant="Variant.Outlined" Class="mt-3 mr-2"
@@ -61,19 +64,12 @@
 @code {
     [Inject] private PackageContract.PackageContractClient PackageContractClient { get; set; } = default!;
     [Inject] private UserContract.UserContractClient UserContractClient { get; set; } = default!;
-    [Inject] private DiscountOrderService DiscountOrderService { get; set; } = default!;
     [Inject] private ILocalStorageService LocalStorage { get; set; } = default!;
     [Inject] private AuthService AuthService { get; set; } = default!;
     [Inject] private NavigationManager NavManager { get; set; } = default!;
     
     private const string TokenStorageKey = "auth:token";
     
-    /// <summary>
-    /// نوع پرداخت: package (پیش‌فرض) | magic-wallet | discount-wallet | discount-order
-    /// </summary>
-    [SupplyParameterFromQuery(Name = "type")]
-    private string? PaymentType { get; set; }
-    
     [SupplyParameterFromQuery(Name = "orderId")]
     private long OrderId { get; set; }
     
@@ -89,42 +85,15 @@
     private bool _isLoading = true;
     private bool _isSuccess;
     private string _message = string.Empty;
-    private long _transactionId;
+    private string? _refId;
     private long _walletBalance;
-    private bool _verifyCompleted;
-    private readonly SemaphoreSlim _verifyGate = new(1, 1);
-    
-    // دکمه‌های بازگشت بسته به نوع پرداخت
-    private string _successReturnUrl = "/profile";
-    private string _successReturnText = "بازگشت به پروفایل";
-    private string _failReturnUrl = "/profile";
-    private string _failReturnText = "بازگشت به پروفایل";
+    private long _discountBalance;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender && !_verifyCompleted)
+        if (firstRender)
         {
-            await VerifyPaymentOnceAsync();
-        }
-    }
-
-    /// <summary>
-    /// Blazor Server may invoke render/verify twice in quick succession — gate with semaphore.
-    /// </summary>
-    private async Task VerifyPaymentOnceAsync()
-    {
-        if (_verifyCompleted) return;
-
-        await _verifyGate.WaitAsync();
-        try
-        {
-            if (_verifyCompleted) return;
             await VerifyPayment();
-            _verifyCompleted = true;
-        }
-        finally
-        {
-            _verifyGate.Release();
         }
     }
 
@@ -132,26 +101,35 @@
     {
         try
         {
-            // تعیین نوع پرداخت — اگر type نباشد، پیش‌فرض خرید پکیج
-            var type = PaymentType?.ToLowerInvariant() ?? "package";
-            
-            switch (type)
+            if (OrderId <= 0 || TransactionId <= 0 || string.IsNullOrEmpty(Authority))
             {
-                case "magic-wallet":
-                    await VerifyMagicWalletCharge();
-                    break;
-                case "discount-wallet":
-                    await VerifyDiscountWalletCharge();
-                    break;
-                case "credit-wallet":
-                    await VerifyCreditWalletCharge();
-                    break;
-                case "discount-order":
-                    await VerifyDiscountOrderPayment();
-                    break;
-                default: // "package" or missing
-                    await VerifyPackagePurchase();
-                    break;
+                _isSuccess = false;
+                _message = "پارامترهای پرداخت نامعتبر است";
+                _isLoading = false;
+                StateHasChanged();
+                return;
+            }
+
+            var response = await PackageContractClient.VerifyBasePackagePaymentAsync(new VerifyBasePackagePaymentRequest
+            {
+                OrderId = OrderId,
+                TransactionId = TransactionId,
+                PaymentSuccess = Status == "OK",
+                RefId = !string.IsNullOrEmpty(Authority) ? Authority : null,
+                Message = !string.IsNullOrEmpty(Status) ? Status : null
+            });
+
+            _isSuccess = response.Success;
+            _message = response.Message;
+            _refId = response.ReferenceCode ?? "";
+            _walletBalance = response.WalletBalance;
+            _discountBalance = response.DiscountBalance;
+            
+            // اگر پرداخت موفق بود، توکن را refresh می‌کنیم
+            // چون PackagePurchaseMethod تغییر کرده و باید در claims جدید باشد
+            if (_isSuccess)
+            {
+                await RefreshTokenAsync();
             }
         }
         catch (Exception ex)
@@ -165,186 +143,10 @@
             StateHasChanged();
         }
     }
-    
-    /// <summary>
-    /// تأیید خرید پکیج — رفتار فعلی
-    /// </summary>
-    private async Task VerifyPackagePurchase()
-    {
-        _successReturnUrl = "/profile";
-        _successReturnText = "بازگشت به پروفایل";
-        _failReturnUrl = "/profile";
-        _failReturnText = "بازگشت به پروفایل";
-        
-        if (OrderId <= 0 || string.IsNullOrEmpty(Authority))
-        {
-            _isSuccess = false;
-            _message = "پارامترهای پرداخت نامعتبر است";
-            return;
-        }
-
-        var response = await PackageContractClient.CustomerVerifyPackagePurchaseAsync(new CustomerVerifyPackagePurchaseRequest
-        {
-            OrderId = OrderId,
-            Authority = Authority ?? string.Empty,
-            Status = Status ?? string.Empty
-        });
-
-        _isSuccess = response.Success;
-        _message = response.Message;
-        _transactionId = response.TransactionId;
-        
-        if (_isSuccess)
-        {
-            await UpdateWalletBalanceAndRefreshToken();
-        }
-    }
-    
-    /// <summary>
-    /// تأیید شارژ کیف‌پول جادویی
-    /// </summary>
-    private async Task VerifyMagicWalletCharge()
-    {
-        _successReturnUrl = "/profile/magic-wallet";
-        _successReturnText = "بازگشت به کیف پول جادویی";
-        _failReturnUrl = "/profile/magic-wallet";
-        _failReturnText = "بازگشت به کیف پول جادویی";
-        
-        if (string.IsNullOrEmpty(Authority))
-        {
-            _isSuccess = false;
-            _message = "کد Authority نامعتبر است";
-            return;
-        }
-
-        var (success, message) = await WalletService.VerifyMagicChargeAsync(
-            Authority, Status ?? "NOK");
-        
-        _isSuccess = success;
-        _message = message;
-        
-        if (_isSuccess)
-        {
-            await UpdateWalletBalance();
-        }
-    }
-    
-    /// <summary>
-    /// تأیید شارژ کیف پول تخفیفی
-    /// </summary>
-    private async Task VerifyDiscountWalletCharge()
-    {
-        _successReturnUrl = "/profile/charge-discount-wallet";
-        _successReturnText = "بازگشت به کیف پول تخفیفی";
-        _failReturnUrl = "/profile/charge-discount-wallet";
-        _failReturnText = "بازگشت به کیف پول تخفیفی";
-        
-        if (string.IsNullOrEmpty(Authority))
-        {
-            _isSuccess = false;
-            _message = "کد Authority نامعتبر است";
-            return;
-        }
-
-        var (success, message) = await WalletService.VerifyDiscountChargeAsync(
-            Authority, Status ?? "NOK");
-        
-        _isSuccess = success;
-        _message = message;
-        
-        if (_isSuccess)
-        {
-            await UpdateWalletBalance();
-        }
-    }
-
-    /// <summary>
-    /// تأیید شارژ کیف پول اصلی
-    /// </summary>
-    private async Task VerifyCreditWalletCharge()
-    {
-        _successReturnUrl = "/profile/charge-credit-wallet?payment=success";
-        _successReturnText = "بازگشت به شارژ کیف پول اصلی";
-        _failReturnUrl = "/profile/charge-credit-wallet?payment=failed";
-        _failReturnText = "بازگشت به شارژ کیف پول اصلی";
-
-        if (string.IsNullOrEmpty(Authority))
-        {
-            _isSuccess = false;
-            _message = "کد Authority نامعتبر است";
-            return;
-        }
-
-        var (success, message) = await WalletService.VerifyCreditChargeAsync(
-            Authority, Status ?? "NOK");
-
-        _isSuccess = success;
-        _message = message;
-
-        if (_isSuccess)
-        {
-            await UpdateWalletBalance();
-        }
-    }
-    
-    /// <summary>
-    /// تأیید پرداخت سفارش فروشگاه تخفیفی
-    /// </summary>
-    private async Task VerifyDiscountOrderPayment()
-    {
-        _successReturnUrl = $"/discount-store/order/{OrderId}";
-        _successReturnText = "مشاهده سفارش";
-        _failReturnUrl = $"/discount-store/order/{OrderId}";
-        _failReturnText = "مشاهده سفارش";
-        
-        if (OrderId <= 0 || string.IsNullOrEmpty(Authority))
-        {
-            _isSuccess = false;
-            _message = "پارامترهای پرداخت نامعتبر است";
-            return;
-        }
-
-        var (success, message, _) = await DiscountOrderService.VerifyDiscountOrderPaymentAsync(
-            OrderId, Authority, Status ?? "NOK");
-        
-        _isSuccess = success;
-        _message = message;
-    }
-    
-    /// <summary>
-    /// بروزرسانی موجودی کیف پول
-    /// </summary>
-    private async Task UpdateWalletBalance()
-    {
-        try
-        {
-            var balances = await WalletService.GetBalancesAsync();
-            _walletBalance = balances.CreditBalance;
-        }
-        catch { /* اگر خطا شد، صفر نمایش بده */ }
-    }
-    
-    /// <summary>
-    /// بروزرسانی موجودی + refresh توکن (فقط برای خرید پکیج)
-    /// </summary>
-    private async Task UpdateWalletBalanceAndRefreshToken()
-    {
-        await UpdateWalletBalance();
-        await RefreshTokenAsync();
-    }
 
     private void RetryPayment()
     {
-        var type = PaymentType?.ToLowerInvariant() ?? "package";
-        var url = type switch
-        {
-            "magic-wallet" => "/profile/magic-wallet",
-            "discount-wallet" => "/profile/charge-discount-wallet",
-            "credit-wallet" => "/profile/charge-credit-wallet",
-            "discount-order" => "/discount-store",
-            _ => "/profile"
-        };
-        NavManager.NavigateTo(url, forceLoad: true);
+        NavManager.NavigateTo("/profile");
     }
     
     /// <summary>
@@ -372,4 +174,6 @@
     }
 
     private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
+
+    private async Task GoBack() => await JS.InvokeVoidAsync("history.back");
 }

src/FrontOffice.Main/Pages/Profile/Tree.razor

@@ -1,11 +1,11 @@
 @attribute [Route(RouteConstants.Profile.Tree)]
 @using FrontOffice.Main.Pages.Profile.Components
 
-<PageTitle>سازمان فروش</PageTitle>
+<PageTitle>شجره‌نامه</PageTitle>
 
 <MudContainer MaxWidth="MaxWidth.Large" Class="py-6">
     <MudStack Spacing="3">
-        <PageHeader Title="سازمان فروش" BackHref="@RouteConstants.Profile.Index" />
+        <PageHeader Title="شجره‌نامه" BackHref="@RouteConstants.Profile.Index" />
 
         <MudPaper Elevation="2" Class="pa-4 rounded-lg">
             <OrganizationChart />

src/FrontOffice.Main/Pages/Profile/Wallet.razor

@@ -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>
@@ -38,93 +38,6 @@
             درخواست‌های برداشت
         </MudButton>
 
-        <!-- دکمه شارژ کیف‌پول اصلی / جادویی -->
-        @if (_isClubMemberActive)
-        {
-            @if (_isMagicWallet)
-            {
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Secondary"
-                           Size="Size.Large"
-                           FullWidth="true"
-                           StartIcon="@Icons.Material.Filled.AutoAwesome"
-                           Href="@RouteConstants.Profile.MagicWallet"
-                           Class="rounded-lg">
-                    شارژ کیف‌پول جادویی
-                </MudButton>
-                @if (_magicCeilingFull)
-                {
-                    <MudAlert Severity="Severity.Warning" Dense="true" Variant="Variant.Outlined">
-                        سقف شارژ جادویی این دور پر است. در صورت نیاز می‌توانید به‌صورت استثنایی بدون ضریب شارژ کنید.
-                    </MudAlert>
-                    <MudButton Variant="Variant.Outlined"
-                               Color="Color.Primary"
-                               Size="Size.Large"
-                               FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.AccountBalanceWallet"
-                               Href="@RouteConstants.Profile.ChargeCreditWallet"
-                               Class="rounded-lg">
-                        شارژ عادی بدون ضریب
-                    </MudButton>
-                }
-                else
-                {
-                    <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Outlined">
-                        کیف پول شما در حالت جادویی است؛ شارژ از مسیر جادویی با ضریب چندبرابر اعمال می‌شود.
-                    </MudAlert>
-                }
-            }
-            else
-            {
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Primary"
-                           Size="Size.Large"
-                           FullWidth="true"
-                           StartIcon="@Icons.Material.Filled.AccountBalanceWallet"
-                           Href="@RouteConstants.Profile.ChargeCreditWallet"
-                           Class="rounded-lg">
-                    شارژ کیف‌پول اصلی
-                </MudButton>
-            }
-        }
-        else
-        {
-            <MudPaper Elevation="0" Class="pa-3 rounded-lg" Outlined="true">
-                <MudStack Spacing="2">
-                    <MudButton Variant="Variant.Filled"
-                               Color="Color.Primary"
-                               Size="Size.Large"
-                               FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.AccountBalanceWallet"
-                               Disabled="true"
-                               Class="rounded-lg">
-                        شارژ کیف‌پول اصلی
-                    </MudButton>
-                    <MudAlert Severity="Severity.Warning" Dense="true" Variant="Variant.Outlined">
-                        برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.
-                    </MudAlert>
-                    <MudStack Row="true" Spacing="1" Class="flex-wrap">
-                        @if (!_hasPurchasedPackage)
-                        {
-                            <MudButton Size="Size.Small" Variant="Variant.Outlined" Color="Color.Primary"
-                                       Href="@RouteConstants.Package.List"
-                                       StartIcon="@Icons.Material.Filled.CardGiftcard">
-                                مشاهده پکیج‌ها
-                            </MudButton>
-                        }
-                        else
-                        {
-                            <MudButton Size="Size.Small" Variant="Variant.Outlined" Color="Color.Primary"
-                                       Href="@RouteConstants.Club.Membership"
-                                       StartIcon="@Icons.Material.Filled.Handshake">
-                                امضای قرارداد باشگاه
-                            </MudButton>
-                        }
-                    </MudStack>
-                </MudStack>
-            </MudPaper>
-        }
-
         <!-- دکمه شارژ کیف‌پول اعتباری -->
         <MudButton Variant="Variant.Filled" 
                    Color="Color.Info" 
@@ -169,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>
@@ -179,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) : "-")
@@ -187,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) : "-")
@@ -223,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>
@@ -234,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>

src/FrontOffice.Main/Pages/Profile/Wallet.razor.cs

@@ -6,43 +6,13 @@ namespace FrontOffice.Main.Pages.Profile;
 
 public partial class Wallet : ComponentBase
 {
-    [Inject] private AuthService AuthService { get; set; } = default!;
-
     private (string Credit, string Discount, string Network) _balances = ("-", "-", "-");
     private List<WalletTransaction> _txs = new();
     private string? _filterReferenceId;
     private string _filterType = "all";
-    private bool _isClubMemberActive;
-    private bool _hasPurchasedPackage;
-    private bool _isMagicWallet;
-    private bool _magicCeilingFull;
 
     protected override async Task OnInitializedAsync()
     {
-        try
-        {
-            var userInfo = await AuthService.GetUserAuthInfo();
-            _isClubMemberActive = userInfo.IsClubMemberActive;
-            _hasPurchasedPackage = userInfo.HasPurchasedPackage;
-        }
-        catch
-        {
-            _isClubMemberActive = false;
-            _hasPurchasedPackage = false;
-        }
-
-        try
-        {
-            var magicStatus = await WalletService.GetMagicWalletStatusAsync();
-            _isMagicWallet = magicStatus.WalletMode == 1;
-            _magicCeilingFull = _isMagicWallet && magicStatus.MagicRemainingDeposit <= 0;
-        }
-        catch
-        {
-            _isMagicWallet = false;
-            _magicCeilingFull = false;
-        }
-
         var b = await WalletService.GetBalancesAsync();
         _balances = (FormatPrice(b.CreditBalance), FormatPrice(b.DiscountBalance), FormatPrice(b.NetworkBalance));
         _txs = await WalletService.GetTransactionsAsync();

src/FrontOffice.Main/Pages/Profile/WithdrawalRequests.razor.cs

@@ -58,19 +58,8 @@ public partial class WithdrawalRequests : ComponentBase
         try
         {
             _isSubmittingWithdrawal = true;
-
-            string? normalizedIban = null;
-            if (_withdrawMethod == WithdrawalMethodClient.Cash)
-            {
-                normalizedIban = NormalizeIranianIban(_withdrawIban);
-                if (normalizedIban is null)
-                {
-                    Snackbar.Add("فرمت شماره شبا معتبر نیست. باید IR و ۲۴ رقم باشد (خط تیره اختیاری است).", Severity.Warning);
-                    return;
-                }
-            }
-
-            await WalletService.RequestWithdrawalAsync(_selectedPayout.Id, _withdrawMethod, normalizedIban);
+            _withdrawIban=_withdrawIban!.Trim().ToUpper().Replace("IR", "").Replace(" ", "");
+            await WalletService.RequestWithdrawalAsync(_selectedPayout.Id, _withdrawMethod, "IR"+_withdrawIban);
             Snackbar.Add("درخواست برداشت ثبت شد.", Severity.Success);
             
             // بروزرسانی لیست
@@ -136,26 +125,4 @@ public partial class WithdrawalRequests : ComponentBase
         1 => "الماس",
         _ => "-"
     };
-
-    /// <summary>
-    /// فاصله و خط تیره را حذف می‌کند و شبا را به شکل IR + ۲۴ رقم برمی‌گرداند.
-    /// </summary>
-    private static string? NormalizeIranianIban(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 System.Text.RegularExpressions.Regex.IsMatch(normalized, @"^IR\d{24}$")
-            ? normalized
-            : null;
-    }
 }

src/FrontOffice.Main/Pages/Store/Cart.razor.cs

@@ -8,17 +8,11 @@ public partial class Cart : ComponentBase, IDisposable
 {
     [Inject] private CartService CartService { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
     // Navigation and Snackbar are available via _Imports.razor
     private CartService CartData => CartService;
 
     protected override async Task OnInitializedAsync()
     {
-        if (!await AuthService.IsAuthenticatedAsync())
-        {
-            await AuthDialogService.ShowAuthDialogAsync();
-        }
         // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
         await CartService.EnsureInitializedAsync();
         CartService.OnChange += StateHasChanged;

src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor

@@ -21,11 +21,9 @@
                 else if (_addresses.Count == 0)
                 {
                     <MudAlert Severity="Severity.Warning">
-                        هیچ آدرسی ثبت نشده است. می‌توانید همین‌جا آدرس جدید اضافه کنید.
+                        هیچ آدرسی ثبت نشده است. لطفاً از بخش پروفایل آدرس خود را اضافه کنید.
                     </MudAlert>
-                    <MudButton Class="mt-2" Variant="Variant.Outlined" Color="Color.Primary"
-                               StartIcon="@Icons.Material.Filled.Add"
-                               OnClick="OpenAddAddressDialog">افزودن آدرس</MudButton>
+                    <MudButton Class="mt-2" Variant="Variant.Outlined" Href="/profile/addresses">افزودن آدرس</MudButton>
                 }
                 else
                 {
@@ -42,25 +40,13 @@
                                         <MudText Typo="Typo.subtitle2">@address.Title</MudText>
                                         <MudText Typo="Typo.body2" Class="mud-text-secondary">@address.Address</MudText>
                                     </MudStack>
-                                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
-                                        @if (address.IsDefault)
-                                        {
-                                            <MudChip T="string" Color="Color.Success" Variant="Variant.Outlined" Size="Size.Small">پیش‌فرض</MudChip>
-                                        }
-                                        <span @onclick:stopPropagation="true">
-                                            <MudIconButton Icon="@Icons.Material.Filled.Edit"
-                                                           Size="Size.Small"
-                                                           Color="Color.Primary"
-                                                           aria-label="ویرایش آدرس"
-                                                           OnClick="@(() => OpenEditAddressDialog(address))" />
-                                        </span>
-                                    </MudStack>
+                                    @if (address.IsDefault)
+                                    {
+                                        <MudChip T="string" Color="Color.Success" Variant="Variant.Outlined">پیش‌فرض</MudChip>
+                                    }
                                 </MudStack>
                             </MudPaper>
                         }
-                        <MudButton Class="mt-2" Variant="Variant.Text" Color="Color.Primary"
-                                   StartIcon="@Icons.Material.Filled.Add"
-                                   OnClick="OpenAddAddressDialog">افزودن آدرس جدید</MudButton>
                     </MudStack>
                 }
             </MudPaper>

src/FrontOffice.Main/Pages/Store/CheckoutSummary.razor.cs

@@ -1,7 +1,5 @@
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
-using FrontOffice.Main.Pages.Profile.Components;
-using FrontOffice.Main.Shared;
 using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
@@ -16,8 +14,6 @@ public partial class CheckoutSummary : ComponentBase
     [Inject] private VATService VAT { get; set; } = default!;
     [Inject] private UserAddressContract.UserAddressContractClient UserAddressContract { get; set; } = default!;
     [Inject] private UserOrderContract.UserOrderContractClient UserOrderContract { get; set; } = default!;
-    [Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
     // Snackbar and Navigation are injected via _Imports.razor
 
     private List<CustomerAddressModel> _addresses = new();
@@ -31,16 +27,9 @@ public partial class CheckoutSummary : ComponentBase
 
     protected override async Task OnInitializedAsync()
     {
-        if (!await AuthService.IsAuthenticatedAsync())
-        {
-            await AuthDialogService.ShowAuthDialogAsync();
-        }
+        // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
         await Cart.EnsureInitializedAsync();
-        var userInfo = await AuthService.GetUserAuthInfo();
-        if (userInfo.HasAddress)
-            await LoadAddresses();
-        else
-            _addresses = new();
+        await LoadAddresses();
         await LoadWalletBalance();
     }
 
@@ -48,6 +37,7 @@ public partial class CheckoutSummary : ComponentBase
     {
         if (firstRender)
         {
+            // بارگذاری نرخ VAT
             await VAT.LoadAsync();
         }
         await base.OnAfterRenderAsync(firstRender);
@@ -56,7 +46,9 @@ public partial class CheckoutSummary : ComponentBase
     private async Task LoadWalletBalance()
     {
         var walletResult = await WalletService.GetBalancesAsync();
-        walletBalance = walletResult.CreditBalance;
+        walletBalance = walletResult.CreditBalance
+        //  + walletResult.NetworkBalance
+         ;
     }
 
     private async Task LoadAddresses()
@@ -73,14 +65,12 @@ public partial class CheckoutSummary : ComponentBase
             else
             {
                 _addresses = new();
-                _selectedAddress = null;
             }
         }
         catch (Exception ex)
         {
             Snackbar.Add($"خطا در بارگذاری آدرس‌ها: {ex.Message}", Severity.Error);
             _addresses = new();
-            _selectedAddress = null;
         }
         finally
         {
@@ -89,30 +79,6 @@ public partial class CheckoutSummary : ComponentBase
         }
     }
 
-    private async Task OpenAddAddressDialog()
-    {
-        var dialog = await DialogService.ShowAsync<AddAddressDialog>("افزودن آدرس جدید");
-        var result = await dialog.Result;
-        if (result is { Canceled: false })
-        {
-            await AuthService.RefreshTokenAsync();
-            await LoadAddresses();
-        }
-    }
-
-    private async Task OpenEditAddressDialog(CustomerAddressModel address)
-    {
-        var dialog = await DialogService.ShowAsync<EditAddressDialog>("ویرایش آدرس", new DialogParameters<EditAddressDialog>
-        {
-            { x => x.Model, address }
-        });
-        var result = await dialog.Result;
-        if (result is { Canceled: false })
-        {
-            await LoadAddresses();
-        }
-    }
-
     private async Task PlaceOrder()
     {
         if (!CanPlaceOrder || _selectedAddress is null)
@@ -121,15 +87,11 @@ public partial class CheckoutSummary : ComponentBase
             return;
         }
 
-        var totalRequired = VAT.AddVAT(Cart.Total);
-        if (await TryHandleInsufficientBalanceAsync(totalRequired))
-            return;
-
         try
         {
             var request = new SubmitShopBuyOrderRequest
             {
-                TotalAmount = totalRequired
+                TotalAmount = VAT.AddVAT(Cart.Total)
             };
 
             var response = await UserOrderContract.SubmitShopBuyOrderAsync(request);
@@ -139,87 +101,17 @@ public partial class CheckoutSummary : ComponentBase
         }
         catch (Exception ex)
         {
-            if (CreditChargeNavigation.IsInsufficientWalletBalance(ex))
-            {
-                await LoadWalletBalance();
-                await TryHandleInsufficientBalanceAsync(totalRequired);
-                return;
-            }
-
             Snackbar.Add($"خطا در ثبت سفارش: {ex.Message}", Severity.Error);
         }
     }
 
-    private async Task<bool> TryHandleInsufficientBalanceAsync(long totalRequired)
-    {
-        if (walletBalance >= totalRequired)
-            return false;
-
-        var shortfall = totalRequired - walletBalance;
-        var allowCharge = false;
-        var hasPurchasedPackage = false;
-        var isMagicWallet = false;
-        var magicCeilingFull = false;
-        try
-        {
-            var userInfo = await AuthService.GetUserAuthInfo();
-            allowCharge = userInfo.IsClubMemberActive;
-            hasPurchasedPackage = userInfo.HasPurchasedPackage;
-        }
-        catch
-        {
-            allowCharge = false;
-        }
-
-        try
-        {
-            var magicStatus = await WalletService.GetMagicWalletStatusAsync();
-            isMagicWallet = magicStatus.WalletMode == 1;
-            magicCeilingFull = isMagicWallet && magicStatus.MagicRemainingDeposit <= 0;
-        }
-        catch
-        {
-            isMagicWallet = false;
-            magicCeilingFull = false;
-        }
-
-        var parameters = new DialogParameters<InsufficientCreditDialog>
-        {
-            { x => x.CurrentBalance, walletBalance },
-            { x => x.RequiredAmount, totalRequired },
-            { x => x.ShortfallAmount, shortfall },
-            { x => x.AllowChargeCredit, allowCharge },
-            { x => x.HasPurchasedPackage, hasPurchasedPackage },
-            { x => x.IsMagicWallet, isMagicWallet },
-            { x => x.MagicCeilingFull, magicCeilingFull }
-        };
-
-        var dialog = await DialogService.ShowAsync<InsufficientCreditDialog>(
-            "موجودی کافی نیست",
-            parameters,
-            new DialogOptions
-            {
-                CloseOnEscapeKey = true,
-                MaxWidth = MaxWidth.Small,
-                FullWidth = true
-            });
-
-        var result = await dialog.Result;
-        if (allowCharge && result is { Canceled: false } && result.Data is long chargeShortfall)
-        {
-            var chargeAmount = CreditChargeNavigation.NormalizeChargeAmount(chargeShortfall);
-            Navigation.NavigateTo(CreditChargeNavigation.BuildChargeUrl(
-                chargeAmount,
-                RouteConstants.Store.CheckoutSummary));
-        }
-
-        return true;
-    }
-
     private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
 
+    /// <summary>
+    /// محاسبه مالیات بر ارزش افزوده
+    /// </summary>
     private long CalculateVAT() => VAT.CalculateVAT(Cart.Total);
 
     private static string GetProductImageUrl(string? imageUrl)
         => string.IsNullOrWhiteSpace(imageUrl) ? "/images/product-placeholder.svg" : imageUrl.TrimStart('/');
-}
+}

src/FrontOffice.Main/Pages/Store/OrderDetail.razor.cs

@@ -47,3 +47,4 @@ public partial class OrderDetail : ComponentBase
     private static string GetProductImageUrl(string? imageUrl)
         => string.IsNullOrWhiteSpace(imageUrl) ? "/images/product-placeholder.svg" : imageUrl.TrimStart('/');
 }
+

src/FrontOffice.Main/Pages/Store/OrderTracking.razor.cs

@@ -46,19 +46,12 @@ public partial class OrderTracking : ComponentBase
     private void BuildTrackingSteps()
     {
         if (_order is null) return;
-
+        
+        // Build tracking steps based on PaymentStatus
         var isPaid = _order.PaymentStatus == Messages.PaymentStatus.Success;
-        // Domain/public_messages: None=0, Pending=1, InTransit=2, Delivered=3, Returned=4, Cancelled=5, ReadyForOfficePickup=6
-        var delivery = (int)_order.DeliveryStatus;
-        var isCancelled = delivery == 5;
-        var isReturned = delivery == 4;
-        var isOfficePickup = delivery == 6;
-        var isInTransit = delivery == 2;
-        var isDelivered = delivery == 3;
-        var isPendingDelivery = delivery is 0 or 1;
-
-        _trackingSteps =
-        [
+        
+        _trackingSteps = new List<TrackingStep>
+        {
             new()
             {
                 Title = "ثبت سفارش",
@@ -68,77 +61,45 @@ public partial class OrderTracking : ComponentBase
             },
             new()
             {
-                Title = "پرداخت",
-                Description = isPaid ? "پرداخت شما تایید شد" : "منتظر تایید پرداخت هستیم",
+                Title = "در انتظار پرداخت",
+                Description = "منتظر تایید پرداخت هستیم",
                 IsCompleted = isPaid,
-                IsCurrent = !isPaid && !isCancelled,
+                IsCurrent = !isPaid,
                 Date = isPaid ? FormatDate(_order.PaymentDate) : ""
+            },
+            new()
+            {
+                Title = "تایید پرداخت",
+                Description = "پرداخت شما تایید شد",
+                IsCompleted = isPaid,
+                IsCurrent = false,
+                Date = isPaid ? FormatDate(_order.PaymentDate) : ""
+            },
+            new()
+            {
+                Title = "در حال پردازش",
+                Description = "سفارش شما در حال آماده‌سازی است",
+                IsCompleted = false,
+                IsCurrent = isPaid,
+                Date = ""
+            },
+            new()
+            {
+                Title = "ارسال شده",
+                Description = "سفارش شما به پست تحویل داده شد",
+                IsCompleted = false,
+                IsCurrent = false,
+                Date = ""
+            },
+            new()
+            {
+                Title = "تحویل داده شده",
+                Description = "سفارش به دست شما رسید",
+                IsCompleted = false,
+                IsCurrent = false,
+                Date = ""
             }
-        ];
-
-        if (isCancelled)
-        {
-            _trackingSteps.Add(new()
-            {
-                Title = "لغو شده",
-                Description = "ارسال این سفارش لغو شده است",
-                IsCompleted = true,
-                IsCurrent = true,
-                Date = ""
-            });
-            return;
-        }
-
-        if (isReturned)
-        {
-            _trackingSteps.Add(new()
-            {
-                Title = "مرجوع شده",
-                Description = "سفارش مرجوع شده است",
-                IsCompleted = true,
-                IsCurrent = true,
-                Date = ""
-            });
-            return;
-        }
-
-        if (isOfficePickup)
-        {
-            _trackingSteps.Add(new()
-            {
-                Title = "آماده تحویل در دفتر",
-                Description = "سفارش برای تحویل حضوری در دفتر آماده است",
-                IsCompleted = true,
-                IsCurrent = true,
-                Date = ""
-            });
-            return;
-        }
-
-        _trackingSteps.Add(new()
-        {
-            Title = "در حال آماده‌سازی",
-            Description = "سفارش شما در حال آماده‌سازی است",
-            IsCompleted = isInTransit || isDelivered,
-            IsCurrent = isPaid && isPendingDelivery,
-            Date = ""
-        });
-        _trackingSteps.Add(new()
-        {
-            Title = "ارسال شده",
-            Description = "سفارش شما به پست تحویل داده شد",
-            IsCompleted = isDelivered,
-            IsCurrent = isInTransit,
-            Date = ""
-        });
-        _trackingSteps.Add(new()
-        {
-            Title = "تحویل داده شده",
-            Description = "سفارش به دست شما رسید",
-            IsCompleted = isDelivered,
-            IsCurrent = false,
-            Date = ""
-        });
+        };
     }
 
     private static string FormatDate(Google.Protobuf.WellKnownTypes.Timestamp? timestamp)

src/FrontOffice.Main/Pages/Store/Orders.razor

@@ -1,102 +1,80 @@
 @attribute [Route(RouteConstants.Store.Orders)]
+@* Injection is handled in code-behind *@
 
 <PageTitle>سفارشات من</PageTitle>
 
 <MudContainer MaxWidth="MaxWidth.Large" Class="py-6">
-    <MudStack Spacing="3">
-        <PageHeader Title="سفارشات من" BackHref="@RouteConstants.Store.Products" />
-
-        @if (_loading)
-        {
-            <LoadingState />
-        }
-        else if (_orders.Count == 0)
-        {
-            <MudAlert Severity="Severity.Info">هنوز سفارشی ثبت نشده است.</MudAlert>
-            <MudButton Variant="Variant.Outlined" StartIcon="@Icons.Material.Filled.Store"
-                       Href="@RouteConstants.Store.Products">
-                مشاهده فروشگاه
-            </MudButton>
-        }
-        else
-        {
-            <!-- Desktop Table -->
-            <MudHidden Breakpoint="Breakpoint.MdAndUp" Invert="true">
-                <MudPaper Elevation="1" Class="pa-4 rounded-lg">
-                    <MudTable Items="_orders">
-                        <HeaderContent>
-                            <MudTh>شماره سفارش</MudTh>
-                            <MudTh>تعداد اقلام</MudTh>
-                            <MudTh>مبلغ کل</MudTh>
-                            <MudTh>وضعیت پرداخت</MudTh>
-                            <MudTh>وضعیت ارسال</MudTh>
-                            <MudTh>تاریخ</MudTh>
-                            <MudTh></MudTh>
-                        </HeaderContent>
-                        <RowTemplate>
-                            <MudTd>@context.Id</MudTd>
-                            <MudTd>@GetItemsCount(context)</MudTd>
-                            <MudTd>@FormatPrice(GetTotalAmount(context))</MudTd>
-                            <MudTd>
-                                <MudChip T="string" Size="Size.Small"
-                                         Color="@GetPaymentStatusColor(context.PaymentStatus)"
-                                         Variant="Variant.Filled">
-                                    @GetPaymentStatusText(context.PaymentStatus)
-                                </MudChip>
-                            </MudTd>
-                            <MudTd>
-                                <MudChip T="string" Size="Size.Small"
-                                         Color="@GetDeliveryStatusColor((int)context.DeliveryStatus)"
-                                         Variant="Variant.Outlined">
-                                    @GetDeliveryStatusText((int)context.DeliveryStatus)
-                                </MudChip>
-                            </MudTd>
-                            <MudTd>@FormatDate(context)</MudTd>
-                            <MudTd>
-                                <MudButton Size="Size.Small" Variant="Variant.Outlined" Color="Color.Primary"
-                                           OnClick="() => ViewOrder(context.Id)">
-                                    جزئیات
-                                </MudButton>
-                            </MudTd>
-                        </RowTemplate>
-                    </MudTable>
-                </MudPaper>
-            </MudHidden>
-
-            <!-- Mobile Cards -->
-            <MudHidden Breakpoint="Breakpoint.MdAndUp">
-                <MudStack Spacing="2">
-                    @foreach (var order in _orders)
+    <PageHeader Title="سفارشات من" BackHref="@RouteConstants.Store.Products" />
+    @if (_loading)
+    {
+        <LoadingState />
+    }
+    else if (_orders.Count == 0)
+    {
+        <MudAlert Severity="Severity.Info">هنوز سفارشی ثبت نکرده‌اید.</MudAlert>
+    }
+    else
+    {
+        <MudHidden Breakpoint="Breakpoint.MdAndUp" Invert="true">
+        <MudTable Items="_orders" Dense="true">
+            <HeaderContent>
+                <MudTh>شناسه</MudTh>
+                <MudTh>تاریخ</MudTh>
+                <MudTh>وضعیت</MudTh>
+                <MudTh>مبلغ</MudTh>
+                <MudTh></MudTh>
+            </HeaderContent>
+            <RowTemplate>
+                <MudTd>@context.Id</MudTd>
+                <MudTd>
+                    @if (context.PaymentDate != null)
                     {
-                        <MudPaper Class="pa-3 rounded-lg cursor-pointer" Outlined="true"
-                                  @onclick="() => ViewOrder(order.Id)">
-                            <MudStack Spacing="1">
-                                <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                                    <MudText Typo="Typo.subtitle2">سفارش #@order.Id</MudText>
-                                    <MudChip T="string" Size="Size.Small"
-                                             Color="@GetPaymentStatusColor(order.PaymentStatus)"
-                                             Variant="Variant.Filled">
-                                        @GetPaymentStatusText(order.PaymentStatus)
-                                    </MudChip>
-                                </MudStack>
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.caption" Class="mud-text-secondary">@FormatDate(order)</MudText>
-                                    <MudChip T="string" Size="Size.Small"
-                                             Color="@GetDeliveryStatusColor((int)order.DeliveryStatus)"
-                                             Variant="Variant.Outlined">
-                                        @GetDeliveryStatusText((int)order.DeliveryStatus)
-                                    </MudChip>
-                                </MudStack>
-                                <MudDivider />
-                                <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <MudText Typo="Typo.body2">@GetItemsCount(order) قلم</MudText>
-                                    <MudText Typo="Typo.body2" Class="fw-semibold">@FormatPrice(GetTotalAmount(order)) تومان</MudText>
-                                </MudStack>
-                            </MudStack>
-                        </MudPaper>
+                        @context.PaymentDate.ToDateTime().MiladiToJalaliWithTime()
                     }
-                </MudStack>
-            </MudHidden>
-        }
-    </MudStack>
+                    else
+                    {
+                        <text>در انتظار پرداخت</text>
+                    }
+                </MudTd>
+                <MudTd>@GetStatusText(context.PaymentStatus)</MudTd>
+                <MudTd>@FormatPrice(context.FactorDetails.Sum(s=>(s.UnitPrice ?? 0) * (s.Count ?? 0)))</MudTd>
+                <MudTd>
+                    <MudButton Variant="Variant.Text" Href="@($"{RouteConstants.Store.OrderDetail}{context.Id}")" StartIcon="@Icons.Material.Filled.Receipt">جزئیات</MudButton>
+                </MudTd>
+            </RowTemplate>
+        </MudTable>
+        </MudHidden>
+
+        <MudHidden Breakpoint="Breakpoint.MdAndUp">
+            <MudStack Spacing="2">
+                @foreach (var o in _orders)
+                {
+                    <MudPaper Class="pa-3 rounded-lg" Outlined="true">
+                        <MudStack Spacing="1">
+                            <MudStack Row="true" Justify="Justify.SpaceBetween">
+                                <MudText>سفارش #@o.Id</MudText>
+                                <MudText Class="mud-text-secondary">
+                                    @if (o.PaymentDate != null)
+                                    {
+                                        @o.PaymentDate.ToDateTime().MiladiToJalaliWithTime()
+                                    }
+                                    else
+                                    {
+                                        <text>در انتظار پرداخت</text>
+                                    }
+                                </MudText>
+                            </MudStack>
+                            <MudStack Row="true" Justify="Justify.SpaceBetween">
+                                <MudText>وضعیت: @GetStatusText(o.PaymentStatus)</MudText>
+                                <MudText Color="Color.Primary">@FormatPrice(o.FactorDetails.Sum(s=>(s.UnitPrice ?? 0) * (s.Count ?? 0)))</MudText>
+                            </MudStack>
+                            <MudStack Row="true" Justify="Justify.FlexEnd">
+                                <MudButton Size="Size.Small" Variant="Variant.Outlined" Href="@($"{RouteConstants.Store.OrderDetail}{o.Id}")" StartIcon="@Icons.Material.Filled.Receipt">جزئیات</MudButton>
+                            </MudStack>
+                        </MudStack>
+                    </MudPaper>
+                }
+            </MudStack>
+        </MudHidden>
+    }
 </MudContainer>

src/FrontOffice.Main/Pages/Store/Orders.razor.cs

@@ -1,5 +1,5 @@
+using System;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
-using DateTimeConverterCL;
 using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
 using Messages = CMSMicroservice.Protobuf.Protos;
@@ -10,6 +10,7 @@ namespace FrontOffice.Main.Pages.Store;
 public partial class Orders : ComponentBase
 {
     [Inject] private OrderService OrderService { get; set; } = default!;
+    [Inject] private VATService VAT { get; set; } = default!;
 
     private List<GetUserOrderResponse> _orders = new();
     private bool _loading;
@@ -32,81 +33,28 @@ public partial class Orders : ComponentBase
         }
     }
 
-    private void ViewOrder(long orderId)
+    protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        Navigation.NavigateTo($"{RouteConstants.Store.OrderDetail}{orderId}");
-    }
-
-    private static string FormatPrice(long price) => $"{price:N0}";
-
-    private static string FormatDate(GetUserOrderResponse order)
-    {
-        try
+        if (firstRender)
         {
-            var timestamp = order.PaymentDate;
-            if (timestamp is null)
-                return "در انتظار پرداخت";
-
-            return timestamp.ToDateTime().ToLocalTime().MiladiToJalaliWithTime();
+            // بارگذاری نرخ VAT
+            await VAT.LoadAsync();
         }
-        catch
+        await base.OnAfterRenderAsync(firstRender);
+    }
+
+    private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
+
+
+    private string GetStatusText(Messages.PaymentStatus contextPaymentStatus)
+    {
+        return contextPaymentStatus switch
         {
-            return "—";
-        }
+            Messages.PaymentStatus.Pending => "در انتظار پرداخت",
+            Messages.PaymentStatus.Success => "پرداخت شده",
+            Messages.PaymentStatus.Reject => "پرداخت ناموفق",
+            _ => "نامشخص",
+        };
     }
-
-    private static int GetItemsCount(GetUserOrderResponse order) =>
-        order.FactorDetails.Sum(f => f.Count ?? 0);
-
-    private static long GetTotalAmount(GetUserOrderResponse order)
-    {
-        if (order.VatInfo is not null && order.VatInfo.TotalAmount > 0)
-            return order.VatInfo.TotalAmount;
-
-        if (order.Amount > 0)
-            return order.Amount;
-
-        return order.FactorDetails.Sum(f => (f.UnitPrice ?? 0) * (f.Count ?? 0));
-    }
-
-    private static string GetPaymentStatusText(Messages.PaymentStatus status) => status switch
-    {
-        Messages.PaymentStatus.Pending => "در انتظار پرداخت",
-        Messages.PaymentStatus.Success => "پرداخت شده",
-        Messages.PaymentStatus.Reject => "پرداخت ناموفق",
-        _ => "نامشخص"
-    };
-
-    private static Color GetPaymentStatusColor(Messages.PaymentStatus status) => status switch
-    {
-        Messages.PaymentStatus.Pending => Color.Warning,
-        Messages.PaymentStatus.Success => Color.Success,
-        Messages.PaymentStatus.Reject => Color.Error,
-        _ => Color.Default
-    };
-
-    // Domain/public_messages: None=0, Pending=1, InTransit=2, Delivered=3, Returned=4, Cancelled=5, ReadyForOfficePickup=6
-    private static string GetDeliveryStatusText(int status) => status switch
-    {
-        0 => "بدون ارسال",
-        1 => "در انتظار ارسال",
-        2 => "ارسال شده",
-        3 => "تحویل داده شده",
-        4 => "مرجوع شده",
-        5 => "لغو شده",
-        6 => "آماده تحویل در دفتر",
-        _ => "نامشخص"
-    };
-
-    private static Color GetDeliveryStatusColor(int status) => status switch
-    {
-        0 => Color.Default,
-        1 => Color.Warning,
-        2 => Color.Primary,
-        3 => Color.Success,
-        4 => Color.Error,
-        5 => Color.Dark,
-        6 => Color.Primary,
-        _ => Color.Default
-    };
 }
+

src/FrontOffice.Main/Pages/Store/ProductDetail.razor

@@ -78,24 +78,15 @@ else
                     @*     </MudStack> *@
                     @* } *@
                     <MudDivider Class="my-2"/>
-                    @if (_isAuthenticated)
-                    {
-                        <MudStack Spacing="1">
-                            <MudText Typo="Typo.h5" Color="Color.Primary">@FormatPrice(_product.Price)</MudText>
-                            @if (VAT.IsEnabled)
-                            {
-                                <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                    (شامل @VAT.VatPercentage% مالیات بر ارزش افزوده)
-                                </MudText>
-                            }
-                        </MudStack>
-                    }
-                    else
-                    {
-                        <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Outlined" Icon="@Icons.Material.Filled.Lock">
-                            برای مشاهده قیمت ابتدا وارد شوید
-                        </MudAlert>
-                    }
+                    <MudStack Spacing="1">
+                        <MudText Typo="Typo.h5" Color="Color.Primary">@FormatPrice(_product.Price)</MudText>
+                        @if (VAT.IsEnabled)
+                        {
+                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
+                                (شامل @VAT.VatPercentage% مالیات بر ارزش افزوده)
+                            </MudText>
+                        }
+                    </MudStack>
                     
                     <!-- نمایش وضعیت موجودی -->
                     @if (IsInStock)
@@ -150,27 +141,18 @@ else
             {
                 <MudGrid Class="align-center" Justify="Justify.SpaceBetween">
                     <MudItem xs="6">
-                        @if (_isAuthenticated)
-                        {
-                            <MudStack Spacing="1">
-                                @if (HasDiscount && OriginalPrice is not null)
-                                {
-                                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
-                                        <MudText Typo="Typo.caption"
-                                                 Class="mud-text-secondary mud-line-through">@FormatPrice(OriginalPrice.Value)</MudText>
-                                        <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small"
-                                                 Label="true">@($"٪{_product!.Discount}")</MudChip>
-                                    </MudStack>
-                                }
-                                <MudText Typo="Typo.h6" Color="Color.Primary">@FormatPrice(TotalPrice)</MudText>
-                            </MudStack>
-                        }
-                        else
-                        {
-                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                <MudIcon Icon="@Icons.Material.Filled.Lock" Size="Size.Small" Class="me-1"/>برای مشاهده قیمت وارد شوید
-                            </MudText>
-                        }
+                        <MudStack Spacing="1">
+                            @if (HasDiscount && OriginalPrice is not null)
+                            {
+                                <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                                    <MudText Typo="Typo.caption"
+                                             Class="mud-text-secondary mud-line-through">@FormatPrice(OriginalPrice.Value)</MudText>
+                                    <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small"
+                                             Label="true">@($"٪{_product!.Discount}")</MudChip>
+                                </MudStack>
+                            }
+                            <MudText Typo="Typo.h6" Color="Color.Primary">@FormatPrice(TotalPrice)</MudText>
+                        </MudStack>
                     </MudItem>
 
                     @if (IsInCart)

src/FrontOffice.Main/Pages/Store/ProductDetail.razor.cs

@@ -12,16 +12,11 @@ public partial class ProductDetail : ComponentBase, IDisposable
     [Inject] private ProductService ProductService { get; set; } = default!;
     [Inject] private CartService Cart { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private GuestActionGate GuestGate { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
-
-    private bool _isAuthenticated;
 
     [Parameter] public long id { get; set; }
 
     private Product? _product;
     private bool _loading;
-    private bool _initialized;
     private int _qty = 1;
     private const int MinQty = 1;
     
@@ -49,35 +44,29 @@ public partial class ProductDetail : ComponentBase, IDisposable
     private bool IsInCart => CurrentCartItem is not null;
     private int CurrentCartQuantity => CurrentCartItem?.Quantity ?? 0;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
-        await Cart.EnsureInitializedAsync();
-        Cart.OnChange += HandleCartChanged;
-        _initialized = true;
-    }
-
     protected override async Task OnParametersSetAsync()
     {
-        if (!_initialized || id <= 0)
-            return;
-
-        await LoadProductAsync();
+      
     }
 
-    private async Task LoadProductAsync()
+    protected override async Task OnInitializedAsync()
     {
+        // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
+        await Cart.EnsureInitializedAsync();
+        Cart.OnChange += HandleCartChanged;
+        
+   
+        
         _loading = true;
         _product = await ProductService.GetByIdAsync(id);
         _loading = false;
-
         if (_product is not null)
         {
             _galleryItems = BuildGalleryItems(_product);
             _selectedGalleryImage = _galleryItems.FirstOrDefault();
             _categoryPaths = _product.Categories;
             UpdateBreadcrumb();
-            _qty = Math.Clamp(CurrentCartItem?.Quantity ?? MinQty, MinQty, Math.Max(MinQty, MaxQty));
+            _qty = Math.Clamp(CurrentCartItem?.Quantity ?? _qty, MinQty, MaxQty);
         }
         else
         {
@@ -85,33 +74,32 @@ public partial class ProductDetail : ComponentBase, IDisposable
             _categoryPaths = Array.Empty<ProductCategoryPathInfo>();
             _breadcrumbItems.Clear();
         }
+
+        StateHasChanged();
+        await base.OnInitializedAsync();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+       await base.OnAfterRenderAsync(firstRender);
         if (firstRender)
         {
+            // بارگذاری نرخ VAT
             await VAT.LoadAsync();
         }
-
-        await base.OnAfterRenderAsync(firstRender);
     }
 
     private async Task AddToCart()
     {
         if (_product is null) return;
-        var product = _product;
-        await GuestGate.RunAsync(() => Cart.Add(product, 1));
+        await Cart.Add(_product, 1);
     }
 
     private async Task RemoveFromCart()
     {
         if (_product is null) return;
-        await GuestGate.RunAsync(async () =>
-        {
-            _qty--;
-            await Cart.UpdateQuantity(CurrentCartItem!.ProductId, _qty);
-        });
+        _qty--;
+        await Cart.UpdateQuantity(CurrentCartItem.ProductId, _qty);
     }
 
     private void IncreaseLocalQty()

src/FrontOffice.Main/Pages/Store/Products.razor

@@ -118,8 +118,7 @@
             @foreach (var p in _products)
             {
                 <MudItem xs="6" sm="6" md="3"
-                         onclick="@(() => OpenProduct(p.Id))">
-                    <div id="@($"shop-product-{p.Id}")" class="h-100">
+                         onclick="@(() => Navigation.NavigateTo($"{RouteConstants.Store.ProductDetail}{p.Id}"))">
                     <MudCard Class="rounded-lg h-100 d-flex flex-column overflow-hidden"
                              Style="cursor:pointer;">
 
@@ -142,16 +141,8 @@
                             </div>
                             <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
                                 <MudText Typo="Typo.subtitle1">@p.Title</MudText>
-                                @if (_isAuthenticated)
-                                {
-                                    <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</MudText>
-                                }
-                                else
-                                {
-                                    <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                        <MudIcon Icon="@Icons.Material.Filled.Lock" Size="Size.Small" Class="me-1"/>برای مشاهده قیمت وارد شوید
-                                    </MudText>
-                                }
+                                <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</MudText>
+
                             </div>
                         </MudCardContent>
                         <MudCardActions Class="mt-auto d-flex justify-space-between pa-2">
@@ -165,7 +156,6 @@
                             </MudButton>
                         </MudCardActions>
                     </MudCard>
-                    </div>
                 </MudItem>
             }
         </MudGrid>

src/FrontOffice.Main/Pages/Store/Products.razor.cs

@@ -2,22 +2,26 @@ using System.Linq;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
+using Microsoft.AspNetCore.WebUtilities;
 using FrontOffice.Main.Utilities;
 
 namespace FrontOffice.Main.Pages.Store;
 
+public enum ProductSortOption
+{
+    PriceDesc,  // گران‌ترین (پیش‌فرض)
+    PriceAsc,   // ارزان‌ترین
+    Newest,     // جدیدترین
+    Title       // الفبایی
+}
+
 public partial class Products : ComponentBase, IDisposable
 {
     [Inject] private ProductService ProductService { get; set; } = default!;
     [Inject] private CategoryService CategoryService { get; set; } = default!;
     [Inject] private CartService Cart { get; set; } = default!;
     [Inject] private VATService VAT { get; set; } = default!;
-    [Inject] private GuestActionGate GuestGate { get; set; } = default!;
-    [Inject] private AuthService AuthService { get; set; } = default!;
-    [Inject] private IJSRuntime Js { get; set; } = default!;
 
-    private bool _isAuthenticated;
     private string _query = string.Empty;
     private bool _loading;
     private bool _loadingMore;
@@ -28,140 +32,87 @@ public partial class Products : ComponentBase, IDisposable
     private List<Product> _products = new();
     private long? _activeCategoryId;
     private string? _activeCategoryTitle;
-    private ProductSortOption _sortOption = ProductSortOption.PriceDesc;
-    private bool _ignoreNextLocationChange;
-    private bool _pendingScrollRestore;
+    
+    private ProductSortOption _sortOption = ProductSortOption.PriceDesc; // پیش‌فرض: گران‌ترین
 
     protected override async Task OnInitializedAsync()
     {
-        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
+        // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
         await Cart.EnsureInitializedAsync();
         Cart.OnChange += StateHasChanged;
         Navigation.LocationChanged += HandleLocationChanged;
-        ApplyStateFromUri();
-        await LoadPages(_currentPage);
-        _pendingScrollRestore = true;
+        await LoadInitial();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
-            await VAT.LoadAsync();
-
-        if (_pendingScrollRestore && !_loading && _products.Count > 0)
         {
-            _pendingScrollRestore = false;
-            var payload = await ShopListScrollRestore.TakeAsync(Js, ShopListScrollRestore.StoreKey);
-            if (payload is not null)
-                await ShopListScrollRestore.RestoreAsync(Js, payload);
+            // بارگذاری نرخ VAT
+            await VAT.LoadAsync();
         }
-
         await base.OnAfterRenderAsync(firstRender);
     }
 
-    private void ApplyStateFromUri()
-    {
-        var state = ShopListQueryState.Parse(Navigation.ToAbsoluteUri(Navigation.Uri));
-        _query = state.Query;
-        _sortOption = ShopListQueryState.ParseSortOption(state.Sort);
-        _activeCategoryId = state.CategoryId;
-        _currentPage = state.Pages;
-    }
-
-    private ShopListQueryState CaptureState() => new()
-    {
-        Query = _query,
-        Sort = ShopListQueryState.ToSortKey(_sortOption),
-        CategoryId = _activeCategoryId,
-        Pages = Math.Max(1, _currentPage)
-    };
-
-    private void SyncUrl()
-    {
-        var target = CaptureState().ToRelativeUrl(RouteConstants.Store.Products);
-        var currentPathAndQuery = Navigation.ToAbsoluteUri(Navigation.Uri).PathAndQuery;
-        if (string.Equals(currentPathAndQuery, target, StringComparison.OrdinalIgnoreCase)
-            || string.Equals(currentPathAndQuery, target + "/", StringComparison.OrdinalIgnoreCase))
-            return;
-
-        _ignoreNextLocationChange = true;
-        Navigation.NavigateTo(target, replace: true);
-    }
-
-    private async Task LoadPages(int pagesToLoad)
+    private async Task LoadInitial()
     {
         _loading = true;
+        _currentPage = 1;
         _products.Clear();
-        _hasMore = true;
-        pagesToLoad = Math.Max(1, pagesToLoad);
-        var sortBy = ShopListQueryState.ToApiSortBy(_sortOption);
-
-        for (var page = 1; page <= pagesToLoad; page++)
-        {
-            var result = await ProductService.GetProductsPagedAsync(
-                _query, _activeCategoryId, sortBy, page, PageSize);
-            if (page == 1)
-            {
-                _products = result.Products;
-                _totalCount = result.TotalCount;
-            }
-            else
-            {
-                _products.AddRange(result.Products);
-            }
-
-            _currentPage = page;
-            _hasMore = result.HasNext;
-            if (!_hasMore)
-                break;
-        }
-
+        UpdateCategoryFilterFromUri();
+        var sortBy = GetSortByValue();
+        var result = await ProductService.GetProductsPagedAsync(_query, _activeCategoryId, sortBy, _currentPage, PageSize);
+        _products = result.Products;
+        _hasMore = result.HasNext;
+        _totalCount = result.TotalCount;
         _activeCategoryTitle = _activeCategoryId is { } categoryId
             ? (await CategoryService.GetByIdAsync(categoryId))?.Title
             : null;
         _loading = false;
     }
 
-    private async Task ReloadFromFilters()
-    {
-        _currentPage = 1;
-        await LoadPages(1);
-        SyncUrl();
-        StateHasChanged();
-    }
-
     private async Task LoadMore()
     {
         if (_loadingMore || !_hasMore) return;
-
+        
         _loadingMore = true;
         StateHasChanged();
-
+        
         _currentPage++;
-        var sortBy = ShopListQueryState.ToApiSortBy(_sortOption);
-        var result = await ProductService.GetProductsPagedAsync(
-            _query, _activeCategoryId, sortBy, _currentPage, PageSize);
+        var sortBy = GetSortByValue();
+        var result = await ProductService.GetProductsPagedAsync(_query, _activeCategoryId, sortBy, _currentPage, PageSize);
         _products.AddRange(result.Products);
         _hasMore = result.HasNext;
-        SyncUrl();
-
+        
         _loadingMore = false;
         StateHasChanged();
     }
 
-    private async Task OnSortChanged() => await ReloadFromFilters();
+    private string GetSortByValue()
+    {
+        return _sortOption switch
+        {
+            ProductSortOption.PriceDesc => "price desc",
+            ProductSortOption.PriceAsc => "price asc",
+            ProductSortOption.Newest => "id desc",
+            ProductSortOption.Title => "title asc",
+            _ => "price desc"
+        };
+    }
 
-    private async Task OnQueryChanged(KeyboardEventArgs _) => await ReloadFromFilters();
+    private async Task OnSortChanged()
+    {
+        await LoadInitial();
+    }
+
+    private async Task OnQueryChanged(KeyboardEventArgs _)
+    {
+        await LoadInitial();
+    }
 
     private async Task AddToCart(Product p)
     {
-        await GuestGate.RunAsync(() => Cart.Add(p, 1));
-    }
-
-    private async Task OpenProduct(long productId)
-    {
-        await ShopListScrollRestore.SaveAsync(Js, ShopListScrollRestore.StoreKey, productId);
-        Navigation.NavigateTo($"{RouteConstants.Store.ProductDetail}{productId}");
+        await Cart.Add(p, 1);
     }
 
     private string FormatPrice(long price) => $"{VAT.AddVAT(price):N0} تومان";
@@ -174,33 +125,24 @@ public partial class Products : ComponentBase, IDisposable
 
     private void HandleLocationChanged(object? sender, LocationChangedEventArgs args)
     {
-        if (_ignoreNextLocationChange)
+        _ = InvokeAsync(LoadInitial);
+    }
+
+    private void UpdateCategoryFilterFromUri()
+    {
+        var uri = Navigation.ToAbsoluteUri(Navigation.Uri);
+        if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("category", out var values) &&
+            long.TryParse(values.FirstOrDefault(), out var categoryId))
         {
-            _ignoreNextLocationChange = false;
+            _activeCategoryId = categoryId;
             return;
         }
 
-        var uri = Navigation.ToAbsoluteUri(args.Location);
-        if (!uri.AbsolutePath.Equals(RouteConstants.Store.Products, StringComparison.OrdinalIgnoreCase))
-            return;
-
-        var incoming = ShopListQueryState.Parse(uri);
-        if (incoming.Matches(CaptureState()))
-            return;
-
-        _ = InvokeAsync(async () =>
-        {
-            ApplyStateFromUri();
-            await LoadPages(_currentPage);
-            _pendingScrollRestore = true;
-            StateHasChanged();
-        });
+        _activeCategoryId = null;
     }
 
-    private async Task ClearCategoryFilter()
+    private void ClearCategoryFilter()
     {
-        _activeCategoryId = null;
-        _activeCategoryTitle = null;
-        await ReloadFromFilters();
+        Navigation.NavigateTo(RouteConstants.Store.Products);
     }
 }

src/FrontOffice.Main/Pages/_Host.cshtml

@@ -1,5 +1,4 @@
 @page "/"
-@model FrontOffice.Main.Pages.HostModel
 @using Microsoft.AspNetCore.Components.Web
 @namespace FrontOffice.Main.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@@ -9,26 +8,6 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@Model.Seo.Title</title>
-    <meta name="description" content="@Model.Seo.Description" />
-    <link rel="canonical" href="@Model.Seo.CanonicalUrl" />
-    @if (Model.Seo.NoIndex)
-    {
-        <meta name="robots" content="noindex, nofollow" />
-    }
-    else
-    {
-        <meta name="robots" content="index, follow" />
-    }
-    <meta property="og:type" content="website" />
-    <meta property="og:locale" content="fa_IR" />
-    <meta property="og:title" content="@Model.Seo.Title" />
-    <meta property="og:description" content="@Model.Seo.Description" />
-    <meta property="og:url" content="@Model.Seo.CanonicalUrl" />
-    <meta property="og:site_name" content="کارابازار سلامت" />
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:title" content="@Model.Seo.Title" />
-    <meta name="twitter:description" content="@Model.Seo.Description" />
     <meta name="theme-color" content="#7c4dff" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="default" />
@@ -36,7 +15,7 @@
     <link rel="icon" type="image/png" href="favicon.png"/>
     <component type="typeof(HeadOutlet)" render-mode="Server" />
 
-    @* <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" /> *@
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
     <!-- MudBlazor CSS (باید قبل از site.css باشه تا override بشه) -->
     <link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" asp-append-version="true" />
     <!-- Custom styles (بعد از MudBlazor برای override) -->
@@ -44,26 +23,8 @@
     <link href="FrontOffice.Main.styles.css" rel="stylesheet" />
     <!-- d3-org-chart custom styles -->
     <link href="css/org-chart.css" rel="stylesheet" asp-append-version="true" />
-    <style>
-        .seo-crawlable {
-            position: absolute;
-            width: 1px;
-            height: 1px;
-            padding: 0;
-            margin: -1px;
-            overflow: hidden;
-            clip: rect(0, 0, 0, 0);
-            white-space: nowrap;
-            border: 0;
-        }
-    </style>
 </head>
 <body>
-    @if (!string.IsNullOrWhiteSpace(Model.Seo.CrawlableContent))
-    {
-        <div class="seo-crawlable">@Model.Seo.CrawlableContent</div>
-    }
-
     <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">

src/FrontOffice.Main/Pages/_Host.cshtml.cs

@@ -1,21 +0,0 @@
-using FrontOffice.Main.Utilities.Seo;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-
-namespace FrontOffice.Main.Pages;
-
-public class HostModel : PageModel
-{
-    private readonly SeoMetadataProvider _seoMetadataProvider;
-
-    public SeoPageMetadata Seo { get; private set; } = default!;
-
-    public HostModel(SeoMetadataProvider seoMetadataProvider)
-    {
-        _seoMetadataProvider = seoMetadataProvider;
-    }
-
-    public async Task OnGetAsync()
-    {
-        Seo = await _seoMetadataProvider.GetForPathAsync(Request.Path);
-    }
-}

src/FrontOffice.Main/Program.cs

@@ -1,6 +1,5 @@
 using FluentValidation;
 using FrontOffice.Main.Utilities;
-using FrontOffice.Main.Utilities.Seo;
 using System.Net;
 using FrontOffice.Main.Utilities.Pdf;
 
@@ -13,7 +12,6 @@ builder.Services.AddServerSideBlazor();
 #region AddCommonServices
 
 builder.Services.AddCommonServices();
-builder.Services.Configure<SeoSettings>(builder.Configuration.GetSection(SeoSettings.SectionName));
 builder.Services.AddSingleton<MainService>();
 
 #endregion
@@ -57,17 +55,6 @@ webApp.UseStaticFiles();
 webApp.UseRouting();
 
 webApp.MapBlazorHub();
-
-webApp.MapGet("/sitemap.xml", async (SitemapGenerator sitemapGenerator, CancellationToken cancellationToken) =>
-{
-    var bytes = await sitemapGenerator.GenerateBytesAsync(cancellationToken);
-    return Results.File(bytes, "application/xml; charset=utf-8");
-});
-
-// Legacy URLs from old site / common e-commerce paths — redirect to homepage
-webApp.MapGet("/wishlist", () => Results.Redirect("/", permanent: true));
-webApp.MapGet("/wishlist/", () => Results.Redirect("/", permanent: true));
-
 webApp.MapFallbackToPage("/_Host");
 
 

src/FrontOffice.Main/Shared/AuthDialog.razor

@@ -22,9 +22,7 @@
                          PhoneNumber="@_phoneNumber"
                          ResendRemaining="_resendRemaining"
                          OnChangePhone="ChangePhoneAsync"
-                         OnResendOtp="ResendOtpAsync"
-                         ReferralCode="@_referralCode"
-                         ReferralCodeChanged="OnReferralCodeChanged" />
+                         OnResendOtp="ResendOtpAsync" />
     </div>
 }
 else
@@ -53,9 +51,7 @@ else
                                  PhoneNumber="@_phoneNumber"
                                  ResendRemaining="_resendRemaining"
                                  OnChangePhone="ChangePhoneAsync"
-                                 OnResendOtp="ResendOtpAsync"
-                                 ReferralCode="@_referralCode"
-                                 ReferralCodeChanged="OnReferralCodeChanged" />
+                                 OnResendOtp="ResendOtpAsync" />
 
                 <MudStack Class="mt-4" Spacing="2">
                     @if (_currentStep == AuthStep.Phone)

src/FrontOffice.Main/Shared/AuthDialog.razor.cs

@@ -42,9 +42,6 @@ public partial class AuthDialog : IDisposable
     private string? _captchaCode;
     private string? _captchaInput;
 
-    // Referral code field
-    private string? _referralCode;
-
     [Inject] private ILocalStorageService LocalStorage { get; set; } = default!;
     [Inject] private UserContract.UserContractClient UserClient { get; set; } = default!;
 
@@ -69,20 +66,9 @@ public partial class AuthDialog : IDisposable
         {
             _phoneRequest.Mobile = storedPhone;
         }
-
-        _referralCode = await LocalStorage.GetItemAsync<string>("referral:code");
         // await LocalStorage.RemoveItemAsync(TokenStorageKey);
     }
 
-    private async Task OnReferralCodeChanged(string? value)
-    {
-        _referralCode = value;
-        if (!string.IsNullOrWhiteSpace(value))
-            await LocalStorage.SetItemAsync("referral:code", value);
-        else
-            await LocalStorage.RemoveItemAsync("referral:code");
-    }
-
     private void GenerateCaptcha()
     {
         _captchaCode = Guid.NewGuid().ToString("N")[..6].ToUpperInvariant();
@@ -196,12 +182,9 @@ public partial class AuthDialog : IDisposable
             _verifyRequest.Mobile = _phoneNumber;
 
             var storedReferralCode = await LocalStorage.GetItemAsync<string>("referral:code");
-            var effectiveReferralCode = !string.IsNullOrWhiteSpace(_referralCode)
-                ? _referralCode
-                : storedReferralCode;
-            if (!string.IsNullOrWhiteSpace(effectiveReferralCode))
+            if (!string.IsNullOrWhiteSpace(storedReferralCode))
             {
-                _verifyRequest.ParentReferralCode = effectiveReferralCode;
+                _verifyRequest.ParentReferralCode = storedReferralCode;
             }
 
             var validationResult = true; // _verifyRequestValidator.Validate(_verifyRequest);

src/FrontOffice.Main/Shared/ClubMembershipContractDialog.razor

@@ -9,7 +9,6 @@
 @inject AuthService AuthService
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation
-@inject PackageService PackageService
 
 <MudDialog DisableSidePadding="true">
     <DialogContent>
@@ -124,23 +123,6 @@
     private readonly Guid _signGuid = Guid.NewGuid();
     private System.Timers.Timer? _timer;
     private const string TokenStorageKey = "auth:token";
-    private string _packageDisplayName = "پکیج پایه";
-    private string _packageDisplayPrice = "۵۶ میلیون تومان";
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            var packages = await PackageService.GetAllPackagesAsync();
-            var basePackage = packages.FirstOrDefault(p => p.IsBasePackage) ?? packages.FirstOrDefault();
-            if (basePackage != null)
-            {
-                _packageDisplayName = basePackage.Title;
-                _packageDisplayPrice = $"{basePackage.Price:N0} تومان";
-            }
-        }
-        catch { /* fallback to defaults */ }
-    }
 
     // این Modal غیرقابل بسته شدن است - Options در ShowAsync تنظیم می‌شوند
 
@@ -260,7 +242,7 @@
 <p>۱-۳. پاداش معرفی: مبلغی که به ازای هر معرفی موفق به کاربر تعلق می‌گیرد.</p>
 
 <p><strong>ماده ۲ - شرایط عضویت</strong></p>
-<p>۲-۱. کاربر با پرداخت مبلغ {_packageDisplayPrice} ({_packageDisplayName})، امکان عضویت در باشگاه مشتریان را خواهد داشت.</p>
+<p>۲-۱. کاربر با پرداخت مبلغ ۵۶ میلیون تومان (پکیج پایه)، امکان عضویت در باشگاه مشتریان را خواهد داشت.</p>
 <p>۲-۲. پس از امضای این قرارداد، لینک دعوت کاربر فعال خواهد شد.</p>
 <p>۲-۳. کاربر می‌تواند حداکثر ۲ نفر را مستقیماً دعوت کند (یک نفر در تیم اول و یک نفر در تیم دوم).</p>
 

src/FrontOffice.Main/Shared/Footer.razor

@@ -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>
 

src/FrontOffice.Main/Shared/InsufficientCreditDialog.razor

@@ -1,152 +0,0 @@
-@using FrontOffice.Main.Utilities
-
-<MudDialog>
-    <TitleContent>
-        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-            <MudIcon Icon="@Icons.Material.Filled.AccountBalanceWallet" Color="Color.Warning" />
-            <MudText Typo="Typo.h6">موجودی کیف پول اصلی کافی نیست</MudText>
-        </MudStack>
-    </TitleContent>
-    <DialogContent>
-        <MudStack Spacing="2">
-            @if (AllowChargeCredit)
-            {
-                @if (IsMagicWallet && !MagicCeilingFull)
-                {
-                    <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                        برای تکمیل این سفارش موجودی شما کافی نیست. کیف پول شما در حالت جادویی است؛ برای دریافت ضریب، از مسیر شارژ جادویی اقدام کنید.
-                    </MudText>
-                }
-                else if (IsMagicWallet && MagicCeilingFull)
-                {
-                    <MudAlert Severity="Severity.Warning" Dense="true" Variant="Variant.Outlined">
-                        سقف شارژ جادویی شما در این دور پر است. می‌توانید به‌صورت استثنایی کیف اصلی را بدون ضریب (۱:۱) شارژ کنید.
-                    </MudAlert>
-                }
-                else
-                {
-                    <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                        برای تکمیل این سفارش، موجودی اصلی شما کافی نیست. می‌توانید کیف پول را شارژ کنید و سپس سفارش را ثبت کنید.
-                    </MudText>
-                }
-            }
-            else
-            {
-                <MudAlert Severity="Severity.Warning" Dense="true" Variant="Variant.Outlined">
-                    برای شارژ کیف پول اصلی ابتدا باید پکیج را خریداری کرده و قرارداد باشگاه مشتریان را امضا کنید.
-                </MudAlert>
-            }
-
-            <MudPaper Outlined="true" Class="pa-3 rounded-lg">
-                <MudStack Spacing="1">
-                    <MudStack Row="true" Justify="Justify.SpaceBetween">
-                        <MudText Typo="Typo.body2">موجودی فعلی:</MudText>
-                        <MudText Typo="Typo.body2"><strong>@FormatPrice(CurrentBalance)</strong></MudText>
-                    </MudStack>
-                    <MudStack Row="true" Justify="Justify.SpaceBetween">
-                        <MudText Typo="Typo.body2">مبلغ سفارش:</MudText>
-                        <MudText Typo="Typo.body2"><strong>@FormatPrice(RequiredAmount)</strong></MudText>
-                    </MudStack>
-                    <MudDivider Class="my-1" />
-                    <MudStack Row="true" Justify="Justify.SpaceBetween">
-                        <MudText Typo="Typo.body2" Color="Color.Error">کمبود:</MudText>
-                        <MudText Typo="Typo.body2" Color="Color.Error"><strong>@FormatPrice(ShortfallAmount)</strong></MudText>
-                    </MudStack>
-                </MudStack>
-            </MudPaper>
-        </MudStack>
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel">بستن</MudButton>
-        @if (AllowChargeCredit)
-        {
-            <MudButton Variant="Variant.Filled"
-                       Color="@(IsMagicWallet && !MagicCeilingFull ? Color.Secondary : Color.Primary)"
-                       StartIcon="@(IsMagicWallet && !MagicCeilingFull ? Icons.Material.Filled.AutoAwesome : Icons.Material.Filled.Payment)"
-                       OnClick="GoToCharge">
-                @ChargeButtonLabel
-            </MudButton>
-        }
-        else if (!HasPurchasedPackage)
-        {
-            <MudButton Variant="Variant.Filled"
-                       Color="Color.Primary"
-                       StartIcon="@Icons.Material.Filled.CardGiftcard"
-                       OnClick="GoToPackages">
-                مشاهده پکیج‌ها
-            </MudButton>
-        }
-        else
-        {
-            <MudButton Variant="Variant.Filled"
-                       Color="Color.Primary"
-                       StartIcon="@Icons.Material.Filled.Handshake"
-                       OnClick="GoToClubMembership">
-                امضای قرارداد باشگاه
-            </MudButton>
-        }
-    </DialogActions>
-</MudDialog>
-
-@code {
-    [CascadingParameter]
-    private IMudDialogInstance MudDialog { get; set; } = default!;
-
-    [Parameter]
-    public long CurrentBalance { get; set; }
-
-    [Parameter]
-    public long RequiredAmount { get; set; }
-
-    [Parameter]
-    public long ShortfallAmount { get; set; }
-
-    /// <summary>اگر false باشد، به صفحه شارژ هدایت نمی‌شود.</summary>
-    [Parameter]
-    public bool AllowChargeCredit { get; set; } = true;
-
-    [Parameter]
-    public bool HasPurchasedPackage { get; set; }
-
-    [Parameter]
-    public bool IsMagicWallet { get; set; }
-
-    /// <summary>سقف واریز جادویی این دور پر شده است.</summary>
-    [Parameter]
-    public bool MagicCeilingFull { get; set; }
-
-    private string ChargeButtonLabel =>
-        IsMagicWallet && !MagicCeilingFull
-            ? "شارژ کیف جادویی"
-            : IsMagicWallet && MagicCeilingFull
-                ? "شارژ عادی بدون ضریب (سقف جادویی پر است)"
-                : "شارژ حساب اصلی";
-
-    private void Cancel() => MudDialog.Cancel();
-
-    private void GoToCharge()
-    {
-        if (IsMagicWallet && !MagicCeilingFull)
-        {
-            MudDialog.Cancel();
-            Navigation.NavigateTo(RouteConstants.Profile.MagicWallet);
-            return;
-        }
-
-        MudDialog.Close(DialogResult.Ok(ShortfallAmount));
-    }
-
-    private void GoToPackages()
-    {
-        MudDialog.Cancel();
-        Navigation.NavigateTo(RouteConstants.Package.List);
-    }
-
-    private void GoToClubMembership()
-    {
-        MudDialog.Cancel();
-        Navigation.NavigateTo(RouteConstants.Club.Membership);
-    }
-
-    private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
-}

src/FrontOffice.Main/Shared/PackagePurchaseDialog.razor

@@ -1,234 +0,0 @@
-@using FrontOffice.Main.Utilities
-@inject PackageService PackageService
-@inject ISnackbar Snackbar
-
-<MudDialog>
-    <TitleContent>
-        @if (_selectedPackage != null)
-        {
-            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                <MudIconButton Icon="@Icons.Material.Filled.ArrowForward"
-                               Size="Size.Small"
-                               OnClick="BackToList" />
-                <MudText Typo="Typo.h6">انتخاب روش پرداخت</MudText>
-            </MudStack>
-        }
-        else
-        {
-            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                <MudIcon Icon="@Icons.Material.Filled.ShoppingCart" Color="Color.Primary" />
-                <MudText Typo="Typo.h6">انتخاب پکیج</MudText>
-            </MudStack>
-        }
-    </TitleContent>
-    <DialogContent>
-        @if (_isLoading)
-        {
-            <MudStack AlignItems="AlignItems.Center" Class="py-8">
-                <MudProgressCircular Color="Color.Primary" Indeterminate="true" />
-                <MudText Typo="Typo.body2" Class="mud-text-secondary mt-2">در حال بارگذاری پکیج‌ها...</MudText>
-            </MudStack>
-        }
-        else if (_selectedPackage != null)
-        {
-            @* ── Step 2: Payment method selection ── *@
-            <MudStack Spacing="3">
-                @* Selected Package Summary *@
-                <MudPaper Elevation="0" Class="pa-3 rounded-lg" Style="background:rgba(99,102,241,.06);">
-                    <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                        <MudAvatar Size="Size.Medium" Style="background:rgba(99,102,241,.15); color:#6366f1;">
-                            <MudIcon Icon="@Icons.Material.Filled.Inventory2" />
-                        </MudAvatar>
-                        <MudStack Spacing="0" Class="flex-grow-1">
-                            <MudText Typo="Typo.subtitle1"><b>@_selectedPackage.Title</b></MudText>
-                            <MudText Typo="Typo.body2" Color="Color.Success">@_selectedPackage.FormattedPrice</MudText>
-                        </MudStack>
-                    </MudStack>
-                </MudPaper>
-
-                <MudDivider />
-
-                <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                    روش پرداخت خود را انتخاب کنید:
-                </MudText>
-
-                @* Direct Payment — always available *@
-                <MudPaper Elevation="0" Class="pa-4 rounded-lg pkg-payment-option"
-                          Style="border:2px solid var(--mud-palette-primary); cursor:pointer;"
-                          @onclick="() => SelectPaymentMethod(PaymentMethodType.DirectPayment)">
-                    <MudStack Spacing="2">
-                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                            <MudIcon Icon="@Icons.Material.Filled.CreditCard" Color="Color.Primary" Size="Size.Medium" />
-                            <MudStack Spacing="0" Class="flex-grow-1">
-                                <MudText Typo="Typo.subtitle1" Color="Color.Primary"><b>پرداخت مستقیم</b></MudText>
-                                <MudText Typo="Typo.caption" Class="mud-text-secondary">پرداخت آنی از طریق درگاه بانکی</MudText>
-                            </MudStack>
-                            <MudIcon Icon="@Icons.Material.Filled.ArrowBack" Color="Color.Primary" Size="Size.Small" />
-                        </MudStack>
-                    </MudStack>
-                </MudPaper>
-
-                @* Daya Loan — only for base package AND first purchase cycle *@
-                @if (_selectedPackage.SupportsDayaPurchase && PurchaseCycleCount == 0)
-                {
-                    <MudPaper Elevation="0" Class="pa-4 rounded-lg pkg-payment-option"
-                              Style="border:2px solid var(--mud-palette-tertiary); cursor:pointer;"
-                              @onclick="() => SelectPaymentMethod(PaymentMethodType.DayaLoan)">
-                        <MudStack Spacing="2">
-                            <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
-                                <MudIcon Icon="@Icons.Material.Filled.Diamond" Color="Color.Tertiary" Size="Size.Medium" />
-                                <MudStack Spacing="0" Class="flex-grow-1">
-                                    <MudText Typo="Typo.subtitle1" Color="Color.Tertiary"><b>اعتبار الماسی دایا</b></MudText>
-                                    <MudText Typo="Typo.caption" Class="mud-text-secondary">تأمین اعتبار از طریق خرید توکن الماس</MudText>
-                                </MudStack>
-                                <MudIcon Icon="@Icons.Material.Filled.ArrowBack" Color="Color.Tertiary" Size="Size.Small" />
-                            </MudStack>
-                        </MudStack>
-                    </MudPaper>
-                }
-                else if (!_selectedPackage.SupportsDayaPurchase)
-                {
-                    <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Text" Class="mt-1">
-                        اعتبار الماسی دایا فقط برای پکیج پایه قابل استفاده است.
-                    </MudAlert>
-                }
-                else if (PurchaseCycleCount > 0)
-                {
-                    <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Text" Class="mt-1">
-                        از دور دوم به بعد، خرید پکیج فقط از طریق درگاه بانکی امکان‌پذیر است.
-                    </MudAlert>
-                }
-            </MudStack>
-        }
-        else
-        {
-            @* ── Step 1: Package tile grid ── *@
-            <MudStack Spacing="3">
-                <MudText Typo="Typo.body2" Class="mud-text-secondary">
-                    پکیج مورد نظر خود را انتخاب کنید:
-                </MudText>
-
-                <MudGrid Spacing="3">
-                    @foreach (var pkg in _packages)
-                    {
-                        <MudItem xs="12" sm="6" md="@(_packages.Count <= 2 ? 6 : 4)">
-                            <MudPaper Elevation="0" Class="pa-4 rounded-xl pkg-tile text-center"
-                                      Style="@GetTileStyle(pkg)"
-                                      @onclick="() => SelectPackage(pkg)">
-                                @if (pkg.IsBasePackage)
-                                {
-                                    <MudChip T="string" Size="Size.Small" Color="Color.Primary" Variant="Variant.Filled"
-                                             Class="pkg-tile-badge">پایه</MudChip>
-                                }
-                                <MudStack Spacing="1" AlignItems="AlignItems.Center">
-                                    <MudAvatar Size="Size.Large" Style="@GetAvatarStyle(pkg)" Class="mb-1">
-                                        <MudIcon Icon="@Icons.Material.Filled.Inventory2" Size="Size.Large" />
-                                    </MudAvatar>
-                                    <MudText Typo="Typo.subtitle1"><b>@pkg.Title</b></MudText>
-                                    <MudText Typo="Typo.h6" Color="Color.Success">@pkg.FormattedPrice</MudText>
-                                    @if (!string.IsNullOrWhiteSpace(pkg.Description))
-                                    {
-                                        <MudText Typo="Typo.caption" Class="mud-text-secondary"
-                                                 Style="display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;">
-                                            @((MarkupString)pkg.Description)
-                                        </MudText>
-                                    }
-                                    @* Key features *@
-                                    <MudStack Spacing="0" Class="mt-2" Style="width:100%;">
-                                        @if (pkg.MagicWalletMultiplier > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                                <MudIcon Icon="@Icons.Material.Filled.AutoAwesome" Size="Size.Small" Class="me-1" Style="font-size:.85rem;vertical-align:middle;" />
-                                                ضریب جادویی: @pkg.MagicWalletMultiplier.ToString("F1")x
-                                            </MudText>
-                                        }
-                                        @if (pkg.DiscountMultiplier > 0)
-                                        {
-                                            <MudText Typo="Typo.caption" Class="mud-text-secondary">
-                                                <MudIcon Icon="@Icons.Material.Filled.Discount" Size="Size.Small" Class="me-1" Style="font-size:.85rem;vertical-align:middle;" />
-                                                ضریب اعتبار: @pkg.DiscountMultiplier.ToString("F1")x
-                                            </MudText>
-                                        }
-                                        @if (pkg.SupportsDayaPurchase)
-                                        {
-                                            <MudText Typo="Typo.caption" Color="Color.Tertiary">
-                                                <MudIcon Icon="@Icons.Material.Filled.Diamond" Size="Size.Small" Class="me-1" Style="font-size:.85rem;vertical-align:middle;" />
-                                                قابل خرید با دایا
-                                            </MudText>
-                                        }
-                                    </MudStack>
-                                </MudStack>
-                            </MudPaper>
-                        </MudItem>
-                    }
-                </MudGrid>
-            </MudStack>
-        }
-    </DialogContent>
-    <DialogActions>
-        <MudButton OnClick="Cancel" Variant="Variant.Text" Color="Color.Default">بستن</MudButton>
-    </DialogActions>
-</MudDialog>
-
-@code {
-    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = default!;
-
-    /// <summary>Number of previous purchase cycles — controls Daya eligibility</summary>
-    [Parameter] public int PurchaseCycleCount { get; set; }
-
-    private List<PackageDto> _packages = new();
-    private PackageDto? _selectedPackage;
-    private bool _isLoading = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        _isLoading = true;
-        try
-        {
-            _packages = await PackageService.GetAllPackagesAsync();
-        }
-        catch (Exception ex)
-        {
-            Snackbar.Add("خطا در بارگذاری پکیج‌ها", MudBlazor.Severity.Error);
-        }
-        finally
-        {
-            _isLoading = false;
-        }
-    }
-
-    private void SelectPackage(PackageDto package)
-    {
-        _selectedPackage = package;
-    }
-
-    private void BackToList()
-    {
-        _selectedPackage = null;
-    }
-
-    private void SelectPaymentMethod(PaymentMethodType method)
-    {
-        var result = new PackagePurchaseResult(_selectedPackage!, method);
-        MudDialog.Close(DialogResult.Ok(result));
-    }
-
-    private void Cancel() => MudDialog.Cancel();
-
-    private static string GetTileStyle(PackageDto pkg)
-    {
-        return pkg.IsBasePackage
-            ? "border:2px solid var(--mud-palette-primary); background:rgba(99,102,241,.04); cursor:pointer;"
-            : "border:2px solid var(--mud-palette-lines-default); background:var(--mud-palette-surface); cursor:pointer;";
-    }
-
-    private static string GetAvatarStyle(PackageDto pkg)
-    {
-        return pkg.IsBasePackage
-            ? "background:rgba(99,102,241,.15); color:#6366f1;"
-            : "background:rgba(16,185,129,.12); color:#10b981;";
-    }
-
-    public enum PaymentMethodType { DirectPayment, DayaLoan }
-    public record PackagePurchaseResult(PackageDto Package, PaymentMethodType Method);
-}

src/FrontOffice.Main/Shared/PhoneVerifyForm.razor

@@ -36,14 +36,6 @@
                      Color="Color.Primary"
                      Class="mb-2" />
 
-        <MudTextField Value="ReferralCode"
-                      ValueChanged="@((string? v) => ReferralCodeChanged.InvokeAsync(v))"
-                      Label="کد معرف (اختیاری)"
-                      Variant="Variant.Outlined"
-                      Immediate="true"
-                      Placeholder="کد معرف را وارد کنید"
-                      Class="mb-3" />
-
         @if (!string.IsNullOrWhiteSpace(ErrorMessage))
         {
             <MudAlert Severity="Severity.Error" Dense="true" Elevation="0"

src/FrontOffice.Main/Shared/PhoneVerifyForm.razor.cs

@@ -29,10 +29,6 @@ public partial class PhoneVerifyForm
     [Parameter] public string? PhoneNumber { get; set; }
     [Parameter] public int ResendRemaining { get; set; }
 
-    // ── Referral ──
-    [Parameter] public string? ReferralCode { get; set; }
-    [Parameter] public EventCallback<string?> ReferralCodeChanged { get; set; }
-
     // ── Verify actions ──
     [Parameter] public EventCallback OnChangePhone { get; set; }
     [Parameter] public EventCallback OnResendOtp { get; set; }

src/FrontOffice.Main/Utilities/AuthService.cs

@@ -79,7 +79,6 @@ public class AuthService
         var isSignMainContractStr = claims.FirstOrDefault(c => c.key == "IsSignMainContract").value;
         var hasPurchasedPackageStr = claims.FirstOrDefault(c => c.key == "HasPurchasedPackage").value;
         var isClubMemberActiveStr = claims.FirstOrDefault(c => c.key == "IsClubMemberActive").value;
-        var hasAddressStr = claims.FirstOrDefault(c => c.key == "HasAddress").value;
         
         _userAuthInfo.UserId = long.TryParse(userIdStr, out var userId) ? userId : 0;
         _userAuthInfo.FirstName = firstName ?? string.Empty;
@@ -89,7 +88,6 @@ public class AuthService
         _userAuthInfo.IsSignMainContract = bool.TryParse(isSignMainContractStr, out var isSignMainContract) && isSignMainContract;
         _userAuthInfo.HasPurchasedPackage = bool.TryParse(hasPurchasedPackageStr, out var hasPurchased) && hasPurchased;
         _userAuthInfo.IsClubMemberActive = bool.TryParse(isClubMemberActiveStr, out var isClubActive) && isClubActive;
-        _userAuthInfo.HasAddress = bool.TryParse(hasAddressStr, out var hasAddress) && hasAddress;
     }
 
     private async Task<List<(string key, string value)>?> GetTokenClaimsAsync()

src/FrontOffice.Main/Utilities/CommissionDtos.cs

@@ -15,8 +15,6 @@ public class CommissionPayoutDto
     public string AmountFormatted { get; set; } = string.Empty;
     public int Status { get; set; }
     public string DatePersian { get; set; } = string.Empty;
-    public long PackageId { get; set; }
-    public string PackageTitle { get; set; } = string.Empty;
     
     // Computed properties for UI
     public string StatusText => Status switch
@@ -71,8 +69,6 @@ public class WeeklyBalanceDto
     public int RightNewMembers { get; set; }
     public DateTime StartDate { get; set; }
     public DateTime EndDate { get; set; }
-    public long PackageId { get; set; }
-    public string PackageTitle { get; set; } = string.Empty;
 
     // Formatted properties
     public string LeftBalanceFormatted => $"{LeftBalance:N0} ";

src/FrontOffice.Main/Utilities/CommissionService.cs

@@ -78,8 +78,7 @@ public class CommissionService
         long? weekDefinitionId,
         string? status,
         int pageNumber,
-        int pageSize,
-        long? packageId = null)
+        int pageSize)
     {
         try
         {
@@ -108,11 +107,6 @@ public class CommissionService
                     _ => null
                 };
             }
-
-            if (packageId.HasValue && packageId.Value > 0)
-            {
-                request.PackageId = packageId.Value;
-            }
             
             var response = await _client.GetMyCommissionPayoutsAsync(request);
             
@@ -127,9 +121,7 @@ public class CommissionService
                     TotalAmount = p.TotalAmount,
                     AmountFormatted = p.AmountFormatted,
                     Status = p.Status,
-                    DatePersian = p.DatePersian,
-                    PackageId = p.PackageId,
-                    PackageTitle = p.PackageTitle
+                    DatePersian = p.DatePersian
                 }).ToList(),
                 TotalCount = (int)(response.MetaData?.TotalCount ?? 0),
                 PageNumber = pageNumber,
@@ -153,7 +145,7 @@ public class CommissionService
     /// Get weekly balance details for a specific week
     /// Maps to: CommissionCQ.GetMyWeeklyBalances
     /// </summary>
-    public async Task<WeeklyBalanceDto> GetMyWeeklyBalanceAsync(long? weekDefinitionId = null, long? packageId = null)
+    public async Task<WeeklyBalanceDto> GetMyWeeklyBalanceAsync(long? weekDefinitionId = null)
     {
         try
         {
@@ -171,11 +163,6 @@ public class CommissionService
             {
                 request.WeekDefinitionId=7;
             }
-
-            if (packageId.HasValue && packageId.Value > 0)
-            {
-                request.PackageId = packageId.Value;
-            }
             
             var response = await _client.GetMyWeeklyBalancesAsync(request);
             
@@ -196,9 +183,7 @@ public class CommissionService
                     LeftNewMembers = balance.LeftLegNewMembers,
                     RightNewMembers = balance.RightLegNewMembers,
                     StartDate = balance.CalculatedAt?.ToDateTime().AddDays(-7) ?? DateTime.Now.AddDays(-7),
-                    EndDate = balance.CalculatedAt?.ToDateTime() ?? DateTime.Now,
-                    PackageId = balance.PackageId,
-                    PackageTitle = balance.PackageTitle
+                    EndDate = balance.CalculatedAt?.ToDateTime() ?? DateTime.Now
                 };
             }
             
@@ -242,9 +227,7 @@ public class CommissionService
                     TotalAmount = p.TotalAmount,
                     AmountFormatted = p.AmountFormatted,
                     Status = p.Status,
-                    DatePersian = p.DatePersian,
-                    PackageId = p.PackageId,
-                    PackageTitle = p.PackageTitle
+                    DatePersian = p.DatePersian
                 }).ToList();
         }
         catch

src/FrontOffice.Main/Utilities/CreditChargeNavigation.cs

@@ -1,50 +0,0 @@
-using Grpc.Core;
-using Microsoft.JSInterop;
-
-namespace FrontOffice.Main.Utilities;
-
-public static class CreditChargeNavigation
-{
-    public const long MinChargeAmount = 10_000;
-    public const string ReturnUrlStorageKey = "credit_charge_return_url";
-    private const string InsufficientBalanceMarker = "موجودی کیف پول کافی نیست";
-
-    public static long NormalizeChargeAmount(long shortfall) =>
-        Math.Max(shortfall, MinChargeAmount);
-
-    public static string BuildChargeUrl(long amount, string? returnUrl)
-    {
-        var url = $"{RouteConstants.Profile.ChargeCreditWallet}?amount={amount}";
-        if (IsValidReturnUrl(returnUrl))
-            url += $"&returnUrl={Uri.EscapeDataString(returnUrl!)}";
-        return url;
-    }
-
-    public static bool IsValidReturnUrl(string? url) =>
-        !string.IsNullOrWhiteSpace(url)
-        && url.StartsWith('/')
-        && !url.StartsWith("//", StringComparison.Ordinal);
-
-    public static bool IsInsufficientWalletBalanceMessage(string? message) =>
-        message?.Contains(InsufficientBalanceMarker, StringComparison.Ordinal) == true;
-
-    public static bool IsInsufficientWalletBalance(Exception ex) =>
-        ex switch
-        {
-            RpcException rpc => IsInsufficientWalletBalanceMessage(rpc.Status.Detail)
-                || IsInsufficientWalletBalanceMessage(rpc.Message),
-            _ => IsInsufficientWalletBalanceMessage(ex.Message)
-        };
-
-    public static async Task SaveReturnUrlAsync(IJSRuntime js, string returnUrl)
-    {
-        if (!IsValidReturnUrl(returnUrl)) return;
-        await js.InvokeVoidAsync("sessionStorage.setItem", ReturnUrlStorageKey, returnUrl);
-    }
-
-    public static async Task<string?> GetReturnUrlAsync(IJSRuntime js) =>
-        await js.InvokeAsync<string?>("sessionStorage.getItem", ReturnUrlStorageKey);
-
-    public static async Task ClearReturnUrlAsync(IJSRuntime js) =>
-        await js.InvokeVoidAsync("sessionStorage.removeItem", ReturnUrlStorageKey);
-}

src/FrontOffice.Main/Utilities/DiscountOrderService.cs

@@ -112,27 +112,6 @@ public class DiscountOrderService
         catch { return false; }
     }
 
-    public async Task<(bool Success, string Message, long OrderId)> VerifyDiscountOrderPaymentAsync(
-        long orderId, string authority, string status)
-    {
-        try
-        {
-            var response = await _client.CustomerVerifyDiscountOrderPaymentAsync(
-                new CustomerVerifyDiscountOrderPaymentRequest
-                {
-                    OrderId = orderId,
-                    Authority = authority,
-                    Status = status
-                });
-
-            return (response.Success, response.Message, response.OrderId);
-        }
-        catch (Grpc.Core.RpcException ex)
-        {
-            return (false, ex.Status.Detail ?? "خطا در بررسی وضعیت پرداخت", orderId);
-        }
-    }
-
     public async Task<DiscountOrderListResult> GetUserOrdersAsync(int page = 1, int pageSize = 10)
     {
         try
@@ -219,8 +198,6 @@ public class DiscountOrderService
         2 => "ارسال شده",
         3 => "تحویل داده شده",
         4 => "لغو شده",
-        5 => "آماده تحویل در دفتر",
-        6 => "مرجوع شده",
         _ => "نامشخص"
     };
 
@@ -230,9 +207,7 @@ public class DiscountOrderService
         1 => Color.Info,
         2 => Color.Primary,
         3 => Color.Success,
-        4 => Color.Dark,
-        5 => Color.Primary,
-        6 => Color.Error,
+        4 => Color.Error,
         _ => Color.Default
     };
 

src/FrontOffice.Main/Utilities/DiscountProductService.cs

@@ -80,7 +80,7 @@ public class DiscountProductService
     public async Task<DiscountProductListResult> GetProductsAsync(
         int page = 1, int pageSize = 12,
         string? search = null, long? categoryId = null,
-        bool? inStock = null, string? sortBy = null)
+        bool? inStock = null)
     {
         try
         {
@@ -97,8 +97,6 @@ public class DiscountProductService
                 request.CategoryId = categoryId.Value;
             if (inStock.HasValue)
                 request.InStock = inStock.Value;
-            if (!string.IsNullOrWhiteSpace(sortBy))
-                request.SortBy = sortBy;
 
             var response = await _productClient.GetDiscountProductsAsync(request);
 
@@ -127,9 +125,6 @@ public class DiscountProductService
         }
     }
 
-    public Task<DiscountProductListResult> GetTopSellingAsync(int count = 6, bool? inStock = null)
-        => GetProductsAsync(page: 1, pageSize: count, sortBy: "SaleCount desc", inStock: inStock);
-
     public async Task<DiscountProductDetail?> GetByIdAsync(long productId)
     {
         try

src/FrontOffice.Main/Utilities/GuestActionGate.cs

@@ -1,42 +0,0 @@
-namespace FrontOffice.Main.Utilities;
-
-/// <summary>
-/// هر action ای که نیاز به لاگین دارد را از طریق این سرویس اجرا کنید.
-/// اگر کاربر لاگین نباشد، مودال ورود نشان داده می‌شود.
-/// پس از ورود موفق، action به صورت خودکار اجرا می‌شود.
-/// </summary>
-public class GuestActionGate
-{
-    private readonly AuthService _authService;
-    private readonly AuthDialogService _authDialogService;
-
-    public GuestActionGate(AuthService authService, AuthDialogService authDialogService)
-    {
-        _authService = authService;
-        _authDialogService = authDialogService;
-    }
-
-    /// <summary>
-    /// اگر کاربر لاگین باشد action را اجرا می‌کند.
-    /// در غیر این صورت مودال لاگین را باز کرده و پس از ورود موفق، action را اجرا می‌کند.
-    /// </summary>
-    /// <returns>true اگر action اجرا شد، false اگر کاربر لاگین نکرد.</returns>
-    public async Task<bool> RunAsync(Func<Task> action)
-    {
-        if (await _authService.IsAuthenticatedAsync())
-        {
-            await action();
-            return true;
-        }
-
-        await _authDialogService.ShowAuthDialogAsync();
-
-        if (await _authService.IsAuthenticatedAsync())
-        {
-            await action();
-            return true;
-        }
-
-        return false;
-    }
-}

src/FrontOffice.Main/Utilities/NetworkMembershipDtos.cs

@@ -21,23 +21,6 @@ public class NetworkNodeDto
     /// کد معرف کاربر
     /// </summary>
     public string? ReferralCode { get; set; }
-
-    /// <summary>
-    /// نام پکیج موثر (مثلاً پکیج طلایی / نقره‌ای)
-    /// </summary>
-    public string? PackageName { get; set; }
-
-    /// <summary>آخرین امتیاز پای چپ پکیج طلایی</summary>
-    public int GoldLeftLegTotal { get; set; }
-
-    /// <summary>آخرین امتیاز پای راست پکیج طلایی</summary>
-    public int GoldRightLegTotal { get; set; }
-
-    /// <summary>آخرین امتیاز پای چپ پکیج نقره‌ای</summary>
-    public int SilverLeftLegTotal { get; set; }
-
-    /// <summary>آخرین امتیاز پای راست پکیج نقره‌ای</summary>
-    public int SilverRightLegTotal { get; set; }
 }
 
 /// <summary>
@@ -60,16 +43,6 @@ public class FlatNetworkNodeDto
     /// کد معرف کاربر - فقط برای کاربران فعال در باشگاه نمایش داده شود
     /// </summary>
     public string? ReferralCode { get; set; }
-
-    /// <summary>
-    /// نام پکیج موثر (مثلاً پکیج طلایی / نقره‌ای)
-    /// </summary>
-    public string? PackageName { get; set; }
-
-    public int GoldLeftLegTotal { get; set; }
-    public int GoldRightLegTotal { get; set; }
-    public int SilverLeftLegTotal { get; set; }
-    public int SilverRightLegTotal { get; set; }
 }
 
 /// <summary>
@@ -108,12 +81,7 @@ public class NetworkTreeDto
             IsClubActive = node.IsClubActive,
             ActivationWeekNumber = node.ActivationWeekNumber,
             JoinedAt = node.JoinedAt,
-            ReferralCode = node.ReferralCode,
-            PackageName = node.PackageName,
-            GoldLeftLegTotal = node.GoldLeftLegTotal,
-            GoldRightLegTotal = node.GoldRightLegTotal,
-            SilverLeftLegTotal = node.SilverLeftLegTotal,
-            SilverRightLegTotal = node.SilverRightLegTotal
+            ReferralCode = node.ReferralCode
         };
         
         result.Add(flatNode);

src/FrontOffice.Main/Utilities/NetworkMembershipService.cs

@@ -137,11 +137,6 @@ public class NetworkMembershipService
             IsActive = node.IsActive,
             IsClubActive = node.IsClubActive,
             ReferralCode = node.ReferralCode,
-            PackageName = string.IsNullOrWhiteSpace(node.PackageName) ? null : node.PackageName,
-            GoldLeftLegTotal = node.GoldLeftLegTotal,
-            GoldRightLegTotal = node.GoldRightLegTotal,
-            SilverLeftLegTotal = node.SilverLeftLegTotal,
-            SilverRightLegTotal = node.SilverRightLegTotal,
             ActivationWeekNumber = node.ActivationWeekDefinitionId?.ToString(),
             JoinedAt = node.JoinedAt?.ToDateTime(),
             LeftChild = MapNodeFromProto(node.LeftChild),

src/FrontOffice.Main/Utilities/PackageService.cs

@@ -10,17 +10,8 @@ public record PackageDto(
     string Title,
     string Description,
     string ImageUrl,
-    long Price,
-    long ActivationFee = 0,
-    double DiscountMultiplier = 0,
-    double MagicWalletMultiplier = 0,
-    long MagicWalletMaxDeposit = 0,
-    long MagicWalletMaxCredit = 0,
-    bool IsBasePackage = false,
-    bool SupportsDayaPurchase = false,
-    bool SupportsDirectPurchase = false)
+    long Price)
 {
-    /// <summary>قیمت فرمت‌شده به تومان</summary>
     public string FormattedPrice => string.Format("{0:N0} تومان", Price);
 }
 
@@ -29,7 +20,6 @@ public record PackageDto(
 /// </summary>
 public record UserPackageStatusDto(
     bool HasPurchasedPackage,
-    string? PackageTitle,
     string? PurchaseMethod, // DayaLoan, DirectPurchase, or null
     bool IsClubMemberActive,
     long WalletBalance,
@@ -65,15 +55,7 @@ public class PackageService
                     m.Title,
                     m.Description,
                     m.ImagePath,
-                    m.Price,
-                    m.ActivationFee,
-                    m.DiscountMultiplier,
-                    m.MagicWalletMultiplier,
-                    m.MagicWalletMaxDeposit,
-                    m.MagicWalletMaxCredit,
-                    m.IsBasePackage,
-                    m.SupportsDayaPurchase,
-                    m.SupportsDirectPurchase))
+                    m.Price))
                 .ToList();
         }
         catch (Exception ex)
@@ -117,32 +99,15 @@ public class PackageService
     /// <summary>
     /// Get user's package purchase status
     /// </summary>
-    public async Task<UserPackageStatusDto> GetUserPackageStatusAsync(CancellationToken ct = default)
+    public Task<UserPackageStatusDto> GetUserPackageStatusAsync(CancellationToken ct = default)
     {
-        try
-        {
-            var response = await _client.GetUserPackageStatusAsync(
-                new GetUserPackageStatusRequest(), cancellationToken: ct);
-
-            return new UserPackageStatusDto(
-                HasPurchasedPackage: response.HasPurchasedPackage,
-                PackageTitle: null,
-                PurchaseMethod: response.PackagePurchaseMethod,
-                IsClubMemberActive: response.IsClubMemberActive,
-                WalletBalance: response.WalletBalance,
-                CanActivateClubMembership: response.CanActivateClubMembership,
-                PurchaseDate: response.LastPurchaseDate?.ToDateTime());
-        }
-        catch
-        {
-            return new UserPackageStatusDto(
-                HasPurchasedPackage: false,
-                PackageTitle: null,
-                PurchaseMethod: null,
-                IsClubMemberActive: false,
-                WalletBalance: 0,
-                CanActivateClubMembership: false,
-                PurchaseDate: null);
-        }
+        // TODO: Connect to GetUserPackageStatus RPC when available in FrontOffice.BFF
+        return Task.FromResult(new UserPackageStatusDto(
+            HasPurchasedPackage: false,
+            PurchaseMethod: null,
+            IsClubMemberActive: false,
+            WalletBalance: 0,
+            CanActivateClubMembership: false,
+            PurchaseDate: null));
     }
 }

src/FrontOffice.Main/Utilities/ProductService.cs

@@ -71,12 +71,9 @@ public class ProductService
         return result.Products;
     }
 
-    public Task<ProductListResult> GetTopSellingAsync(int count = 6, bool? inStock = null)
-        => GetProductsPagedAsync(sortBy: "SaleCount desc", page: 1, pageSize: count, inStock: inStock);
-
     public async Task<ProductListResult> GetProductsPagedAsync(
         string? query = null, long? categoryId = null, string? sortBy = null,
-        int page = 1, int pageSize = 12, bool? inStock = null)
+        int page = 1, int pageSize = 12)
     {
         try
         {
@@ -87,25 +84,20 @@ public class ProductService
                     PageNumber = page,
                     PageSize = pageSize
                 },
-                Filter = new GetAllProductsByFilterFilter()
+                Filter = new GetAllProductsByFilterFilter
+                {
+                    Title = query ?? string.Empty,
+                    Description = query ?? string.Empty,
+                    ShortInfomation = query ?? string.Empty,
+                    FullInformation = query ?? string.Empty
+                }
             };
 
-            // فقط Title — CMS فیلترها را AND می‌زند؛ ارسال query در همه فیلدها جستجو را می‌شکند
-            if (!string.IsNullOrWhiteSpace(query))
-            {
-                request.Filter.Title = query.Trim();
-            }
-
             if (categoryId is { } value)
             {
                 request.Filter.CategoryId = value;
             }
 
-            if (inStock.HasValue)
-            {
-                request.Filter.InStock = inStock.Value;
-            }
-
             if (!string.IsNullOrEmpty(sortBy))
             {
                 request.SortBy = sortBy;
@@ -137,66 +129,30 @@ public class ProductService
 
     public async Task<Product?> GetByIdAsync(long id)
     {
-        if (id <= 0)
-            return null;
-
-        TryGetCachedProduct(id, out var cached);
-
-        if (cached is not null && HasDetailedData(cached))
+        if (TryGetCachedProduct(id, out var cached) && HasDetailedData(cached))
+        {
             return cached;
+        }
 
-        // جزئیات کامل (گالری + دسته‌بندی)
-        var detailed = await TryFetchDetailAsync(id);
-        if (detailed is not null)
-            return detailed;
-
-        // fallback: همان API لیست محصولات — ناموجودها را هم برمی‌گرداند
-        var fromFilter = await TryFetchByFilterIdAsync(id);
-        if (fromFilter is not null)
-            return fromFilter;
-
-        return cached;
-    }
-
-    private async Task<Product?> TryFetchDetailAsync(long id)
-    {
         try
         {
             var resp = await _client.GetProductsAsync(new GetProductsRequest { Id = id });
-            if (resp is null || resp.Id <= 0)
+            if (resp == null)
+            {
                 return null;
+            }
 
             return MapAndCache(resp);
         }
         catch
         {
-            return null;
-        }
-    }
-
-    private async Task<Product?> TryFetchByFilterIdAsync(long id)
-    {
-        try
-        {
-            var resp = await _client.GetAllProductsByFilterAsync(new GetAllProductsByFilterRequest
+            if (cached is not null)
             {
-                PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
-                {
-                    PageNumber = 1,
-                    PageSize = 1
-                },
-                Filter = new GetAllProductsByFilterFilter { Id = id }
-            });
+                return cached;
+            }
 
-            var model = resp.Models.FirstOrDefault(m => m.Id == id);
-            if (model is null)
-                return null;
-
-            return MapAndCache(resp.Models).FirstOrDefault(p => p.Id == id);
-        }
-        catch
-        {
-            return null;
+            TryGetCachedProduct(id, out var result);
+            return result;
         }
     }
 

src/FrontOffice.Main/Utilities/RouteConstants.cs

@@ -24,7 +24,6 @@ public static class RouteConstants
         public const string Wallet = "/profile/wallet";
         public const string MagicWallet = "/profile/magic-wallet";
         public const string ChargeDiscountWallet = "/profile/charge-discount-wallet";
-        public const string ChargeCreditWallet = "/profile/charge-credit-wallet";
         public const string WithdrawalRequests = "/profile/withdrawal-requests";
     }
 

src/FrontOffice.Main/Utilities/Seo/SeoMetadataProvider.cs

@@ -1,213 +0,0 @@
-using System.Text.RegularExpressions;
-using Microsoft.Extensions.Options;
-
-namespace FrontOffice.Main.Utilities.Seo;
-
-public class SeoMetadataProvider
-{
-    private readonly BlogPostService _blogPostService;
-    private readonly SeoSettings _settings;
-
-    private static readonly Dictionary<string, (string Title, string Description)> StaticPages = new(StringComparer.OrdinalIgnoreCase)
-    {
-        ["/"] = (
-            "کارابازار سلامت | باشگاه مشتریان KBS",
-            "باشگاه مشتریان کارابازار سلامت — رشد تیم، فروش واقعی و پاداش شفاف. فروشگاه محصولات سلامت، کیف پول و ثبت‌نام رایگان."),
-        [RouteConstants.About.Index] = (
-            "درباره ما | کارابازار سلامت",
-            "آشنایی با کارابازار سلامت، باشگاه مشتریان KBS و خدمات فروشگاه محصولات سلامت."),
-        [RouteConstants.FAQ.Index] = (
-            "سوالات متداول | کارابازار سلامت",
-            "پاسخ سوالات متداول درباره باشگاه مشتریان، کیف پول، پاداش‌ها و خرید از کارابازار سلامت."),
-        [RouteConstants.Contact.Index] = (
-            "ارتباط با ما | کارابازار سلامت",
-            "تماس با تیم پشتیبانی کارابازار سلامت — سوالات، پیشنهادات و پشتیبانی کاربران."),
-        [RouteConstants.Licenses.Index] = (
-            "مجوزها و گواهینامه‌ها | کارابازار سلامت",
-            "مجوزها، گواهینامه‌ها و مدارک رسمی کارابازار سلامت."),
-        [RouteConstants.Blog.Index] = (
-            "بلاگ | کارابازار سلامت",
-            "آخرین مقالات و اخبار باشگاه مشتریان کارابازار سلامت."),
-        [RouteConstants.Store.Products] = (
-            "محصولات | کارابازار سلامت",
-            "فروشگاه محصولات سلامت کارابازار — خرید آنلاین با پاداش باشگاه مشتریان."),
-        [RouteConstants.Store.Categories] = (
-            "دسته‌بندی‌ها | کارابازار سلامت",
-            "دسته‌بندی محصولات فروشگاه کارابازار سلامت."),
-        [RouteConstants.Package.List] = (
-            "پکیج‌ها | کارابازار سلامت",
-            "پکیج‌های عضویت باشگاه مشتریان کارابازار سلامت."),
-        [RouteConstants.Club.Membership] = (
-            "عضویت باشگاه مشتریان | کارابازار سلامت",
-            "عضویت در باشگاه مشتریان KBS و بهره‌مندی از مزایا و پاداش‌ها."),
-        [RouteConstants.Club.Features] = (
-            "ویژگی‌های باشگاه مشتریان | کارابازار سلامت",
-            "امکانات و ویژگی‌های باشگاه مشتریان کارابازار سلامت."),
-        [RouteConstants.DiscountStore.Products] = (
-            "فروشگاه اعتباری | کارابازار سلامت",
-            "خرید از فروشگاه اعتباری کارابازار سلامت با کیف پول تخفیفی."),
-        [RouteConstants.Registration.Wizard] = (
-            "ثبت‌نام | کارابازار سلامت",
-            "ثبت‌نام سریع در باشگاه مشتریان کارابازار سلامت."),
-        [RouteConstants.Gateway.StoreChooser] = (
-            "فروشگاه‌ها | کارابازار سلامت",
-            "انتخاب فروشگاه اصلی یا اعتباری در کارابازار سلامت."),
-    };
-
-    private static readonly HashSet<string> NoIndexPaths = new(StringComparer.OrdinalIgnoreCase)
-    {
-        "/wishlist",
-        "/wp-admin",
-        "/wp-login.php",
-        "/feed",
-        "/xmlrpc.php",
-    };
-
-    private static readonly HashSet<string> NoIndexPrefixes = new(StringComparer.OrdinalIgnoreCase)
-    {
-        RouteConstants.Profile.Index,
-        "/profile/",
-        RouteConstants.Checkout.Index,
-        RouteConstants.Store.Cart,
-        RouteConstants.Store.CheckoutSummary,
-        RouteConstants.Store.Orders,
-        "/order/",
-        RouteConstants.DiscountStore.Cart,
-        RouteConstants.DiscountStore.Checkout,
-        RouteConstants.DiscountStore.Orders,
-        "/discount-store/order/",
-        RouteConstants.Gateway.OrdersChooser,
-        RouteConstants.Gateway.CartChooser,
-        RouteConstants.Commission.Dashboard,
-        "/commission/",
-        RouteConstants.Network.Statistics,
-        "/network/",
-        RouteConstants.Package.MyPackages,
-        "/wp-content/",
-        "/wp-includes/",
-    };
-
-    private static readonly Regex ProductDetailPattern = new(@"^/product/\d+$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-    private static readonly Regex DiscountProductPattern = new(@"^/discount-store/product/\d+$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-    private static readonly Regex PackageDetailPattern = new(@"^/package/\d+$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-    private static readonly Regex CheckoutPackagePattern = new(@"^/checkout/\d+$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
-
-    public SeoMetadataProvider(BlogPostService blogPostService, IOptions<SeoSettings> settings)
-    {
-        _blogPostService = blogPostService;
-        _settings = settings.Value;
-    }
-
-    public async Task<SeoPageMetadata> GetForPathAsync(string path, CancellationToken cancellationToken = default)
-    {
-        var normalizedPath = NormalizePath(path);
-        var baseUrl = _settings.SiteUrl.TrimEnd('/');
-
-        if (IsNoIndexPath(normalizedPath))
-        {
-            return new SeoPageMetadata
-            {
-                Title = _settings.SiteName,
-                Description = _settings.DefaultDescription,
-                CanonicalUrl = $"{baseUrl}{normalizedPath}",
-                NoIndex = true
-            };
-        }
-
-        if (normalizedPath.StartsWith(RouteConstants.Blog.Post, StringComparison.OrdinalIgnoreCase)
-            && normalizedPath.Length > RouteConstants.Blog.Post.Length)
-        {
-            var slug = normalizedPath[RouteConstants.Blog.Post.Length..].Trim('/');
-            if (!string.IsNullOrWhiteSpace(slug))
-            {
-                var post = await _blogPostService.GetBySlugAsync(slug);
-                if (post != null)
-                {
-                    var description = !string.IsNullOrWhiteSpace(post.Summary)
-                        ? post.Summary
-                        : $"مقاله {post.Title} — بلاگ کارابازار سلامت";
-
-                    return new SeoPageMetadata
-                    {
-                        Title = $"{post.Title} | بلاگ کارابازار سلامت",
-                        Description = description,
-                        CanonicalUrl = $"{baseUrl}{RouteConstants.Blog.Post}{post.Slug}",
-                        CrawlableContent = $"{post.Title}. {description}"
-                    };
-                }
-            }
-        }
-
-        if (StaticPages.TryGetValue(normalizedPath, out var page))
-        {
-            return new SeoPageMetadata
-            {
-                Title = page.Title,
-                Description = page.Description,
-                CanonicalUrl = $"{baseUrl}{normalizedPath}",
-                CrawlableContent = normalizedPath == "/" ? GetHomeCrawlableContent() : null
-            };
-        }
-
-        if (IsIndexableDynamicRoute(normalizedPath))
-        {
-            return new SeoPageMetadata
-            {
-                Title = _settings.SiteName,
-                Description = _settings.DefaultDescription,
-                CanonicalUrl = $"{baseUrl}{normalizedPath}"
-            };
-        }
-
-        return new SeoPageMetadata
-        {
-            Title = _settings.SiteName,
-            Description = _settings.DefaultDescription,
-            CanonicalUrl = $"{baseUrl}{normalizedPath}",
-            NoIndex = true
-        };
-    }
-
-    private static bool IsIndexableDynamicRoute(string path) =>
-        ProductDetailPattern.IsMatch(path)
-        || DiscountProductPattern.IsMatch(path)
-        || PackageDetailPattern.IsMatch(path)
-        || CheckoutPackagePattern.IsMatch(path);
-
-    private static string NormalizePath(string path)
-    {
-        if (string.IsNullOrWhiteSpace(path))
-            return "/";
-
-        var normalized = path.Split('?', '#')[0].Trim();
-        if (!normalized.StartsWith('/'))
-            normalized = "/" + normalized;
-
-        if (normalized.Length > 1 && normalized.EndsWith('/'))
-            normalized = normalized.TrimEnd('/');
-
-        return normalized;
-    }
-
-    private static bool IsNoIndexPath(string path)
-    {
-        if (NoIndexPaths.Contains(path))
-            return true;
-
-        foreach (var prefix in NoIndexPrefixes)
-        {
-            if (path.Equals(prefix, StringComparison.OrdinalIgnoreCase)
-                || path.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static string GetHomeCrawlableContent() =>
-        "کارابازار سلامت (KBS) — باشگاه مشتریان و فروشگاه محصولات سلامت. " +
-        "با عضویت در باشگاه مشتریان KBS از پاداش شفاف، کیف پول جادویی، فروشگاه اعتباری و شبکه فروش بهره‌مند شوید. " +
-        "ثبت‌نام رایگان در kbs2.ir.";
-}

src/FrontOffice.Main/Utilities/Seo/SeoPageMetadata.cs

@@ -1,10 +0,0 @@
-namespace FrontOffice.Main.Utilities.Seo;
-
-public sealed class SeoPageMetadata
-{
-    public required string Title { get; init; }
-    public required string Description { get; init; }
-    public required string CanonicalUrl { get; init; }
-    public string? CrawlableContent { get; init; }
-    public bool NoIndex { get; init; }
-}

src/FrontOffice.Main/Utilities/Seo/SeoSettings.cs

@@ -1,11 +0,0 @@
-namespace FrontOffice.Main.Utilities.Seo;
-
-public class SeoSettings
-{
-    public const string SectionName = "Seo";
-
-    public string SiteUrl { get; set; } = "https://kbs2.ir";
-    public string SiteName { get; set; } = "کارابازار سلامت";
-    public string DefaultDescription { get; set; } =
-        "باشگاه مشتریان کارابازار سلامت (KBS) — فروشگاه محصولات سلامت، پاداش شفاف، کیف پول و شبکه فروش.";
-}

src/FrontOffice.Main/Utilities/Seo/SitemapGenerator.cs

@@ -1,117 +0,0 @@
-using System.Text;
-using System.Xml;
-using System.Xml.Linq;
-using Microsoft.Extensions.Options;
-
-namespace FrontOffice.Main.Utilities.Seo;
-
-public class SitemapGenerator
-{
-    private readonly BlogPostService _blogPostService;
-    private readonly SeoSettings _settings;
-
-    private static readonly string[] StaticPaths =
-    [
-        RouteConstants.Main.MainPage,
-        RouteConstants.About.Index,
-        RouteConstants.FAQ.Index,
-        RouteConstants.Contact.Index,
-        RouteConstants.Licenses.Index,
-        RouteConstants.Blog.Index,
-        RouteConstants.Store.Products,
-        RouteConstants.Package.List,
-        RouteConstants.Club.Membership,
-        RouteConstants.Club.Features,
-        RouteConstants.DiscountStore.Products,
-        RouteConstants.Registration.Wizard,
-    ];
-
-    public SitemapGenerator(BlogPostService blogPostService, IOptions<SeoSettings> settings)
-    {
-        _blogPostService = blogPostService;
-        _settings = settings.Value;
-    }
-
-    public async Task<string> GenerateAsync(CancellationToken cancellationToken = default)
-    {
-        var baseUrl = _settings.SiteUrl.TrimEnd('/');
-        var ns = XNamespace.Get("http://www.sitemaps.org/schemas/sitemap/0.9");
-        var urls = new List<XElement>();
-
-        foreach (var path in StaticPaths)
-        {
-            urls.Add(CreateUrlElement(ns, $"{baseUrl}{path}", priority: path == "/" ? "1.0" : "0.8"));
-        }
-
-        var page = 1;
-        const int pageSize = 100;
-
-        while (true)
-        {
-            var result = await _blogPostService.GetPublishedPostsAsync(page: page, pageSize: pageSize);
-            if (result.Posts.Count == 0)
-                break;
-
-            foreach (var post in result.Posts)
-            {
-                if (string.IsNullOrWhiteSpace(post.Slug))
-                    continue;
-
-                var lastMod = post.PublishedAt?.ToString("yyyy-MM-dd") ?? DateTime.UtcNow.ToString("yyyy-MM-dd");
-                urls.Add(CreateUrlElement(
-                    ns,
-                    $"{baseUrl}{RouteConstants.Blog.Post}{post.Slug}",
-                    lastMod: lastMod,
-                    priority: "0.6"));
-            }
-
-            if (page >= result.TotalPages)
-                break;
-
-            page++;
-        }
-
-        var document = new XDocument(
-            new XDeclaration("1.0", "utf-8", null),
-            new XElement(ns + "urlset", urls));
-
-        var settings = new XmlWriterSettings
-        {
-            Encoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false),
-            Indent = true,
-            OmitXmlDeclaration = false
-        };
-
-        using var stream = new MemoryStream();
-        using (var writer = XmlWriter.Create(stream, settings))
-        {
-            document.Save(writer);
-        }
-
-        return Encoding.UTF8.GetString(stream.ToArray());
-    }
-
-    public async Task<byte[]> GenerateBytesAsync(CancellationToken cancellationToken = default)
-    {
-        var xml = await GenerateAsync(cancellationToken);
-        return Encoding.UTF8.GetBytes(xml);
-    }
-
-    private static XElement CreateUrlElement(
-        XNamespace ns,
-        string loc,
-        string? lastMod = null,
-        string changefreq = "weekly",
-        string priority = "0.5")
-    {
-        var element = new XElement(ns + "url",
-            new XElement(ns + "loc", loc),
-            new XElement(ns + "changefreq", changefreq),
-            new XElement(ns + "priority", priority));
-
-        if (!string.IsNullOrWhiteSpace(lastMod))
-            element.Add(new XElement(ns + "lastmod", lastMod));
-
-        return element;
-    }
-}

src/FrontOffice.Main/Utilities/ShopListQueryState.cs

@@ -1,94 +0,0 @@
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Primitives;
-
-namespace FrontOffice.Main.Utilities;
-
-public enum ProductSortOption
-{
-    PriceDesc,
-    PriceAsc,
-    Newest,
-    Title
-}
-
-/// <summary>
-/// وضعیت لیست فروشگاه در query string — فقط برای /products و /discount-store.
-/// </summary>
-public sealed class ShopListQueryState
-{
-    public string Query { get; init; } = string.Empty;
-    public string? Sort { get; init; }
-    public long? CategoryId { get; init; }
-    public int Pages { get; init; } = 1;
-
-    public static ShopListQueryState Parse(Uri uri)
-    {
-        var q = QueryHelpers.ParseQuery(uri.Query);
-        return new ShopListQueryState
-        {
-            Query = GetString(q, "q") ?? string.Empty,
-            Sort = GetString(q, "sort"),
-            CategoryId = GetLong(q, "category"),
-            Pages = Math.Max(1, GetInt(q, "pages") ?? 1)
-        };
-    }
-
-    public string ToRelativeUrl(string path)
-    {
-        var dict = new Dictionary<string, string?>();
-        if (!string.IsNullOrWhiteSpace(Query))
-            dict["q"] = Query.Trim();
-        if (!string.IsNullOrWhiteSpace(Sort) && !string.Equals(Sort, "price-desc", StringComparison.OrdinalIgnoreCase))
-            dict["sort"] = Sort;
-        if (CategoryId is > 0)
-            dict["category"] = CategoryId.Value.ToString();
-        if (Pages > 1)
-            dict["pages"] = Pages.ToString();
-
-        return dict.Count == 0
-            ? path
-            : QueryHelpers.AddQueryString(path, dict!);
-    }
-
-    public bool Matches(ShopListQueryState other) =>
-        string.Equals(Query?.Trim() ?? "", other.Query?.Trim() ?? "", StringComparison.Ordinal)
-        && string.Equals(NormalizeSort(Sort), NormalizeSort(other.Sort), StringComparison.OrdinalIgnoreCase)
-        && CategoryId == other.CategoryId
-        && Pages == other.Pages;
-
-    public static string NormalizeSort(string? sort) =>
-        string.IsNullOrWhiteSpace(sort) ? "price-desc" : sort.Trim().ToLowerInvariant();
-
-    public static string ToSortKey(ProductSortOption option) => option switch
-    {
-        ProductSortOption.PriceAsc => "price-asc",
-        ProductSortOption.Newest => "newest",
-        ProductSortOption.Title => "title",
-        _ => "price-desc"
-    };
-
-    public static ProductSortOption ParseSortOption(string? sort) => NormalizeSort(sort) switch
-    {
-        "price-asc" => ProductSortOption.PriceAsc,
-        "newest" => ProductSortOption.Newest,
-        "title" => ProductSortOption.Title,
-        _ => ProductSortOption.PriceDesc
-    };
-
-    public static string ToApiSortBy(ProductSortOption option) => option switch
-    {
-        ProductSortOption.PriceAsc => "price asc",
-        ProductSortOption.Newest => "id desc",
-        ProductSortOption.Title => "title asc",
-        _ => "price desc"
-    };
-
-    private static string? GetString(Dictionary<string, StringValues> q, string key) =>
-        q.TryGetValue(key, out var v) ? v.FirstOrDefault() : null;
-
-    private static long? GetLong(Dictionary<string, StringValues> q, string key) =>
-        long.TryParse(GetString(q, key), out var n) ? n : null;
-
-    private static int? GetInt(Dictionary<string, StringValues> q, string key) =>
-        int.TryParse(GetString(q, key), out var n) ? n : null;
-}

src/FrontOffice.Main/Utilities/ShopListScrollRestore.cs

@@ -1,69 +0,0 @@
-using System.Text.Json;
-using Microsoft.JSInterop;
-
-namespace FrontOffice.Main.Utilities;
-
-/// <summary>
-/// اسکرول/فوکوس محصول پس از بازگشت از جزئیات — کلیدهای محدود به لیست فروشگاه (نه لندینگ).
-/// </summary>
-public static class ShopListScrollRestore
-{
-    public const string StoreKey = "fo:store:scroll";
-    public const string DiscountKey = "fo:discount:scroll";
-
-    private static readonly JsonSerializerOptions JsonOptions = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-    };
-
-    public static async Task SaveAsync(IJSRuntime js, string storageKey, long productId)
-    {
-        double scrollY = 0;
-        try
-        {
-            scrollY = await js.InvokeAsync<double>("eval", "window.scrollY || window.pageYOffset || 0");
-        }
-        catch
-        {
-            // ignore
-        }
-
-        var payload = JsonSerializer.Serialize(new ScrollPayload(productId, scrollY), JsonOptions);
-        await js.InvokeVoidAsync("sessionStorage.setItem", storageKey, payload);
-    }
-
-    public static async Task<ScrollPayload?> TakeAsync(IJSRuntime js, string storageKey)
-    {
-        try
-        {
-            var raw = await js.InvokeAsync<string?>("sessionStorage.getItem", storageKey);
-            await js.InvokeVoidAsync("sessionStorage.removeItem", storageKey);
-            if (string.IsNullOrWhiteSpace(raw))
-                return null;
-            return JsonSerializer.Deserialize<ScrollPayload>(raw, JsonOptions);
-        }
-        catch
-        {
-            return null;
-        }
-    }
-
-    public static async Task RestoreAsync(IJSRuntime js, ScrollPayload payload)
-    {
-        try
-        {
-            await js.InvokeVoidAsync("eval",
-                $@"(function(){{
-                    var el = document.getElementById('shop-product-{payload.ProductId}');
-                    if (el) {{ el.scrollIntoView({{ block: 'center', behavior: 'instant' }}); return; }}
-                    window.scrollTo(0, {payload.ScrollY.ToString(System.Globalization.CultureInfo.InvariantCulture)});
-                }})()");
-        }
-        catch
-        {
-            // ignore
-        }
-    }
-
-    public sealed record ScrollPayload(long ProductId, double ScrollY);
-}

src/FrontOffice.Main/Utilities/TokenNotificationService.cs

@@ -69,7 +69,7 @@ public class TokenNotificationService : IAsyncDisposable
                 return;
             }
 
-            var gwUrl = (_configuration["GW_URL"] ?? _configuration["GwUrl"])?.TrimEnd('/') ?? "https://localhost:5002";
+            var gwUrl = _configuration["GwUrl"]?.TrimEnd('/') ?? "https://localhost:5002";
             var hubPath = _configuration["SignalR:HubPath"] ?? "/hubs/token-relay";
             var hubUrl = $"{gwUrl}{hubPath}";
             

src/FrontOffice.Main/Utilities/UserAuthInfo.cs

@@ -11,5 +11,4 @@ public class UserAuthInfo
     public bool IsSignMainContract { get; set; }
     public bool HasPurchasedPackage { get; set; }
     public bool IsClubMemberActive { get; set; }
-    public bool HasAddress { get; set; }
 }

src/FrontOffice.Main/Utilities/WalletService.cs

@@ -1,5 +1,6 @@
 using DateTimeConverterCL;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
+using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog;
 using Google.Protobuf.WellKnownTypes;
 
 namespace FrontOffice.Main.Utilities;
@@ -32,9 +33,7 @@ public record MagicWalletStatus(
     long MagicRemainingDeposit,
     long Balance,
     DateTime? MagicActivatedAt,
-    int PurchaseCycleCount,
-    double MagicMultiplier = 2.5,
-    long MagicMaxCredit = 2_500_000_000
+    int PurchaseCycleCount
 );
 
 public class WalletService
@@ -64,7 +63,7 @@ public class WalletService
     {
         try
         {
-            var request = new GetCustomerWalletHistoryRequest();
+            var request = new GetCustomerWalletChangeLogRequest();
             if (referenceId.HasValue)
             {
                 request.ReferenceId = referenceId.Value;
@@ -73,7 +72,7 @@ public class WalletService
             {
                 request.IsIncrease = isIncrease.Value;
             }
-            var response = await _client.GetCustomerWalletHistoryAsync(request);
+            var response = await _client.GetCustomerWalletChangeLogAsync(request);
             
             return response.Models
                 .Select(log => new WalletTransaction(
@@ -97,7 +96,7 @@ public class WalletService
         }
     }
 
-    private static string ResolveTransactionDate(CustomerWalletHistoryModel model)
+    private static string ResolveTransactionDate(CustomerWalletChangeLogModel model)
     {
         if (model.CreatedAt is not null)
         {
@@ -115,15 +114,15 @@ public class WalletService
         return DateTime.Now.MiladiToJalaliWithTime();
     }
 
-    private static string ResolveDescription(CustomerWalletHistoryModel model)
+    private static string ResolveDescription(CustomerWalletChangeLogModel model)
     {
         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 ? "شارژ اعتباری" : "خرید اعتباری");
@@ -215,9 +214,7 @@ public class WalletService
                 response.MagicRemainingDeposit,
                 response.Balance,
                 activatedAt,
-                response.PurchaseCycleCount,
-                response.MagicMultiplier > 0 ? response.MagicMultiplier : 2.5,
-                response.MagicMaxCredit > 0 ? response.MagicMaxCredit : 2_500_000_000
+                response.PurchaseCycleCount
             );
         }
         catch
@@ -266,82 +263,6 @@ public class WalletService
         }
     }
 
-    public async Task<(bool Success, string? GatewayUrl, string? Error)> InitiateCreditChargeAsync(long amount)
-    {
-        try
-        {
-            var response = await _client.InitiateCreditChargeAsync(new InitiateCreditChargeRequest
-            {
-                Amount = amount
-            });
-
-            if (response.IsSuccess)
-                return (true, response.GatewayUrl, null);
-
-            return (false, null, response.ErrorMessage);
-        }
-        catch (Grpc.Core.RpcException ex)
-        {
-            return (false, null, ex.Status.Detail ?? "خطا در ارتباط با سرور");
-        }
-    }
-
-    // ============= Wallet Verify Methods =============
-
-    public async Task<(bool Success, string Message)> VerifyMagicChargeAsync(string authority, string status)
-    {
-        try
-        {
-            var response = await _client.VerifyMagicChargeAsync(new VerifyWalletChargeRequest
-            {
-                Authority = authority,
-                Status = status
-            });
-
-            return (response.Success, response.Message);
-        }
-        catch (Grpc.Core.RpcException ex)
-        {
-            return (false, ex.Status.Detail ?? "خطا در بررسی وضعیت پرداخت");
-        }
-    }
-
-    public async Task<(bool Success, string Message)> VerifyDiscountChargeAsync(string authority, string status)
-    {
-        try
-        {
-            var response = await _client.VerifyDiscountChargeAsync(new VerifyWalletChargeRequest
-            {
-                Authority = authority,
-                Status = status
-            });
-
-            return (response.Success, response.Message);
-        }
-        catch (Grpc.Core.RpcException ex)
-        {
-            return (false, ex.Status.Detail ?? "خطا در بررسی وضعیت پرداخت");
-        }
-    }
-
-    public async Task<(bool Success, string Message)> VerifyCreditChargeAsync(string authority, string status)
-    {
-        try
-        {
-            var response = await _client.VerifyCreditChargeAsync(new VerifyWalletChargeRequest
-            {
-                Authority = authority,
-                Status = status
-            });
-
-            return (response.Success, response.Message);
-        }
-        catch (Grpc.Core.RpcException ex)
-        {
-            return (false, ex.Status.Detail ?? "خطا در بررسی وضعیت پرداخت");
-        }
-    }
-
     public int GetWalletMode()
     {
         try

src/FrontOffice.Main/appsettings.Staging.json

@@ -1,9 +1,4 @@
 {
-  "Seo": {
-    "SiteUrl": "https://kbs1.ir",
-    "SiteName": "کارابازار سلامت",
-    "DefaultDescription": "باشگاه مشتریان کارابازار سلامت (KBS) — فروشگاه محصولات سلامت، پاداش شفاف، کیف پول و شبکه فروش."
-  },
   "GwUrl": "https://cms.se.kbs1.ir",
   "DownloadUrl": "",
   "EncryptionSettings": {

src/FrontOffice.Main/appsettings.json

@@ -1,10 +1,5 @@
 {
-  "Seo": {
-    "SiteUrl": "http://localhost:5268",
-    "SiteName": "کارابازار سلامت",
-    "DefaultDescription": "باشگاه مشتریان کارابازار سلامت (KBS) — فروشگاه محصولات سلامت، پاداش شفاف، کیف پول و شبکه فروش."
-  },
-  "GwUrl": "https://cms.se.kbs1.ir",
+  "GwUrl": "https://localhost:32846",
   "DownloadUrl": "",
   "EncryptionSettings": {
     "Key": "kmcQ3XTmH4mrdh8VHziuscyf8LLYjG//Kyni81nH/0E=",

src/FrontOffice.Main/staging-ca.crt

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC9jCCAd6gAwIBAgIQAwobM2pDCheGeQdvVZzMPTANBgkqhkiG9w0BAQsFADAV
-MRMwEQYDVQQDEwpzdGFnaW5nLWNhMB4XDTI2MDQyODE5MjU0NVoXDTM2MDQyNTE5
-MjU0NVowFTETMBEGA1UEAxMKc3RhZ2luZy1jYTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALOOLPxgHegrkI9YXm/0wHKchE5ukb8omv2oDYPp/CjQn8yJ
-KBpn+8tev8wT1SECACNuA3XhxtjV9dryV5U6lxkmQv2YlLrJOFa3ljcODQpAkKXl
-Q+PMWic2VyO9/UkW1a4HcPQfGhpgN710evOfBFB4Ora4CUVsADKPLbjJfX8jpqkU
-LAZiQCrA1kJ087fiKheuXEAWPgcwEE5q0BCs876zIHyST6FaLVNabM5/m0sr7Bky
-1GQCJlgOLtUeDkaXAv/WJqq/LetcjNy2dWS26PJc7C2byShTfaaWDM8Ki5FG/uMQ
-/6L54Lx5QKGbl8MzIKmEscXe4GYnmE8MyHQX0aECAwEAAaNCMEAwDgYDVR0PAQH/
-BAQDAgKkMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFELZSJbeWDRQgj6cTQWY
-K2sT9ZsLMA0GCSqGSIb3DQEBCwUAA4IBAQCT2eGmHcd1t4K80NobrUzm1d3SB4EW
-XOLCR+TTYFIYsim0eltwzrOuch+MBTf4+v+4zXWE4e7d1B1lzJIqFIXcgLpDu0i2
-QeZMrPxY1rkUhqGPwwsoOWBIK/cGot2yg6SZEwj64f7lKUbUB8aWY+xSzct2mwlG
-i0j6wt0/eRh6hKGdvEiYORffdubC94utkNzr0kFszY4yb3vG0zCVWYiGzkxe0IiF
-Gc8zN8ZHTY9tk+G5wQuj2WAo7M3DXgFWBbhNgharKulEXTxLXhQksw/nXITa2IwM
-qt4MWHdGn7/iIyUp/774ySkFk2n6cHi7gQAvolT6OZNCuAOYm8+No7P6
------END CERTIFICATE-----

src/FrontOffice.Main/wwwroot/css/org-chart.css

@@ -72,10 +72,10 @@
 /* Compact Header */
 .node-header-compact {
     display: flex;
-    align-items: flex-start;
+    align-items: center;
     gap: 6px;
     padding: 6px 8px;
-    min-height: 100%;
+    height: 100%;
     background: linear-gradient(135deg, #f8f9fa 0%, #fff 100%);
 }
 
@@ -124,39 +124,6 @@
     margin-top: 1px;
 }
 
-.org-node-card .package-name-badge {
-    display: inline-flex;
-    align-items: center;
-    height: 14px;
-    padding: 0 6px;
-    margin-top: 2px;
-    border-radius: 7px;
-    font-size: 9px;
-    color: #546e7a;
-    background: #eceff1;
-    border: 1px solid #b0bec5;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 120px;
-}
-
-/* D3: طلایی / نقره‌ای — پای چپ و راست */
-.node-leg-scores {
-    margin-top: 3px;
-    line-height: 1.25;
-    font-size: 8px;
-    font-weight: 600;
-}
-
-.node-leg-scores .leg-score-line.gold {
-    color: #b8860b;
-}
-
-.node-leg-scores .leg-score-line.silver {
-    color: #607d8b;
-}
-
 /* Referral Code - only for club active members */
 .node-referral {
     display: flex;

src/FrontOffice.Main/wwwroot/css/site.css

@@ -39,31 +39,7 @@
     font-display: swap;
     src: url(../fonts/Vazir-Bold.ttf) format('truetype');
 }
-/* Roboto - Latin Extended */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300 700;
-  font-stretch: 100%;
-  font-display: swap;
-  src: url('../fonts/roboto/roboto-latin-ext.woff2') format('woff2');
-  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF,
-    U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020,
-    U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
-}
 
-/* Roboto - Latin */
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 300 700;
-  font-stretch: 100%;
-  font-display: swap;
-  src: url('../fonts/roboto/roboto-latin.woff2') format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193,
-    U+2212, U+2215, U+FEFF, U+FFFD;
-}
 :root {
     --app-font-family: 'Vazir', Tahoma, 'Segoe UI', Arial, sans-serif;
 }
@@ -1635,30 +1611,3 @@ html, body {
 }
 
 /*#endregion*/
-
-/* ── Package Purchase Dialog tiles ── */
-.pkg-tile {
-    transition: transform .2s ease, box-shadow .2s ease, border-color .2s ease;
-    position: relative;
-}
-.pkg-tile:hover {
-    transform: translateY(-3px);
-    box-shadow: 0 6px 20px rgba(0,0,0,.08);
-    border-color: var(--mud-palette-primary) !important;
-}
-.pkg-tile-badge {
-    position: absolute;
-    top: 8px;
-    right: 8px;
-}
-.pkg-payment-option {
-    transition: transform .15s ease, box-shadow .15s ease;
-}
-.pkg-payment-option:hover {
-    transform: translateY(-2px);
-    box-shadow: 0 4px 12px rgba(0,0,0,.06);
-}
-@media (max-width: 600px) {
-    .pkg-tile { padding: .8rem !important; }
-    .pkg-tile .mud-avatar-large { width: 48px !important; height: 48px !important; }
-}