Merge branch 'kub-stage' into production

- Included the Microsoft.JSInterop namespace in the Checkout.razor.cs file to enable JavaScript interop functionality.
- This addition prepares the Checkout component for future enhancements that may require interaction with JavaScript libraries or functions.

These changes improve the potential for interactive features in the checkout process, enhancing user experience.

.gitattributes

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

.gitea/workflows/kub-deploy.yml

@@ -0,0 +1,82 @@
+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

@@ -69,8 +69,15 @@ 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 set image deployment/frontoffice frontoffice=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
-            kubectl rollout status deployment/frontoffice --timeout=300s
+            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
           "
           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,3 +1,4 @@
 # Docs moved to totalDoc
 
 See [totalDoc/INDEX.md](../../totalDoc/INDEX.md) for all documentation.
+ 

docs/CUSTOMER-SERVICES.md

@@ -0,0 +1,263 @@
+# سرویس‌های 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.9 | `OrderService.CalculateOrderPVAsync` | `UserOrderContract.CalculateOrderPV` | `/order/{id}` | محاسبه PV سفارش |
+| 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

@@ -0,0 +1,56 @@
+---
+# 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

@@ -0,0 +1,56 @@
+---
+# 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.UserWalletChangeLog;
+using CMSMicroservice.Protobuf.Protos.UserWalletHistory;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.Configuration;
 using CMSMicroservice.Protobuf.Protos.NetworkMembership;
@@ -30,6 +30,7 @@ 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;
 
@@ -56,6 +57,7 @@ public static class ConfigureServices
         services.AddSingleton<UserAuthInfo>();
         services.AddScoped<AuthService>();
         services.AddScoped<AuthDialogService>();
+        services.AddScoped<GuestActionGate>();
         // Storefront services
         services.AddScoped<CartService>();
         services.AddScoped<ProductService>();
@@ -94,26 +96,45 @@ 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 = configuration["GwUrl"];
+        var baseUrl = ResolveGatewayUrl(configuration)
+            ?? throw new InvalidOperationException("Gateway URL is missing. Set GW_URL or GwUrl.");
 
-        // Register optimized HttpClient for gRPC
+        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.
         services.AddScoped(sp =>
         {
-            var handler = new HttpClientHandler
-            {
-                MaxConnectionsPerServer = 10,
-                AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
-            };
+            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
+                };
 
-            return new HttpClient(new GrpcWebHandler(GrpcWebMode.GrpcWeb, handler))
+            return new HttpClient(new GrpcWebHandler(GrpcWebMode.GrpcWeb, inner))
             {
                 Timeout = TimeSpan.FromMinutes(10),
-                BaseAddress = new Uri(baseUrl)
+                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
             };
         });
 
@@ -128,7 +149,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.UserWalletChangeLog.UserWalletChangeLogContract.UserWalletChangeLogContractClient>);
+        services.AddScoped(CreateAuthenticatedClient<CMSMicroservice.Protobuf.Protos.UserWalletHistory.UserWalletHistoryContract.UserWalletHistoryContractClient>);
         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>);
@@ -151,12 +172,22 @@ 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) =>
         {
@@ -176,10 +207,14 @@ 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 = true,
-            Credentials = ChannelCredentials.Create(new SslCredentials(), credentials),
+            UnsafeUseInsecureChannelCallCredentials = !isHttps,
+            Credentials = channelCredentials,
             HttpClient = httpClient,
             MaxReceiveMessageSize = 1000 * 1024 * 1024, // 1 GB
             MaxSendMessageSize = 1000 * 1024 * 1024     // 1 GB

src/FrontOffice.Main/Dockerfile

@@ -20,6 +20,10 @@ 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.181" />
+    <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.204" />
 <!--    <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,12 +56,6 @@
     <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,6 +27,11 @@
                 <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>
@@ -66,80 +71,6 @@
                         </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>
 
@@ -207,15 +138,36 @@
                                        FullWidth="true"
                                        StartIcon="@Icons.Material.Filled.Payment"
                                        OnClick="ProcessPayment"
-                                       Disabled="@(!CanProceedToPayment || _isProcessingPayment)"
+                                       Disabled="@(!CanProceedToPayment || _isProcessingPayment || !_selectedPackage.SupportsDirectPurchase)"
                                        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,11 +1,7 @@
-
 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;
 
@@ -13,17 +9,12 @@ 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
@@ -34,16 +25,11 @@ public partial class Checkout
     private long _discountAmount;
     private long _finalPrice;
 
-    // Address management
-    private bool _isSettingDefaultAddress;
-    private long? _settingDefaultAddressId;
-
-    private bool CanProceedToPayment => _selectedPackage != null && _selectedAddress != null;
+    private bool CanProceedToPayment => _selectedPackage != null;
 
     protected override async Task OnInitializedAsync()
     {
         await LoadPackageDetails();
-        await LoadAddresses();
     }
 
     private async Task LoadPackageDetails()
@@ -52,15 +38,18 @@ public partial class Checkout
         {
             try
             {
-                var response = await PackageClient.GetPackageAsync(new() { Id = PackageId.Value });
-                if (response != null)
+                var packages = await PackageService.GetAllPackagesAsync();
+                var pkg = packages.FirstOrDefault(p => p.Id == PackageId.Value);
+                if (pkg != null)
                 {
                     _selectedPackage = new Pack(
-                        Id: response.Id,
-                        Title: response.Title,
-                        Body: response.Description,
-                        Image: response.ImagePath ?? string.Empty,
-                        Price: response.Price
+                        Id: pkg.Id,
+                        Title: pkg.Title,
+                        Body: pkg.Description,
+                        Image: pkg.ImageUrl,
+                        Price: pkg.Price,
+                        SupportsDirectPurchase: pkg.SupportsDirectPurchase,
+                        SupportsDayaPurchase: pkg.SupportsDayaPurchase
                     );
                     _finalPrice = _selectedPackage.Price;
                 }
@@ -72,60 +61,6 @@ 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))
@@ -157,7 +92,7 @@ public partial class Checkout
                 _finalPrice = _selectedPackage!.Price;
             }
         }
-        catch (Exception ex)
+        catch (Exception)
         {
             _discountMessage = "خطا در اعمال کد تخفیف.";
             _discountApplied = false;
@@ -173,12 +108,11 @@ public partial class Checkout
 
     private async Task ProcessPayment()
     {
-        Snackbar.Add("درگاه پرداخت متصل نیست! لطفا در زمان دیگری مجددا تلاش فرمایید!", Severity.Warning);
-        return;
+        if (_isProcessingPayment) return;
 
-        if (!CanProceedToPayment || _selectedPackage == null || _selectedAddress == null)
+        if (!CanProceedToPayment || _selectedPackage == null)
         {
-            Snackbar.Add("لطفاً پکیج و آدرس را انتخاب کنید.", Severity.Warning);
+            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
             return;
         }
 
@@ -186,33 +120,26 @@ public partial class Checkout
 
         try
         {
-            // Step 1: Create payment request
-            var paymentRequest = new CustomerPaymentRequestRequest
+            var response = await PackageClient.CustomerPurchasePackageAsync(new CustomerPurchasePackageRequest
             {
-                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,
-                PaymentStatus = CMSMicroservice.Protobuf.Protos.PaymentStatus.Pending
-            };
+                PurchaseMethod = PurchaseMethodEnum.PurchaseMethodGateway
+            });
 
-            var orderResponse = await UserOrderContract.CreateNewUserOrderAsync(orderRequest);
+            if (!response.Success)
+            {
+                Snackbar.Add(response.Message ?? "خطا در آغاز فرآیند پرداخت", Severity.Error);
+                return;
+            }
 
-            // Step 3: Redirect to payment gateway
-            Navigation.NavigateTo(paymentResponse.PaymentGWUrl);
+            if (!string.IsNullOrEmpty(response.PaymentGatewayUrl))
+            {
+                Navigation.NavigateTo(response.PaymentGatewayUrl, forceLoad: true);
+            }
+            else
+            {
+                Snackbar.Add("خطا در دریافت آدرس درگاه پرداخت", Severity.Error);
+            }
         }
         catch (Exception ex)
         {
@@ -225,5 +152,17 @@ public partial class Checkout
         }
     }
 
-    private record Pack(long Id, string Title, string Body, string Image, long Price);
-}
+    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);
+}

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

@@ -3,7 +3,12 @@
 
 <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,6 +10,7 @@ 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; }
 
@@ -21,6 +22,18 @@ 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()
     {
@@ -75,9 +88,8 @@ public partial class ActivationSection : ComponentBase
 
     private string GetEstimatedCost()
     {
-        // فرمول تقریبی: 56M per month (base amount from BFF implementation)
-        var baseAmount = 56_000_000;
-        var total = baseAmount * _durationMonths;
+        if (_basePackagePrice <= 0) return "در حال بارگذاری...";
+        var total = _basePackagePrice * _durationMonths;
         return $"{total:N0} تومان";
     }
 }

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

@@ -9,6 +9,11 @@
     <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="در حال دریافت اطلاعات عضویت..." />
@@ -65,7 +70,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,10 +10,15 @@
     <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="4">
+                <MudItem xs="12" sm="6" md="3">
                     <WeekSelector @ref="_weekSelector"
                                   @bind-Value="_selectedWeekDefinition"
                                   Label="انتخاب هفته"
@@ -23,7 +28,7 @@
                                   Clearable="true"
                                   OnlyActive="false" />
                 </MudItem>
-                <MudItem xs="12" sm="6" md="4">
+                <MudItem xs="12" sm="6" md="3">
                     <MudSelect T="string" @bind-Value="_filterStatus" Label="وضعیت" Variant="Variant.Outlined">
                         <MudSelectItem T="string" Value="@string.Empty">همه</MudSelectItem>
                         <MudSelectItem T="string" Value="@("Pending")">در انتظار</MudSelectItem>
@@ -34,7 +39,16 @@
                         <MudSelectItem T="string" Value="@("Cancelled")">لغو شده</MudSelectItem>
                     </MudSelect>
                 </MudItem>
-                <MudItem xs="12" sm="12" md="4">
+                <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">
                     <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">
                             اعمال فیلتر
@@ -87,6 +101,7 @@
                         <MudTable Items="_payouts" Hover="true" Striped="true" Dense="true" FixedHeader="true" Height="400px">
                             <HeaderContent>
                                 <MudTh>هفته</MudTh>
+                                <MudTh>پکیج</MudTh>
                                 <MudTh>امتیاز</MudTh>
                                 <MudTh>مبلغ (تومان)</MudTh>
                                 <MudTh>وضعیت</MudTh>
@@ -97,6 +112,11 @@
                                 <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>
@@ -127,6 +147,10 @@
                                         <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,8 +8,10 @@ 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;
@@ -19,12 +21,26 @@ 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
@@ -35,7 +51,8 @@ public partial class CommissionDashboardPage : ComponentBase
                 weekDefinitionId,
                 _filterStatus,
                 _pageNumber,
-                _pageSize
+                _pageSize,
+                _filterPackageId
             );
             _payouts = result.Payouts;
             _totalCount = result.TotalCount;
@@ -61,6 +78,7 @@ 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="6" md="6">
+                <MudItem xs="8" sm="4" md="4">
                     <WeekSelector @ref="_weekSelector"
                                   @bind-Value="_selectedWeekDefinition"
                                   Label="انتخاب هفته"
@@ -21,15 +21,15 @@
                                   Dense="false"
                                   OnlyActive="true" />
                 </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="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" Class="pt-6">
                     <MudButton Variant="Variant.Filled" 
                                Color="Color.Primary" 
@@ -66,6 +66,12 @@
                     <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,6 +8,7 @@ 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]
@@ -17,6 +18,8 @@ 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;
 
@@ -34,6 +37,8 @@ public partial class WeeklyBalancePage : ComponentBase
     {
         if (firstRender)
         {
+            await LoadPackagesAsync();
+
             // Wait for WeekSelector to initialize and load its cached weeks
             if (_weekSelector != null)
             {
@@ -88,7 +93,7 @@ public partial class WeeklyBalancePage : ComponentBase
             
             long? weekDefinitionId = _selectedWeekDefinition?.Id;
             
-            _weeklyBalance = await CommissionService.GetMyWeeklyBalanceAsync(weekDefinitionId);
+            _weeklyBalance = await CommissionService.GetMyWeeklyBalanceAsync(weekDefinitionId, _filterPackageId);
             
             // Update week display name from selected definition if available
             if (_selectedWeekDefinition != null && _weeklyBalance != null)
@@ -113,6 +118,18 @@ 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

@@ -23,9 +23,9 @@
                         <HeaderContent>
                             <MudTh>محصول</MudTh>
                             <MudTh>قیمت واحد</MudTh>
-                            <MudTh>سقف تخفیف</MudTh>
+                            <MudTh>سقف اعتبار</MudTh>
                             <MudTh>تعداد</MudTh>
-                            <MudTh>تخفیف</MudTh>
+                            <MudTh>اعتبار</MudTh>
                             <MudTh>قیمت نهایی</MudTh>
                             <MudTh></MudTh>
                         </HeaderContent>
@@ -40,7 +40,7 @@
                             <MudTd>@FormatPrice(context.UnitPrice)</MudTd>
                             <MudTd>
                                 <MudChip T="string" Color="Color.Error" Variant="Variant.Outlined" Size="Size.Small">
-                                    @context.MaxDiscountPercent% تخفیف
+                                    @context.MaxDiscountPercent% اعتبار
                                 </MudChip>
                             </MudTd>
                             <MudTd>
@@ -86,7 +86,7 @@
                                         <MudText Typo="Typo.subtitle2">@item.Title</MudText>
                                     </MudStack>
                                     <MudChip T="string" Color="Color.Error" Variant="Variant.Outlined" Size="Size.Small">
-                                        @item.MaxDiscountPercent% تخفیف
+                                        @item.MaxDiscountPercent% اعتبار
                                     </MudChip>
                                 </MudStack>
 
@@ -107,7 +107,7 @@
                                     <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
                                         @if (item.DiscountAmount > 0)
                                         {
-                                            <MudText Typo="Typo.caption" Color="Color.Success">تخفیف: @FormatPrice(item.DiscountAmount)-</MudText>
+                                            <MudText Typo="Typo.caption" Color="Color.Success">اعتبار: @FormatPrice(item.DiscountAmount)-</MudText>
                                         }
                                         <MudText>جمع: @FormatPrice(item.FinalPrice)</MudText>
                                         <MudIconButton Icon="@Icons.Material.Filled.Delete" Color="Color.Error"
@@ -131,13 +131,20 @@
                     @if (DiscountCart.TotalDiscount > 0)
                     {
                         <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
-                            <MudText Typo="Typo.caption" Color="Color.Success">سقف تخفیف قابل اعمال:</MudText>
+                            <MudText Typo="Typo.caption" Color="Color.Success">سقف اعتبار قابل اعمال:</MudText>
                             <MudText Typo="Typo.caption" Color="Color.Success">@FormatPrice(DiscountCart.TotalDiscount)- تومان</MudText>
                         </MudStack>
                     }
+                    @if (VAT.IsEnabled)
+                    {
+                        <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
+                            <MudText Typo="Typo.caption" Class="mud-text-secondary">مالیات ارزش افزوده (@VAT.VatPercentage%):</MudText>
+                            <MudText Typo="Typo.caption" Class="mud-text-secondary">@FormatPrice(VatAmount)+ تومان</MudText>
+                        </MudStack>
+                    }
                     <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
                         <MudText Typo="Typo.h6" Class="fw-bold">حداقل پرداخت:</MudText>
-                        <MudText Typo="Typo.h6" Color="Color.Primary" Class="fw-bold">@FormatPrice(DiscountCart.FinalPrice) تومان</MudText>
+                        <MudText Typo="Typo.h6" Color="Color.Primary" Class="fw-bold">@FormatPrice(TotalWithVat) تومان</MudText>
                     </MudStack>
                 </MudStack>
 
@@ -161,14 +168,21 @@
                         @if (DiscountCart.TotalDiscount > 0)
                         {
                             <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                <MudText Typo="Typo.body2" Color="Color.Success">سقف تخفیف قابل اعمال:</MudText>
+                                <MudText Typo="Typo.body2" Color="Color.Success">سقف اعتبار قابل اعمال:</MudText>
                                 <MudText Typo="Typo.body2" Color="Color.Success">@FormatPrice(DiscountCart.TotalDiscount)- تومان</MudText>
                             </MudStack>
                         }
+                        @if (VAT.IsEnabled)
+                        {
+                            <MudStack Row="true" Justify="Justify.SpaceBetween">
+                                <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات بر ارزش افزوده (@VAT.VatPercentage%):</MudText>
+                                <MudText Typo="Typo.body2" Class="mud-text-secondary">@FormatPrice(VatAmount)+ تومان</MudText>
+                            </MudStack>
+                        }
                         <MudDivider Class="my-1" />
                         <MudStack Row="true" Justify="Justify.SpaceBetween">
                             <MudText Typo="Typo.subtitle1" Class="fw-bold">حداقل مبلغ پرداخت درگاه:</MudText>
-                            <MudText Typo="Typo.subtitle1" Color="Color.Primary" Class="fw-bold">@FormatPrice(DiscountCart.FinalPrice) تومان</MudText>
+                            <MudText Typo="Typo.subtitle1" Color="Color.Primary" Class="fw-bold">@FormatPrice(TotalWithVat) تومان</MudText>
                         </MudStack>
                         <MudText Typo="Typo.caption" Class="mud-text-secondary">
                             مبلغ دقیق پرداخت در مرحله تسویه مشخص خواهد شد.

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

@@ -6,9 +6,16 @@ namespace FrontOffice.Main.Pages.DiscountStore;
 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;
     }
@@ -44,6 +51,18 @@ public partial class Cart : IDisposable
         Navigation.NavigateTo(RouteConstants.DiscountStore.Checkout);
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await VAT.LoadAsync();
+            StateHasChanged();
+        }
+    }
+
+    private long VatAmount => VAT.CalculateVAT(DiscountCart.FinalPrice);
+    private long TotalWithVat => DiscountCart.FinalPrice + VatAmount;
+
     private static string FormatPrice(long price) => $"{price:N0} ";
 
     private static string GetImageUrl(string? imageUrl)

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

@@ -90,7 +90,7 @@
                                             </MudText>
                                             @if (item.MaxDiscountPercent > 0)
                                             {
-                                                <MudText Typo="Typo.caption" Color="Color.Error">@item.MaxDiscountPercent% تخفیف</MudText>
+                                                <MudText Typo="Typo.caption" Color="Color.Error">@item.MaxDiscountPercent% اعتبار</MudText>
                                             }
                                         </MudStack>
                                     </MudStack>
@@ -108,17 +108,17 @@
                         </MudStack>
 
                         <MudStack Row="true" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2" Color="Color.Success">تخفیف از کیف اعتباری:</MudText>
+                            <MudText Typo="Typo.body2" Color="Color.Success">اعتبار از کیف اعتباری:</MudText>
                             <MudText Typo="Typo.body2" Color="Color.Success">@FormatPrice(DiscountCart.TotalDiscount)- تومان</MudText>
                         </MudStack>
 
                         <MudStack Row="true" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2">مبلغ پس از تخفیف:</MudText>
+                            <MudText Typo="Typo.body2">مبلغ پس از اعتبار:</MudText>
                             <MudText Typo="Typo.body2">@FormatPrice(NetGatewayAmount) تومان</MudText>
                         </MudStack>
 
                         <MudStack Row="true" Justify="Justify.SpaceBetween">
-                            <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات بر ارزش افزوده (۱۰٪):</MudText>
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات بر ارزش افزوده (@VAT.VatPercentage٪):</MudText>
                             <MudText Typo="Typo.body2" Class="mud-text-secondary">@FormatPrice(VatAmount)+ تومان</MudText>
                         </MudStack>
 

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

@@ -10,6 +10,9 @@ public partial class Checkout
     [Inject] private DiscountCartService DiscountCart { get; set; } = default!;
     [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;
@@ -18,13 +21,11 @@ public partial class Checkout
     private string? _notes;
     private bool _placing;
 
-    private const decimal VAT_RATE = 0.10m;
-
-    /// <summary>مبلغ درگاه قبل از مالیات (جمع کل - تخفیف)</summary>
+    /// <summary>مبلغ درگاه قبل از مالیات (جمع کل - اعتبار)</summary>
     private long NetGatewayAmount => DiscountCart.TotalPrice - DiscountCart.TotalDiscount;
 
-    /// <summary>مالیات بر ارزش افزوده ۱۰٪</summary>
-    private long VatAmount => (long)(NetGatewayAmount * VAT_RATE);
+    /// <summary>مالیات بر ارزش افزوده</summary>
+    private long VatAmount => VAT.CalculateVAT(NetGatewayAmount);
 
     /// <summary>مبلغ نهایی قابل پرداخت (شامل VAT)</summary>
     private long FinalGatewayAmount => NetGatewayAmount + VatAmount;
@@ -33,8 +34,17 @@ public partial class Checkout
 
     protected override async Task OnInitializedAsync()
     {
+        if (!await AuthService.IsAuthenticatedAsync())
+        {
+            await AuthDialogService.ShowAuthDialogAsync();
+        }
+        await VAT.LoadAsync();
         await DiscountCart.EnsureInitializedAsync();
-        await LoadAddresses();
+        var userInfo = await AuthService.GetUserAuthInfo();
+        if (userInfo.HasAddress)
+            await LoadAddresses();
+        else
+            _addresses = new();
     }
 
     private async Task LoadAddresses()

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

@@ -82,8 +82,8 @@ else
                             <MudTh>محصول</MudTh>
                             <MudTh>قیمت واحد</MudTh>
                             <MudTh>تعداد</MudTh>
-                            <MudTh>سقف تخفیف</MudTh>
-                            <MudTh>تخفیف</MudTh>
+                            <MudTh>سقف اعتبار</MudTh>
+                            <MudTh>اعتبار</MudTh>
                             <MudTh>قیمت نهایی</MudTh>
                         </HeaderContent>
                         <RowTemplate>
@@ -131,7 +131,7 @@ else
                                     @if (item.DiscountAmount > 0)
                                     {
                                         <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                            <MudText Typo="Typo.body2" Color="Color.Success">تخفیف (@item.MaxDiscountPercent%):</MudText>
+                                            <MudText Typo="Typo.body2" Color="Color.Success">اعتبار (@item.MaxDiscountPercent%):</MudText>
                                             <MudText Typo="Typo.body2" Color="Color.Success">@FormatPrice(item.DiscountAmount)-</MudText>
                                         </MudStack>
                                     }
@@ -163,6 +163,14 @@ else
                         </MudStack>
                     }
 
+                    @if (VAT.IsEnabled)
+                    {
+                        <MudStack Row="true" Justify="Justify.SpaceBetween">
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary">مالیات بر ارزش افزوده (@VAT.VatPercentage%):</MudText>
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary">@FormatPrice(OrderVatAmount)+</MudText>
+                        </MudStack>
+                    }
+
                     <MudDivider Class="my-1" />
 
                     <MudStack Row="true" Justify="Justify.SpaceBetween">

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

@@ -12,12 +12,28 @@ public partial class OrderDetail
     public string? PaymentResult { get; set; }
 
     [Inject] private DiscountOrderService DiscountOrderService { get; set; } = default!;
+    [Inject] private VATService VAT { get; set; } = default!;
 
     private DiscountOrderDetail? _order;
     private bool _loading = true;
     private string? _paymentMessage;
     private MudBlazor.Severity _paymentSeverity;
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await VAT.LoadAsync();
+            StateHasChanged();
+        }
+    }
+
+    /// <summary>مبلغ قبل از مالیات (جمع کل - اعتبار)</summary>
+    private long PreVatGateway => _order is null ? 0 : (_order.TotalPrice - _order.DiscountBalanceUsed);
+
+    /// <summary>مالیات بر ارزش افزوده</summary>
+    private long OrderVatAmount => VAT.CalculateVAT(PreVatGateway);
+
     protected override async Task OnInitializedAsync()
     {
         // نمایش پیام نتیجه پرداخت (بعد از بازگشت از درگاه)

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

@@ -63,25 +63,58 @@
                     }
 
                     <!-- Price & Discount -->
-                    <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.h5" Color="Color.Primary" Class="fw-bold">
-                                    @($"{_product.Price:N0}") تومان
-                                </MudText>
-                            </MudStack>
-                            @if (_product.MaxDiscountPercent > 0)
-                            {
+                    @if (_isAuthenticated)
+                    {
+                        <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>
-                                    <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small">
-                                        @_product.MaxDiscountPercent% (@($"{_product.Price * _product.MaxDiscountPercent / 100:N0}") تومان)
-                                    </MudChip>
+                                    <MudText Typo="Typo.body2" Class="mud-text-secondary">قیمت محصول:</MudText>
+                                    <MudText Typo="Typo.body1" Class="fw-bold">
+                                        @($"{_product.Price:N0}") تومان
+                                    </MudText>
                                 </MudStack>
-                            }
-                        </MudStack>
-                    </MudPaper>
+                                @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>
+                    }
 
                     <!-- Stock & Stats -->
                     <MudStack Row="true" Spacing="3" Class="flex-wrap">

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

@@ -9,6 +9,11 @@ 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;
@@ -18,9 +23,19 @@ public partial class ProductDetail
 
     protected override async Task OnInitializedAsync()
     {
+        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
         await LoadProductAsync();
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await VAT.LoadAsync();
+            StateHasChanged();
+        }
+    }
+
     private async Task LoadProductAsync()
     {
         _loading = true;
@@ -49,8 +64,14 @@ public partial class ProductDetail
         _addingToCart = true;
         try
         {
-            await DiscountCartService.AddAsync(_product.Id, _quantity);
-            Snackbar.Add($"{_product.Title} به سبد خرید اضافه شد", MudBlazor.Severity.Success);
+            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);
+            });
         }
         catch
         {

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

@@ -76,6 +76,7 @@
             {
                 <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">
@@ -97,13 +98,25 @@
                                 {
                                     <MudChip T="string" Color="Color.Error" Variant="Variant.Filled" Size="Size.Small"
                                              Style="position:absolute;top:8px;left:8px;">
-                                        @p.MaxDiscountPercent% تخفیف
+                                        @p.MaxDiscountPercent% اعتبار
                                     </MudChip>
                                 }
                             </div>
                             <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
                                 <MudText Typo="Typo.subtitle1">@p.Title</MudText>
-                                <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</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>
                         </MudCardContent>
                         <MudCardActions Class="mt-auto d-flex justify-space-between pa-2">
@@ -115,6 +128,7 @@
                             </MudButton>
                         </MudCardActions>
                     </MudCard>
+                    </div>
                 </MudItem>
             }
         </MudGrid>

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

@@ -1,5 +1,7 @@
 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;
@@ -8,7 +10,11 @@ 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;
@@ -17,41 +23,107 @@ 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()
     {
-        _loading = true;
+        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
         await DiscountCart.EnsureInitializedAsync();
         DiscountCart.OnChange += StateHasChanged;
-        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;
+        Navigation.LocationChanged += HandleLocationChanged;
+
+        _categories = await ProductService.GetCategoriesAsync();
+        ApplyStateFromUri();
+        _loading = true;
+        await LoadPages(_currentPage);
         _loading = false;
+        _pendingScrollRestore = true;
     }
 
-    private async Task LoadInitial()
+    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()
     {
         _loading = true;
         _currentPage = 1;
-        _products.Clear();
         StateHasChanged();
-        
-        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;
+        await LoadPages(1);
+        SyncUrl();
         _loading = false;
         StateHasChanged();
     }
@@ -59,53 +131,82 @@ 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);
+            categoryId: _selectedCategoryId,
+            sortBy: DefaultSortBy);
         _products.AddRange(result.Products);
         _hasMore = result.CurrentPage < result.TotalPages;
-        
+        SyncUrl();
+
         _loadingMore = false;
         StateHasChanged();
     }
 
-    private async Task SearchProducts() => await LoadInitial();
+    private async Task SearchProducts() => await ReloadFromFilters();
 
     private async Task OnSearchKeyUp(KeyboardEventArgs e)
     {
         if (e.Key == "Enter")
-        {
-            await LoadInitial();
-        }
+            await ReloadFromFilters();
     }
 
     private async Task OnCategoryChanged(long? value)
     {
         _selectedCategoryId = value;
-        await LoadInitial();
+        await ReloadFromFilters();
     }
 
     private async Task AddToCart(DiscountProductCard p)
     {
-        await DiscountCart.AddAsync(p.Id);
+        await GuestGate.RunAsync(() => DiscountCart.AddAsync(p.Id));
     }
 
-    private void NavigateToProduct(long id)
+    private async Task 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,6 +172,179 @@
     </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
    ═══════════════════════════════════════════════ *@
@@ -256,6 +429,8 @@
 @* ═══════════════════════════════════════════════
    6. TESTIMONIALS
    ═══════════════════════════════════════════════ *@
+@if (_testimonials.Count > 0)
+{
 <section class="section-landing">
     <MudContainer MaxWidth="MaxWidth.Large">
         <div class="text-center mb-8 fade-in-up">
@@ -292,6 +467,7 @@
         </MudGrid>
     </MudContainer>
 </section>
+}
 
 @* ═══════════════════════════════════════════════
    7. FAQ

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

@@ -10,11 +10,26 @@ 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();
 
@@ -33,6 +48,7 @@ public partial class Index : IDisposable
     protected override async Task OnInitializedAsync()
     {
         MainService.OnChangeHandler += OnStateChanged;
+        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
 
         // Load landing page settings from CMS
         try
@@ -51,10 +67,29 @@ 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 = await BlogPostService.GetFeaturedPostsAsync(2);
+            _latestPosts = featuredPostsTask.IsCompletedSuccessfully
+                ? featuredPostsTask.Result
+                : await BlogPostService.GetFeaturedPostsAsync(2);
 
             if (_latestPosts.Count < 2)
             {
@@ -158,9 +193,10 @@ public partial class Index : IDisposable
         }
 
         // ── Testimonials ──
-        if (_settings?.Testimonials?.Any() == true)
+        // اگر تنظیمات از CMS لود شده، لیست خالی یعنی ادمین عمداً حذف کرده — بدون fallback hardcode
+        if (_settings is not null)
         {
-            _testimonials = _settings.Testimonials
+            _testimonials = (_settings.Testimonials ?? [])
                 .Select((t, i) => new TestimonialItem(t.Quote ?? "", t.Name ?? "", t.Role ?? "", i * 150))
                 .ToList();
         }
@@ -169,7 +205,7 @@ public partial class Index : IDisposable
             _testimonials = new()
             {
                 new("با کارا بازار سلامت، محاسبه کارمزدها و پایش تیم‌ها بدون اکسل و دردسر انجام می‌شود.", "شرکت سینا نت", "مدیر عملیات", 0),
-                new("شجره‌نامه بصری و گزارش‌های دقیق باعث شد رشد تیم را لحظه‌ای ببینیم.", "هولدینگ آریانا", "مدیر فروش", 150),
+                new("سازمان فروش بصری و گزارش‌های دقیق باعث شد رشد تیم را لحظه‌ای ببینیم.", "هولدینگ آریانا", "مدیر فروش", 150),
                 new("سادگی ثبت‌نام و شفافیت پاداش‌ها مهم‌ترین مزیت این پلتفرم است.", "گروه بهداشتی نوین", "مدیر توسعه", 300),
             };
         }
@@ -267,6 +303,21 @@ 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/Licenses.razor

@@ -37,7 +37,7 @@ else
                     <MudGrid Spacing="4" Justify="Justify.Center">
                         @foreach (var license in _licenseImages)
                         {
-                            <MudItem xs="12" sm="6" md="4">
+                            <MudItem xs="6" sm="6" md="4">
                                 <MudCard Elevation="2" Class="h-100">
                                     <MudCardMedia Image="@license.ImagePath" Height="250" />
                                     <MudCardContent>

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,7 +34,76 @@
     }
     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">
@@ -49,7 +118,7 @@
                         <MudStack Spacing="2">
                             <MudStack Row="true" Justify="Justify.SpaceBetween">
                                 <MudText Typo="Typo.body2" Class="mud-text-secondary">نوع پکیج:</MudText>
-                                <MudText Typo="Typo.body2">پکیج طلایی</MudText>
+                                <MudText Typo="Typo.body2">@_userStatus.PackageTitle</MudText>
                             </MudStack>
 
                             <MudStack Row="true" Justify="Justify.SpaceBetween">
@@ -146,7 +215,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,7 +9,9 @@ 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()
     {
@@ -30,6 +32,18 @@ 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)
         {
@@ -67,4 +81,11 @@ 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,6 +5,11 @@
 <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">
@@ -27,7 +32,7 @@
         {
             <MudAlert Severity="Severity.Success" Class="mb-6" Icon="@Icons.Material.Filled.CheckCircle">
                 <MudText>
-                    شما قبلاً پکیج طلایی را خریداری کرده‌اید.
+                    شما قبلاً پکیج را خریداری کرده‌اید.
                     @if (_userStatus.IsClubMemberActive)
                     {
                         <span>عضویت باشگاه شما فعال است.</span>
@@ -64,20 +69,43 @@
                                     <MudText Typo="Typo.h6" Color="Color.Success">@package.FormattedPrice</MudText>
                                 </MudStack>
 
-                                <!-- Features Preview -->
+                                <!-- Package Highlights -->
                                 <MudStack Spacing="1" Class="mt-2">
-                                    <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>
+                                    @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>
                             </MudStack>
                         </MudCardContent>
@@ -100,9 +128,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,36 +64,38 @@ public partial class PackageDetail : IDisposable
 
         try
         {
-            // Load package details
-            var packageResponse = await PackageClient.GetPackageAsync(request: new() { Id = Id}, cancellationToken: _loadCts.Token);
+            // Load package details via Customer RPC
+            var response = await PackageClient.GetCustomerPackageDetailsAsync(
+                new GetCustomerPackageDetailsRequest { PackageId = Id },
+                cancellationToken: _loadCts.Token);
 
-            if (packageResponse != null)
+            if (response != 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 = 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>
-                    {
-                        "مدیریت تیم نامحدود",
-                        "شجره‌نامه بصری",
-                        "محاسبه کارمزد خودکار",
-                        "گزارش‌های مالی",
-                        "پشتیبانی اولویت‌دار"
-                    },
+                    Id = response.Id,
+                    Title = response.Title,
+                    Body = response.Description,
+                    Image = response.ImagePath ?? string.Empty,
+                    Specifications = specs,
+                    Features = features,
                     Pricing = new PricingInfo
                     {
-                        OriginalPrice = packageResponse.Price,
-                        FinalPrice = packageResponse.Price,
+                        OriginalPrice = response.Price,
+                        FinalPrice = response.Price,
                         HasDiscount = false,
                         DiscountPercent = 0
                     }

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

@@ -1,4 +1,4 @@
-using CMSMicroservice.Protobuf.Protos.UserAddress;
+using FrontOffice.Main.Utilities;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using FrontOffice.Main.Pages.Profile.Components;
 using Microsoft.AspNetCore.Components;
@@ -9,6 +9,7 @@ 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;
@@ -42,7 +43,10 @@ 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)
@@ -80,6 +84,7 @@ 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

@@ -0,0 +1,212 @@
+@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

@@ -0,0 +1,199 @@
+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

@@ -0,0 +1,121 @@
+@attribute [Route(RouteConstants.Profile.ChargeDiscountWallet)]
+@attribute [Authorize]
+
+<PageTitle>شارژ کیف‌پول اعتباری</PageTitle>
+
+<MudContainer MaxWidth="MaxWidth.Medium" Class="py-6">
+    <MudStack Spacing="3">
+        <PageHeader Title="💳 شارژ کیف‌پول اعتباری" BackHref="@RouteConstants.Profile.Wallet" />
+
+        @* ─── نتیجه پرداخت (اگه از callback برگشته) ─── *@
+        @if (_paymentResult != null)
+        {
+            <MudAlert Severity="@(_paymentResult == "success" ? MudBlazor.Severity.Success : MudBlazor.Severity.Error)"
+                      Class="rounded-lg" Variant="Variant.Filled">
+                @if (_paymentResult == "success")
+                {
+                    <span>شارژ اعتباری با موفقیت انجام شد! ✅</span>
+                }
+                else if (_paymentResult == "cancelled")
+                {
+                    <span>پرداخت توسط شما لغو شد.</span>
+                }
+                else
+                {
+                    <span>پرداخت ناموفق بود. لطفاً دوباره تلاش کنید.</span>
+                }
+            </MudAlert>
+        }
+
+        @* ─── فرم شارژ ─── *@
+        <MudPaper Elevation="2" Class="pa-5 rounded-lg">
+            <MudText Typo="Typo.h6" Class="mb-3">
+                <MudIcon Icon="@Icons.Material.Filled.CreditCard" Class="ml-1" />
+                شارژ موجودی اعتباری
+            </MudText>
+
+            <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: #f0fdf4;">
+                        <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.Success"><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="StartDiscountCharge"
+                           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/ChargeDiscountWallet.razor.cs

@@ -0,0 +1,57 @@
+using FrontOffice.Main.Utilities;
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace FrontOffice.Main.Pages.Profile;
+
+public partial class ChargeDiscountWallet : ComponentBase
+{
+    private bool _isProcessing;
+    private long _chargeAmount;
+    private string? _paymentResult;
+
+    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; }
+
+    protected override void OnInitialized()
+    {
+        _paymentResult = PaymentQueryParam;
+    }
+
+    private async Task StartDiscountCharge()
+    {
+        if (_chargeAmount <= 0 || _isProcessing) return;
+
+        _isProcessing = true;
+        StateHasChanged();
+
+        try
+        {
+            // مبلغ به تومان — CMS خودش موقع ارسال به درگاه ×۱۰ می‌کنه
+            var (success, gatewayUrl, error) = await WalletService.InitiateDiscountChargeAsync(_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();
+        }
+    }
+
+    private static string FormatToman(long toman)
+        => string.Format("{0:N0} تومان", toman);
+}

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,7 +95,23 @@ public partial class OrganizationChart : IAsyncDisposable
         try
         {
             _dotNetHelper = DotNetObjectReference.Create(this);
-            var flatData = _networkTree.ToFlatArray();
+            // 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
+            }).ToArray();
             
             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>
@@ -53,7 +53,7 @@
                     <div class="wallet-strip-item">
                         <div class="wallet-strip-label">
                             <MudIcon Icon="@Icons.Material.Outlined.Discount" Size="Size.Small" Color="Color.Success" />
-                            <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.Success">@_walletDiscount</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,49 +195,4 @@
     </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>
-                    <MudButton Variant="Variant.Filled" Disabled="true" Color="Color.Primary" FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.Payment" OnClick="DirectPayment">
-                        پرداخت با کارت بانکی(بزودی)
-                    </MudButton>
-                </MudStack>
-            </MudPaper>
-
-            <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>
-
-            <MudButton Variant="Variant.Text" Color="Color.Default" FullWidth="true" OnClick="ClosePurchaseOptions">
-                بستن
-            </MudButton>
-        </MudStack>
-    </DialogContent>
-</MudDialog>

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

@@ -42,19 +42,19 @@ public partial class Index
     private bool _isClubMemberActive;
     private bool CanShowReferralLink => _hasPurchasedPackage && _isClubMemberActive;
 
-    // Purchase Options Bottom Sheet
-    private bool _showPurchaseBottomSheet;
+    // Purchase flow
     private bool _isProcessingPayment;
+    private int _purchaseCycleCount; // تعداد دورهای خرید — اگر > 0 فقط IPG مجاز
 
     // Dashboard Tiles
     private readonly List<DashTile> _dashTiles = new()
     {
         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, "کیف‌پول جادویی", "شارژ ×2.5", "background:rgba(168,85,247,.12); color:#a855f7;"),
+        new(RouteConstants.Profile.MagicWallet, Icons.Material.Filled.AutoAwesome, "کیف‌پول جادویی", "شارژ چند‌برابری", "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;"),
@@ -148,6 +148,11 @@ public partial class Index
         var discount = FormatPrice(b.DiscountBalance);
         _walletNetwork = FormatPrice(b.NetworkBalance);
         _walletDiscount = discount;
+
+        // بارگذاری تعداد دورهای خرید برای کنترل روش‌های پرداخت
+        var magicStatus = await WalletService.GetMagicWalletStatusAsync();
+        _purchaseCycleCount = magicStatus.PurchaseCycleCount;
+
         StateHasChanged();
     }
 
@@ -328,6 +333,7 @@ public partial class Index
         if (!result.Canceled)
         {
             await LoadAddresses();
+            await AuthService.RefreshTokenAsync();
         }
     }
 
@@ -380,6 +386,7 @@ public partial class Index
                 });
                 Snackbar.Add("آدرس با موفقیت حذف شد.", Severity.Success);
                 await LoadAddresses();
+                await AuthService.RefreshTokenAsync();
             }
             catch (Exception ex)
             {
@@ -388,41 +395,62 @@ public partial class Index
         }
     }
 
-    private void OpenPurchaseOptions()
+    private async Task OpenPurchaseOptions()
     {
-        _showPurchaseBottomSheet = true;
+        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;
+            }
+        }
     }
 
-    private void ClosePurchaseOptions()
-    {
-        _showPurchaseBottomSheet = false;
-    }
-
-    private async Task DirectPayment()
+    private async Task ProcessDirectPayment(long packageId)
     {
         if (_isProcessingPayment) return;
-        
+
         _isProcessingPayment = true;
-        _showPurchaseBottomSheet = false;
-        
+        StateHasChanged();
+
         try
         {
-            // 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
+            var response = await PackageContract.CustomerPurchasePackageAsync(new CustomerPurchasePackageRequest
             {
-                CallbackUrl = callbackUrl
+                PackageId = packageId,
+                PurchaseMethod = PurchaseMethodEnum.PurchaseMethodGateway
             });
-            
+
             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);
@@ -443,41 +471,29 @@ public partial class Index
         }
     }
 
-    private async Task DayaLoanPayment()
+    private async Task ProcessDayaLoanPayment()
     {
-        // Validate user info before redirecting
         if (string.IsNullOrWhiteSpace(_updateUserRequest.FirstName))
         {
-            _showPurchaseBottomSheet = false;
-            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (نام وارد نشده)", Severity.Error);
+            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (نام وارد نشده)", Severity.Error);
             return;
         }
         if (string.IsNullOrWhiteSpace(_updateUserRequest.LastName))
         {
-            _showPurchaseBottomSheet = false;
-            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (نام خانوادگی وارد نشده)", Severity.Error);
+            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (نام خانوادگی وارد نشده)", Severity.Error);
             return;
         }
         if (string.IsNullOrWhiteSpace(_updateUserRequest.NationalCode))
         {
-            _showPurchaseBottomSheet = false;
-            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (کدملی وارد نشده)", Severity.Error);
+            Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (کدملی وارد نشده)", Severity.Error);
             return;
         }
         if (_updateUserRequest.BirthDate == null)
         {
-            _showPurchaseBottomSheet = false;
-            Snackbar.Add($"لطفا اطلاعات شخصی خود را تکمیل کنید. (تاریخ تولد وارد نشده)", Severity.Error);
+            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,6 +36,11 @@
         {
             @* ═══ حالت جادویی فعال ═══ *@
 
+            @* ── 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">
@@ -92,8 +97,8 @@
                     </MudText>
 
                     <MudAlert Severity="MudBlazor.Severity.Info" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
-                        مبلغ واریزی شما <strong>×۲.۵</strong> به موجودی اضافه می‌شود.
-                        مثلاً ۱۰ میلیون واریز = ۲۵ میلیون اعتبار.
+                        مبلغ واریزی شما <strong>×@_status.MagicMultiplier.ToString("0.#")</strong> به موجودی اضافه می‌شود.
+                        مثلاً ۱۰ میلیون واریز = @FormatToman((long)(10_000_000 * (decimal)_status.MagicMultiplier)) اعتبار.
                     </MudAlert>
 
                     <MudStack Spacing="2">
@@ -101,11 +106,11 @@
                                          Label="مبلغ واریز (تومان)"
                                          Variant="Variant.Outlined"
                                          Min="10_000"
-                                         Max="@(_status.MagicRemainingDeposit / 10)"
+                                         Max="@_status.MagicRemainingDeposit"
                                          Format="N0"
                                          Adornment="Adornment.Start"
                                          AdornmentIcon="@Icons.Material.Filled.Payments"
-                                         HelperText="@($"حداکثر: {FormatPrice(_status.MagicRemainingDeposit)} (ریال)")" />
+                                         HelperText="@($"حداکثر: {FormatPrice(_status.MagicRemainingDeposit)} (تومان)")" />
 
                         @if (_chargeAmount > 0)
                         {
@@ -115,8 +120,8 @@
                                     <MudText Typo="Typo.body2">@FormatToman(_chargeAmount)</MudText>
                                 </MudStack>
                                 <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                    <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>
+                                    <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>
                                 </MudStack>
                             </MudPaper>
                         }
@@ -125,7 +130,7 @@
                         <MudStack Row="true" Spacing="1" Class="flex-wrap">
                             @foreach (var preset in _presetAmounts)
                             {
-                                if (preset * 10 <= _status.MagicRemainingDeposit)
+                                if (preset <= _status.MagicRemainingDeposit)
                                 {
                                     <MudButton Variant="Variant.Outlined" Size="Size.Small"
                                                Color="@(_chargeAmount == preset ? Color.Primary : Color.Default)"
@@ -141,18 +146,18 @@
                                    Color="Color.Primary"
                                    Size="Size.Large"
                                    FullWidth="true"
-                                   Disabled="@(_chargeAmount <= 0 || _isProcessing)"
+                                   Disabled="@(_isProcessing || _chargeAmount < 10_000)"
                                    OnClick="StartMagicCharge"
                                    StartIcon="@Icons.Material.Filled.Payment"
                                    Class="rounded-lg mt-2">
                             @if (_isProcessing)
                             {
-                                <MudProgressCircular Indeterminate="true" Size="Size.Small" Class="ml-2" />
+                                <MudProgressCircular Size="Size.Small" Indeterminate="true" Class="me-2" />
                                 <span>در حال انتقال به درگاه...</span>
                             }
                             else
                             {
-                                <span>پرداخت از درگاه</span>
+                                <span>پرداخت با کارت بانکی</span>
                             }
                         </MudButton>
                     </MudStack>
@@ -161,8 +166,23 @@
             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>
             }
 
@@ -171,16 +191,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

@@ -7,7 +7,7 @@ namespace FrontOffice.Main.Pages.Profile;
 
 public partial class MagicWallet : ComponentBase
 {
-    private MagicWalletStatus _status = new(0, 0, 0, 0, 0, 0, null);
+    private MagicWalletStatus _status = new(0, 0, 0, 0, 0, 0, null, 0);
     private bool _isLoading = true;
     private bool _isProcessing;
     private long _chargeAmount;
@@ -46,10 +46,8 @@ public partial class MagicWallet : ComponentBase
 
         try
         {
-            // تبدیل تومان به ریال
-            var amountInRial = _chargeAmount * 10;
-
-            var (success, gatewayUrl, error) = await WalletService.InitiateMagicChargeAsync(amountInRial);
+            // مبلغ به تومان — CMS خودش موقع ارسال به درگاه ×۱۰ می‌کنه
+            var (success, gatewayUrl, error) = await WalletService.InitiateMagicChargeAsync(_chargeAmount);
 
             if (success && !string.IsNullOrEmpty(gatewayUrl))
             {
@@ -71,8 +69,8 @@ public partial class MagicWallet : ComponentBase
         }
     }
 
-    private static string FormatPrice(long priceInRial)
-        => string.Format("{0:N0} تومان", priceInRial / 10);
+    private static string FormatPrice(long price)
+        => string.Format("{0:N0} تومان", price);
 
     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
-@inject IJSRuntime JS
+@using FrontOffice.Main.Utilities
 
 
 <PageTitle>نتیجه پرداخت | کارا بازار سلامت</PageTitle>
@@ -21,25 +21,22 @@
             <MudText Typo="Typo.h5" Color="Color.Success" Class="mt-4">پرداخت موفق</MudText>
             <MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
             
-            @if (!string.IsNullOrEmpty(_refId))
+            @if (_transactionId > 0)
             {
                 <MudText Typo="Typo.body2" Class="mt-3">
-                    <strong>کد پیگیری:</strong> @_refId
+                    <strong>کد ارجاعی:</strong> @_transactionId
                 </MudText>
             }
             
             <MudDivider Class="my-4" />
             
             <MudText Typo="Typo.body2" Color="Color.Secondary">
-                موجودی کیف پول: @FormatPrice(_walletBalance)
-            </MudText>
-            <MudText Typo="Typo.body2" Color="Color.Secondary">
-                موجودی اعتبار تخفیف: @FormatPrice(_discountBalance)
+                موجودی کیف پول اصلی: @FormatPrice(_walletBalance)
             </MudText>
             
             <MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
-                       OnClick="GoBack">
-                بازگشت به پروفایل
+                       Href="@_successReturnUrl">
+                @_successReturnText
             </MudButton>
         }
         else
@@ -49,8 +46,8 @@
             <MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
             
             <MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
-                       OnClick="GoBack">
-                بازگشت به پروفایل
+                       Href="@_failReturnUrl">
+                @_failReturnText
             </MudButton>
             
             <MudButton Color="Color.Secondary" Variant="Variant.Outlined" Class="mt-3 mr-2"
@@ -64,12 +61,19 @@
 @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; }
     
@@ -85,15 +89,42 @@
     private bool _isLoading = true;
     private bool _isSuccess;
     private string _message = string.Empty;
-    private string? _refId;
+    private long _transactionId;
     private long _walletBalance;
-    private long _discountBalance;
+    private bool _verifyCompleted;
+    private readonly SemaphoreSlim _verifyGate = new(1, 1);
+    
+    // دکمه‌های بازگشت بسته به نوع پرداخت
+    private string _successReturnUrl = "/profile";
+    private string _successReturnText = "بازگشت به پروفایل";
+    private string _failReturnUrl = "/profile";
+    private string _failReturnText = "بازگشت به پروفایل";
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender && !_verifyCompleted)
         {
+            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();
         }
     }
 
@@ -101,35 +132,26 @@
     {
         try
         {
-            if (OrderId <= 0 || TransactionId <= 0 || string.IsNullOrEmpty(Authority))
-            {
-                _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;
+            // تعیین نوع پرداخت — اگر type نباشد، پیش‌فرض خرید پکیج
+            var type = PaymentType?.ToLowerInvariant() ?? "package";
             
-            // اگر پرداخت موفق بود، توکن را refresh می‌کنیم
-            // چون PackagePurchaseMethod تغییر کرده و باید در claims جدید باشد
-            if (_isSuccess)
+            switch (type)
             {
-                await RefreshTokenAsync();
+                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;
             }
         }
         catch (Exception ex)
@@ -143,10 +165,186 @@
             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()
     {
-        NavManager.NavigateTo("/profile");
+        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);
     }
     
     /// <summary>
@@ -174,6 +372,4 @@
     }
 
     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,6 +38,104 @@
             درخواست‌های برداشت
         </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" 
+                   Size="Size.Large"
+                   FullWidth="true"
+                   StartIcon="@Icons.Material.Filled.CreditCard"
+                   Href="@RouteConstants.Profile.ChargeDiscountWallet"
+                   Class="rounded-lg">
+            شارژ کیف‌پول اعتباری
+        </MudButton>
+
         <MudPaper Elevation="2" Class="pa-4 rounded-lg">
             <MudText Typo="Typo.h6" Class="mb-2">تراکنش‌ها و مسیرهای شارژ</MudText>
 
@@ -71,8 +169,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>
@@ -81,7 +179,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) : "-")
@@ -89,7 +187,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) : "-")
@@ -125,10 +223,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>
@@ -136,10 +234,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,13 +6,43 @@ 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,8 +58,19 @@ public partial class WithdrawalRequests : ComponentBase
         try
         {
             _isSubmittingWithdrawal = true;
-            _withdrawIban=_withdrawIban!.Trim().ToUpper().Replace("IR", "").Replace(" ", "");
-            await WalletService.RequestWithdrawalAsync(_selectedPayout.Id, _withdrawMethod, "IR"+_withdrawIban);
+
+            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);
             Snackbar.Add("درخواست برداشت ثبت شد.", Severity.Success);
             
             // بروزرسانی لیست
@@ -125,4 +136,26 @@ 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,11 +8,17 @@ 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.cs

@@ -1,5 +1,6 @@
 using CMSMicroservice.Protobuf.Protos.UserAddress;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
+using FrontOffice.Main.Shared;
 using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
@@ -14,6 +15,8 @@ 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();
@@ -27,9 +30,16 @@ public partial class CheckoutSummary : ComponentBase
 
     protected override async Task OnInitializedAsync()
     {
-        // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
+        if (!await AuthService.IsAuthenticatedAsync())
+        {
+            await AuthDialogService.ShowAuthDialogAsync();
+        }
         await Cart.EnsureInitializedAsync();
-        await LoadAddresses();
+        var userInfo = await AuthService.GetUserAuthInfo();
+        if (userInfo.HasAddress)
+            await LoadAddresses();
+        else
+            _addresses = new();
         await LoadWalletBalance();
     }
 
@@ -37,7 +47,6 @@ public partial class CheckoutSummary : ComponentBase
     {
         if (firstRender)
         {
-            // بارگذاری نرخ VAT
             await VAT.LoadAsync();
         }
         await base.OnAfterRenderAsync(firstRender);
@@ -46,9 +55,7 @@ public partial class CheckoutSummary : ComponentBase
     private async Task LoadWalletBalance()
     {
         var walletResult = await WalletService.GetBalancesAsync();
-        walletBalance = walletResult.CreditBalance
-        //  + walletResult.NetworkBalance
-         ;
+        walletBalance = walletResult.CreditBalance;
     }
 
     private async Task LoadAddresses()
@@ -87,11 +94,15 @@ public partial class CheckoutSummary : ComponentBase
             return;
         }
 
+        var totalRequired = VAT.AddVAT(Cart.Total);
+        if (await TryHandleInsufficientBalanceAsync(totalRequired))
+            return;
+
         try
         {
             var request = new SubmitShopBuyOrderRequest
             {
-                TotalAmount = VAT.AddVAT(Cart.Total)
+                TotalAmount = totalRequired
             };
 
             var response = await UserOrderContract.SubmitShopBuyOrderAsync(request);
@@ -101,17 +112,87 @@ 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

@@ -112,6 +112,30 @@ else
                         </MudStack>
                     }
                 </MudStack>
+
+                @* نمایش PV سفارش *@
+                @if (_pvData != null && _pvData.TotalPv > 0)
+                {
+                    <MudDivider Class="my-2" />
+                    <MudStack Spacing="1" Class="pa-2" Style="background-color: var(--mud-palette-background-grey); border-radius: 8px;">
+                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
+                            <MudIcon Icon="@Icons.Material.Filled.TrendingUp" Color="Color.Info" Size="Size.Small" />
+                            <MudText Typo="Typo.subtitle2" Color="Color.Info">امتیاز فروش (PV)</MudText>
+                        </MudStack>
+                        @foreach (var product in _pvData.Products)
+                        {
+                            <MudStack Row="true" Justify="Justify.SpaceBetween">
+                                <MudText Typo="Typo.caption" Class="mud-text-secondary">@product.ProductTitle × @product.Quantity</MudText>
+                                <MudText Typo="Typo.caption">@string.Format("{0:N0}", product.TotalPv) PV</MudText>
+                            </MudStack>
+                        }
+                        <MudDivider Class="my-1" />
+                        <MudStack Row="true" Justify="Justify.SpaceBetween">
+                            <MudText Typo="Typo.body2" Class="fw-bold">جمع PV:</MudText>
+                            <MudText Typo="Typo.body2" Color="Color.Info" Class="fw-bold">@string.Format("{0:N0}", _pvData.TotalPv) PV</MudText>
+                        </MudStack>
+                    </MudStack>
+                }
             </MudStack>
         </MudPaper>
     </MudContainer>

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

@@ -12,12 +12,17 @@ public partial class OrderDetail : ComponentBase
     [Parameter] public long id { get; set; }
 
     private GetUserOrderResponse? _order;
+    private CalculateOrderPVResponse? _pvData;
     private bool _loading;
 
     protected override async Task OnParametersSetAsync()
     {
         _loading = true;
         _order = await OrderService.GetOrderAsync(id);
+        if (_order != null)
+        {
+            _pvData = await OrderService.CalculateOrderPVAsync(id);
+        }
         _loading = false;
     }
 

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

@@ -46,12 +46,19 @@ 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;
-        
-        _trackingSteps = new List<TrackingStep>
-        {
+        // 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 =
+        [
             new()
             {
                 Title = "ثبت سفارش",
@@ -61,45 +68,77 @@ public partial class OrderTracking : ComponentBase
             },
             new()
             {
-                Title = "در انتظار پرداخت",
-                Description = "منتظر تایید پرداخت هستیم",
+                Title = "پرداخت",
+                Description = isPaid ? "پرداخت شما تایید شد" : "منتظر تایید پرداخت هستیم",
                 IsCompleted = isPaid,
-                IsCurrent = !isPaid,
+                IsCurrent = !isPaid && !isCancelled,
                 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,80 +1,102 @@
 @attribute [Route(RouteConstants.Store.Orders)]
-@* Injection is handled in code-behind *@
 
 <PageTitle>سفارشات من</PageTitle>
 
 <MudContainer MaxWidth="MaxWidth.Large" Class="py-6">
-    <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)
-                    {
-                        @context.PaymentDate.ToDateTime().MiladiToJalaliWithTime()
-                    }
-                    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>
+    <MudStack Spacing="3">
+        <PageHeader Title="سفارشات من" BackHref="@RouteConstants.Store.Products" />
 
-        <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>
+        @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)
+                    {
+                        <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>
-                            <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>
-    }
+                        </MudPaper>
+                    }
+                </MudStack>
+            </MudHidden>
+        }
+    </MudStack>
 </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,7 +10,6 @@ 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;
@@ -33,28 +32,81 @@ public partial class Orders : ComponentBase
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    private void ViewOrder(long orderId)
     {
-        if (firstRender)
+        Navigation.NavigateTo($"{RouteConstants.Store.OrderDetail}{orderId}");
+    }
+
+    private static string FormatPrice(long price) => $"{price:N0}";
+
+    private static string FormatDate(GetUserOrderResponse order)
+    {
+        try
         {
-            // بارگذاری نرخ VAT
-            await VAT.LoadAsync();
+            var timestamp = order.PaymentDate;
+            if (timestamp is null)
+                return "در انتظار پرداخت";
+
+            return timestamp.ToDateTime().ToLocalTime().MiladiToJalaliWithTime();
         }
-        await base.OnAfterRenderAsync(firstRender);
-    }
-
-    private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
-
-
-    private string GetStatusText(Messages.PaymentStatus contextPaymentStatus)
-    {
-        return contextPaymentStatus switch
+        catch
         {
-            Messages.PaymentStatus.Pending => "در انتظار پرداخت",
-            Messages.PaymentStatus.Success => "پرداخت شده",
-            Messages.PaymentStatus.Reject => "پرداخت ناموفق",
-            _ => "نامشخص",
-        };
+            return "—";
+        }
     }
-}
 
+    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,15 +78,24 @@ else
                     @*     </MudStack> *@
                     @* } *@
                     <MudDivider Class="my-2"/>
-                    <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 (_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>
+                    }
                     
                     <!-- نمایش وضعیت موجودی -->
                     @if (IsInStock)
@@ -141,18 +150,27 @@ else
             {
                 <MudGrid Class="align-center" Justify="Justify.SpaceBetween">
                     <MudItem xs="6">
-                        <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>
+                        @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>
+                        }
                     </MudItem>
 
                     @if (IsInCart)

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

@@ -12,11 +12,16 @@ 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;
     
@@ -44,29 +49,35 @@ public partial class ProductDetail : ComponentBase, IDisposable
     private bool IsInCart => CurrentCartItem is not null;
     private int CurrentCartQuantity => CurrentCartItem?.Quantity ?? 0;
 
-    protected override async Task OnParametersSetAsync()
-    {
-      
-    }
-
     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()
+    {
         _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 ?? _qty, MinQty, MaxQty);
+            _qty = Math.Clamp(CurrentCartItem?.Quantity ?? MinQty, MinQty, Math.Max(MinQty, MaxQty));
         }
         else
         {
@@ -74,32 +85,33 @@ 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;
-        await Cart.Add(_product, 1);
+        var product = _product;
+        await GuestGate.RunAsync(() => Cart.Add(product, 1));
     }
 
     private async Task RemoveFromCart()
     {
         if (_product is null) return;
-        _qty--;
-        await Cart.UpdateQuantity(CurrentCartItem.ProductId, _qty);
+        await GuestGate.RunAsync(async () =>
+        {
+            _qty--;
+            await Cart.UpdateQuantity(CurrentCartItem!.ProductId, _qty);
+        });
     }
 
     private void IncreaseLocalQty()

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

@@ -118,7 +118,8 @@
             @foreach (var p in _products)
             {
                 <MudItem xs="6" sm="6" md="3"
-                         onclick="@(() => Navigation.NavigateTo($"{RouteConstants.Store.ProductDetail}{p.Id}"))">
+                         onclick="@(() => OpenProduct(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;">
 
@@ -141,8 +142,16 @@
                             </div>
                             <div class="pa-1 flex-grow-1 d-flex flex-column justify-space-between">
                                 <MudText Typo="Typo.subtitle1">@p.Title</MudText>
-                                <MudText Typo="Typo.subtitle2" Color="Color.Primary">@FormatPrice(p.Price)</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 d-flex justify-space-between pa-2">
@@ -156,6 +165,7 @@
                             </MudButton>
                         </MudCardActions>
                     </MudCard>
+                    </div>
                 </MudItem>
             }
         </MudGrid>

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

@@ -2,26 +2,22 @@ using System.Linq;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.JSInterop;
 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;
@@ -32,87 +28,140 @@ public partial class Products : ComponentBase, IDisposable
     private List<Product> _products = new();
     private long? _activeCategoryId;
     private string? _activeCategoryTitle;
-    
-    private ProductSortOption _sortOption = ProductSortOption.PriceDesc; // پیش‌فرض: گران‌ترین
+    private ProductSortOption _sortOption = ProductSortOption.PriceDesc;
+    private bool _ignoreNextLocationChange;
+    private bool _pendingScrollRestore;
 
     protected override async Task OnInitializedAsync()
     {
-        // لود سبد خرید (فقط اگر کاربر لاگین کرده باشد)
+        _isAuthenticated = await AuthService.IsAuthenticatedAsync();
         await Cart.EnsureInitializedAsync();
         Cart.OnChange += StateHasChanged;
         Navigation.LocationChanged += HandleLocationChanged;
-        await LoadInitial();
+        ApplyStateFromUri();
+        await LoadPages(_currentPage);
+        _pendingScrollRestore = true;
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
-        {
-            // بارگذاری نرخ VAT
             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);
         }
+
         await base.OnAfterRenderAsync(firstRender);
     }
 
-    private async Task LoadInitial()
+    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)
     {
         _loading = true;
-        _currentPage = 1;
         _products.Clear();
-        UpdateCategoryFilterFromUri();
-        var sortBy = GetSortByValue();
-        var result = await ProductService.GetProductsPagedAsync(_query, _activeCategoryId, sortBy, _currentPage, PageSize);
-        _products = result.Products;
-        _hasMore = result.HasNext;
-        _totalCount = result.TotalCount;
+        _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;
+        }
+
         _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 = GetSortByValue();
-        var result = await ProductService.GetProductsPagedAsync(_query, _activeCategoryId, sortBy, _currentPage, PageSize);
+        var sortBy = ShopListQueryState.ToApiSortBy(_sortOption);
+        var result = await ProductService.GetProductsPagedAsync(
+            _query, _activeCategoryId, sortBy, _currentPage, PageSize);
         _products.AddRange(result.Products);
         _hasMore = result.HasNext;
-        
+        SyncUrl();
+
         _loadingMore = false;
         StateHasChanged();
     }
 
-    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 OnSortChanged() => await ReloadFromFilters();
 
-    private async Task OnSortChanged()
-    {
-        await LoadInitial();
-    }
-
-    private async Task OnQueryChanged(KeyboardEventArgs _)
-    {
-        await LoadInitial();
-    }
+    private async Task OnQueryChanged(KeyboardEventArgs _) => await ReloadFromFilters();
 
     private async Task AddToCart(Product p)
     {
-        await Cart.Add(p, 1);
+        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}");
     }
 
     private string FormatPrice(long price) => $"{VAT.AddVAT(price):N0} تومان";
@@ -125,24 +174,33 @@ public partial class Products : ComponentBase, IDisposable
 
     private void HandleLocationChanged(object? sender, LocationChangedEventArgs args)
     {
-        _ = 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))
+        if (_ignoreNextLocationChange)
         {
-            _activeCategoryId = categoryId;
+            _ignoreNextLocationChange = false;
             return;
         }
 
-        _activeCategoryId = null;
+        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();
+        });
     }
 
-    private void ClearCategoryFilter()
+    private async Task ClearCategoryFilter()
     {
-        Navigation.NavigateTo(RouteConstants.Store.Products);
+        _activeCategoryId = null;
+        _activeCategoryTitle = null;
+        await ReloadFromFilters();
     }
 }

src/FrontOffice.Main/Pages/_Host.cshtml

@@ -1,4 +1,5 @@
 @page "/"
+@model FrontOffice.Main.Pages.HostModel
 @using Microsoft.AspNetCore.Components.Web
 @namespace FrontOffice.Main.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@@ -8,6 +9,26 @@
 <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" />
@@ -15,7 +36,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) -->
@@ -23,8 +44,26 @@
     <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

@@ -0,0 +1,21 @@
+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,5 +1,6 @@
 using FluentValidation;
 using FrontOffice.Main.Utilities;
+using FrontOffice.Main.Utilities.Seo;
 using System.Net;
 using FrontOffice.Main.Utilities.Pdf;
 
@@ -12,6 +13,7 @@ builder.Services.AddServerSideBlazor();
 #region AddCommonServices
 
 builder.Services.AddCommonServices();
+builder.Services.Configure<SeoSettings>(builder.Configuration.GetSection(SeoSettings.SectionName));
 builder.Services.AddSingleton<MainService>();
 
 #endregion
@@ -55,6 +57,17 @@ 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,7 +22,9 @@
                          PhoneNumber="@_phoneNumber"
                          ResendRemaining="_resendRemaining"
                          OnChangePhone="ChangePhoneAsync"
-                         OnResendOtp="ResendOtpAsync" />
+                         OnResendOtp="ResendOtpAsync"
+                         ReferralCode="@_referralCode"
+                         ReferralCodeChanged="OnReferralCodeChanged" />
     </div>
 }
 else
@@ -51,7 +53,9 @@ else
                                  PhoneNumber="@_phoneNumber"
                                  ResendRemaining="_resendRemaining"
                                  OnChangePhone="ChangePhoneAsync"
-                                 OnResendOtp="ResendOtpAsync" />
+                                 OnResendOtp="ResendOtpAsync"
+                                 ReferralCode="@_referralCode"
+                                 ReferralCodeChanged="OnReferralCodeChanged" />
 
                 <MudStack Class="mt-4" Spacing="2">
                     @if (_currentStep == AuthStep.Phone)

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

@@ -42,6 +42,9 @@ 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!;
 
@@ -66,9 +69,20 @@ 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();
@@ -182,9 +196,12 @@ public partial class AuthDialog : IDisposable
             _verifyRequest.Mobile = _phoneNumber;
 
             var storedReferralCode = await LocalStorage.GetItemAsync<string>("referral:code");
-            if (!string.IsNullOrWhiteSpace(storedReferralCode))
+            var effectiveReferralCode = !string.IsNullOrWhiteSpace(_referralCode)
+                ? _referralCode
+                : storedReferralCode;
+            if (!string.IsNullOrWhiteSpace(effectiveReferralCode))
             {
-                _verifyRequest.ParentReferralCode = storedReferralCode;
+                _verifyRequest.ParentReferralCode = effectiveReferralCode;
             }
 
             var validationResult = true; // _verifyRequestValidator.Validate(_verifyRequest);

src/FrontOffice.Main/Shared/ClubMembershipContractDialog.razor

@@ -9,6 +9,7 @@
 @inject AuthService AuthService
 @inject ISnackbar Snackbar
 @inject NavigationManager Navigation
+@inject PackageService PackageService
 
 <MudDialog DisableSidePadding="true">
     <DialogContent>
@@ -123,6 +124,23 @@
     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 تنظیم می‌شوند
 
@@ -242,7 +260,7 @@
 <p>۱-۳. پاداش معرفی: مبلغی که به ازای هر معرفی موفق به کاربر تعلق می‌گیرد.</p>
 
 <p><strong>ماده ۲ - شرایط عضویت</strong></p>
-<p>۲-۱. کاربر با پرداخت مبلغ ۵۶ میلیون تومان (پکیج پایه)، امکان عضویت در باشگاه مشتریان را خواهد داشت.</p>
+<p>۲-۱. کاربر با پرداخت مبلغ {_packageDisplayPrice} ({_packageDisplayName})، امکان عضویت در باشگاه مشتریان را خواهد داشت.</p>
 <p>۲-۲. پس از امضای این قرارداد، لینک دعوت کاربر فعال خواهد شد.</p>
 <p>۲-۳. کاربر می‌تواند حداکثر ۲ نفر را مستقیماً دعوت کند (یک نفر در تیم اول و یک نفر در تیم دوم).</p>
 

src/FrontOffice.Main/Shared/InsufficientCreditDialog.razor

@@ -0,0 +1,152 @@
+@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

@@ -0,0 +1,234 @@
+@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,6 +36,14 @@
                      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,6 +29,10 @@ 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,6 +79,7 @@ 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;
@@ -88,6 +89,7 @@ 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,6 +15,8 @@ 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
@@ -69,6 +71,8 @@ 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,7 +78,8 @@ public class CommissionService
         long? weekDefinitionId,
         string? status,
         int pageNumber,
-        int pageSize)
+        int pageSize,
+        long? packageId = null)
     {
         try
         {
@@ -107,6 +108,11 @@ public class CommissionService
                     _ => null
                 };
             }
+
+            if (packageId.HasValue && packageId.Value > 0)
+            {
+                request.PackageId = packageId.Value;
+            }
             
             var response = await _client.GetMyCommissionPayoutsAsync(request);
             
@@ -121,7 +127,9 @@ public class CommissionService
                     TotalAmount = p.TotalAmount,
                     AmountFormatted = p.AmountFormatted,
                     Status = p.Status,
-                    DatePersian = p.DatePersian
+                    DatePersian = p.DatePersian,
+                    PackageId = p.PackageId,
+                    PackageTitle = p.PackageTitle
                 }).ToList(),
                 TotalCount = (int)(response.MetaData?.TotalCount ?? 0),
                 PageNumber = pageNumber,
@@ -145,7 +153,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)
+    public async Task<WeeklyBalanceDto> GetMyWeeklyBalanceAsync(long? weekDefinitionId = null, long? packageId = null)
     {
         try
         {
@@ -163,6 +171,11 @@ public class CommissionService
             {
                 request.WeekDefinitionId=7;
             }
+
+            if (packageId.HasValue && packageId.Value > 0)
+            {
+                request.PackageId = packageId.Value;
+            }
             
             var response = await _client.GetMyWeeklyBalancesAsync(request);
             
@@ -183,7 +196,9 @@ 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
+                    EndDate = balance.CalculatedAt?.ToDateTime() ?? DateTime.Now,
+                    PackageId = balance.PackageId,
+                    PackageTitle = balance.PackageTitle
                 };
             }
             
@@ -227,7 +242,9 @@ public class CommissionService
                     TotalAmount = p.TotalAmount,
                     AmountFormatted = p.AmountFormatted,
                     Status = p.Status,
-                    DatePersian = p.DatePersian
+                    DatePersian = p.DatePersian,
+                    PackageId = p.PackageId,
+                    PackageTitle = p.PackageTitle
                 }).ToList();
         }
         catch

src/FrontOffice.Main/Utilities/CreditChargeNavigation.cs

@@ -0,0 +1,50 @@
+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,6 +112,27 @@ 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
@@ -198,6 +219,8 @@ public class DiscountOrderService
         2 => "ارسال شده",
         3 => "تحویل داده شده",
         4 => "لغو شده",
+        5 => "آماده تحویل در دفتر",
+        6 => "مرجوع شده",
         _ => "نامشخص"
     };
 
@@ -207,7 +230,9 @@ public class DiscountOrderService
         1 => Color.Info,
         2 => Color.Primary,
         3 => Color.Success,
-        4 => Color.Error,
+        4 => Color.Dark,
+        5 => Color.Primary,
+        6 => 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)
+        bool? inStock = null, string? sortBy = null)
     {
         try
         {
@@ -97,6 +97,8 @@ 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);
 
@@ -125,6 +127,9 @@ 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

@@ -0,0 +1,42 @@
+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,6 +21,11 @@ public class NetworkNodeDto
     /// کد معرف کاربر
     /// </summary>
     public string? ReferralCode { get; set; }
+
+    /// <summary>
+    /// نام پکیج موثر (مثلاً پکیج طلایی / نقره‌ای)
+    /// </summary>
+    public string? PackageName { get; set; }
 }
 
 /// <summary>
@@ -43,6 +48,11 @@ public class FlatNetworkNodeDto
     /// کد معرف کاربر - فقط برای کاربران فعال در باشگاه نمایش داده شود
     /// </summary>
     public string? ReferralCode { get; set; }
+
+    /// <summary>
+    /// نام پکیج موثر (مثلاً پکیج طلایی / نقره‌ای)
+    /// </summary>
+    public string? PackageName { get; set; }
 }
 
 /// <summary>
@@ -81,7 +91,8 @@ public class NetworkTreeDto
             IsClubActive = node.IsClubActive,
             ActivationWeekNumber = node.ActivationWeekNumber,
             JoinedAt = node.JoinedAt,
-            ReferralCode = node.ReferralCode
+            ReferralCode = node.ReferralCode,
+            PackageName = node.PackageName
         };
         
         result.Add(flatNode);

src/FrontOffice.Main/Utilities/NetworkMembershipService.cs

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

src/FrontOffice.Main/Utilities/OrderService.cs

@@ -97,4 +97,22 @@ public class OrderService
             return 0.10;
         }
     }
+
+    /// <summary>
+    /// محاسبه PV سفارش
+    /// </summary>
+    public async Task<CalculateOrderPVResponse?> CalculateOrderPVAsync(long orderId)
+    {
+        try
+        {
+            return await _userOrderContractClient.CalculateOrderPVAsync(new CalculateOrderPVRequest
+            {
+                OrderId = orderId
+            });
+        }
+        catch
+        {
+            return null;
+        }
+    }
 }

src/FrontOffice.Main/Utilities/PackageService.cs

@@ -10,8 +10,17 @@ public record PackageDto(
     string Title,
     string Description,
     string ImageUrl,
-    long Price)
+    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)
 {
+    /// <summary>قیمت فرمت‌شده به تومان</summary>
     public string FormattedPrice => string.Format("{0:N0} تومان", Price);
 }
 
@@ -20,6 +29,7 @@ public record PackageDto(
 /// </summary>
 public record UserPackageStatusDto(
     bool HasPurchasedPackage,
+    string? PackageTitle,
     string? PurchaseMethod, // DayaLoan, DirectPurchase, or null
     bool IsClubMemberActive,
     long WalletBalance,
@@ -55,7 +65,15 @@ public class PackageService
                     m.Title,
                     m.Description,
                     m.ImagePath,
-                    m.Price))
+                    m.Price,
+                    m.ActivationFee,
+                    m.DiscountMultiplier,
+                    m.MagicWalletMultiplier,
+                    m.MagicWalletMaxDeposit,
+                    m.MagicWalletMaxCredit,
+                    m.IsBasePackage,
+                    m.SupportsDayaPurchase,
+                    m.SupportsDirectPurchase))
                 .ToList();
         }
         catch (Exception ex)
@@ -99,15 +117,32 @@ public class PackageService
     /// <summary>
     /// Get user's package purchase status
     /// </summary>
-    public Task<UserPackageStatusDto> GetUserPackageStatusAsync(CancellationToken ct = default)
+    public async Task<UserPackageStatusDto> GetUserPackageStatusAsync(CancellationToken ct = default)
     {
-        // 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));
+        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);
+        }
     }
 }

src/FrontOffice.Main/Utilities/ProductService.cs

@@ -71,9 +71,12 @@ 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)
+        int page = 1, int pageSize = 12, bool? inStock = null)
     {
         try
         {
@@ -84,20 +87,25 @@ public class ProductService
                     PageNumber = page,
                     PageSize = pageSize
                 },
-                Filter = new GetAllProductsByFilterFilter
-                {
-                    Title = query ?? string.Empty,
-                    Description = query ?? string.Empty,
-                    ShortInfomation = query ?? string.Empty,
-                    FullInformation = query ?? string.Empty
-                }
+                Filter = new GetAllProductsByFilterFilter()
             };
 
+            // فقط 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;
@@ -129,30 +137,66 @@ public class ProductService
 
     public async Task<Product?> GetByIdAsync(long id)
     {
-        if (TryGetCachedProduct(id, out var cached) && HasDetailedData(cached))
-        {
-            return cached;
-        }
+        if (id <= 0)
+            return null;
 
+        TryGetCachedProduct(id, out var cached);
+
+        if (cached is not null && 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 == null)
-            {
+            if (resp is null || resp.Id <= 0)
                 return null;
-            }
 
             return MapAndCache(resp);
         }
         catch
         {
-            if (cached is not null)
-            {
-                return cached;
-            }
+            return null;
+        }
+    }
 
-            TryGetCachedProduct(id, out var result);
-            return result;
+    private async Task<Product?> TryFetchByFilterIdAsync(long id)
+    {
+        try
+        {
+            var resp = await _client.GetAllProductsByFilterAsync(new GetAllProductsByFilterRequest
+            {
+                PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
+                {
+                    PageNumber = 1,
+                    PageSize = 1
+                },
+                Filter = new GetAllProductsByFilterFilter { Id = id }
+            });
+
+            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;
         }
     }
 

src/FrontOffice.Main/Utilities/RouteConstants.cs

@@ -23,6 +23,8 @@ public static class RouteConstants
         public const string Tree = "/profile/tree";
         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

@@ -0,0 +1,213 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,117 @@
+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

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,69 @@
+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["GwUrl"]?.TrimEnd('/') ?? "https://localhost:5002";
+            var gwUrl = (_configuration["GW_URL"] ?? _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,4 +11,5 @@ 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,6 +1,5 @@
 using DateTimeConverterCL;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
-using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog;
 using Google.Protobuf.WellKnownTypes;
 
 namespace FrontOffice.Main.Utilities;
@@ -32,7 +31,10 @@ public record MagicWalletStatus(
     long MagicMaxDeposit,
     long MagicRemainingDeposit,
     long Balance,
-    DateTime? MagicActivatedAt
+    DateTime? MagicActivatedAt,
+    int PurchaseCycleCount,
+    double MagicMultiplier = 2.5,
+    long MagicMaxCredit = 2_500_000_000
 );
 
 public class WalletService
@@ -62,7 +64,7 @@ public class WalletService
     {
         try
         {
-            var request = new GetCustomerWalletChangeLogRequest();
+            var request = new GetCustomerWalletHistoryRequest();
             if (referenceId.HasValue)
             {
                 request.ReferenceId = referenceId.Value;
@@ -71,7 +73,7 @@ public class WalletService
             {
                 request.IsIncrease = isIncrease.Value;
             }
-            var response = await _client.GetCustomerWalletChangeLogAsync(request);
+            var response = await _client.GetCustomerWalletHistoryAsync(request);
             
             return response.Models
                 .Select(log => new WalletTransaction(
@@ -95,7 +97,7 @@ public class WalletService
         }
     }
 
-    private static string ResolveTransactionDate(CustomerWalletChangeLogModel model)
+    private static string ResolveTransactionDate(CustomerWalletHistoryModel model)
     {
         if (model.CreatedAt is not null)
         {
@@ -113,15 +115,15 @@ public class WalletService
         return DateTime.Now.MiladiToJalaliWithTime();
     }
 
-    private static string ResolveDescription(CustomerWalletChangeLogModel model)
+    private static string ResolveDescription(CustomerWalletHistoryModel 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 ? "شارژ اعتباری" : "خرید اعتباری");
@@ -212,12 +214,15 @@ public class WalletService
                 response.MagicMaxDeposit,
                 response.MagicRemainingDeposit,
                 response.Balance,
-                activatedAt
+                activatedAt,
+                response.PurchaseCycleCount,
+                response.MagicMultiplier > 0 ? response.MagicMultiplier : 2.5,
+                response.MagicMaxCredit > 0 ? response.MagicMaxCredit : 2_500_000_000
             );
         }
         catch
         {
-            return new MagicWalletStatus(0, 0, 0, 0, 0, 0, null);
+            return new MagicWalletStatus(0, 0, 0, 0, 0, 0, null, 0);
         }
     }
 
@@ -241,6 +246,102 @@ public class WalletService
         }
     }
 
+    public async Task<(bool Success, string? GatewayUrl, string? Error)> InitiateDiscountChargeAsync(long amount)
+    {
+        try
+        {
+            var response = await _client.InitiateDiscountChargeAsync(new InitiateDiscountChargeRequest
+            {
+                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 ?? "خطا در ارتباط با سرور");
+        }
+    }
+
+    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.Production.json

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

src/FrontOffice.Main/appsettings.Staging.json

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

src/FrontOffice.Main/appsettings.json

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