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.

docs/CHANGELOG.md

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

src/FrontOffice.Main/ConfigureServices.cs

@@ -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;
 
@@ -95,6 +96,10 @@ public static class ConfigureServices
         // SignalR Token Notification Service
         services.AddScoped<TokenNotificationService>();
 
+        // SEO
+        services.AddScoped<SeoMetadataProvider>();
+        services.AddScoped<SitemapGenerator>();
+
         return services;
     }
 

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>

src/FrontOffice.Main/Pages/Checkout.razor

@@ -71,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>
 
@@ -241,7 +167,7 @@
                             @if (!CanProceedToPayment)
                             {
                                 <MudText Typo="Typo.caption" Color="Color.Error" Align="Align.Center">
-                                    لطفاً پکیج و آدرس را انتخاب کنید.
+                                    لطفاً پکیج را انتخاب کنید.
                                 </MudText>
                             }
                         </MudStack>

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

@@ -1,6 +1,4 @@
-
 using CMSMicroservice.Protobuf.Protos.Package;
-using CMSMicroservice.Protobuf.Protos.UserAddress;
 using FrontOffice.Main.Utilities;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
@@ -13,14 +11,10 @@ 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!;
 
     [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
@@ -31,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()
@@ -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;
@@ -175,9 +110,9 @@ public partial class Checkout
     {
         if (_isProcessingPayment) return;
 
-        if (!CanProceedToPayment || _selectedPackage == null || _selectedAddress == null)
+        if (!CanProceedToPayment || _selectedPackage == null)
         {
-            Snackbar.Add("لطفاً پکیج و آدرس را انتخاب کنید.", Severity.Warning);
+            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
             return;
         }
 
@@ -219,9 +154,9 @@ public partial class Checkout
 
     private async Task DayaLoanPayment()
     {
-        if (_selectedAddress == null)
+        if (_selectedPackage == null)
         {
-            Snackbar.Add("لطفاً آدرس را انتخاب کنید.", Severity.Warning);
+            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
             return;
         }
 

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

@@ -40,7 +40,11 @@ public partial class Checkout
         }
         await VAT.LoadAsync();
         await DiscountCart.EnsureInitializedAsync();
+        var userInfo = await AuthService.GetUserAuthInfo();
+        if (userInfo.HasAddress)
             await LoadAddresses();
+        else
+            _addresses = new();
     }
 
     private async Task LoadAddresses()

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">
@@ -127,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;
@@ -10,6 +12,7 @@ public partial class Products : ComponentBase, IDisposable
     [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;
@@ -20,42 +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()
     {
         _isAuthenticated = await AuthService.IsAuthenticatedAsync();
-        _loading = true;
         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();
     }
@@ -72,28 +140,28 @@ public partial class Products : ComponentBase, IDisposable
             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)
@@ -101,15 +169,44 @@ public partial class Products : ComponentBase, IDisposable
         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/Index.razor

@@ -93,6 +93,85 @@
     </section>
 }
 
+@* ═══════════════════════════════════════════════
+   2. HOW IT WORKS — 3 numbered steps
+   ═══════════════════════════════════════════════ *@
+<section class="section-landing">
+    <MudContainer MaxWidth="MaxWidth.Large">
+        <div class="text-center mb-8 fade-in-up">
+            <MudText Typo="Typo.h3">@(_settings?.StepsTitle ?? "سه گام تا شروع")</MudText>
+            <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2">
+                بدون پیچیدگی، سریع و آسان
+            </MudText>
+        </div>
+
+        <MudGrid Spacing="4" Justify="Justify.Center">
+            @foreach (var (step, i) in _steps.Select((s, i) => (s, i)))
+            {
+                <MudItem xs="12" sm="4">
+                    <MudPaper Elevation="0" Class="pa-5 rounded-xl feature-card-v2 text-center fade-in-up" data-delay="@(i * 150)">
+                        <MudAvatar Size="Size.Large" Color="Color.Primary" Variant="Variant.Filled" Class="mx-auto mb-3 landing-step-num">
+                            <MudText Typo="Typo.h5" Style="color:#fff;font-weight:800;">@(i + 1)</MudText>
+                        </MudAvatar>
+                        <MudText Typo="Typo.h6" Class="mb-1">@step.Title</MudText>
+                        <MudText Typo="Typo.body2" Class="mud-text-secondary">@step.Desc</MudText>
+                    </MudPaper>
+                </MudItem>
+            }
+        </MudGrid>
+    </MudContainer>
+</section>
+
+@* ═══════════════════════════════════════════════
+   3. FEATURES — 6 cards with icons
+   ═══════════════════════════════════════════════ *@
+<section class="section-landing" style="background:var(--mud-palette-background-gray);">
+    <MudContainer MaxWidth="MaxWidth.Large">
+        <div class="text-center mb-8 fade-in-up">
+            <MudText Typo="Typo.h3">@(_settings?.FeaturesTitle ?? "چرا کارا بازار سلامت؟")</MudText>
+            <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2" Style="max-width:540px;margin:0 auto;">
+                ابزارهایی ساده و قدرتمند برای رشد کسب‌وکار شما
+            </MudText>
+        </div>
+
+        <MudGrid Spacing="3" Justify="Justify.Center">
+            @foreach (var (icon, title, desc, delay) in _features)
+            {
+                <MudItem xs="12" sm="6" md="4">
+                    <MudPaper Elevation="0" Class="pa-5 rounded-xl feature-card-v2 fade-in-up" data-delay="@delay">
+                        <MudStack Spacing="2">
+                            <MudAvatar Color="Color.Primary" Variant="Variant.Filled" Size="Size.Medium" Class="mb-1">
+                                <MudIcon Icon="@icon" />
+                            </MudAvatar>
+                            <MudText Typo="Typo.h6">@title</MudText>
+                            <MudText Typo="Typo.body2" Class="mud-text-secondary">@desc</MudText>
+                        </MudStack>
+                    </MudPaper>
+                </MudItem>
+            }
+        </MudGrid>
+    </MudContainer>
+</section>
+
+@* ═══════════════════════════════════════════════
+   4. STATS — Counter cards
+   ═══════════════════════════════════════════════ *@
+<section class="section-landing">
+    <MudContainer MaxWidth="MaxWidth.Medium">
+        <MudGrid Spacing="3" Justify="Justify.Center">
+            @foreach (var stat in _stats)
+            {
+                <MudItem xs="6" sm="3">
+                    <MudPaper Elevation="2" Class="pa-4 rounded-xl stat-card fade-in-up text-center">
+                        <MudText Class="stat-number" Color="@stat.Color" id="@stat.ElementId">@stat.Display</MudText>
+                        <MudText Typo="Typo.caption" Class="mud-text-secondary mt-1">@stat.Label</MudText>
+                    </MudPaper>
+                </MudItem>
+            }
+        </MudGrid>
+    </MudContainer>
+</section>
+
 @* ═══════════════════════════════════════════════
    1c. TOP-SELLING REGULAR PRODUCTS
    ═══════════════════════════════════════════════ *@
@@ -266,85 +345,6 @@ else
     }
 }
 
-@* ═══════════════════════════════════════════════
-   2. HOW IT WORKS — 3 numbered steps
-   ═══════════════════════════════════════════════ *@
-<section class="section-landing">
-    <MudContainer MaxWidth="MaxWidth.Large">
-        <div class="text-center mb-8 fade-in-up">
-            <MudText Typo="Typo.h3">@(_settings?.StepsTitle ?? "سه گام تا شروع")</MudText>
-            <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2">
-                بدون پیچیدگی، سریع و آسان
-            </MudText>
-        </div>
-
-        <MudGrid Spacing="4" Justify="Justify.Center">
-            @foreach (var (step, i) in _steps.Select((s, i) => (s, i)))
-            {
-                <MudItem xs="12" sm="4">
-                    <MudPaper Elevation="0" Class="pa-5 rounded-xl feature-card-v2 text-center fade-in-up" data-delay="@(i * 150)">
-                        <MudAvatar Size="Size.Large" Color="Color.Primary" Variant="Variant.Filled" Class="mx-auto mb-3 landing-step-num">
-                            <MudText Typo="Typo.h5" Style="color:#fff;font-weight:800;">@(i + 1)</MudText>
-                        </MudAvatar>
-                        <MudText Typo="Typo.h6" Class="mb-1">@step.Title</MudText>
-                        <MudText Typo="Typo.body2" Class="mud-text-secondary">@step.Desc</MudText>
-                    </MudPaper>
-                </MudItem>
-            }
-        </MudGrid>
-    </MudContainer>
-</section>
-
-@* ═══════════════════════════════════════════════
-   3. FEATURES — 6 cards with icons
-   ═══════════════════════════════════════════════ *@
-<section class="section-landing" style="background:var(--mud-palette-background-gray);">
-    <MudContainer MaxWidth="MaxWidth.Large">
-        <div class="text-center mb-8 fade-in-up">
-            <MudText Typo="Typo.h3">@(_settings?.FeaturesTitle ?? "چرا کارا بازار سلامت؟")</MudText>
-            <MudText Typo="Typo.body1" Class="mud-text-secondary mt-2" Style="max-width:540px;margin:0 auto;">
-                ابزارهایی ساده و قدرتمند برای رشد کسب‌وکار شما
-            </MudText>
-        </div>
-
-        <MudGrid Spacing="3" Justify="Justify.Center">
-            @foreach (var (icon, title, desc, delay) in _features)
-            {
-                <MudItem xs="12" sm="6" md="4">
-                    <MudPaper Elevation="0" Class="pa-5 rounded-xl feature-card-v2 fade-in-up" data-delay="@delay">
-                        <MudStack Spacing="2">
-                            <MudAvatar Color="Color.Primary" Variant="Variant.Filled" Size="Size.Medium" Class="mb-1">
-                                <MudIcon Icon="@icon" />
-                            </MudAvatar>
-                            <MudText Typo="Typo.h6">@title</MudText>
-                            <MudText Typo="Typo.body2" Class="mud-text-secondary">@desc</MudText>
-                        </MudStack>
-                    </MudPaper>
-                </MudItem>
-            }
-        </MudGrid>
-    </MudContainer>
-</section>
-
-@* ═══════════════════════════════════════════════
-   4. STATS — Counter cards
-   ═══════════════════════════════════════════════ *@
-<section class="section-landing">
-    <MudContainer MaxWidth="MaxWidth.Medium">
-        <MudGrid Spacing="3" Justify="Justify.Center">
-            @foreach (var stat in _stats)
-            {
-                <MudItem xs="6" sm="3">
-                    <MudPaper Elevation="2" Class="pa-4 rounded-xl stat-card fade-in-up text-center">
-                        <MudText Class="stat-number" Color="@stat.Color" id="@stat.ElementId">@stat.Display</MudText>
-                        <MudText Typo="Typo.caption" Class="mud-text-secondary mt-1">@stat.Label</MudText>
-                    </MudPaper>
-                </MudItem>
-            }
-        </MudGrid>
-    </MudContainer>
-</section>
-
 @* ═══════════════════════════════════════════════
    5. LATEST BLOG POSTS
    ═══════════════════════════════════════════════ *@
@@ -429,6 +429,8 @@ else
 @* ═══════════════════════════════════════════════
    6. TESTIMONIALS
    ═══════════════════════════════════════════════ *@
+@if (_testimonials.Count > 0)
+{
 <section class="section-landing">
     <MudContainer MaxWidth="MaxWidth.Large">
         <div class="text-center mb-8 fade-in-up">
@@ -465,6 +467,7 @@ else
         </MudGrid>
     </MudContainer>
 </section>
+}
 
 @* ═══════════════════════════════════════════════
    7. FAQ

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

@@ -193,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();
         }

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

@@ -35,12 +35,97 @@
             </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">
                 مبلغ وارد شده (به تومان) از طریق درگاه پرداخت به موجودی اصلی شما اضافه می‌شود.
                 از موجودی اصلی برای خرید از فروشگاه عادی و پرداخت سفارش استفاده می‌شود.
@@ -122,5 +207,6 @@
                 </MudList>
             </MudExpansionPanel>
         </MudExpansionPanels>
+        }
     </MudStack>
 </MudContainer>

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

@@ -7,10 +7,18 @@ 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 };
 
@@ -23,7 +31,13 @@ public partial class ChargeCreditWallet : ComponentBase
     [SupplyParameterFromQuery(Name = "returnUrl")]
     public string? ReturnUrlQueryParam { get; set; }
 
-    protected override void OnInitialized()
+    private bool ShowChargeForm =>
+        _authLoaded
+        && _isClubMemberActive
+        && !_redirectingToMagic
+        && (!_needsMagicCeilingConsent || _allowNormalDespiteMagic);
+
+    protected override async Task OnInitializedAsync()
     {
         _paymentResult = PaymentQueryParam;
 
@@ -32,20 +46,63 @@ public partial class ChargeCreditWallet : ComponentBase
 
         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))
-        {
+        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;
@@ -84,6 +141,50 @@ public partial class ChargeCreditWallet : ComponentBase
         }
     }
 
+    /// <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);

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;
 

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

@@ -333,6 +333,7 @@ public partial class Index
         if (!result.Canceled)
         {
             await LoadAddresses();
+            await AuthService.RefreshTokenAsync();
         }
     }
 
@@ -385,6 +386,7 @@ public partial class Index
                 });
                 Snackbar.Add("آدرس با موفقیت حذف شد.", Severity.Success);
                 await LoadAddresses();
+                await AuthService.RefreshTokenAsync();
             }
             catch (Exception ex)
             {
@@ -491,11 +493,6 @@ public partial class Index
             Snackbar.Add("لطفا اطلاعات شخصی خود را تکمیل کنید. (تاریخ تولد وارد نشده)", Severity.Error);
             return;
         }
-        if (!_addresses.Any())
-        {
-            Snackbar.Add("آدرس محل سکونت شما الزامی است!", Severity.Error);
-            return;
-        }
 
         var url = "https://dayadiamond.ir/profile/creditpurchase/?merchantcode=56146364";
         await JSRuntime.InvokeVoidAsync("open", url, "_blank");

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

@@ -166,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>
             }
 

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

@@ -38,7 +38,44 @@
             درخواست‌های برداشت
         </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"
@@ -48,6 +85,45 @@
                            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" 

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/CheckoutSummary.razor.cs

@@ -35,7 +35,11 @@ public partial class CheckoutSummary : ComponentBase
             await AuthDialogService.ShowAuthDialogAsync();
         }
         await Cart.EnsureInitializedAsync();
+        var userInfo = await AuthService.GetUserAuthInfo();
+        if (userInfo.HasAddress)
             await LoadAddresses();
+        else
+            _addresses = new();
         await LoadWalletBalance();
     }
 
@@ -125,11 +129,42 @@ public partial class CheckoutSummary : ComponentBase
             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.ShortfallAmount, shortfall },
+            { x => x.AllowChargeCredit, allowCharge },
+            { x => x.HasPurchasedPackage, hasPurchasedPackage },
+            { x => x.IsMagicWallet, isMagicWallet },
+            { x => x.MagicCeilingFull, magicCeilingFull }
         };
 
         var dialog = await DialogService.ShowAsync<InsufficientCreditDialog>(
@@ -143,7 +178,7 @@ public partial class CheckoutSummary : ComponentBase
             });
 
         var result = await dialog.Result;
-        if (result is { Canceled: false } && result.Data is long chargeShortfall)
+        if (allowCharge && result is { Canceled: false } && result.Data is long chargeShortfall)
         {
             var chargeAmount = CreditChargeNavigation.NormalizeChargeAmount(chargeShortfall);
             Navigation.NavigateTo(CreditChargeNavigation.BuildChargeUrl(

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

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

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

@@ -1,75 +1,96 @@
 @attribute [Route(RouteConstants.Store.Orders)]
-@* Injection is handled in code-behind *@
 
 <PageTitle>سفارشات من</PageTitle>
 
 <MudContainer MaxWidth="MaxWidth.Large" Class="py-6">
+    <MudStack Spacing="3">
         <PageHeader Title="سفارشات من" BackHref="@RouteConstants.Store.Products" />
+
         @if (_loading)
         {
             <LoadingState />
         }
         else if (_orders.Count == 0)
         {
-        <MudAlert Severity="Severity.Info">هنوز سفارشی ثبت نکرده‌اید.</MudAlert>
+            <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">
-        <MudTable Items="_orders" Dense="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>
-                <MudTh>وضعیت</MudTh>
-                <MudTh>مبلغ</MudTh>
                             <MudTh></MudTh>
                         </HeaderContent>
                         <RowTemplate>
                             <MudTd>@context.Id</MudTd>
+                            <MudTd>@GetItemsCount(context)</MudTd>
+                            <MudTd>@FormatPrice(GetTotalAmount(context))</MudTd>
                             <MudTd>
-                    @if (context.PaymentDate != null)
-                    {
-                        @context.PaymentDate.ToDateTime().MiladiToJalaliWithTime()
-                    }
-                    else
-                    {
-                        <text>در انتظار پرداخت</text>
-                    }
+                                <MudChip T="string" Size="Size.Small"
+                                         Color="@GetPaymentStatusColor(context.PaymentStatus)"
+                                         Variant="Variant.Filled">
+                                    @GetPaymentStatusText(context.PaymentStatus)
+                                </MudChip>
                             </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>
+                                <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 o in _orders)
+                    @foreach (var order in _orders)
                     {
-                    <MudPaper Class="pa-3 rounded-lg" Outlined="true">
+                        <MudPaper Class="pa-3 rounded-lg cursor-pointer" Outlined="true"
+                                  @onclick="() => ViewOrder(order.Id)">
                             <MudStack Spacing="1">
-                            <MudStack Row="true" Justify="Justify.SpaceBetween">
-                                <MudText>سفارش #@o.Id</MudText>
-                                <MudText Class="mud-text-secondary">
-                                    @if (o.PaymentDate != null)
-                                    {
-                                        @o.PaymentDate.ToDateTime().MiladiToJalaliWithTime()
-                                    }
-                                    else
-                                    {
-                                        <text>در انتظار پرداخت</text>
-                                    }
-                                </MudText>
+                                <MudStack 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>وضعیت: @GetStatusText(o.PaymentStatus)</MudText>
-                                <MudText Color="Color.Primary">@FormatPrice(o.FactorDetails.Sum(s=>(s.UnitPrice ?? 0) * (s.Count ?? 0)))</MudText>
+                                    <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>
-                            <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>
+                                <MudDivider />
+                                <MudStack Row="true" Justify="Justify.SpaceBetween">
+                                    <MudText Typo="Typo.body2">@GetItemsCount(order) قلم</MudText>
+                                    <MudText Typo="Typo.body2" Class="fw-semibold">@FormatPrice(GetTotalAmount(order)) تومان</MudText>
                                 </MudStack>
                             </MudStack>
                         </MudPaper>
@@ -77,4 +98,5 @@
                 </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)
-        {
-            // بارگذاری نرخ VAT
-            await VAT.LoadAsync();
-        }
-        await base.OnAfterRenderAsync(firstRender);
+        Navigation.NavigateTo($"{RouteConstants.Store.OrderDetail}{orderId}");
     }
 
-    private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
+    private static string FormatPrice(long price) => $"{price:N0}";
 
-
-    private string GetStatusText(Messages.PaymentStatus contextPaymentStatus)
+    private static string FormatDate(GetUserOrderResponse order)
     {
-        return contextPaymentStatus switch
+        try
+        {
+            var timestamp = order.PaymentDate;
+            if (timestamp is null)
+                return "در انتظار پرداخت";
+
+            return timestamp.ToDateTime().ToLocalTime().MiladiToJalaliWithTime();
+        }
+        catch
+        {
+            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.cs

@@ -21,6 +21,7 @@ public partial class ProductDetail : ComponentBase, IDisposable
 
     private Product? _product;
     private bool _loading;
+    private bool _initialized;
     private int _qty = 1;
     private const int MinQty = 1;
     
@@ -48,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
         {
@@ -78,19 +85,16 @@ 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()

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;">
 
@@ -164,6 +165,7 @@
                             </MudButton>
                         </MudCardActions>
                     </MudCard>
+                    </div>
                 </MudItem>
             }
         </MudGrid>

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

@@ -2,19 +2,11 @@ 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!;
@@ -23,6 +15,7 @@ public partial class Products : ComponentBase, IDisposable
     [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;
@@ -35,8 +28,9 @@ 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()
     {
@@ -44,36 +38,98 @@ public partial class Products : ComponentBase, IDisposable
         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);
+        _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;
-        _hasMore = result.HasNext;
                 _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;
@@ -82,42 +138,32 @@ public partial class Products : ComponentBase, IDisposable
         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 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} تومان";
 
     public void Dispose()
@@ -128,24 +174,33 @@ public partial class Products : ComponentBase, IDisposable
 
     private void HandleLocationChanged(object? sender, LocationChangedEventArgs args)
     {
-        _ = InvokeAsync(LoadInitial);
-    }
-
-    private void UpdateCategoryFilterFromUri()
+        if (_ignoreNextLocationChange)
         {
-        var uri = Navigation.ToAbsoluteUri(Navigation.Uri);
-        if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("category", out var values) &&
-            long.TryParse(values.FirstOrDefault(), out var categoryId))
-        {
-            _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" />
@@ -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/InsufficientCreditDialog.razor

@@ -1,3 +1,5 @@
+@using FrontOffice.Main.Utilities
+
 <MudDialog>
     <TitleContent>
         <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
@@ -7,9 +9,34 @@
     </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">
@@ -31,12 +58,33 @@
     </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.Payment"
-                   OnClick="GoToCharge">
-            شارژ حساب اصلی
+                       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>
 
@@ -53,9 +101,52 @@
     [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() => MudDialog.Close(DialogResult.Ok(ShortfallAmount));
+    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/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/DiscountOrderService.cs

@@ -219,6 +219,8 @@ public class DiscountOrderService
         2 => "ارسال شده",
         3 => "تحویل داده شده",
         4 => "لغو شده",
+        5 => "آماده تحویل در دفتر",
+        6 => "مرجوع شده",
         _ => "نامشخص"
     };
 
@@ -228,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/ProductService.cs

@@ -137,30 +137,66 @@ public class ProductService
 
     public async Task<Product?> GetByIdAsync(long id)
     {
-        if (TryGetCachedProduct(id, out var cached) && HasDetailedData(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/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/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/appsettings.Production.json

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

src/FrontOffice.Main/wwwroot/robots.txt

@@ -0,0 +1,21 @@
+User-agent: *
+Allow: /
+
+Disallow: /profile/
+Disallow: /checkout
+Disallow: /checkout-summary
+Disallow: /cart
+Disallow: /orders
+Disallow: /order/
+Disallow: /discount-store/cart
+Disallow: /discount-store/checkout
+Disallow: /discount-store/orders
+Disallow: /discount-store/order/
+Disallow: /my-orders
+Disallow: /my-cart
+Disallow: /wishlist
+Disallow: /commission/
+Disallow: /network/
+Disallow: /my-packages
+
+Sitemap: https://kbs2.ir/sitemap.xml