+ مدیریت بلاگ
+
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+
+ protected override void OnInitialized()
+ {
+ var uri = Navigation.ToBaseRelativePath(Navigation.Uri).ToLowerInvariant().TrimEnd('/');
+ _activeTab = uri switch
+ {
+ "blog/categories" => 1,
+ _ => 0
+ };
+ }
+}
diff --git a/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor b/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor
new file mode 100644
index 0000000..c015171
--- /dev/null
+++ b/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor
@@ -0,0 +1,152 @@
+@* Merged into /blog *@
+@attribute [Authorize(Roles = "Administrator")]
+
+@using BackOffice.Services.Blog
+
+@inject IBlogPostService BlogPostService
+@inject IBlogCategoryService BlogCategoryService
+
+
+
+
+ مدیریت پستهای بلاگ
+
+ افزودن پست
+
+
+
+
+
+ همه
+ پیشنویس
+ منتشر شده
+ آرشیو شده
+
+
+
+ همه
+ @foreach (var cat in _categories)
+ {
+ @cat.Title
+ }
+
+
+
+ اعمال فیلتر
+
+
+
+
+
+
+
+
+ @context.Item.StatusName
+
+
+
+
+
+ @if (context.Item.IsFeatured)
+ {
+
+
+
+
+
+ @foreach (var cat in context.Item.Categories)
+ {
+ @cat.Title
+ }
+
+
+
+
+
+ @context.Item.Created.MiladiToJalali()
+
+
+
+
+
+ @if (context.Item.Status == 0)
+ {
+
+
+ }
+ @if (context.Item.Status == 1)
+ {
+
+
+ }
+
+
+
+
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+
+
diff --git a/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor.cs b/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor.cs
new file mode 100644
index 0000000..03babba
--- /dev/null
+++ b/src/BackOffice/Pages/Blog/BlogPostManagementPage.razor.cs
@@ -0,0 +1,189 @@
+using BackOffice.Services.Blog;
+using BackOffice.Pages.Blog.Components;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+using MudBlazor;
+
+namespace BackOffice.Pages.Blog;
+
+public partial class BlogPostManagementPage
+{
+ private MudDataGrid
+ فیچرهای باشگاه
+
+
+
+ @* ── تب اول: لیست فیچرها ── *@
+
+ @if (_loadingFeatures)
+ {
+ فیچری تعریف نشده است.
+ }
+ else
+ {
+
+ @foreach (var feature in _features)
+ {
+
+
+
+
+ @feature.Title
+
+ @(feature.IsEnabled ? "فعال" : "غیرفعال")
+
+
+ @if (!string.IsNullOrWhiteSpace(feature.Description))
+ {
+ @feature.Description
+ }
+ ترتیب: @feature.DisplayOrder
+
+
+
+ }
+
+ }
+
+
+ @* ── تب دوم: فیچرهای کاربران ── *@
+
+
+ جستجو
+
+
+ @if (_loadingUserFeatures)
+ {
+ لطفاً یک کاربر انتخاب کنید.
+ }
+ else if (_userFeatures.Count == 0)
+ {
+ فیچری برای این کاربر یافت نشد.
+ }
+ else
+ {
+
+
+
+
+ @(string.IsNullOrWhiteSpace(context.Item.FeatureDescription) ? "—" : context.Item.FeatureDescription)
+
+
+
+
+
+
+
+
+ @if (context.Item.GrantedAt != null)
+ {
+ @context.Item.GrantedAt.ToDateTime().ToLocalTime().MiladiToJalali()
+ }
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+ }
+
+
+
+
+@code {
+ private int _activeTab;
+ private bool _loadingFeatures;
+ private bool _loadingUserFeatures;
+
+ // Features tab
+ private List
+ باشگاه مشتریان
+
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+
+ protected override void OnInitialized()
+ {
+ var uri = Navigation.ToBaseRelativePath(Navigation.Uri).ToLowerInvariant().TrimEnd('/');
+ _activeTab = uri switch
+ {
+ "club/statistics" => 1,
+ _ => 0
+ };
+ }
+}
diff --git a/src/BackOffice/Pages/Club/ClubMembers.razor b/src/BackOffice/Pages/Club/ClubMembers.razor
index 6ea9edd..5d222f0 100644
--- a/src/BackOffice/Pages/Club/ClubMembers.razor
+++ b/src/BackOffice/Pages/Club/ClubMembers.razor
@@ -1,18 +1,18 @@
-@page "/club/members"
+@* Merged into /club *@
@attribute [Authorize]
@using Google.Protobuf.WellKnownTypes
@using BackOffice.Pages.Club.Components
-@using Foursat.BackOffice.BFF.ClubMembership.Protos
+@using CMSMicroservice.Protobuf.Protos.ClubMembership
-
+
+
+ مدیریت صفحات سایت
+
+ افزودن صفحه جدید
+
+
+
+
+
+
+
+
+ @(context.Item.IsActive ? "فعال" : "غیرفعال")
+
+
+
+
+
+ @context.Item.LastModified.MiladiToJalaliWithTime()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
diff --git a/src/BackOffice/Pages/Content/SitePageManagementPage.razor.cs b/src/BackOffice/Pages/Content/SitePageManagementPage.razor.cs
new file mode 100644
index 0000000..abc3b81
--- /dev/null
+++ b/src/BackOffice/Pages/Content/SitePageManagementPage.razor.cs
@@ -0,0 +1,128 @@
+using BackOffice.Services.Content;
+using BackOffice.Pages.Content.Components;
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace BackOffice.Pages.Content;
+
+public partial class SitePageManagementPage
+{
+ private List
+ قراردادهای کاربران
+
+
+
+
+ جستجو
+
+
+
+
+
+ @if (!string.IsNullOrWhiteSpace(context.Item.SignedPdfFile))
+ {
+
+ دانلود PDF
+
+ }
+ else
+ {
+ بدون فایل
+ }
+
+
+
+
+
+
+
+
+
+
+ قراردادی یافت نشد.
+
+
+
+
+
+
+@code {
+ private MudDataGrid
- @if (context.Item.Children.Any())
- {
- (@context.Item.Name)
- }
-
-
+
+
+ سفارشات فروشگاه تخفیفی
+
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+
+ protected override void OnInitialized()
+ {
+ var uri = Navigation.ToBaseRelativePath(Navigation.Uri).ToLowerInvariant().TrimEnd('/');
+ _activeTab = uri switch
+ {
+ "discount-sales-reports" => 1,
+ _ => 0
+ };
+ }
+}
diff --git a/src/BackOffice/Pages/DiscountShop/SalesReports.razor b/src/BackOffice/Pages/DiscountShop/SalesReports.razor
index 4d2cdd9..4bc6083 100644
--- a/src/BackOffice/Pages/DiscountShop/SalesReports.razor
+++ b/src/BackOffice/Pages/DiscountShop/SalesReports.razor
@@ -1,4 +1,4 @@
-@page "/discount-sales-reports"
+@* Merged into /discount-shop *@
@attribute [Authorize(Roles = "Administrator")]
@using MudBlazor
@@ -10,13 +10,13 @@
@inject ISnackbar Snackbar
@inject IJSRuntime JsRuntime
-
+ مدیریت انبار
+
+ @* Filters Section *@
+
+
+
+
+ @foreach (var wh in _warehouses)
+ {
+ @wh.Name
+ }
+
+
+
+
+ همه
+ محصول عادی
+ محصول تخفیفی
+
+
+
+
+
+
+ اعمال فیلتر
+
+
+ پاک کردن
+
+
+
+
+
+ @* Stats Cards *@
+
+
+
+
+
+
+ کل اقلام انبار
+ @_totalCount
+
+
+
+
+
+
+
+
+
+
+ محصولات کمموجود
+ @_lowStockCount
+
+
+
+
+
+
+
+ @* Data Grid *@
+
+
+ لیست موجودی انبار
+
+
+ خروجی Excel
+
+
+ ورود کالا
+
+
+
+
+
+
+
+ @context.Item.ProductTitle
+
+ @GetProductTypeLabel(context.Item.ProductType)
+
+
+
+
+
+
+
+
+ @context.Item.WarehouseName
+
+
+
+
+
+
+
+ @context.Item.Quantity
+
+
+
+
+
+
+ @context.Item.ReservedQuantity
+
+
+
+
+
+ @context.Item.AvailableQuantity
+
+
+
+
+
+ @if (context.Item.IsLowStock)
+ {
+
+
+ }
+ else
+ {
+
+ موجود
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+
diff --git a/src/BackOffice/Pages/Inventory/InventoryMainPage.razor.cs b/src/BackOffice/Pages/Inventory/InventoryMainPage.razor.cs
new file mode 100644
index 0000000..651a815
--- /dev/null
+++ b/src/BackOffice/Pages/Inventory/InventoryMainPage.razor.cs
@@ -0,0 +1,316 @@
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Protobuf.Protos.Inventory;
+using BackOffice.Pages.Inventory.Components;
+using BackOffice.Common.Utilities;
+using Microsoft.JSInterop;
+using System.Text;
+
+namespace BackOffice.Pages.Inventory;
+
+public partial class InventoryMainPage
+{
+ [Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
+ [Inject] public IJSRuntime JsRuntime { get; set; } = default!;
+
+ private MudDataGrid
+
+
+
+
+
+ لیست محصولاتی که موجودی آنها کمتر از حد هشدار است
+
+
+
+ بازگشت به انبار
+
+
+
+ @* Filters Section *@
+
+
+
+
+ @foreach (var wh in _warehouses)
+ {
+ @wh.Name
+ }
+
+
+
+
+ همه
+ محصول عادی
+ محصول تخفیفی
+
+
+
+
+ بارگذاری
+
+
+
+
+
+ @* Stats *@
+
+
+ @_items.Count محصول کمموجود شناسایی شده است.
+ لطفاً برای جلوگیری از کمبود موجودی، اقدام به سفارش مجدد کنید.
+
+
+
+ @if (_isLoading)
+ {
+
+
+
+
+
+ @context.Item.ProductTitle
+
+ @GetProductTypeLabel(context.Item.ProductType)
+
+
+
+
+
+
+
+
+ @context.Item.WarehouseName
+
+
+
+
+
+
+ @context.Item.Quantity
+
+
+
+
+
+ @context.Item.AvailableQuantity
+
+
+
+
+
+ @{
+ var shortage = context.Item.LowStockThreshold - context.Item.Quantity;
+ }
+
+ @shortage عدد
+
+
+
+
+
+
+
+ ورود کالا
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+ }
+
diff --git a/src/BackOffice/Pages/Inventory/LowStockPage.razor.cs b/src/BackOffice/Pages/Inventory/LowStockPage.razor.cs
new file mode 100644
index 0000000..7c98d4a
--- /dev/null
+++ b/src/BackOffice/Pages/Inventory/LowStockPage.razor.cs
@@ -0,0 +1,121 @@
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+using CMSMicroservice.Protobuf.Protos.Inventory;
+using BackOffice.Pages.Inventory.Components;
+using BackOffice.Common.Utilities;
+
+namespace BackOffice.Pages.Inventory;
+
+public partial class LowStockPage
+{
+ [Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
+
+ private List
+
+
+ تاریخچه تغییرات موجودی
+ @if (!string.IsNullOrEmpty(_productName))
+ {
+ محصول: @_productName
+ }
+
+
+ بازگشت به انبار
+
+
+
+ @* Filters Section *@
+
+
+
+
+ همه
+ موجودی اولیه
+ ورود کالا
+ برگشت از مشتری
+ فروش
+ افزایش موجودی
+ کاهش موجودی
+ رزرو
+ آزادسازی رزرو
+ خسارت
+ آسیبدیده
+ منقضی
+ انتقال به بیرون
+ انتقال به داخل
+
+
+
+
+ همه
+ محصول عادی
+ محصول تخفیفی
+
+
+
+
+
+
+
+
+ اعمال فیلتر
+
+
+ پاک کردن
+
+
+
+
+
+ @* Data Grid *@
+
+
+ تغییرات موجودی
+
+ کل: @_totalCount ردیف
+
+
+ خروجی Excel
+
+
+
+
+
+
+ @GetMovementTypeLabel(context.Item.MovementType)
+
+
+
+
+
+
+
+ @(IsIncreaseMovement(context.Item.MovementType) ? "+" : "-")@Math.Abs(context.Item.Quantity)
+
+
+
+
+
+
+ @if (!string.IsNullOrEmpty(context.Item.ReferenceNumber))
+ {
+ @context.Item.ReferenceNumber
+ }
+ else
+ {
+ -
+ }
+
+
+
+
+
+ @if (context.Item.PerformedByUserId != null && context.Item.PerformedByUserId > 0)
+ {
+ کاربر #@context.Item.PerformedByUserId
+ }
+ else
+ {
+ سیستم
+ }
+
+
+
+
+
+ @if (context.Item.Created != null)
+ {
+
+ @context.Item.Created.ToDateTime().ToLocalTime().MiladiToJalaliWithTime()
+
+ }
+
+
+
+
+
+ @if (!string.IsNullOrEmpty(context.Item.Note))
+ {
+
+
+
+ }
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+
diff --git a/src/BackOffice/Pages/Inventory/MovementsPage.razor.cs b/src/BackOffice/Pages/Inventory/MovementsPage.razor.cs
new file mode 100644
index 0000000..39bcd07
--- /dev/null
+++ b/src/BackOffice/Pages/Inventory/MovementsPage.razor.cs
@@ -0,0 +1,219 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MudBlazor;
+using Google.Protobuf.WellKnownTypes;
+using CMSMicroservice.Protobuf.Protos.Inventory;
+using BackOffice.Common.Utilities;
+using System.Text;
+using DateTimeConverterCL;
+
+namespace BackOffice.Pages.Inventory;
+
+public partial class MovementsPage
+{
+ [Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
+ [Inject] public IJSRuntime JsRuntime { get; set; } = default!;
+
+ [SupplyParameterFromQuery(Name = "itemId")]
+ public long? ItemId { get; set; }
+
+ [SupplyParameterFromQuery(Name = "productName")]
+ public string? _productName { get; set; }
+
+ private MudDataGrid
+
+
+
+
+
+ تعریف و مدیریت انبارهای سیستم
+
+
+
+
+ انبار جدید
+
+
+ بازگشت به انبار
+
+
+
+
+ @* Filter Toggle *@
+
+
+ بارگذاری مجدد
+
+
+
+ @if (_isLoading)
+ {
+
+ @foreach (var warehouse in _warehouses)
+ {
+
+
+
+
+
+
+
+
+
+ @warehouse.Name
+ @if (warehouse.IsDefault)
+ {
+ پیشفرض
+ }
+
+
+ کد: @warehouse.Code
+
+
+
+
+ @(warehouse.IsActive ? "فعال" : "غیرفعال")
+
+
+
+
+
+
+
+ @(string.IsNullOrEmpty(warehouse.Address) ? "آدرس ثبت نشده" : warehouse.Address)
+
+
+
+
+ ایجاد: @(warehouse.Created?.ToDateTime().ToLocalTime().MiladiToJalali() ?? "-")
+
+
+
+
+
+
+ مشاهده موجودی
+
+
+
+
+ }
+
+ @if (_warehouses.Count == 0)
+ {
+
+
+ هیچ انباری یافت نشد. برای شروع، یک انبار جدید ایجاد کنید.
+
+
+ }
+
+ }
+
diff --git a/src/BackOffice/Pages/Inventory/WarehousesPage.razor.cs b/src/BackOffice/Pages/Inventory/WarehousesPage.razor.cs
new file mode 100644
index 0000000..d44e385
--- /dev/null
+++ b/src/BackOffice/Pages/Inventory/WarehousesPage.razor.cs
@@ -0,0 +1,73 @@
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+using CMSMicroservice.Protobuf.Protos.Inventory;
+using BackOffice.Pages.Inventory.Components;
+using BackOffice.Common.Utilities;
+
+namespace BackOffice.Pages.Inventory;
+
+public partial class WarehousesPage
+{
+ [Inject] public InventoryContract.InventoryContractClient InventoryContract { get; set; } = default!;
+
+ private List
- @* 
*@
- )
+ }
+ else if (!string.IsNullOrWhiteSpace(item.ImagePath))
+ {
+ )
+ }
+ else
+ {
+
{
- { x => x.ImageUrl, item.ImagePath },
+ { x => x.ImageUrl, GetFullImageUrl(item.ImagePath) },
{ x => x.Title, item.Title }
};
@@ -133,6 +135,14 @@ public partial class GalleryDialog
private void Close() => MudDialog.Close();
+ private string GetFullImageUrl(string? path)
+ {
+ if (string.IsNullOrWhiteSpace(path)) return string.Empty;
+ if (path.StartsWith("data:") || path.StartsWith("http")) return path;
+ var baseUrl = Configuration["GwUrl"]?.TrimEnd('/') ?? "";
+ return baseUrl + path;
+ }
+
private class GalleryItemViewModel
{
public long ProductGalleryId { get; set; }
diff --git a/src/BackOffice/Pages/Products/Components/UpdateDialog.razor b/src/BackOffice/Pages/Products/Components/UpdateDialog.razor
index f29f147..451b9f5 100644
--- a/src/BackOffice/Pages/Products/Components/UpdateDialog.razor
+++ b/src/BackOffice/Pages/Products/Components/UpdateDialog.razor
@@ -1,7 +1,6 @@
-@using BackOffice.BFF.Products.Protobuf.Protos.Products
+@using CMSMicroservice.Protobuf.Protos.Products
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
-@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
@@ -10,7 +9,7 @@
@if (!string.IsNullOrWhiteSpace(_mainImagePreview))
{
- )
}
else
{
@@ -26,7 +25,7 @@
Color="Color.Primary"
ButtonType="ButtonType.Button"
StartIcon="@Icons.Material.Filled.Image"
- Style="cursor:pointer;">
+ >
تغییر تصویر اصلی
@@ -38,22 +37,19 @@
-
-
+
-
-
+
@@ -72,6 +68,14 @@
تصویر بندانگشتی
+ @if (!string.IsNullOrWhiteSpace(_thumbnailPreview))
+ {
+ )
+ }
+ else if (!string.IsNullOrWhiteSpace(Model.ThumbnailPath))
+ {
+ )
+ }
+ >
تغییر تصویر بندانگشتی (اختیاری)
diff --git a/src/BackOffice/Pages/Products/Components/UpdateDialog.razor.cs b/src/BackOffice/Pages/Products/Components/UpdateDialog.razor.cs
index 65c7279..e5747d6 100644
--- a/src/BackOffice/Pages/Products/Components/UpdateDialog.razor.cs
+++ b/src/BackOffice/Pages/Products/Components/UpdateDialog.razor.cs
@@ -1,7 +1,8 @@
-using BackOffice.BFF.Products.Protobuf.Protos.Products;
+using CMSMicroservice.Protobuf.Protos.Products;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.Extensions.Configuration;
using MudBlazor;
namespace BackOffice.Pages.Products.Components;
@@ -10,6 +11,7 @@ public partial class UpdateDialog
{
[CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
[Inject] public ProductsContract.ProductsContractClient ProductsContract { get; set; } = default!;
+ [Inject] private IConfiguration Configuration { get; set; } = default!;
[Parameter] public UpdateProductsRequest Model { get; set; } = default!;
private IBrowserFile? _mainImageFile;
@@ -17,6 +19,9 @@ public partial class UpdateDialog
private readonly long _maxAllowedSize = (1024 * 1024) * 5;
private bool _isLoading;
private string? _mainImagePreview;
+ private string? _thumbnailPreview;
+ private byte[]? _mainImageBuffer;
+ private byte[]? _thumbnailImageBuffer;
private List _selectedCategoryIds = new();
private async Task OnMainImageSelected(IBrowserFile? file)
@@ -24,9 +29,10 @@ public partial class UpdateDialog
_mainImageFile = file;
if (file != null)
{
- var buffer = new byte[file.Size];
- await file.OpenReadStream(_maxAllowedSize).ReadAsync(buffer);
- _mainImagePreview = $"data:{file.ContentType};base64," + Convert.ToBase64String(buffer);
+ using var ms = new MemoryStream();
+ await file.OpenReadStream(_maxAllowedSize).CopyToAsync(ms);
+ _mainImageBuffer = ms.ToArray();
+ _mainImagePreview = $"data:{file.ContentType};base64," + Convert.ToBase64String(_mainImageBuffer);
StateHasChanged();
}
}
@@ -34,6 +40,14 @@ public partial class UpdateDialog
private async Task OnThumbnailSelected(IBrowserFile? file)
{
_thumbnailImageFile = file;
+ if (file != null)
+ {
+ using var ms = new MemoryStream();
+ await file.OpenReadStream(_maxAllowedSize).CopyToAsync(ms);
+ _thumbnailImageBuffer = ms.ToArray();
+ _thumbnailPreview = $"data:{file.ContentType};base64," + Convert.ToBase64String(_thumbnailImageBuffer);
+ StateHasChanged();
+ }
}
protected override async Task OnInitializedAsync()
@@ -60,7 +74,7 @@ public partial class UpdateDialog
}
}
- public async void CallUpdateMethod()
+ public async Task CallUpdateMethod()
{
_isLoading = true;
StateHasChanged();
@@ -73,25 +87,21 @@ public partial class UpdateDialog
return;
}
- if (_mainImageFile != null)
+ if (_mainImageFile != null && _mainImageBuffer != null)
{
- var buffer = new byte[_mainImageFile.Size];
- await _mainImageFile.OpenReadStream(_maxAllowedSize).ReadAsync(buffer);
Model.ImageFile = new ImageFileModel
{
- File = ByteString.CopyFrom(buffer),
+ File = ByteString.CopyFrom(_mainImageBuffer),
Mime = _mainImageFile.ContentType,
FileName = Path.GetFileNameWithoutExtension(_mainImageFile.Name)
};
}
- if (_thumbnailImageFile != null)
+ if (_thumbnailImageFile != null && _thumbnailImageBuffer != null)
{
- var buffer = new byte[_thumbnailImageFile.Size];
- await _thumbnailImageFile.OpenReadStream(_maxAllowedSize).ReadAsync(buffer);
Model.ThumbnailFile = new ImageFileModel
{
- File = ByteString.CopyFrom(buffer),
+ File = ByteString.CopyFrom(_thumbnailImageBuffer),
Mime = _thumbnailImageFile.ContentType,
FileName = Path.GetFileNameWithoutExtension(_thumbnailImageFile.Name)
};
@@ -116,4 +126,12 @@ public partial class UpdateDialog
void Submit() => MudDialog.Close(DialogResult.Ok(true));
void Cancel() => MudDialog.Cancel();
+
+ private string GetFullImageUrl(string? path)
+ {
+ if (string.IsNullOrWhiteSpace(path)) return string.Empty;
+ if (path.StartsWith("data:") || path.StartsWith("http")) return path;
+ var baseUrl = Configuration["GwUrl"]?.TrimEnd('/') ?? "";
+ return baseUrl + path;
+ }
}
diff --git a/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor b/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor
index be0fb04..41938f1 100644
--- a/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor
+++ b/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor
@@ -1,6 +1,6 @@
@attribute [Route(RouteConstance.ProductCategories + "{ProductId:long?}")]
-@using BackOffice.BFF.Products.Protobuf.Protos.Products
+@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
diff --git a/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor.cs b/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor.cs
index 5b1f41d..89078a9 100644
--- a/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor.cs
+++ b/src/BackOffice/Pages/Products/ProductCategoriesDragDropPage.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Products.Protobuf.Protos.Products;
+using CMSMicroservice.Protobuf.Protos.Products;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using MudBlazor;
diff --git a/src/BackOffice/Pages/Products/ProductsMainPage.razor b/src/BackOffice/Pages/Products/ProductsMainPage.razor
index 29f24c1..6843c92 100644
--- a/src/BackOffice/Pages/Products/ProductsMainPage.razor
+++ b/src/BackOffice/Pages/Products/ProductsMainPage.razor
@@ -1,50 +1,37 @@
@attribute [Route(RouteConstance.Products)]
-@using BackOffice.BFF.Products.Protobuf.Protos.Products
+@using CMSMicroservice.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.Products.Components
-@using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel
-
+
+
+
+
+
+
+
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
@@ -58,7 +45,7 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="BulkDelete"
- Style="cursor:pointer;">
+ >
حذف انتخابشدهها (@_selectedProductIds.Count)
@@ -67,7 +54,7 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="@(() => BulkToggleStatus(true))"
- Style="cursor:pointer;">
+ >
فعالسازی انتخابشدهها
@@ -76,7 +63,7 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="@(() => BulkToggleStatus(false))"
- Style="cursor:pointer;">
+ >
غیرفعالسازی انتخابشدهها
}
@@ -86,7 +73,7 @@
ButtonType="ButtonType.Button"
StartIcon="@Icons.Material.Filled.Edit"
OnClick="OpenBulkEdit"
- Style="cursor:pointer;">
+ >
ویرایش گروهی
+ >
خروجی Excel
- افزودن
+ افزودن
@@ -115,8 +102,7 @@
-
+
-
+
+ @context.Item.Price.ToString("N0") ریال
+
+
@@ -159,19 +149,28 @@
+
+
+
+ @(context.Item.IsActive ? "فعال" : "غیرفعال")
+
+
+
+
-
-
-
@@ -179,7 +178,7 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenCategoryMapping(context.Item))"
- Style="cursor:pointer;" />
+ />
@@ -187,14 +186,19 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenTagAssignment(context.Item))"
- Style="cursor:pointer;" />
+ />
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/Products/ProductsMainPage.razor.cs b/src/BackOffice/Pages/Products/ProductsMainPage.razor.cs
index 0d11997..b3930a3 100644
--- a/src/BackOffice/Pages/Products/ProductsMainPage.razor.cs
+++ b/src/BackOffice/Pages/Products/ProductsMainPage.razor.cs
@@ -1,5 +1,5 @@
-using BackOffice.BFF.Products.Protobuf.Protos.Products;
-using BackOffice.BFF.Protobuf.Common;
+using CMSMicroservice.Protobuf.Protos.Products;
+using CMSMicroservice.Protobuf.Protos;
using BackOffice.Common.BaseComponents;
using BackOffice.Common.Utilities;
using BackOffice.Pages.Tag.Components;
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MudBlazor;
using System.Text;
-using DataModel = BackOffice.BFF.Products.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
+using DataModel = CMSMicroservice.Protobuf.Protos.Products.GetAllProductsByFilterResponseModel;
namespace BackOffice.Pages.Products;
@@ -181,7 +181,7 @@ public partial class ProductsMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف محصول «{model.Title}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result == true)
diff --git a/src/BackOffice/Pages/PublicMessages/Components/MessageFormDialog.razor b/src/BackOffice/Pages/PublicMessages/Components/MessageFormDialog.razor
index 26bd4ad..52168cc 100644
--- a/src/BackOffice/Pages/PublicMessages/Components/MessageFormDialog.razor
+++ b/src/BackOffice/Pages/PublicMessages/Components/MessageFormDialog.razor
@@ -24,10 +24,10 @@
Label="نوع پیام *"
Required="true"
Variant="Variant.Outlined">
- اطلاعیه
- خبر
- هشدار
- تبلیغات
+ اطلاعیه
+ خبر
+ هشدار
+ تبلیغات
diff --git a/src/BackOffice/Pages/PublicMessages/Components/MessageTemplatesDialog.razor b/src/BackOffice/Pages/PublicMessages/Components/MessageTemplatesDialog.razor
index 1ca0b07..d1dece6 100644
--- a/src/BackOffice/Pages/PublicMessages/Components/MessageTemplatesDialog.razor
+++ b/src/BackOffice/Pages/PublicMessages/Components/MessageTemplatesDialog.razor
@@ -24,10 +24,10 @@
- اطلاعیه
- خبر
- هشدار
- تبلیغات
+ اطلاعیه
+ خبر
+ هشدار
+ تبلیغات
@@ -99,6 +99,9 @@
+
+ موردی یافت نشد.
+
diff --git a/src/BackOffice/Pages/PublicMessages/Components/MessageViewDialog.razor b/src/BackOffice/Pages/PublicMessages/Components/MessageViewDialog.razor
index 0a1ca6b..e9e4154 100644
--- a/src/BackOffice/Pages/PublicMessages/Components/MessageViewDialog.razor
+++ b/src/BackOffice/Pages/PublicMessages/Components/MessageViewDialog.razor
@@ -81,20 +81,20 @@
تاریخ ایجاد:
- @(Message.Created?.ToString("yyyy/MM/dd HH:mm") ?? "-")
+ @(Message.Created?.MiladiToJalaliWithTime() ?? "-")
@if (Message.StartsAt.HasValue)
{
شروع نمایش:
- @Message.StartsAt.Value.ToString("yyyy/MM/dd HH:mm")
+ @Message.StartsAt.Value.MiladiToJalaliWithTime()
}
@if (Message.PublishedAt.HasValue)
{
تاریخ انتشار:
- @Message.PublishedAt.Value.ToString("yyyy/MM/dd HH:mm")
+ @Message.PublishedAt.Value.MiladiToJalaliWithTime()
}
@if (Message.ExpiresAt.HasValue)
@@ -102,7 +102,7 @@
تاریخ انقضا:
- @Message.ExpiresAt.Value.ToString("yyyy/MM/dd")
+ @Message.ExpiresAt.Value.MiladiToJalali()
@if (Message.ExpiresAt.Value < DateTime.Now)
{
منقضی شده
diff --git a/src/BackOffice/Pages/PublicMessages/PublicMessagesMainPage.razor b/src/BackOffice/Pages/PublicMessages/PublicMessagesMainPage.razor
index 8f30828..e1d6bd4 100644
--- a/src/BackOffice/Pages/PublicMessages/PublicMessagesMainPage.razor
+++ b/src/BackOffice/Pages/PublicMessages/PublicMessagesMainPage.razor
@@ -8,7 +8,7 @@
مدیریت پیامهای عمومی
-
+
همه
- پیشنویس
- منتشر شده
- بایگانی شده
+ همه
+ پیشنویس
+ منتشر شده
+ بایگانی شده
@@ -44,11 +44,11 @@
T="MessageType?"
Clearable="true"
OnClearButtonClick="@(() => OnSearch())">
- همه
- اطلاعیه
- خبر
- هشدار
- تبلیغات
+ همه
+ اطلاعیه
+ خبر
+ هشدار
+ تبلیغات
@@ -106,11 +106,23 @@
-
+
+ @(context.Item.StartsAt?.MiladiToJalali() ?? "—")
+
+
-
+
+ @(context.Item.ExpiresAt?.MiladiToJalali() ?? "—")
+
+
-
+
+ @(context.Item.Created?.MiladiToJalali() ?? "—")
+
+
@@ -147,13 +159,18 @@
+
+ موردی یافت نشد.
+
-
-
+
@code {
private MudDataGrid? _dataGrid;
@@ -374,9 +391,10 @@
private async Task DeleteMessage(long messageId)
{
+ var message = _messages.FirstOrDefault(m => m.Id == messageId);
var result = await DialogService.ShowMessageBox(
"تأیید حذف",
- "آیا از حذف این پیام اطمینان دارید؟",
+ $"آیا از حذف پیام «{message?.Title}» مطمئن هستید؟",
yesText: "بله", cancelText: "خیر");
if (result == true)
diff --git a/src/BackOffice/Pages/Role/Components/CreateDialog.razor b/src/BackOffice/Pages/Role/Components/CreateDialog.razor
index 98ba619..b4c6bff 100644
--- a/src/BackOffice/Pages/Role/Components/CreateDialog.razor
+++ b/src/BackOffice/Pages/Role/Components/CreateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.Package.Protobuf.Protos.Package
+@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/Role/Components/CreateDialog.razor.cs b/src/BackOffice/Pages/Role/Components/CreateDialog.razor.cs
index 2c0c776..ee285ab 100644
--- a/src/BackOffice/Pages/Role/Components/CreateDialog.razor.cs
+++ b/src/BackOffice/Pages/Role/Components/CreateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Role.Protobuf.Protos.Role;
+using CMSMicroservice.Protobuf.Protos.Role;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
diff --git a/src/BackOffice/Pages/Role/Components/UpdateDialog.razor b/src/BackOffice/Pages/Role/Components/UpdateDialog.razor
index 2e71175..1fc865e 100644
--- a/src/BackOffice/Pages/Role/Components/UpdateDialog.razor
+++ b/src/BackOffice/Pages/Role/Components/UpdateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.Package.Protobuf.Protos.Package
+@using CMSMicroservice.Protobuf.Protos.Package
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/Role/Components/UpdateDialog.razor.cs b/src/BackOffice/Pages/Role/Components/UpdateDialog.razor.cs
index 82236e0..e1d75b9 100644
--- a/src/BackOffice/Pages/Role/Components/UpdateDialog.razor.cs
+++ b/src/BackOffice/Pages/Role/Components/UpdateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Role.Protobuf.Protos.Role;
+using CMSMicroservice.Protobuf.Protos.Role;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
diff --git a/src/BackOffice/Pages/Role/RoleMainPage.razor b/src/BackOffice/Pages/Role/RoleMainPage.razor
index 8e2a2d6..80b6021 100644
--- a/src/BackOffice/Pages/Role/RoleMainPage.razor
+++ b/src/BackOffice/Pages/Role/RoleMainPage.razor
@@ -1,17 +1,19 @@
@attribute [Route(RouteConstance.Role)]
-@using BackOffice.BFF.Role.Protobuf.Protos.Role
+@using CMSMicroservice.Protobuf.Protos.Role
@using BackOffice.Pages.Role.Components
@using BackOffice.Common.BaseComponents
-@using DataModel = BackOffice.BFF.Role.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel
-
+
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
مدیریت نقش
- افزودن
+ افزودن
@@ -35,11 +37,11 @@
-
-
@@ -48,14 +50,17 @@
Color="Color.Primary"
ButtonType="ButtonType.Button"
OnClick="@(() => EditPermissions(context.Item))"
- Style="cursor:pointer;" />
+ />
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/Role/RoleMainPage.razor.cs b/src/BackOffice/Pages/Role/RoleMainPage.razor.cs
index efde8cb..61fcd5e 100644
--- a/src/BackOffice/Pages/Role/RoleMainPage.razor.cs
+++ b/src/BackOffice/Pages/Role/RoleMainPage.razor.cs
@@ -1,10 +1,10 @@
-using BackOffice.BFF.Role.Protobuf.Protos.Role;
+using CMSMicroservice.Protobuf.Protos.Role;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.Role.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
-using DataModel = BackOffice.BFF.Role.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel;
+using DataModel = CMSMicroservice.Protobuf.Protos.Role.GetAllRoleByFilterResponseModel;
namespace BackOffice.Pages.Role;
public partial class RoleMainPage
@@ -61,7 +61,7 @@ public partial class RoleMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف نقش «{model.Title}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result != null && result.Value)
diff --git a/src/BackOffice/Pages/Settings/AppVersions.razor b/src/BackOffice/Pages/Settings/AppVersions.razor
index e12d2ed..d2945b6 100644
--- a/src/BackOffice/Pages/Settings/AppVersions.razor
+++ b/src/BackOffice/Pages/Settings/AppVersions.razor
@@ -9,7 +9,7 @@
مدیریت نسخه اپلیکیشنها
-
+
+
+ @(context.Item.LastModified?.MiladiToJalaliWithTime() ?? "—")
+
+
@@ -130,6 +134,9 @@
+
+ موردی یافت نشد.
+
@@ -193,7 +200,7 @@
}
-
+
@code {
private List _versions = new();
@@ -342,8 +349,8 @@
"یادداشتهای انتشار:",
version.ReleaseNotes ?? "ندارد",
"",
- $"تاریخ ایجاد: {version.Created?.ToString("yyyy/MM/dd HH:mm") ?? "-"}",
- $"آخرین تغییر: {version.LastModified?.ToString("yyyy/MM/dd HH:mm") ?? "-"}"
+ $"تاریخ ایجاد: {version.Created?.MiladiToJalaliWithTime() ?? "-"}",
+ $"آخرین تغییر: {version.LastModified?.MiladiToJalaliWithTime() ?? "-"}"
};
return string.Join(Environment.NewLine, lines);
}
diff --git a/src/BackOffice/Pages/Settings/Components/AppVersionEditDialog.razor b/src/BackOffice/Pages/Settings/Components/AppVersionEditDialog.razor
index b57b404..2700c0a 100644
--- a/src/BackOffice/Pages/Settings/Components/AppVersionEditDialog.razor
+++ b/src/BackOffice/Pages/Settings/Components/AppVersionEditDialog.razor
@@ -13,8 +13,8 @@
Variant="Variant.Outlined"
Required="true"
RequiredError="انتخاب اپلیکیشن اجباری است">
- کارابازار
- ادمین کارابازار
+ کارابازار
+ ادمین کارابازار
}
else
diff --git a/src/BackOffice/Pages/Settings/UserSettings.razor b/src/BackOffice/Pages/Settings/UserSettings.razor
index 52a6a2c..906dccb 100644
--- a/src/BackOffice/Pages/Settings/UserSettings.razor
+++ b/src/BackOffice/Pages/Settings/UserSettings.razor
@@ -6,7 +6,7 @@
@inject IJSRuntime JSRuntime
@inject ISnackbar Snackbar
-
+
تنظیمات
مدیریت تنظیمات کاربری و سیستم
@@ -26,8 +26,8 @@
- فارسی
- English
+ فارسی
+ English
-
-
- تنظیمات اعلانها
-
-
-
-
- نوع اعلانها
-
-
- درخواست برداشت جدید
-
-
-
- محاسبه کمیسیون هفتگی
-
-
-
- عضو جدید باشگاه
-
-
-
- خطاهای سیستمی
-
-
+
+ سیستم اعلانها بهزودی فعال میشود
+
+ امکان تنظیم اعلانهای ایمیل، پیامک و سیستمی در نسخههای آینده اضافه خواهد شد.
+
-
-
- ذخیره تغییرات
-
-
-
-
-
- تغییر رمز عبور
-
-
-
-
-
-
-
-
- تغییر رمز عبور
-
-
-
-
-
-
- احراز هویت دو مرحلهای
-
-
-
-
-
- احراز هویت دو مرحلهای فعال است. برای ورود به حساب کاربری، علاوه بر رمز عبور، کد تایید ارسال شده به موبایل شما نیز لازم است.
-
- }
-
+
+ تنظیمات امنیتی بهزودی فعال میشود
+
+ امکان تغییر رمز عبور و احراز هویت دو مرحلهای در نسخههای آینده اضافه خواهد شد.
+
-
-
- ذخیره تغییرات
-
-
@@ -230,7 +128,7 @@
-
+
@code {
// General Settings
@@ -239,24 +137,8 @@
private bool _compactMode = false;
private int _pageSize = 20;
- // Notification Settings
- private bool _emailNotifications = true;
- private bool _smsNotifications = false;
- private bool _systemNotifications = true;
- private bool _notifyOnNewWithdrawal = true;
- private bool _notifyOnCommissionCalculation = true;
- private bool _notifyOnNewClubMember = false;
- private bool _notifyOnSystemError = true;
-
- // Security Settings
- private string _currentPassword = "";
- private string _newPassword = "";
- private string _confirmPassword = "";
- private bool _twoFactorEnabled = false;
-
protected override async Task OnInitializedAsync()
{
- // Load settings from local storage or API
await LoadSettings();
}
@@ -264,27 +146,13 @@
{
try
{
- // Load General Settings
_selectedLanguage = await GetLocalStorage("user_language", "fa");
_darkMode = await GetLocalStorage("user_darkMode", false);
_compactMode = await GetLocalStorage("user_compactMode", false);
_pageSize = await GetLocalStorage("user_pageSize", 20);
-
- // Load Notification Settings
- _emailNotifications = await GetLocalStorage("user_emailNotifications", true);
- _smsNotifications = await GetLocalStorage("user_smsNotifications", false);
- _systemNotifications = await GetLocalStorage("user_systemNotifications", true);
- _notifyOnNewWithdrawal = await GetLocalStorage("user_notifyOnNewWithdrawal", true);
- _notifyOnCommissionCalculation = await GetLocalStorage("user_notifyOnCommissionCalculation", true);
- _notifyOnNewClubMember = await GetLocalStorage("user_notifyOnNewClubMember", false);
- _notifyOnSystemError = await GetLocalStorage("user_notifyOnSystemError", true);
-
- // Load Security Settings
- _twoFactorEnabled = await GetLocalStorage("user_twoFactorEnabled", false);
}
catch (Exception ex)
{
- Console.WriteLine($"Error loading settings: {ex.Message}");
}
}
@@ -305,83 +173,6 @@
}
}
- private async Task SaveNotificationSettings()
- {
- try
- {
- await SetLocalStorage("user_emailNotifications", _emailNotifications);
- await SetLocalStorage("user_smsNotifications", _smsNotifications);
- await SetLocalStorage("user_systemNotifications", _systemNotifications);
- await SetLocalStorage("user_notifyOnNewWithdrawal", _notifyOnNewWithdrawal);
- await SetLocalStorage("user_notifyOnCommissionCalculation", _notifyOnCommissionCalculation);
- await SetLocalStorage("user_notifyOnNewClubMember", _notifyOnNewClubMember);
- await SetLocalStorage("user_notifyOnSystemError", _notifyOnSystemError);
-
- Snackbar.Add("تنظیمات اعلانها با موفقیت ذخیره شد", Severity.Success);
- }
- catch (Exception ex)
- {
- Snackbar.Add($"خطا در ذخیره تنظیمات: {ex.Message}", Severity.Error);
- }
- }
-
- private async Task SaveSecuritySettings()
- {
- try
- {
- await SetLocalStorage("user_twoFactorEnabled", _twoFactorEnabled);
- Snackbar.Add("تنظیمات امنیتی با موفقیت ذخیره شد", Severity.Success);
- }
- catch (Exception ex)
- {
- Snackbar.Add($"خطا در ذخیره تنظیمات: {ex.Message}", Severity.Error);
- }
- }
-
- private async Task ChangePassword()
- {
- if (string.IsNullOrWhiteSpace(_currentPassword))
- {
- Snackbar.Add("رمز عبور فعلی را وارد کنید", Severity.Warning);
- return;
- }
-
- if (string.IsNullOrWhiteSpace(_newPassword))
- {
- Snackbar.Add("رمز عبور جدید را وارد کنید", Severity.Warning);
- return;
- }
-
- if (_newPassword != _confirmPassword)
- {
- Snackbar.Add("رمز عبور جدید و تکرار آن یکسان نیستند", Severity.Warning);
- return;
- }
-
- if (_newPassword.Length < 8)
- {
- Snackbar.Add("رمز عبور باید حداقل 8 کاراکتر باشد", Severity.Warning);
- return;
- }
-
- try
- {
- // NOTE: Password change requires Identity/Authentication API in BFF
- // Future API: AuthClient.ChangePasswordAsync(currentPassword, newPassword)
- await Task.CompletedTask;
-
- _currentPassword = "";
- _newPassword = "";
- _confirmPassword = "";
-
- Snackbar.Add("رمز عبور با موفقیت تغییر کرد", Severity.Success);
- }
- catch (Exception ex)
- {
- Snackbar.Add($"خطا در تغییر رمز عبور: {ex.Message}", Severity.Error);
- }
- }
-
// LocalStorage Helper Methods
private async Task GetLocalStorage(string key, T defaultValue)
{
diff --git a/src/BackOffice/Pages/SystemManagement/AlertsMonitoring.razor b/src/BackOffice/Pages/SystemManagement/AlertsMonitoring.razor
index b6cba79..d8db902 100644
--- a/src/BackOffice/Pages/SystemManagement/AlertsMonitoring.razor
+++ b/src/BackOffice/Pages/SystemManagement/AlertsMonitoring.razor
@@ -3,7 +3,7 @@
@using MudBlazor
-
+
مدیریت هشدارها
مشاهده و مدیریت هشدارهای سیستم
@@ -77,10 +77,10 @@
Label="سطح هشدار"
Variant="Variant.Outlined"
Margin="Margin.Dense">
- همه
- بحرانی
- هشدار
- اطلاعات
+ همه
+ بحرانی
+ هشدار
+ اطلاعات
@@ -89,10 +89,10 @@
Label="وضعیت"
Variant="Variant.Outlined"
Margin="Margin.Dense">
- همه
- فعال
- حل شده
- تایید شده
+ همه
+ فعال
+ حل شده
+ تایید شده
@@ -101,11 +101,11 @@
Label="منبع"
Variant="Variant.Outlined"
Margin="Margin.Dense">
- همه
- کمیسیون
- شبکه
- باشگاه
- سیستم
+ همه
+ کمیسیون
+ شبکه
+ باشگاه
+ سیستم
@@ -167,7 +167,7 @@
- @context.CreatedAt.ToString("yyyy/MM/dd HH:mm")
+ @context.CreatedAt.MiladiToJalaliWithTime()
-
+
@code {
private bool _loading = false;
diff --git a/src/BackOffice/Pages/SystemManagement/Configuration.razor b/src/BackOffice/Pages/SystemManagement/Configuration.razor
index e1d14be..70dc54e 100644
--- a/src/BackOffice/Pages/SystemManagement/Configuration.razor
+++ b/src/BackOffice/Pages/SystemManagement/Configuration.razor
@@ -1,10 +1,11 @@
-@page "/system/configuration"
+@* Merged into /system *@
@attribute [Authorize(Roles = "Administrator")]
-@using Foursat.BackOffice.BFF.Configuration.Protos
+@using CMSMicroservice.Protobuf.Protos.Configuration
+@using CMSMicroservice.Protobuf.Protos
@using MudBlazor
-
+
تنظیمات سیستم
مدیریت پارامترهای سیستم و قوانین محاسبات
@@ -64,13 +65,13 @@
- شنبه
- یکشنبه
- دوشنبه
- سهشنبه
- چهارشنبه
- پنجشنبه
- جمعه
+ شنبه
+ یکشنبه
+ دوشنبه
+ سهشنبه
+ چهارشنبه
+ پنجشنبه
+ جمعه
@@ -407,7 +408,7 @@
-
+
@code {
[Inject] public ConfigurationContract.ConfigurationContractClient ConfigurationClient { get; set; }
@@ -431,8 +432,11 @@
{
var request = new GetAllConfigurationsRequest
{
- PageIndex = 1,
- PageSize = 100
+ PaginationState = new PaginationState
+ {
+ PageNumber = 1,
+ PageSize = 100
+ }
};
var response = await ConfigurationClient.GetAllConfigurationsAsync(request);
diff --git a/src/BackOffice/Pages/SystemManagement/HealthDashboard.razor b/src/BackOffice/Pages/SystemManagement/HealthDashboard.razor
index c82f771..22885e2 100644
--- a/src/BackOffice/Pages/SystemManagement/HealthDashboard.razor
+++ b/src/BackOffice/Pages/SystemManagement/HealthDashboard.razor
@@ -1,11 +1,12 @@
-@page "/system/health"
+@* Merged into /system *@
@attribute [Authorize]
-@using Foursat.BackOffice.BFF.Health.Protobuf
+@using CMSMicroservice.Protobuf.Protos.Health
+@using Google.Protobuf.WellKnownTypes
@using MudBlazor
@inject HealthContract.HealthContractClient HealthClient
-
+
داشبورد سلامت سیستم
مانیتورینگ وضعیت سرویسها و منابع سیستم
@@ -97,89 +98,14 @@
منابع سیستم
-
-
-
-
-
-
-
- CPU
- @_cpuUsage%
-
-
- میانگین 5 دقیقه اخیر
-
-
-
-
-
-
-
-
-
-
-
-
- حافظه
- @_memoryUsage%
-
-
- @_memoryUsed GB از @_memoryTotal GB
-
-
-
-
-
-
-
-
-
-
-
-
- دیسک
- @_diskUsage%
-
-
- @_diskUsed GB از @_diskTotal GB
-
-
-
-
-
-
-
-
-
-
-
-
- شبکه
-
-
- ورودی:
- @_networkIn MB/s
-
-
- خروجی:
- @_networkOut MB/s
-
-
-
-
-
-
+
+
+
+ مانیتورینگ منابع سیستم (CPU، حافظه، دیسک، شبکه) در نسخههای آینده با اتصال به Prometheus/Grafana فعال خواهد شد.
+
+
+
رویدادهای اخیر سیستم
@@ -205,24 +131,13 @@
-
+
@code {
private string _overallStatus = "Healthy";
private DateTime _lastUpdated = DateTime.Now;
private List _services = new();
- // Resource metrics
- private double _cpuUsage = 45.2;
- private double _memoryUsage = 62.8;
- private double _diskUsage = 73.5;
- private double _memoryUsed = 10.1;
- private double _memoryTotal = 16.0;
- private double _diskUsed = 147.0;
- private double _diskTotal = 200.0;
- private double _networkIn = 12.5;
- private double _networkOut = 8.3;
-
private List _recentEvents = new();
protected override async Task OnInitializedAsync()
@@ -234,8 +149,8 @@
{
try
{
- var request = new GetSystemHealthRequest();
- var response = await HealthClient.GetSystemHealthAsync(request);
+ // CMS proto uses google.protobuf.Empty instead of GetSystemHealthRequest
+ var response = await HealthClient.GetSystemHealthAsync(new Empty());
_overallStatus = response.OverallHealthy ? "Healthy" : "Unhealthy";
_lastUpdated = DateTime.Now;
@@ -245,11 +160,11 @@
{
Name = s.ServiceName,
Type = GetServiceType(s.ServiceName),
- Status = s.Status,
+ Status = s.Status.ToString(),
Uptime = "99.9%", // Mock - not in API
ResponseTime = (int)s.ResponseTimeMs,
Version = "1.0.0", // Mock - not in API
- LastError = s.Status != "Healthy" ? s.Description : null
+ LastError = s.Status != HealthStatus.Healthy ? s.Description : null
}).ToList();
// Keep mock events for now
@@ -311,13 +226,6 @@
};
}
- private Color GetResourceColor(double usage)
- {
- if (usage < 70) return Color.Success;
- if (usage < 85) return Color.Warning;
- return Color.Error;
- }
-
private Color GetEventColor(string type)
{
return type switch
diff --git a/src/BackOffice/Pages/SystemManagement/SystemHub.razor b/src/BackOffice/Pages/SystemManagement/SystemHub.razor
new file mode 100644
index 0000000..77e2f20
--- /dev/null
+++ b/src/BackOffice/Pages/SystemManagement/SystemHub.razor
@@ -0,0 +1,37 @@
+@page "/system"
+@page "/system/configuration"
+@page "/system/worker-control"
+@page "/system/health"
+@attribute [Authorize(Roles = "Administrator")]
+
+
+
کنترل Worker محاسبات
مدیریت و نظارت بر Worker محاسبات هفتگی کمیسیون
@@ -174,10 +174,10 @@
@code {
- [Inject] public Foursat.BackOffice.BFF.Commission.Protos.CommissionContract.CommissionContractClient CommissionClient { get; set; }
+ [Inject] public CMSMicroservice.Protobuf.Protos.Commission.CommissionContract.CommissionContractClient CommissionClient { get; set; }
[Inject] public BackOffice.Services.IPersianDateTimeService PersianDateTime { get; set; }
private WorkerStatus _workerStatus = WorkerStatus.Running;
@@ -194,7 +194,7 @@
{
try
{
- var statusResponse = await CommissionClient.GetWorkerStatusAsync(new Foursat.BackOffice.BFF.Commission.Protos.GetWorkerStatusRequest());
+ var statusResponse = await CommissionClient.GetWorkerStatusAsync(new CMSMicroservice.Protobuf.Protos.Commission.GetWorkerStatusRequest());
_workerStatus = statusResponse.IsRunning ? WorkerStatus.Running : WorkerStatus.Paused;
_lastRunTime = statusResponse.LastRunAt?.ToDateTime() ?? DateTime.MinValue;
_nextRunTime = statusResponse.NextScheduledRun?.ToDateTime() ?? DateTime.MinValue;
@@ -228,7 +228,7 @@
_isProcessing = true;
try
{
- var request = new Foursat.BackOffice.BFF.Commission.Protos.TriggerWeeklyCalculationRequest
+ var request = new CMSMicroservice.Protobuf.Protos.Commission.TriggerWeeklyCalculationRequest
{
WeekDefinitionId = _manualWeekDefinitionId.Value
};
@@ -275,7 +275,7 @@
{
try
{
- var request = new Foursat.BackOffice.BFF.Commission.Protos.GetWorkerExecutionLogsRequest
+ var request = new CMSMicroservice.Protobuf.Protos.Commission.GetWorkerExecutionLogsRequest
{
PageIndex = 1,
PageSize = 20
diff --git a/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor b/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor
index 0c06714..9adefea 100644
--- a/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor
+++ b/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor
@@ -15,7 +15,7 @@
Size="Size.Small"
OnClose="@(() => RemoveAsync(tag))"
CloseIcon="@Icons.Material.Filled.Close">
- @($"{tag.TagTitle} (#{tag.TagId})")
+ @tag.TagTitle
}
@@ -31,12 +31,13 @@
Label="انتخاب تگ"
Variant="Variant.Outlined"
Margin="Margin.Dense"
+ ToStringFunc="@(id => id == 0 ? string.Empty : (_tags?.FirstOrDefault(t => t.Id == id)?.Title ?? id.ToString()))"
@bind-Value="_selectedTagId">
@if (_tags != null)
{
- @foreach (var tag in _tags)
+ @foreach (var tag in _tags.Where(t => !_currentTags.Any(ct => ct.TagId == t.Id)))
{
- @tag.Title (@tag.Name)
+ @tag.Title (@tag.Name)
}
}
diff --git a/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor.cs b/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor.cs
index 987a7f2..cb54738 100644
--- a/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor.cs
+++ b/src/BackOffice/Pages/Tag/Components/AssignTagsDialog.razor.cs
@@ -37,10 +37,18 @@ public partial class AssignTagsDialog
if (_selectedTagId == 0)
return;
+ // بررسی تکراری نبودن تگ
+ if (_currentTags.Any(t => t.TagId == _selectedTagId))
+ {
+ Snackbar.Add("این تگ قبلاً به محصول اضافه شده است", Severity.Warning);
+ return;
+ }
+
await TagService.AssignToProductAsync(ProductId, _selectedTagId);
Snackbar.Add("تگ به محصول اضافه شد", Severity.Success);
_currentTags = await TagService.GetProductTagsAsync(ProductId);
+ _selectedTagId = 0;
}
private async Task RemoveAsync(ProductTagViewDto tag)
diff --git a/src/BackOffice/Pages/Tag/TagManagementPage.razor b/src/BackOffice/Pages/Tag/TagManagementPage.razor
index 6c57ff3..ad3e42b 100644
--- a/src/BackOffice/Pages/Tag/TagManagementPage.razor
+++ b/src/BackOffice/Pages/Tag/TagManagementPage.razor
@@ -5,7 +5,7 @@
@inject ITagService TagService
-
+
مدیریت تگها
@@ -33,9 +33,9 @@
Variant="Variant.Outlined"
Margin="Margin.Dense"
Style="width: 160px;">
- همه
- فعال
- غیرفعال
+ همه
+ فعال
+ غیرفعال
+ Height="calc(100vh - 240px)">
+
+ موردی یافت نشد.
+
-
-
+
diff --git a/src/BackOffice/Pages/User/Components/UserRoleDialog.razor b/src/BackOffice/Pages/User/Components/UserRoleDialog.razor
index 12a873b..e0b994f 100644
--- a/src/BackOffice/Pages/User/Components/UserRoleDialog.razor
+++ b/src/BackOffice/Pages/User/Components/UserRoleDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.Role.Protobuf.Protos.Role
+@using CMSMicroservice.Protobuf.Protos.Role
@if (_isFirstLoad)
diff --git a/src/BackOffice/Pages/User/Components/UserRoleDialog.razor.cs b/src/BackOffice/Pages/User/Components/UserRoleDialog.razor.cs
index 7fc56cf..1f178ea 100644
--- a/src/BackOffice/Pages/User/Components/UserRoleDialog.razor.cs
+++ b/src/BackOffice/Pages/User/Components/UserRoleDialog.razor.cs
@@ -1,8 +1,8 @@
-using BackOffice.BFF.Role.Protobuf.Protos.Role;
+using CMSMicroservice.Protobuf.Protos.Role;
using Microsoft.AspNetCore.Components;
using MudBlazor;
-using BackOffice.BFF.User.Protobuf.Protos.User;
-using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
+using CMSMicroservice.Protobuf.Protos.User;
+using CMSMicroservice.Protobuf.Protos.UserRole;
namespace BackOffice.Pages.User.Components;
public partial class UserRoleDialog
diff --git a/src/BackOffice/Pages/User/UserMainPage.razor b/src/BackOffice/Pages/User/UserMainPage.razor
index a45be61..6d2418e 100644
--- a/src/BackOffice/Pages/User/UserMainPage.razor
+++ b/src/BackOffice/Pages/User/UserMainPage.razor
@@ -1,20 +1,28 @@
@attribute [Route(RouteConstance.UserPage)]
-@using BackOffice.BFF.User.Protobuf.Protos.User
+@using CMSMicroservice.Protobuf.Protos.User
@using BackOffice.Pages.User.Components
@using BackOffice.Common.BaseComponents
-@using DataModel = BackOffice.BFF.User.Protobuf.Protos.User.GetAllUserByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.User.GetAllUserByFilterResponseModel
-
+
+
+
+
+
+
+
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
-
+
مدیریت کاربر
+ خروجی Excel
@@ -54,8 +63,11 @@
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/User/UserMainPage.razor.cs b/src/BackOffice/Pages/User/UserMainPage.razor.cs
index 53ec385..50d8436 100644
--- a/src/BackOffice/Pages/User/UserMainPage.razor.cs
+++ b/src/BackOffice/Pages/User/UserMainPage.razor.cs
@@ -1,14 +1,18 @@
-using BackOffice.BFF.User.Protobuf.Protos.User;
+using CMSMicroservice.Protobuf.Protos.User;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.User.Components;
using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
using MudBlazor;
-using DataModel = BackOffice.BFF.User.Protobuf.Protos.User.GetAllUserByFilterResponseModel;
+using System.Text;
+using DateTimeConverterCL;
+using DataModel = CMSMicroservice.Protobuf.Protos.User.GetAllUserByFilterResponseModel;
namespace BackOffice.Pages.User;
public partial class UserMainPage
{
[Inject] public UserContract.UserContractClient UserContract { get; set; }
+ [Inject] public IJSRuntime JsRuntime { get; set; }
private bool _isLoading = true;
private MudDataGrid _gridData;
BasePageComponent _basePage;
@@ -33,7 +37,7 @@ public partial class UserMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف کاربر «{model.FirstName} {model.LastName}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result != null && result.Value)
@@ -75,4 +79,56 @@ public partial class UserMainPage
_request = new() { Filter = new() { } };
ReLoadData();
}
+
+ private async Task ExportToExcel()
+ {
+ try
+ {
+ var exportRequest = new GetAllUserByFilterRequest
+ {
+ Filter = _request.Filter?.Clone() ?? new(),
+ PaginationState = new() { PageNumber = 1, PageSize = 1000 }
+ };
+
+ var result = await UserContract.GetAllUserByFilterAsync(exportRequest);
+
+ if (result?.Models == null || !result.Models.Any())
+ {
+ Snackbar.Add("دادهای برای خروجی وجود ندارد.", Severity.Info);
+ return;
+ }
+
+ var sb = new StringBuilder();
+ sb.AppendLine("شناسه,موبایل,نام,نام خانوادگی,کدملی");
+
+ foreach (var u in result.Models)
+ {
+ sb.AppendLine(string.Join(",",
+ u.Id,
+ EscapeCsv(u.Mobile),
+ EscapeCsv(u.FirstName),
+ EscapeCsv(u.LastName),
+ EscapeCsv(u.NationalCode)));
+ }
+
+ var bytes = Encoding.UTF8.GetPreamble().Concat(Encoding.UTF8.GetBytes(sb.ToString())).ToArray();
+ var base64 = Convert.ToBase64String(bytes);
+ var filename = $"users-{DateTime.Now:yyyyMMddHHmmss}.csv";
+
+ await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename, base64);
+ Snackbar.Add("خروجی Excel (CSV) آماده شد.", Severity.Success);
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا در خروجی Excel: {ex.Message}", Severity.Error);
+ }
+ }
+
+ private static string EscapeCsv(string value)
+ {
+ if (string.IsNullOrEmpty(value)) return "";
+ if (value.Contains(',') || value.Contains('"') || value.Contains('\n'))
+ return $"\"{value.Replace("\"", "\"\"")}\"";
+ return value;
+ }
}
diff --git a/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor b/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor
index 92b57d0..2fc4e2e 100644
--- a/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor
+++ b/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
+@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor.cs b/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor.cs
index ae95782..68194bd 100644
--- a/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor.cs
+++ b/src/BackOffice/Pages/UserAddress/Components/CreateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
+using CMSMicroservice.Protobuf.Protos.UserAddress;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
diff --git a/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor b/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor
index 23a5251..53d1b3d 100644
--- a/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor
+++ b/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
+@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor.cs b/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor.cs
index 0c884a4..d0ce278 100644
--- a/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor.cs
+++ b/src/BackOffice/Pages/UserAddress/Components/UpdateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
+using CMSMicroservice.Protobuf.Protos.UserAddress;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
diff --git a/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor b/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor
index 2a34c45..525c262 100644
--- a/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor
+++ b/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor
@@ -1,17 +1,19 @@
@attribute [Route(RouteConstance.UserAddress + "{UserId:long}")]
-@using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress
+@using CMSMicroservice.Protobuf.Protos.UserAddress
@using BackOffice.Pages.UserAddress.Components
@using BackOffice.Common.BaseComponents
-@using DataModel = BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel
-
+
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
مدیریت آدرس
- افزودن
+ افزودن
@@ -35,18 +37,21 @@
-
-
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor.cs b/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor.cs
index d2e4d53..10256d9 100644
--- a/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor.cs
+++ b/src/BackOffice/Pages/UserAddress/UserAddressMainPage.razor.cs
@@ -1,10 +1,10 @@
-using BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress;
+using CMSMicroservice.Protobuf.Protos.UserAddress;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.UserAddress.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
-using DataModel = BackOffice.BFF.UserAddress.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel;
+using DataModel = CMSMicroservice.Protobuf.Protos.UserAddress.GetAllUserAddressByFilterResponseModel;
namespace BackOffice.Pages.UserAddress;
public partial class UserAddressMainPage
@@ -53,7 +53,7 @@ public partial class UserAddressMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف آدرس «{model.Title}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result != null && result.Value)
diff --git a/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor b/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor
index 79e060a..5e5adad 100644
--- a/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor
+++ b/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserOrder
diff --git a/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor.cs b/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor.cs
index 31e6c55..adbe803 100644
--- a/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/Components/ApplyDiscountDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using Microsoft.AspNetCore.Components;
using MudBlazor;
diff --git a/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor b/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor
index 3307cfc..d397352 100644
--- a/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor
+++ b/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserOrder
diff --git a/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor.cs b/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor.cs
index f3e5061..a5df0b7 100644
--- a/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/Components/CancelOrderDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using Microsoft.AspNetCore.Components;
using MudBlazor;
diff --git a/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor b/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor
index e3c0eb6..b62ec9c 100644
--- a/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor
+++ b/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor
@@ -1,34 +1,88 @@
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserOrder
+
+
+
+
-
-
- تغییر وضعیت ارسال سفارش شماره @OrderId
-
+
+
+
+
+ وضعیت فعلی: @GetDeliveryStatusText(CurrentStatus)
+
+
-
- وضعیت فعلی: @GetDeliveryStatusText(CurrentStatus)
-
+
+
+ بدون ارسال / نامشخص
+ در انتظار ارسال
+ تحویل پست
+ تحویل به مشتری
+ مرجوع شده
+
+
-
- بدون ارسال / نامشخص
- در انتظار ارسال
- تحویل پست
- تحویل به مشتری
- مرجوع شده
-
-
+
+
+
+
+
+
+ @if (_newStatus == 4)
+ {
+
+
+ توجه: در صورت مرجوعی سفارش، موجودی محصولات به انبار بازگردانده میشود.
+
+
+ }
+
+ @if (_newStatus == 2)
+ {
+
+
+ پس از تغییر وضعیت به "تحویل پست"، اطلاعرسانی به کاربر ارسال خواهد شد.
+
+
+ }
+
+
انصراف
-
- ثبت وضعیت
+
+ @if (_isSaving)
+ {
+ ثبت وضعیت
+ }
diff --git a/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor.cs b/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor.cs
index 30df047..cd1dea1 100644
--- a/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/Components/ChangeOrderStatusDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using Microsoft.AspNetCore.Components;
using MudBlazor;
@@ -12,13 +12,21 @@ public partial class ChangeOrderStatusDialog
[Parameter] public long OrderId { get; set; }
[Parameter] public int CurrentStatus { get; set; }
+ [Parameter] public string? TrackingCode { get; set; }
+ [Parameter] public string? DeliveryDescription { get; set; }
+ private MudForm? _form;
+ private bool _isValid;
private int _newStatus;
+ private string? _trackingCode;
+ private string? _deliveryDescription;
private bool _isSaving;
protected override void OnInitialized()
{
_newStatus = CurrentStatus;
+ _trackingCode = TrackingCode;
+ _deliveryDescription = DeliveryDescription;
}
private string GetDeliveryStatusText(int status)
@@ -33,13 +41,32 @@ public partial class ChangeOrderStatusDialog
};
}
+ private Color GetStatusColor(int status)
+ {
+ return status switch
+ {
+ 1 => Color.Warning,
+ 2 => Color.Info,
+ 3 => Color.Success,
+ 4 => Color.Error,
+ _ => Color.Default
+ };
+ }
+
private async Task SubmitAsync()
{
+ if (_form != null)
+ {
+ await _form.Validate();
+ if (!_isValid) return;
+ }
+
_isSaving = true;
StateHasChanged();
try
{
+ // Update delivery status
var response = await UserOrderContract.UpdateOrderStatusAsync(new UpdateOrderStatusRequest
{
OrderId = OrderId,
@@ -48,6 +75,25 @@ public partial class ChangeOrderStatusDialog
if (response.Success)
{
+ // Also update tracking code and description via UpdateUserOrder
+ if (!string.IsNullOrEmpty(_trackingCode) || !string.IsNullOrEmpty(_deliveryDescription))
+ {
+ try
+ {
+ var updateRequest = new UpdateUserOrderRequest
+ {
+ Id = OrderId,
+ TrackingCode = _trackingCode ?? string.Empty,
+ DeliveryDescription = _deliveryDescription ?? string.Empty
+ };
+ await UserOrderContract.UpdateUserOrderAsync(updateRequest);
+ }
+ catch
+ {
+ // Non-critical: status was already updated
+ }
+ }
+
Snackbar.Add("وضعیت ارسال سفارش با موفقیت بهروزرسانی شد.", Severity.Success);
MudDialog.Close(DialogResult.Ok(true));
}
diff --git a/src/BackOffice/Pages/UserOrder/Components/UserOrderDataTable.razor.cs b/src/BackOffice/Pages/UserOrder/Components/UserOrderDataTable.razor.cs
index 24f0639..daddcbf 100644
--- a/src/BackOffice/Pages/UserOrder/Components/UserOrderDataTable.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/Components/UserOrderDataTable.razor.cs
@@ -1,11 +1,11 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using Google.Protobuf.WellKnownTypes;
using HtmlAgilityPack;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
using static Google.Rpc.Context.AttributeContext.Types;
-using DataModel = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel;
+using DataModel = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel;
namespace BackOffice.Pages.UserOrder.Components;
diff --git a/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor b/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor
index e9cdd8c..5464e1e 100644
--- a/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor
+++ b/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor
@@ -1,4 +1,5 @@
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos
@using BackOffice.Common.BaseComponents
@@ -51,18 +52,18 @@
}
- @if (_model.VatAmount > 0)
+ @if (_model.VatInfo != null && _model.VatInfo.VatAmount > 0)
{
جزئیات مالیات بر ارزش افزوده
- مبلغ کالا (قبل از مالیات): @_model.VatBaseAmount.ToString("N0") تومان
+ مبلغ کالا (قبل از مالیات): @_model.VatInfo.BaseAmount.ToString("N0") تومان
- مالیات (@_model.VatPercentage.ToString("0")٪): @_model.VatAmount.ToString("N0") تومان
+ مالیات (@(_model.VatInfo.VatRate * 100).ToString("0")٪): @_model.VatInfo.VatAmount.ToString("N0") تومان
- مبلغ نهایی (شامل مالیات): @_model.VatTotalAmount.ToString("N0") تومان
+ مبلغ نهایی (شامل مالیات): @_model.VatInfo.TotalAmount.ToString("N0") تومان
}
diff --git a/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor.cs b/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor.cs
index 1314716..a2bbf3e 100644
--- a/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor.cs
@@ -1,4 +1,5 @@
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using CMSMicroservice.Protobuf.Protos;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using Microsoft.AspNetCore.Components;
using MudBlazor;
@@ -169,7 +170,7 @@ public partial class UserOrderDetailsDialog
await UserOrderContract.UpdateUserOrderAsync(new UpdateUserOrderRequest
{
Id = _model.Id,
- DeliveryStatus = _deliveryStatusValue,
+ DeliveryStatus = (DeliveryStatus)_deliveryStatusValue,
TrackingCode = _trackingCode ?? string.Empty,
DeliveryDescription = _deliveryDescription ?? string.Empty
});
diff --git a/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor b/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor
new file mode 100644
index 0000000..e0cfc13
--- /dev/null
+++ b/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor
@@ -0,0 +1,269 @@
+@* Merged into OrdersHub *@
+@attribute [Authorize(Roles = "Administrator")]
+
+@using MudBlazor
+@using CMSMicroservice.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos
+@using Google.Protobuf.WellKnownTypes
+@using DateTimeConverterCL
+@using DataModel = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel
+
+ _orders = new();
+ protected bool _loading;
+
+ protected DateTime? _fromDate = DateTime.Today.AddDays(-30);
+ protected DateTime? _toDate = DateTime.Today;
+ protected int? _deliveryStatusFilter;
+ protected int? _paymentStatusFilter;
+
+ protected int _totalOrders;
+ protected long _totalSales;
+ protected long _averageOrder;
+ protected int _paidCount;
+
+ protected string[] _salesLabels = Array.Empty();
+ protected List _salesSeries = new();
+
+ protected string[] _statusChartLabels = Array.Empty();
+ protected List _statusChartSeries = new();
+
+ protected string[] _topProductLabels = Array.Empty();
+ protected List _topProductSeries = new();
+
+ protected override async Task OnInitializedAsync()
+ {
+ await LoadReports();
+ }
+
+ protected async Task LoadReports()
+ {
+ if (_fromDate.HasValue && _toDate.HasValue && _fromDate.Value.Date > _toDate.Value.Date)
+ {
+ Snackbar.Add("تاریخ شروع نباید بعد از تاریخ پایان باشد.", Severity.Warning);
+ return;
+ }
+
+ _loading = true;
+ _orders.Clear();
+
+ try
+ {
+ var request = new GetAllUserOrderByFilterRequest
+ {
+ Filter = new GetAllUserOrderByFilterFilter(),
+ PaginationState = new PaginationState
+ {
+ PageNumber = 1,
+ PageSize = 200
+ }
+ };
+
+ if (_fromDate.HasValue)
+ {
+ request.Filter.PaymentDate =
+ Timestamp.FromDateTime(DateTime.SpecifyKind(_fromDate.Value.Date, DateTimeKind.Utc));
+ }
+
+ if (_deliveryStatusFilter.HasValue)
+ {
+ request.Filter.DeliveryStatus = (DeliveryStatus)_deliveryStatusFilter.Value;
+ }
+ else
+ {
+ request.Filter.ClearDeliveryStatusItem();
+ }
+
+ if (_paymentStatusFilter.HasValue)
+ {
+ request.Filter.PaymentStatus = (PaymentStatus)_paymentStatusFilter.Value;
+ }
+ else
+ {
+ request.Filter.ClearPaymentStatusItem();
+ }
+
+ var result = await UserOrderContract.GetAllUserOrderByFilterAsync(request);
+
+ if (result?.Models != null)
+ {
+ var items = result.Models.ToList();
+
+ // Client-side date filtering for "toDate"
+ if (_toDate.HasValue)
+ {
+ items = items.Where(o =>
+ o.PaymentDate == null ||
+ o.PaymentDate.ToDateTime() <= _toDate.Value.Date.AddDays(1)).ToList();
+ }
+
+ _orders.AddRange(items);
+ }
+
+ BuildSummary();
+ BuildSalesChart();
+ BuildStatusChart();
+ await BuildTopProductsChart();
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا در بارگذاری گزارش فروش: {ex.Message}", Severity.Error);
+ ClearData();
+ }
+ finally
+ {
+ _loading = false;
+ }
+ }
+
+ private void ClearData()
+ {
+ _orders.Clear();
+ _totalOrders = 0;
+ _totalSales = 0;
+ _averageOrder = 0;
+ _paidCount = 0;
+ _salesLabels = Array.Empty();
+ _salesSeries = new List();
+ _statusChartLabels = Array.Empty();
+ _statusChartSeries = new List();
+ _topProductLabels = Array.Empty();
+ _topProductSeries = new List();
+ }
+
+ private void BuildSummary()
+ {
+ _totalOrders = _orders.Count;
+ _totalSales = _orders.Sum(o => o.Amount);
+ _averageOrder = _totalOrders > 0 ? _totalSales / _totalOrders : 0;
+ _paidCount = _orders.Count(o => o.PaymentStatus == PaymentStatus.Success);
+ }
+
+ private void BuildSalesChart()
+ {
+ if (_orders.Count == 0)
+ {
+ _salesLabels = Array.Empty();
+ _salesSeries = new List();
+ return;
+ }
+
+ var grouped = _orders
+ .Where(o => o.PaymentDate != null)
+ .GroupBy(o => o.PaymentDate!.ToDateTime().Date)
+ .OrderBy(g => g.Key)
+ .ToList();
+
+ _salesLabels = grouped
+ .Select(g => g.Key.MiladiToJalali())
+ .ToArray();
+
+ var amountSeries = grouped
+ .Select(g => (double)g.Sum(o => o.Amount))
+ .ToArray();
+
+ var countSeries = grouped
+ .Select(g => (double)g.Count())
+ .ToArray();
+
+ _salesSeries = new List
+ {
+ new ChartSeries { Name = "مبلغ فروش", Data = amountSeries },
+ new ChartSeries { Name = "تعداد سفارش", Data = countSeries }
+ };
+ }
+
+ private void BuildStatusChart()
+ {
+ if (_orders.Count == 0)
+ {
+ _statusChartLabels = Array.Empty();
+ _statusChartSeries = new List();
+ return;
+ }
+
+ var groups = _orders
+ .GroupBy(x => x.DeliveryStatus.GetHashCode())
+ .OrderBy(g => g.Key)
+ .ToList();
+
+ _statusChartLabels = groups
+ .Select(g => GetDeliveryStatusText(g.Key))
+ .ToArray();
+
+ _statusChartSeries = new List
+ {
+ new ChartSeries
+ {
+ Name = "تعداد سفارشها",
+ Data = groups.Select(g => (double)g.Count()).ToArray()
+ }
+ };
+ }
+
+ protected Color GetDeliveryStatusColor(int status)
+ {
+ return status switch
+ {
+ 1 => Color.Warning,
+ 2 => Color.Info,
+ 3 => Color.Success,
+ 4 => Color.Error,
+ 5 => Color.Error,
+ _ => Color.Default
+ };
+ }
+
+ protected string GetDeliveryStatusText(int status)
+ {
+ return status switch
+ {
+ 1 => "در انتظار ارسال",
+ 2 => "تحویل پست",
+ 3 => "تحویل به مشتری",
+ 4 => "مرجوع شده",
+ 5 => "لغو شده",
+ _ => "بدون ارسال / نامشخص"
+ };
+ }
+
+ protected async Task ExportToExcel()
+ {
+ if (_orders.Count == 0)
+ {
+ Snackbar.Add("دادهای برای خروجی وجود ندارد.", Severity.Info);
+ return;
+ }
+
+ var sb = new StringBuilder();
+ sb.AppendLine("شناسه,کاربر,نام کاربر,مبلغ,وضعیت پرداخت,وضعیت ارسال,تاریخ پرداخت");
+
+ foreach (var o in _orders)
+ {
+ sb.AppendLine(string.Join(",",
+ o.Id,
+ o.UserId,
+ EscapeCsv(o.UserFullName),
+ o.Amount,
+ EscapeCsv(o.PaymentStatus == PaymentStatus.Success ? "پرداخت شده" : "پرداخت نشده"),
+ EscapeCsv(GetDeliveryStatusText(o.DeliveryStatus.GetHashCode())),
+ o.PaymentDate != null ? o.PaymentDate.ToDateTime().MiladiToJalaliWithTime() : "-"));
+ }
+
+ var bytes = Encoding.UTF8.GetPreamble().Concat(Encoding.UTF8.GetBytes(sb.ToString())).ToArray();
+ var base64 = Convert.ToBase64String(bytes);
+ var filename = $"store-sales-{DateTime.Now:yyyyMMddHHmmss}.csv";
+
+ await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename, base64);
+ Snackbar.Add("خروجی Excel (CSV) آماده شد.", Severity.Success);
+ }
+
+ protected async Task ExportToPdf()
+ {
+ if (_orders.Count == 0)
+ {
+ Snackbar.Add("دادهای برای خروجی وجود ندارد.", Severity.Info);
+ return;
+ }
+
+ var sb = new StringBuilder();
+ sb.AppendLine("گزارش فروش فروشگاه");
+ sb.AppendLine($"بازه: از {_fromDate?.MiladiToJalali() ?? "-"} تا {_toDate?.MiladiToJalali() ?? "-"}");
+ sb.AppendLine();
+
+ sb.AppendLine("خلاصه:");
+ sb.AppendLine($"تعداد سفارشها: {_totalOrders}");
+ sb.AppendLine($"مجموع فروش: {_totalSales:N0} ریال");
+ sb.AppendLine($"میانگین مبلغ سفارش: {_averageOrder:N0} ریال");
+ sb.AppendLine($"پرداخت شده: {_paidCount}");
+ sb.AppendLine();
+
+ sb.AppendLine("جزئیات سفارشها:");
+ sb.AppendLine("شناسه | کاربر | مبلغ | وضعیت پرداخت | وضعیت ارسال | تاریخ");
+
+ foreach (var o in _orders)
+ {
+ sb.AppendLine(
+ $"{o.Id} | {o.UserFullName} | {o.Amount:N0} | {(o.PaymentStatus == PaymentStatus.Success ? "پرداخت شده" : "پرداخت نشده")} | {GetDeliveryStatusText(o.DeliveryStatus.GetHashCode())} | {(o.PaymentDate != null ? o.PaymentDate.ToDateTime().MiladiToJalaliWithTime() : "-")}");
+ }
+
+ var bytes = Encoding.UTF8.GetPreamble().Concat(Encoding.UTF8.GetBytes(sb.ToString())).ToArray();
+ var base64 = Convert.ToBase64String(bytes);
+ var filename = $"store-sales-{DateTime.Now:yyyyMMddHHmmss}.txt";
+
+ await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename, base64);
+ Snackbar.Add("خروجی PDF (نسخه متنی) آماده شد.", Severity.Success);
+ }
+
+ private async Task BuildTopProductsChart()
+ {
+ _topProductLabels = Array.Empty();
+ _topProductSeries = new List();
+
+ if (_orders.Count == 0)
+ return;
+
+ // استفاده از factor_details که در هر سفارش موجود هست
+ var productTotals = new Dictionary();
+
+ foreach (var order in _orders.Take(100))
+ {
+ if (order.FactorDetails == null)
+ continue;
+
+ foreach (var item in order.FactorDetails)
+ {
+ var amount = (item.UnitPrice ?? 0) * (item.Count ?? 1);
+ if (!productTotals.TryGetValue(item.ProductId, out var existing))
+ {
+ productTotals[item.ProductId] = (item.ProductTitle, amount);
+ }
+ else
+ {
+ productTotals[item.ProductId] = (existing.Name, existing.Amount + amount);
+ }
+ }
+ }
+
+ if (productTotals.Count == 0)
+ return;
+
+ var top = productTotals.Values
+ .OrderByDescending(x => x.Amount)
+ .Take(5)
+ .ToList();
+
+ _topProductLabels = top.Select(x => x.Name).ToArray();
+ _topProductSeries = new List
+ {
+ new ChartSeries
+ {
+ Name = "مبلغ فروش",
+ Data = top.Select(x => (double)x.Amount).ToArray()
+ }
+ };
+ }
+
+ private static string EscapeCsv(string value)
+ {
+ if (string.IsNullOrEmpty(value)) return "";
+ if (value.Contains(',') || value.Contains('"') || value.Contains('\n'))
+ return $"\"{value.Replace("\"", "\"\"")}\"";
+ return value;
+ }
+}
diff --git a/src/BackOffice/Pages/UserOrder/OrdersHub.razor b/src/BackOffice/Pages/UserOrder/OrdersHub.razor
new file mode 100644
index 0000000..e7a55e2
--- /dev/null
+++ b/src/BackOffice/Pages/UserOrder/OrdersHub.razor
@@ -0,0 +1,31 @@
+@page "/OrdersPage/"
+@page "/OrdersSalesReportsPage/"
+@attribute [Authorize(Roles = "Administrator")]
+
+
-
- درگاه پرداخت
- کیف پول
-
-
-
- پرداخت شده
- پرداخت نشده
-
-
-
- در انتظار ارسال
- تحویل پست
- تحویل به مشتری
- مرجوع شده
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ درگاه پرداخت
+ کیف پول
+
+
+
+
+ پرداخت شده
+ پرداخت نشده
+
+
+
+
+ در انتظار ارسال
+ تحویل پست
+ تحویل به مشتری
+ مرجوع شده
+ لغو شده
+
+
-
-
-
-
- جمع سفارشها در بازه فعلی
- @_stats.TotalOrders.ToString("N0")
-
- مجموع مبلغ: @_stats.TotalAmount.ToString("N0") ریال
-
-
-
-
-
-
-
- نمودار تعداد سفارشها بر اساس وضعیت ارسال
- @if (_statusChartLabels.Length == 0)
- {
-
- برای این فیلتر، سفارش فعالی یافت نشد.
-
- }
- else
- {
-
-
-
-
-
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
-
- سفارشهای کاربر
+
+ لیست سفارشات
+
+ خروجی Excel
+
+ @*
@(context.Item.VatAmount > 0 ? context.Item.VatAmount.ToString("N0") : "-")
@@ -136,8 +93,21 @@
@(context.Item.VatPercentage > 0 ? $"{context.Item.VatPercentage:0}٪" : "-")
-
- *@
+
+
+ @if (context.Item.UserId > 0)
+ {
+
+ @context.Item.UserFullName
+
+ }
+ else
+ {
+ @context.Item.UserFullName
+ }
+
+
@@ -167,7 +137,14 @@
HeaderStyle="text-wrap: nowrap;"/>
- @(context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime())
+ @if (context.Item.PaymentDate != null)
+ {
+ @(context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime())
+ }
+ else
+ {
+ -
+ }
@@ -204,7 +181,7 @@
Size="Size.Small"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenDetails(context.Item))"
- Style="cursor:pointer;"/>
+ />
@@ -213,7 +190,7 @@
Color="Color.Primary"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenChangeStatus(context.Item))"
- Style="cursor:pointer;"/>
+ />
@@ -222,7 +199,7 @@
Color="Color.Secondary"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenApplyDiscount(context.Item))"
- Style="cursor:pointer;"/>
+ />
@@ -231,22 +208,25 @@
Color="Color.Error"
ButtonType="ButtonType.Button"
OnClick="@(() => OpenCancelOrder(context.Item))"
- Style="cursor:pointer;"/>
+ />
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
index 7a0d890..ddc90d0 100644
--- a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
@@ -1,9 +1,13 @@
using System.Text.Json;
-using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
+using System.Text;
+using CMSMicroservice.Protobuf.Protos;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
using BackOffice.Common.BaseComponents;
using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
using MudBlazor;
-using DataModel = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel;
+using DateTimeConverterCL;
+using DataModel = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel;
using Google.Protobuf.WellKnownTypes;
namespace BackOffice.Pages.UserOrder;
@@ -12,6 +16,7 @@ public partial class UserOrderMainPage
{
[Parameter] public long? UserId { get; set; }
[Inject] public UserOrderContract.UserOrderContractClient UserOrderContract { get; set; }
+ [Inject] public IJSRuntime JsRuntime { get; set; }
private bool _isLoading = true;
private MudDataGrid _gridData;
BasePageComponent _basePage;
@@ -23,17 +28,15 @@ public partial class UserOrderMainPage
private int? _deliveryStatusFilter;
private int? _paymentMethodFilter;
private DateTime? _paymentDateFrom;
+ private DateTime? _paymentDateTo;
private GetAllUserOrderByFilterRequest _request = new() { Filter = new() };
- private OrderStatsViewModel _stats = new();
- private string[] _statusChartLabels = Array.Empty();
- private List _statusChartSeries = new();
-
private async Task> ServerReload(GridState state)
{
- Console.WriteLine("ServerReload");
+ try
+ {
_request.Filter ??= new();
_request.PaginationState ??= new();
_request.PaginationState.PageNumber = state.Page + 1;
@@ -61,39 +64,49 @@ public partial class UserOrderMainPage
if (_paymentDateFrom.HasValue)
{
- _request.Filter.PaymentDate =
+ _request.Filter.FromDate =
Timestamp.FromDateTime(DateTime.SpecifyKind(_paymentDateFrom.Value.Date, DateTimeKind.Utc));
}
else
{
- _request.Filter.PaymentDate = null;
+ _request.Filter.FromDate = null;
+ }
+
+ if (_paymentDateTo.HasValue)
+ {
+ _request.Filter.ToDate =
+ Timestamp.FromDateTime(DateTime.SpecifyKind(_paymentDateTo.Value.Date.AddDays(1).AddTicks(-1), DateTimeKind.Utc));
+ }
+ else
+ {
+ _request.Filter.ToDate = null;
}
if (_paymentStatusFilter.HasValue)
{
- _request.Filter.PaymentStatus = _paymentStatusFilter;
+ _request.Filter.PaymentStatus = (PaymentStatus)_paymentStatusFilter.Value;
}
else
{
- _request.Filter.PaymentStatus = null;
+ _request.Filter.ClearPaymentStatusItem();
}
if (_deliveryStatusFilter.HasValue)
{
- _request.Filter.DeliveryStatus = _deliveryStatusFilter.Value;
+ _request.Filter.DeliveryStatus = (DeliveryStatus)_deliveryStatusFilter.Value;
}
else
{
- _request.Filter.DeliveryStatus = null;
+ _request.Filter.ClearDeliveryStatusItem();
}
if (_paymentMethodFilter.HasValue)
{
- _request.Filter.PaymentMethod = _paymentMethodFilter.Value;
+ _request.Filter.PaymentMethod = (PaymentMethod)_paymentMethodFilter.Value;
}
else
{
- _request.Filter.PaymentMethod = null;
+ _request.Filter.ClearPaymentMethodItem();
}
if (_transactionIdFilter.HasValue && _transactionIdFilter.Value > 0)
@@ -108,18 +121,20 @@ public partial class UserOrderMainPage
var result = await UserOrderContract.GetAllUserOrderByFilterAsync(_request);
if (result != null && result.Models != null && result.Models.Any())
{
- var items = result.Models.ToList();
- UpdateStats(items);
-
return new GridData
{
- Items = items,
+ Items = result.Models.ToList(),
TotalItems = (int)result.MetaData.TotalCount
};
}
- UpdateStats(new List());
return new GridData();
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا در بارگذاری سفارشات: {ex.Message}", MudBlazor.Severity.Error);
+ return new GridData();
+ }
}
private async Task OpenDetails(DataModel model)
@@ -146,7 +161,7 @@ public partial class UserOrderMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف سفارش شماره «{model.Id}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result != null && result.Value)
@@ -185,10 +200,8 @@ public partial class UserOrderMainPage
_paymentStatusFilter = null;
_deliveryStatusFilter = null;
_paymentDateFrom = null;
+ _paymentDateTo = null;
_paymentMethodFilter = null;
- _stats = new OrderStatsViewModel();
- _statusChartLabels = Array.Empty();
- _statusChartSeries = new List();
ReLoadData();
}
@@ -225,47 +238,6 @@ public partial class UserOrderMainPage
};
}
- private void UpdateStats(List items)
- {
- if (items == null || items.Count == 0)
- {
- _stats = new OrderStatsViewModel();
- _statusChartLabels = Array.Empty();
- _statusChartSeries = new List();
- return;
- }
-
- _stats = new OrderStatsViewModel
- {
- TotalOrders = items.Count,
- TotalAmount = items.Sum(x => x.Amount)
- };
-
- var groups = items
- .GroupBy(x => x.DeliveryStatus.GetHashCode())
- .OrderBy(g => g.Key)
- .ToList();
-
- _statusChartLabels = groups
- .Select(g => GetDeliveryStatusText(g.Key))
- .ToArray();
-
- _statusChartSeries = new List
- {
- new()
- {
- Name = "تعداد سفارشها",
- Data = groups.Select(g => (double)g.Count()).ToArray()
- }
- };
- }
-
- private class OrderStatsViewModel
- {
- public int TotalOrders { get; set; }
- public long TotalAmount { get; set; }
- }
-
private async Task OpenChangeStatus(DataModel model)
{
var parameters = new DialogParameters
@@ -320,4 +292,63 @@ public partial class UserOrderMainPage
ReLoadData();
}
}
+
+ private async Task ExportToExcel()
+ {
+ try
+ {
+ var exportRequest = new GetAllUserOrderByFilterRequest
+ {
+ Filter = _request.Filter ?? new(),
+ PaginationState = new PaginationState
+ {
+ PageNumber = 1,
+ PageSize = 1000
+ }
+ };
+
+ var result = await UserOrderContract.GetAllUserOrderByFilterAsync(exportRequest);
+
+ if (result?.Models == null || !result.Models.Any())
+ {
+ Snackbar.Add("دادهای برای خروجی وجود ندارد.", Severity.Info);
+ return;
+ }
+
+ var sb = new StringBuilder();
+ sb.AppendLine("شناسه,کاربر,نام کاربر,مبلغ,وضعیت پرداخت,وضعیت ارسال,روش پرداخت,تاریخ پرداخت");
+
+ foreach (var o in result.Models)
+ {
+ sb.AppendLine(string.Join(",",
+ o.Id,
+ o.UserId,
+ EscapeCsv(o.UserFullName),
+ o.Amount,
+ EscapeCsv(o.PaymentStatus.ToString()),
+ EscapeCsv(GetDeliveryStatusText(o.DeliveryStatus.GetHashCode())),
+ EscapeCsv(GetPaymentMethodText(o.PaymentMethod.GetHashCode())),
+ o.PaymentDate?.ToDateTime().ToLocalTime().MiladiToJalaliWithTime() ?? "-"));
+ }
+
+ var bytes = Encoding.UTF8.GetPreamble().Concat(Encoding.UTF8.GetBytes(sb.ToString())).ToArray();
+ var base64 = Convert.ToBase64String(bytes);
+ var filename = $"user-orders-{DateTime.Now:yyyyMMddHHmmss}.csv";
+
+ await JsRuntime.InvokeVoidAsync("jsSaveAsFile", filename, base64);
+ Snackbar.Add("خروجی Excel (CSV) آماده شد.", Severity.Success);
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا در خروجی Excel: {ex.Message}", Severity.Error);
+ }
+ }
+
+ private static string EscapeCsv(string value)
+ {
+ if (string.IsNullOrEmpty(value)) return "";
+ if (value.Contains(',') || value.Contains('"') || value.Contains('\n'))
+ return $"\"{value.Replace("\"", "\"\"")}\"";
+ return value;
+ }
}
diff --git a/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor b/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor
index 6995bdf..9c73a07 100644
--- a/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor
+++ b/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole
+@using CMSMicroservice.Protobuf.Protos.UserRole
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor.cs b/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor.cs
index 5b3e918..1a142e1 100644
--- a/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor.cs
+++ b/src/BackOffice/Pages/UserRole/Components/CreateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
+using CMSMicroservice.Protobuf.Protos.UserRole;
using Google.Protobuf;
using Grpc.Core;
using Microsoft.AspNetCore.Components;
@@ -35,7 +35,6 @@ public partial class CreateDialog
}
catch (RpcException ex)
{
- Console.WriteLine(ex);
Snackbar.Add("خطای سرور", Severity.Error);
}
diff --git a/src/BackOffice/Pages/UserRole/Components/RoleTitleColumn.razor.cs b/src/BackOffice/Pages/UserRole/Components/RoleTitleColumn.razor.cs
index 5367f89..c9616c0 100644
--- a/src/BackOffice/Pages/UserRole/Components/RoleTitleColumn.razor.cs
+++ b/src/BackOffice/Pages/UserRole/Components/RoleTitleColumn.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Role.Protobuf.Protos.Role;
+using CMSMicroservice.Protobuf.Protos.Role;
using Microsoft.AspNetCore.Components;
namespace BackOffice.Pages.UserRole.Components;
diff --git a/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor b/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor
index 103001c..6556f9f 100644
--- a/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor
+++ b/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor
@@ -1,4 +1,4 @@
-@using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole
+@using CMSMicroservice.Protobuf.Protos.UserRole
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms
@using Tizzani.MudBlazor.HtmlEditor
diff --git a/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor.cs b/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor.cs
index 9b40628..addfb25 100644
--- a/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor.cs
+++ b/src/BackOffice/Pages/UserRole/Components/UpdateDialog.razor.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
+using CMSMicroservice.Protobuf.Protos.UserRole;
using Google.Protobuf;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Forms;
diff --git a/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor b/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor
index f6ad58d..8e7aaa0 100644
--- a/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor
+++ b/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor
@@ -1,17 +1,19 @@
@attribute [Route(RouteConstance.UserRole + "{UserId:long}")]
-@using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole
+@using CMSMicroservice.Protobuf.Protos.UserRole
@using BackOffice.Pages.UserRole.Components
@using BackOffice.Common.BaseComponents
-@using DataModel = BackOffice.BFF.UserRole.Protobuf.Protos.UserRole.GetAllUserRoleByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.UserRole.GetAllUserRoleByFilterResponseModel
-
+
+ Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
مدیریت نقش های کاربر
- افزودن
+ افزودن
@@ -34,18 +36,21 @@
-
-
+
+ موردی یافت نشد.
+
-
diff --git a/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor.cs b/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor.cs
index 1026c09..647807e 100644
--- a/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor.cs
+++ b/src/BackOffice/Pages/UserRole/UserRoleMainPage.razor.cs
@@ -1,10 +1,10 @@
-using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole;
+using CMSMicroservice.Protobuf.Protos.UserRole;
using BackOffice.Common.BaseComponents;
using BackOffice.Pages.UserRole.Components;
using Mapster;
using Microsoft.AspNetCore.Components;
using MudBlazor;
-using DataModel = BackOffice.BFF.UserRole.Protobuf.Protos.UserRole.GetAllUserRoleByFilterResponseModel;
+using DataModel = CMSMicroservice.Protobuf.Protos.UserRole.GetAllUserRoleByFilterResponseModel;
namespace BackOffice.Pages.UserRole;
public partial class UserRoleMainPage
@@ -52,7 +52,7 @@ public partial class UserRoleMainPage
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small };
bool? result = await DialogService.ShowMessageBox(
"اخطار",
- "آیا از حذف این مورد مطمئن هستید؟",
+ $"آیا از حذف نقش کاربری با شناسه «{model.Id}» مطمئن هستید؟",
yesText: "حذف", cancelText: "لغو",
options: options);
if (result != null && result.Value)
diff --git a/src/BackOffice/Pages/Wallet/WalletManagementPage.razor b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor
new file mode 100644
index 0000000..c1f51f0
--- /dev/null
+++ b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor
@@ -0,0 +1,226 @@
+@page "/wallets"
+@attribute [Authorize(Roles = "Administrator")]
+
+@using CMSMicroservice.Protobuf.Protos.UserWallet
+@using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog
+@using BackOffice.Pages.AutoComplete
+
+@inject UserWalletContract.UserWalletContractClient WalletClient
+@inject UserWalletChangeLogContract.UserWalletChangeLogContractClient ChangeLogClient
+
+? _walletGrid;
+ private MudDataGrid? _logGrid;
+
+ // Wallet filters
+ private long? _filterUserId;
+
+ // ChangeLog filters
+ private long? _logFilterUserId;
+ private bool? _logFilterIsIncrease;
+
+ private async Task> LoadWallets(GridState state)
+ {
+ try
+ {
+ var request = new GetAllUserWalletByFilterRequest
+ {
+ PaginationState = new() { PageNumber = state.Page + 1, PageSize = state.PageSize },
+ Filter = new GetAllUserWalletByFilterFilter()
+ };
+
+ if (_filterUserId.HasValue && _filterUserId.Value > 0)
+ request.Filter.UserId = _filterUserId.Value;
+
+ var result = await WalletClient.GetAllUserWalletByFilterAsync(request);
+ return new GridData
+ {
+ Items = result?.Models?.ToList() ?? new(),
+ TotalItems = (int)(result?.MetaData?.TotalCount ?? 0)
+ };
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا: {ex.Message}", Severity.Error);
+ return new GridData();
+ }
+ }
+
+ private async Task> LoadChangeLogs(GridState state)
+ {
+ try
+ {
+ var request = new GetAllUserWalletChangeLogByFilterRequest
+ {
+ PaginationState = new() { PageNumber = state.Page + 1, PageSize = state.PageSize },
+ Filter = new GetAllUserWalletChangeLogByFilterFilter()
+ };
+
+ if (_logFilterUserId.HasValue && _logFilterUserId.Value > 0)
+ request.Filter.UserId = _logFilterUserId.Value;
+
+ if (_logFilterIsIncrease.HasValue)
+ request.Filter.IsIncrease = _logFilterIsIncrease.Value;
+
+ var result = await ChangeLogClient.GetAllUserWalletChangeLogByFilterAsync(request);
+ return new GridData
+ {
+ Items = result?.Models?.ToList() ?? new(),
+ TotalItems = (int)(result?.MetaData?.TotalCount ?? 0)
+ };
+ }
+ catch (Exception ex)
+ {
+ Snackbar.Add($"خطا: {ex.Message}", Severity.Error);
+ return new GridData();
+ }
+ }
+
+ private async Task ApplyWalletFilter()
+ {
+ if (_walletGrid != null) await _walletGrid.ReloadServerData();
+ }
+
+ private async Task ApplyLogFilter()
+ {
+ if (_logGrid != null) await _logGrid.ReloadServerData();
+ }
+
+ private void ShowChangeLog(GetAllUserWalletByFilterResponseModel wallet)
+ {
+ _logFilterUserId = wallet.UserId;
+ _activeTab = 1;
+ StateHasChanged();
+ _ = ApplyLogFilter();
+ }
+}
diff --git a/src/BackOffice/Pages/_Imports.razor b/src/BackOffice/Pages/_Imports.razor
index 992c394..7c59991 100644
--- a/src/BackOffice/Pages/_Imports.razor
+++ b/src/BackOffice/Pages/_Imports.razor
@@ -1,3 +1,3 @@
-@using BackOffice.BFF.Package.Protobuf.Protos.Package
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
-@using BackOffice.BFF.UserRole.Protobuf.Protos.UserRole
\ No newline at end of file
+@using CMSMicroservice.Protobuf.Protos.Package
+@using CMSMicroservice.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserRole
\ No newline at end of file
diff --git a/src/BackOffice/Services/AppVersion/AppVersionService.cs b/src/BackOffice/Services/AppVersion/AppVersionService.cs
index 4a6b26d..2edaf8b 100644
--- a/src/BackOffice/Services/AppVersion/AppVersionService.cs
+++ b/src/BackOffice/Services/AppVersion/AppVersionService.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
+using CMSMicroservice.Protobuf.Protos.AppVersion;
using Google.Protobuf.WellKnownTypes;
namespace BackOffice.Services.AppVersion;
@@ -45,22 +45,20 @@ public class AppVersionService : IAppVersionService
var response = await _client.GetAppVersionAsync(request);
- if (!response.Found || response.Item == null)
+ if (!response.Found)
return null;
- var item = response.Item;
return new AppVersionDto
{
- Id = item.Id,
- AppName = item.AppName,
- CurrentVersion = item.CurrentVersion,
- MinRequiredVersion = item.MinRequiredVersion,
- RequiresFullCacheClear = item.RequiresFullCacheClear,
- UpdateMessage = item.UpdateMessage,
- ReleaseNotes = item.ReleaseNotes,
- IsActive = item.IsActive,
- Created = item.Created?.ToDateTime(),
- LastModified = item.LastModified?.ToDateTime()
+ AppName = response.AppName,
+ CurrentVersion = response.CurrentVersion,
+ MinRequiredVersion = response.MinRequiredVersion,
+ RequiresFullCacheClear = response.RequiresFullCacheClear,
+ UpdateMessage = response.UpdateMessage,
+ ReleaseNotes = response.ReleaseNotes,
+ IsActive = true,
+ Created = response.LastUpdated?.ToDateTime(),
+ LastModified = response.LastUpdated?.ToDateTime()
};
}
diff --git a/src/BackOffice/Services/Blog/BlogCategoryService.cs b/src/BackOffice/Services/Blog/BlogCategoryService.cs
new file mode 100644
index 0000000..7401b01
--- /dev/null
+++ b/src/BackOffice/Services/Blog/BlogCategoryService.cs
@@ -0,0 +1,122 @@
+namespace BackOffice.Services.Blog;
+
+public class BlogCategoryService : IBlogCategoryService
+{
+ private readonly CMSMicroservice.Protobuf.Protos.BlogCategory.BlogCategoryContract.BlogCategoryContractClient _client;
+
+ public BlogCategoryService(CMSMicroservice.Protobuf.Protos.BlogCategory.BlogCategoryContract.BlogCategoryContractClient client)
+ {
+ _client = client;
+ }
+
+ public async Task GetAllAsync(BlogCategoryFilterDto filter)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogCategory.GetAllBlogCategoriesRequest
+ {
+ PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
+ {
+ PageNumber = filter.PageNumber,
+ PageSize = filter.PageSize
+ }
+ };
+
+ var response = await _client.GetAllBlogCategoriesAsync(request);
+
+ var result = new BlogCategoryListResultDto
+ {
+ TotalCount = response.MetaData != null ? (int)response.MetaData.TotalCount : response.Models.Count
+ };
+
+ foreach (var m in response.Models)
+ {
+ result.Items.Add(new BlogCategoryItemDto
+ {
+ Id = m.Id,
+ Title = m.Title,
+ Slug = m.Slug,
+ Description = m.Description,
+ IconName = m.IconName,
+ SortOrder = m.SortOrder,
+ IsActive = m.IsActive,
+ PostCount = m.PostCount
+ });
+ }
+
+ return result;
+ }
+
+ public async Task> GetActiveAsync()
+ {
+ var response = await _client.GetActiveBlogCategoriesAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogCategory.GetActiveBlogCategoriesRequest());
+
+ return response.Categories.Select(m => new BlogCategoryItemDto
+ {
+ Id = m.Id,
+ Title = m.Title,
+ Slug = m.Slug,
+ Description = m.Description,
+ IconName = m.IconName,
+ SortOrder = m.SortOrder,
+ IsActive = m.IsActive,
+ PostCount = m.PostCount
+ }).ToList();
+ }
+
+ public async Task GetByIdAsync(long id)
+ {
+ var response = await _client.GetBlogCategoryAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogCategory.GetBlogCategoryRequest { Id = id });
+ if (response == null || response.Id <= 0) return null;
+
+ return new BlogCategoryItemDto
+ {
+ Id = response.Id,
+ Title = response.Title,
+ Slug = response.Slug,
+ Description = response.Description,
+ IconName = response.IconName,
+ SortOrder = response.SortOrder,
+ IsActive = response.IsActive,
+ PostCount = response.PostCount
+ };
+ }
+
+ public async Task CreateAsync(BlogCategoryEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogCategory.CreateBlogCategoryRequest
+ {
+ Title = dto.Title,
+ Slug = dto.Slug,
+ Description = dto.Description ?? string.Empty,
+ IconName = dto.IconName ?? string.Empty,
+ SortOrder = dto.SortOrder,
+ IsActive = dto.IsActive
+ };
+
+ var response = await _client.CreateBlogCategoryAsync(request);
+ return response.Id;
+ }
+
+ public async Task UpdateAsync(long id, BlogCategoryEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogCategory.UpdateBlogCategoryRequest
+ {
+ Id = id,
+ Title = dto.Title,
+ Slug = dto.Slug,
+ Description = dto.Description ?? string.Empty,
+ IconName = dto.IconName ?? string.Empty,
+ SortOrder = dto.SortOrder,
+ IsActive = dto.IsActive
+ };
+
+ await _client.UpdateBlogCategoryAsync(request);
+ }
+
+ public async Task DeleteAsync(long id)
+ {
+ await _client.DeleteBlogCategoryAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogCategory.DeleteBlogCategoryRequest { Id = id });
+ }
+}
diff --git a/src/BackOffice/Services/Blog/BlogPostImageService.cs b/src/BackOffice/Services/Blog/BlogPostImageService.cs
new file mode 100644
index 0000000..cabdd01
--- /dev/null
+++ b/src/BackOffice/Services/Blog/BlogPostImageService.cs
@@ -0,0 +1,70 @@
+namespace BackOffice.Services.Blog;
+
+public class BlogPostImageService : IBlogPostImageService
+{
+ private readonly CMSMicroservice.Protobuf.Protos.BlogPostImage.BlogPostImageContract.BlogPostImageContractClient _client;
+
+ public BlogPostImageService(
+ CMSMicroservice.Protobuf.Protos.BlogPostImage.BlogPostImageContract.BlogPostImageContractClient client)
+ {
+ _client = client;
+ }
+
+ public async Task> GetByPostIdAsync(long blogPostId)
+ {
+ var response = await _client.GetBlogPostImagesAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPostImage.GetBlogPostImagesRequest
+ {
+ BlogPostId = blogPostId
+ });
+
+ return response.Images.Select(m => new BlogPostImageItemDto
+ {
+ Id = m.Id,
+ BlogPostId = m.BlogPostId,
+ ImagePath = m.ImagePath,
+ ThumbnailPath = m.ThumbnailPath,
+ AltText = m.AltText,
+ Caption = m.Caption,
+ SortOrder = m.SortOrder
+ }).ToList();
+ }
+
+ public async Task AddAsync(BlogPostImageAddDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogPostImage.AddBlogPostImageRequest
+ {
+ BlogPostId = dto.BlogPostId,
+ ImagePath = dto.ImagePath,
+ ThumbnailPath = dto.ThumbnailPath,
+ AltText = dto.AltText ?? string.Empty,
+ Caption = dto.Caption ?? string.Empty,
+ SortOrder = dto.SortOrder
+ };
+
+ var response = await _client.AddBlogPostImageAsync(request);
+ return response.Id;
+ }
+
+ public async Task DeleteAsync(long id)
+ {
+ await _client.DeleteBlogPostImageAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPostImage.DeleteBlogPostImageRequest { Id = id });
+ }
+
+ public async Task ReorderAsync(List items)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogPostImage.ReorderBlogPostImagesRequest();
+
+ foreach (var item in items)
+ {
+ request.Items.Add(new CMSMicroservice.Protobuf.Protos.BlogPostImage.ImageSortItem
+ {
+ Id = item.Id,
+ SortOrder = item.SortOrder
+ });
+ }
+
+ await _client.ReorderBlogPostImagesAsync(request);
+ }
+}
diff --git a/src/BackOffice/Services/Blog/BlogPostService.cs b/src/BackOffice/Services/Blog/BlogPostService.cs
new file mode 100644
index 0000000..cbecf6a
--- /dev/null
+++ b/src/BackOffice/Services/Blog/BlogPostService.cs
@@ -0,0 +1,226 @@
+namespace BackOffice.Services.Blog;
+
+public class BlogPostService : IBlogPostService
+{
+ private readonly CMSMicroservice.Protobuf.Protos.BlogPost.BlogPostContract.BlogPostContractClient _client;
+
+ public BlogPostService(CMSMicroservice.Protobuf.Protos.BlogPost.BlogPostContract.BlogPostContractClient client)
+ {
+ _client = client;
+ }
+
+ public async Task GetAllAsync(BlogPostFilterDto filter)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogPost.GetAllBlogPostsRequest
+ {
+ PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
+ {
+ PageNumber = filter.PageNumber,
+ PageSize = filter.PageSize
+ },
+ Filter = new CMSMicroservice.Protobuf.Protos.BlogPost.GetAllBlogPostsFilter()
+ };
+
+ if (!string.IsNullOrWhiteSpace(filter.SearchTerm))
+ {
+ request.Filter.SearchTerm = filter.SearchTerm;
+ }
+
+ if (filter.Status.HasValue)
+ {
+ request.Filter.Status = filter.Status.Value;
+ }
+
+ if (filter.CategoryId.HasValue)
+ {
+ request.Filter.CategoryId = filter.CategoryId.Value;
+ }
+
+ if (filter.IsFeatured.HasValue)
+ {
+ request.Filter.IsFeatured = filter.IsFeatured.Value;
+ }
+
+ var response = await _client.GetAllBlogPostsAsync(request);
+
+ var result = new BlogPostListResultDto
+ {
+ TotalCount = response.MetaData != null ? (int)response.MetaData.TotalCount : response.Models.Count
+ };
+
+ foreach (var m in response.Models)
+ {
+ var item = new BlogPostListItemDto
+ {
+ Id = m.Id,
+ Title = m.Title,
+ Slug = m.Slug,
+ Summary = m.Summary,
+ FeaturedImageThumbnailPath = m.FeaturedImageThumbnailPath,
+ Status = m.Status,
+ StatusName = m.StatusName,
+ PublishedAt = m.PublishedAt?.ToDateTime(),
+ ViewCount = m.ViewCount,
+ IsFeatured = m.IsFeatured,
+ Created = m.Created?.ToDateTime() ?? DateTime.MinValue
+ };
+
+ foreach (var c in m.Categories)
+ {
+ item.Categories.Add(new BlogPostCategoryInfoDto
+ {
+ Id = c.Id,
+ Title = c.Title,
+ Slug = c.Slug
+ });
+ }
+
+ result.Items.Add(item);
+ }
+
+ return result;
+ }
+
+ public async Task GetByIdAsync(long id)
+ {
+ var response = await _client.GetBlogPostAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPost.GetBlogPostRequest { Id = id });
+
+ if (response == null || response.Id <= 0) return null;
+
+ var dto = new BlogPostDetailsDto
+ {
+ Id = response.Id,
+ Title = response.Title,
+ Slug = response.Slug,
+ Summary = response.Summary,
+ HtmlContent = response.HtmlContent,
+ FeaturedImagePath = response.FeaturedImagePath,
+ FeaturedImageThumbnailPath = response.FeaturedImageThumbnailPath,
+ Status = response.Status,
+ StatusName = response.StatusName,
+ PublishedAt = response.PublishedAt?.ToDateTime(),
+ ViewCount = response.ViewCount,
+ AuthorUserId = response.AuthorUserId,
+ IsFeatured = response.IsFeatured,
+ SortOrder = response.SortOrder,
+ Created = response.Created?.ToDateTime() ?? DateTime.MinValue,
+ LastModified = response.LastModified?.ToDateTime() ?? DateTime.MinValue
+ };
+
+ foreach (var c in response.Categories)
+ {
+ dto.Categories.Add(new BlogPostCategoryInfoDto
+ {
+ Id = c.Id,
+ Title = c.Title,
+ Slug = c.Slug
+ });
+ }
+
+ foreach (var t in response.Tags)
+ {
+ dto.Tags.Add(new BlogPostTagInfoDto
+ {
+ Id = t.Id,
+ Title = t.Title,
+ Name = t.Name
+ });
+ }
+
+ return dto;
+ }
+
+ public async Task CreateAsync(BlogPostEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogPost.CreateBlogPostRequest
+ {
+ Title = dto.Title,
+ Slug = dto.Slug,
+ Summary = dto.Summary ?? string.Empty,
+ HtmlContent = dto.HtmlContent,
+ FeaturedImagePath = dto.FeaturedImagePath ?? string.Empty,
+ FeaturedImageThumbnailPath = dto.FeaturedImageThumbnailPath ?? string.Empty,
+ IsFeatured = dto.IsFeatured,
+ SortOrder = dto.SortOrder
+ };
+
+ request.CategoryIds.AddRange(dto.CategoryIds);
+ request.TagIds.AddRange(dto.TagIds);
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.BlogPost.BlogImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ var response = await _client.CreateBlogPostAsync(request);
+ return response.Id;
+ }
+
+ public async Task UpdateAsync(long id, BlogPostEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.BlogPost.UpdateBlogPostRequest
+ {
+ Id = id,
+ Title = dto.Title,
+ Slug = dto.Slug,
+ Summary = dto.Summary ?? string.Empty,
+ HtmlContent = dto.HtmlContent,
+ FeaturedImagePath = dto.FeaturedImagePath ?? string.Empty,
+ FeaturedImageThumbnailPath = dto.FeaturedImageThumbnailPath ?? string.Empty,
+ IsFeatured = dto.IsFeatured,
+ SortOrder = dto.SortOrder
+ };
+
+ request.CategoryIds.AddRange(dto.CategoryIds);
+ request.TagIds.AddRange(dto.TagIds);
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.BlogPost.BlogImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ await _client.UpdateBlogPostAsync(request);
+ }
+
+ public async Task DeleteAsync(long id)
+ {
+ await _client.DeleteBlogPostAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPost.DeleteBlogPostRequest { Id = id });
+ }
+
+ public async Task PublishAsync(long id)
+ {
+ var response = await _client.PublishBlogPostAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPost.PublishBlogPostRequest { Id = id });
+
+ return new PublishResultDto
+ {
+ Success = response.Success,
+ Message = response.Message,
+ PublishedAt = response.PublishedAt?.ToDateTime()
+ };
+ }
+
+ public async Task ArchiveAsync(long id)
+ {
+ var response = await _client.ArchiveBlogPostAsync(
+ new CMSMicroservice.Protobuf.Protos.BlogPost.ArchiveBlogPostRequest { Id = id });
+
+ return new ArchiveResultDto
+ {
+ Success = response.Success,
+ Message = response.Message
+ };
+ }
+}
diff --git a/src/BackOffice/Services/Blog/IBlogCategoryService.cs b/src/BackOffice/Services/Blog/IBlogCategoryService.cs
new file mode 100644
index 0000000..e6b1feb
--- /dev/null
+++ b/src/BackOffice/Services/Blog/IBlogCategoryService.cs
@@ -0,0 +1,46 @@
+namespace BackOffice.Services.Blog;
+
+public interface IBlogCategoryService
+{
+ Task GetAllAsync(BlogCategoryFilterDto filter);
+ Task> GetActiveAsync();
+ Task GetByIdAsync(long id);
+ Task CreateAsync(BlogCategoryEditDto dto);
+ Task UpdateAsync(long id, BlogCategoryEditDto dto);
+ Task DeleteAsync(long id);
+}
+
+public class BlogCategoryFilterDto
+{
+ public int PageNumber { get; set; } = 1;
+ public int PageSize { get; set; } = 20;
+ public string? SearchTerm { get; set; }
+}
+
+public class BlogCategoryListResultDto
+{
+ public List Items { get; set; } = new();
+ public int TotalCount { get; set; }
+}
+
+public class BlogCategoryItemDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+ public string? Description { get; set; }
+ public string? IconName { get; set; }
+ public int SortOrder { get; set; }
+ public bool IsActive { get; set; }
+ public int PostCount { get; set; }
+}
+
+public class BlogCategoryEditDto
+{
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+ public string? Description { get; set; }
+ public string? IconName { get; set; }
+ public int SortOrder { get; set; }
+ public bool IsActive { get; set; } = true;
+}
diff --git a/src/BackOffice/Services/Blog/IBlogPostImageService.cs b/src/BackOffice/Services/Blog/IBlogPostImageService.cs
new file mode 100644
index 0000000..a5c2047
--- /dev/null
+++ b/src/BackOffice/Services/Blog/IBlogPostImageService.cs
@@ -0,0 +1,36 @@
+namespace BackOffice.Services.Blog;
+
+public interface IBlogPostImageService
+{
+ Task> GetByPostIdAsync(long blogPostId);
+ Task AddAsync(BlogPostImageAddDto dto);
+ Task DeleteAsync(long id);
+ Task ReorderAsync(List items);
+}
+
+public class BlogPostImageItemDto
+{
+ public long Id { get; set; }
+ public long BlogPostId { get; set; }
+ public string ImagePath { get; set; } = string.Empty;
+ public string ThumbnailPath { get; set; } = string.Empty;
+ public string? AltText { get; set; }
+ public string? Caption { get; set; }
+ public int SortOrder { get; set; }
+}
+
+public class BlogPostImageAddDto
+{
+ public long BlogPostId { get; set; }
+ public string ImagePath { get; set; } = string.Empty;
+ public string ThumbnailPath { get; set; } = string.Empty;
+ public string? AltText { get; set; }
+ public string? Caption { get; set; }
+ public int SortOrder { get; set; }
+}
+
+public class ImageSortItemDto
+{
+ public long Id { get; set; }
+ public int SortOrder { get; set; }
+}
diff --git a/src/BackOffice/Services/Blog/IBlogPostService.cs b/src/BackOffice/Services/Blog/IBlogPostService.cs
new file mode 100644
index 0000000..8402fea
--- /dev/null
+++ b/src/BackOffice/Services/Blog/IBlogPostService.cs
@@ -0,0 +1,112 @@
+namespace BackOffice.Services.Blog;
+
+public interface IBlogPostService
+{
+ Task GetAllAsync(BlogPostFilterDto filter);
+ Task GetByIdAsync(long id);
+ Task CreateAsync(BlogPostEditDto dto);
+ Task UpdateAsync(long id, BlogPostEditDto dto);
+ Task DeleteAsync(long id);
+ Task PublishAsync(long id);
+ Task ArchiveAsync(long id);
+}
+
+public class BlogPostFilterDto
+{
+ public int PageNumber { get; set; } = 1;
+ public int PageSize { get; set; } = 20;
+ public string? SearchTerm { get; set; }
+ public int? Status { get; set; }
+ public long? CategoryId { get; set; }
+ public bool? IsFeatured { get; set; }
+}
+
+public class BlogPostListResultDto
+{
+ public List Items { get; set; } = new();
+ public int TotalCount { get; set; }
+}
+
+public class BlogPostListItemDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+ public string? Summary { get; set; }
+ public string? FeaturedImageThumbnailPath { get; set; }
+ public int Status { get; set; }
+ public string StatusName { get; set; } = string.Empty;
+ public DateTime? PublishedAt { get; set; }
+ public int ViewCount { get; set; }
+ public bool IsFeatured { get; set; }
+ public DateTime Created { get; set; }
+ public List Categories { get; set; } = new();
+}
+
+public class BlogPostCategoryInfoDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+}
+
+public class BlogPostTagInfoDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Name { get; set; } = string.Empty;
+}
+
+public class BlogPostDetailsDto
+{
+ public long Id { get; set; }
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+ public string? Summary { get; set; }
+ public string HtmlContent { get; set; } = string.Empty;
+ public string? FeaturedImagePath { get; set; }
+ public string? FeaturedImageThumbnailPath { get; set; }
+ public int Status { get; set; }
+ public string StatusName { get; set; } = string.Empty;
+ public DateTime? PublishedAt { get; set; }
+ public int ViewCount { get; set; }
+ public long AuthorUserId { get; set; }
+ public bool IsFeatured { get; set; }
+ public int SortOrder { get; set; }
+ public DateTime Created { get; set; }
+ public DateTime LastModified { get; set; }
+ public List Categories { get; set; } = new();
+ public List Tags { get; set; } = new();
+}
+
+public class BlogPostEditDto
+{
+ public string Title { get; set; } = string.Empty;
+ public string Slug { get; set; } = string.Empty;
+ public string? Summary { get; set; }
+ public string HtmlContent { get; set; } = string.Empty;
+ public string? FeaturedImagePath { get; set; }
+ public string? FeaturedImageThumbnailPath { get; set; }
+ public List CategoryIds { get; set; } = new();
+ public List TagIds { get; set; } = new();
+ public bool IsFeatured { get; set; }
+ public int SortOrder { get; set; }
+
+ // Image upload properties
+ public byte[]? ImageFile { get; set; }
+ public string? ImageMime { get; set; }
+ public string? ImageFileName { get; set; }
+}
+
+public class PublishResultDto
+{
+ public bool Success { get; set; }
+ public string Message { get; set; } = string.Empty;
+ public DateTime? PublishedAt { get; set; }
+}
+
+public class ArchiveResultDto
+{
+ public bool Success { get; set; }
+ public string Message { get; set; } = string.Empty;
+}
diff --git a/src/BackOffice/Services/Content/ISitePageService.cs b/src/BackOffice/Services/Content/ISitePageService.cs
new file mode 100644
index 0000000..2342840
--- /dev/null
+++ b/src/BackOffice/Services/Content/ISitePageService.cs
@@ -0,0 +1,108 @@
+namespace BackOffice.Services.Content;
+
+public interface ISitePageService
+{
+ Task> GetAllAsync();
+ Task GetByIdAsync(long id);
+ Task CreateAsync(SitePageCreateDto dto);
+ Task UpdateAsync(long id, SitePageEditDto dto);
+ Task DeleteAsync(long id);
+ Task CreateSectionAsync(SitePageSectionEditDto dto);
+ Task UpdateSectionAsync(long id, SitePageSectionEditDto dto);
+ Task DeleteSectionAsync(long id);
+ Task ReorderSectionsAsync(List items);
+}
+
+public class SitePageSummaryDto
+{
+ public long Id { get; set; }
+ public string PageKey { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public bool IsActive { get; set; }
+ public int SectionCount { get; set; }
+ public DateTime LastModified { get; set; }
+}
+
+public class SitePageDetailsDto
+{
+ public long Id { get; set; }
+ public string PageKey { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public string? MetaDescription { get; set; }
+ public string? HeroTitle { get; set; }
+ public string? HeroSubtitle { get; set; }
+ public string? HeroImagePath { get; set; }
+ public bool IsActive { get; set; }
+ public List Sections { get; set; } = new();
+}
+
+public class SitePageSectionItemDto
+{
+ public long Id { get; set; }
+ public string SectionKey { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public string? Subtitle { get; set; }
+ public string? HtmlContent { get; set; }
+ public string? IconName { get; set; }
+ public string? ImagePath { get; set; }
+ public string? ImageThumbnailPath { get; set; }
+ public int SortOrder { get; set; }
+ public bool IsActive { get; set; }
+ public string? ExtraData { get; set; }
+}
+
+public class SitePageEditDto
+{
+ public string Title { get; set; } = string.Empty;
+ public string? MetaDescription { get; set; }
+ public string? HeroTitle { get; set; }
+ public string? HeroSubtitle { get; set; }
+ public string? HeroImagePath { get; set; }
+ public bool IsActive { get; set; } = true;
+
+ // Image upload properties
+ public byte[]? ImageFile { get; set; }
+ public string? ImageMime { get; set; }
+ public string? ImageFileName { get; set; }
+}
+
+public class SitePageCreateDto
+{
+ public string PageKey { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public string? MetaDescription { get; set; }
+ public string? HeroTitle { get; set; }
+ public string? HeroSubtitle { get; set; }
+ public bool IsActive { get; set; } = true;
+
+ // Image upload properties
+ public byte[]? ImageFile { get; set; }
+ public string? ImageMime { get; set; }
+ public string? ImageFileName { get; set; }
+}
+
+public class SitePageSectionEditDto
+{
+ public long SitePageId { get; set; }
+ public string SectionKey { get; set; } = string.Empty;
+ public string Title { get; set; } = string.Empty;
+ public string? Subtitle { get; set; }
+ public string? HtmlContent { get; set; }
+ public string? IconName { get; set; }
+ public string? ImagePath { get; set; }
+ public string? ImageThumbnailPath { get; set; }
+ public int SortOrder { get; set; }
+ public bool IsActive { get; set; } = true;
+ public string? ExtraData { get; set; }
+
+ // Image upload properties
+ public byte[]? ImageFile { get; set; }
+ public string? ImageMime { get; set; }
+ public string? ImageFileName { get; set; }
+}
+
+public class SectionSortItemDto
+{
+ public long Id { get; set; }
+ public int SortOrder { get; set; }
+}
diff --git a/src/BackOffice/Services/Content/SitePageService.cs b/src/BackOffice/Services/Content/SitePageService.cs
new file mode 100644
index 0000000..f79c8ad
--- /dev/null
+++ b/src/BackOffice/Services/Content/SitePageService.cs
@@ -0,0 +1,208 @@
+namespace BackOffice.Services.Content;
+
+public class SitePageService : ISitePageService
+{
+ private readonly CMSMicroservice.Protobuf.Protos.SitePage.SitePageContract.SitePageContractClient _client;
+
+ public SitePageService(
+ CMSMicroservice.Protobuf.Protos.SitePage.SitePageContract.SitePageContractClient client)
+ {
+ _client = client;
+ }
+
+ public async Task> GetAllAsync()
+ {
+ var response = await _client.GetAllSitePagesAsync(
+ new CMSMicroservice.Protobuf.Protos.SitePage.GetAllSitePagesRequest());
+
+ return response.Pages.Select(m => new SitePageSummaryDto
+ {
+ Id = m.Id,
+ PageKey = m.PageKey,
+ Title = m.Title,
+ IsActive = m.IsActive,
+ SectionCount = m.SectionCount,
+ LastModified = m.LastModified?.ToDateTime() ?? DateTime.MinValue
+ }).ToList();
+ }
+
+ public async Task GetByIdAsync(long id)
+ {
+ var response = await _client.GetSitePageAsync(
+ new CMSMicroservice.Protobuf.Protos.SitePage.GetSitePageRequest { Id = id });
+
+ if (response == null || response.Id <= 0) return null;
+
+ var dto = new SitePageDetailsDto
+ {
+ Id = response.Id,
+ PageKey = response.PageKey,
+ Title = response.Title,
+ MetaDescription = response.MetaDescription,
+ HeroTitle = response.HeroTitle,
+ HeroSubtitle = response.HeroSubtitle,
+ HeroImagePath = response.HeroImagePath,
+ IsActive = response.IsActive
+ };
+
+ foreach (var s in response.Sections)
+ {
+ dto.Sections.Add(new SitePageSectionItemDto
+ {
+ Id = s.Id,
+ SectionKey = s.SectionKey,
+ Title = s.Title,
+ Subtitle = s.Subtitle,
+ HtmlContent = s.HtmlContent,
+ IconName = s.IconName,
+ ImagePath = s.ImagePath,
+ ImageThumbnailPath = s.ImageThumbnailPath,
+ SortOrder = s.SortOrder,
+ IsActive = s.IsActive,
+ ExtraData = s.ExtraData
+ });
+ }
+
+ return dto;
+ }
+
+ public async Task CreateAsync(SitePageCreateDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.SitePage.CreateSitePageRequest
+ {
+ PageKey = dto.PageKey,
+ Title = dto.Title,
+ MetaDescription = dto.MetaDescription ?? string.Empty,
+ HeroTitle = dto.HeroTitle ?? string.Empty,
+ HeroSubtitle = dto.HeroSubtitle ?? string.Empty,
+ IsActive = dto.IsActive
+ };
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.SitePage.SitePageImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ var response = await _client.CreateSitePageAsync(request);
+ return response.Id;
+ }
+
+ public async Task DeleteAsync(long id)
+ {
+ await _client.DeleteSitePageAsync(
+ new CMSMicroservice.Protobuf.Protos.SitePage.DeleteSitePageRequest { Id = id });
+ }
+
+ public async Task UpdateAsync(long id, SitePageEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.SitePage.UpdateSitePageRequest
+ {
+ Id = id,
+ Title = dto.Title,
+ MetaDescription = dto.MetaDescription ?? string.Empty,
+ HeroTitle = dto.HeroTitle ?? string.Empty,
+ HeroSubtitle = dto.HeroSubtitle ?? string.Empty,
+ HeroImagePath = dto.HeroImagePath ?? string.Empty,
+ IsActive = dto.IsActive
+ };
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.SitePage.SitePageImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ await _client.UpdateSitePageAsync(request);
+ }
+
+ public async Task CreateSectionAsync(SitePageSectionEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.SitePage.CreateSitePageSectionRequest
+ {
+ SitePageId = dto.SitePageId,
+ SectionKey = dto.SectionKey,
+ Title = dto.Title,
+ Subtitle = dto.Subtitle ?? string.Empty,
+ HtmlContent = dto.HtmlContent ?? string.Empty,
+ IconName = dto.IconName ?? string.Empty,
+ ImagePath = dto.ImagePath ?? string.Empty,
+ ImageThumbnailPath = dto.ImageThumbnailPath ?? string.Empty,
+ SortOrder = dto.SortOrder,
+ ExtraData = dto.ExtraData ?? string.Empty
+ };
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.SitePage.SitePageImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ var response = await _client.CreateSitePageSectionAsync(request);
+ return response.Id;
+ }
+
+ public async Task UpdateSectionAsync(long id, SitePageSectionEditDto dto)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.SitePage.UpdateSitePageSectionRequest
+ {
+ Id = id,
+ SectionKey = dto.SectionKey,
+ Title = dto.Title,
+ Subtitle = dto.Subtitle ?? string.Empty,
+ HtmlContent = dto.HtmlContent ?? string.Empty,
+ IconName = dto.IconName ?? string.Empty,
+ ImagePath = dto.ImagePath ?? string.Empty,
+ ImageThumbnailPath = dto.ImageThumbnailPath ?? string.Empty,
+ SortOrder = dto.SortOrder,
+ IsActive = dto.IsActive,
+ ExtraData = dto.ExtraData ?? string.Empty
+ };
+
+ if (dto.ImageFile != null && !string.IsNullOrEmpty(dto.ImageMime) && !string.IsNullOrEmpty(dto.ImageFileName))
+ {
+ request.ImageFile = new CMSMicroservice.Protobuf.Protos.SitePage.SitePageImageFileModel
+ {
+ File = Google.Protobuf.ByteString.CopyFrom(dto.ImageFile),
+ Mime = dto.ImageMime,
+ FileName = dto.ImageFileName
+ };
+ }
+
+ await _client.UpdateSitePageSectionAsync(request);
+ }
+
+ public async Task DeleteSectionAsync(long id)
+ {
+ await _client.DeleteSitePageSectionAsync(
+ new CMSMicroservice.Protobuf.Protos.SitePage.DeleteSitePageSectionRequest { Id = id });
+ }
+
+ public async Task ReorderSectionsAsync(List items)
+ {
+ var request = new CMSMicroservice.Protobuf.Protos.SitePage.ReorderSitePageSectionsRequest();
+
+ foreach (var item in items)
+ {
+ request.Items.Add(new CMSMicroservice.Protobuf.Protos.SitePage.SectionSortItem
+ {
+ Id = item.Id,
+ SortOrder = item.SortOrder
+ });
+ }
+
+ await _client.ReorderSitePageSectionsAsync(request);
+ }
+}
diff --git a/src/BackOffice/Services/DiscountCategory/DiscountCategoryService.cs b/src/BackOffice/Services/DiscountCategory/DiscountCategoryService.cs
index c013e09..1aa53f3 100644
--- a/src/BackOffice/Services/DiscountCategory/DiscountCategoryService.cs
+++ b/src/BackOffice/Services/DiscountCategory/DiscountCategoryService.cs
@@ -1,4 +1,4 @@
-using BackOffice.BFF.DiscountCategory.Protobuf.Protos.DiscountCategory;
+using CMSMicroservice.Protobuf.Protos.DiscountCategory;
namespace BackOffice.Services.DiscountCategory;
@@ -80,7 +80,7 @@ public class DiscountCategoryService : IDiscountCategoryService
await _client.DeleteDiscountCategoryAsync(request);
}
- private List MapCategories(IEnumerable protoCategories)
+ private List MapCategories(IEnumerable protoCategories)
{
return protoCategories.Select(c => new DiscountCategoryDto
{
diff --git a/src/BackOffice/Services/DiscountOrder/DiscountOrderService.cs b/src/BackOffice/Services/DiscountOrder/DiscountOrderService.cs
index 8d89fef..bcd0828 100644
--- a/src/BackOffice/Services/DiscountOrder/DiscountOrderService.cs
+++ b/src/BackOffice/Services/DiscountOrder/DiscountOrderService.cs
@@ -1,5 +1,7 @@
-using BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder;
-using ProtoDeliveryStatus = BackOffice.BFF.DiscountOrder.Protobuf.Protos.DiscountOrder.DeliveryStatus;
+using CMSMicroservice.Protobuf.Protos.DiscountOrder;
+using Google.Protobuf.WellKnownTypes;
+using ProtoDeliveryStatus = CMSMicroservice.Protobuf.Protos.DiscountOrder.DeliveryStatus;
+using ProtoPaymentStatus = CMSMicroservice.Protobuf.Protos.DiscountOrder.PaymentStatus;
namespace BackOffice.Services.DiscountOrder;
@@ -16,31 +18,52 @@ public class DiscountOrderService : IDiscountOrderService
{
filter ??= new OrderFilterDto();
- var request = new GetUserOrdersRequest
+ // استفاده از Admin RPC برای دسترسی به فیلدهای کامل
+ var request = new GetAllDiscountOrdersRequest
{
- UserId = filter.UserId ?? 0, // 0 = admin gets all orders
PageNumber = filter.PageNumber,
PageSize = filter.PageSize
};
- if (filter.PaymentCompleted.HasValue)
- request.PaymentCompleted = filter.PaymentCompleted.Value;
+ if (filter.UserId.HasValue)
+ request.UserId = filter.UserId.Value;
+ if (filter.PaymentStatus.HasValue)
+ request.PaymentStatus = filter.PaymentStatus.Value;
if (filter.Status.HasValue)
request.DeliveryStatus = (int)MapToProtoStatus(filter.Status.Value);
+ if (!string.IsNullOrEmpty(filter.UserMobile))
+ request.UserMobile = filter.UserMobile;
+ if (!string.IsNullOrEmpty(filter.TrackingCode))
+ request.TrackingCode = filter.TrackingCode;
+ if (filter.FromDate.HasValue)
+ request.FromDate = Timestamp.FromDateTime(filter.FromDate.Value.ToUniversalTime());
+ if (filter.ToDate.HasValue)
+ request.ToDate = Timestamp.FromDateTime(filter.ToDate.Value.ToUniversalTime());
+ if (filter.MinAmount.HasValue)
+ request.MinAmount = filter.MinAmount.Value;
+ if (filter.MaxAmount.HasValue)
+ request.MaxAmount = filter.MaxAmount.Value;
- var response = await _client.GetUserOrdersAsync(request);
+ var response = await _client.GetAllDiscountOrdersAsync(request);
var orders = response.Models.Select(o => new DiscountOrderDto
{
Id = o.Id,
- OrderNumber = o.OrderNumber,
- TotalPrice = o.TotalPrice,
+ OrderNumber = o.Id.ToString(),
+ UserId = o.UserId,
+ UserFullName = o.UserFullName,
+ UserMobile = o.UserMobile,
+ TotalPrice = o.TotalAmount,
DiscountBalanceUsed = o.DiscountBalanceUsed,
- GatewayAmount = o.GatewayAmount,
- PaymentCompleted = o.PaymentCompleted,
- Status = MapFromProtoStatus(o.DeliveryStatus, o.PaymentCompleted),
+ GatewayAmount = o.GatewayAmountPaid,
+ VatAmount = o.VatAmount,
+ PaymentCompleted = o.PaymentStatus == ProtoPaymentStatus.PaymentCompleted,
+ PaymentStatusValue = (int)o.PaymentStatus,
+ Status = MapFromProtoDeliveryStatus(o.DeliveryStatus),
TrackingCode = o.TrackingCode,
+ ShippingAddress = o.ShippingAddress,
ItemsCount = o.ItemsCount,
+ PaymentDate = o.PaymentDate?.ToDateTime(),
Created = o.Created?.ToDateTime()
}).ToList();
@@ -93,7 +116,9 @@ public class DiscountOrderService : IDiscountOrderService
Count = item.Count,
TotalPrice = item.TotalPrice,
DiscountAmount = item.DiscountAmount,
- FinalPrice = item.FinalPrice
+ FinalPrice = item.FinalPrice,
+ ImagePath = item.ImagePath,
+ ThumbnailPath = item.ThumbnailPath
}).ToList(),
Created = response.Created?.ToDateTime(),
LastModified = response.LastModified?.ToDateTime()
@@ -116,6 +141,59 @@ public class DiscountOrderService : IDiscountOrderService
await _client.UpdateOrderStatusAsync(request);
}
+ public async Task GetSalesReportAsync(DateTime fromDate, DateTime toDate)
+ {
+ var request = new GetDiscountSalesReportRequest
+ {
+ FromDate = Timestamp.FromDateTime(fromDate.ToUniversalTime()),
+ ToDate = Timestamp.FromDateTime(toDate.ToUniversalTime()),
+ ReportType = SalesReportType.ReportDaily
+ };
+
+ var response = await _client.GetDiscountSalesReportAsync(request);
+
+ var result = new DiscountSalesReportDto();
+
+ if (response.Summary != null)
+ {
+ result.Summary = new SalesSummaryDto
+ {
+ TotalOrders = response.Summary.TotalOrders,
+ CompletedOrders = response.Summary.CompletedOrders,
+ PendingOrders = response.Summary.PendingOrders,
+ CancelledOrders = response.Summary.CancelledOrders,
+ TotalSalesAmount = response.Summary.TotalSalesAmount,
+ TotalDiscountUsed = response.Summary.TotalDiscountUsed,
+ TotalGatewayPaid = response.Summary.TotalGatewayPaid,
+ TotalVatAmount = response.Summary.TotalVatAmount,
+ AverageOrderValue = response.Summary.AverageOrderValue,
+ UniqueCustomers = response.Summary.UniqueCustomers,
+ TotalProductsSold = response.Summary.TotalProductsSold
+ };
+ }
+
+ result.Periods = response.Periods.Select(p => new SalesPeriodItemDto
+ {
+ PeriodLabel = p.PeriodLabel,
+ OrdersCount = p.OrdersCount,
+ TotalAmount = p.TotalAmount,
+ DiscountUsed = p.DiscountUsed,
+ GatewayPaid = p.GatewayPaid
+ }).ToList();
+
+ result.TopProducts = response.TopProducts.Select(tp => new TopSellingProductItemDto
+ {
+ ProductId = tp.ProductId,
+ ProductTitle = tp.ProductTitle,
+ ImagePath = tp.ImagePath,
+ QuantitySold = tp.QuantitySold,
+ TotalRevenue = tp.TotalRevenue,
+ OrdersCount = tp.OrdersCount
+ }).ToList();
+
+ return result;
+ }
+
// Map from UI OrderStatus to Proto DeliveryStatus
private static ProtoDeliveryStatus MapToProtoStatus(OrderStatus status)
{
@@ -132,7 +210,7 @@ public class DiscountOrderService : IDiscountOrderService
};
}
- // Map from Proto DeliveryStatus to UI OrderStatus
+ // Map from Proto DeliveryStatus to UI OrderStatus (for GetOrderById which uses bool paymentCompleted)
private static OrderStatus MapFromProtoStatus(ProtoDeliveryStatus status, bool paymentCompleted)
{
return status switch
@@ -146,4 +224,18 @@ public class DiscountOrderService : IDiscountOrderService
_ => OrderStatus.Pending
};
}
+
+ // Map from Proto DeliveryStatus to UI OrderStatus (for GetAllDiscountOrders / AdminOrderDto)
+ private static OrderStatus MapFromProtoDeliveryStatus(ProtoDeliveryStatus status)
+ {
+ return status switch
+ {
+ ProtoDeliveryStatus.DeliveryPending => OrderStatus.Pending,
+ ProtoDeliveryStatus.DeliveryProcessing => OrderStatus.Processing,
+ ProtoDeliveryStatus.DeliveryShipped => OrderStatus.Shipped,
+ ProtoDeliveryStatus.DeliveryDelivered => OrderStatus.Delivered,
+ ProtoDeliveryStatus.DeliveryCancelled => OrderStatus.Cancelled,
+ _ => OrderStatus.Pending
+ };
+ }
}
diff --git a/src/BackOffice/Services/DiscountOrder/IDiscountOrderService.cs b/src/BackOffice/Services/DiscountOrder/IDiscountOrderService.cs
index 91fbfa8..07147a1 100644
--- a/src/BackOffice/Services/DiscountOrder/IDiscountOrderService.cs
+++ b/src/BackOffice/Services/DiscountOrder/IDiscountOrderService.cs
@@ -5,13 +5,21 @@ public interface IDiscountOrderService
Task<(List Orders, int TotalCount, int TotalPages)> GetOrdersAsync(OrderFilterDto? filter = null);
Task GetByIdAsync(long orderId, long? userId = null);
Task UpdateStatusAsync(long orderId, UpdateOrderStatusDto dto);
+ Task
+ مدیریت سیستم
+
+
+
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+
+ protected override void OnInitialized()
+ {
+ var uri = Navigation.ToBaseRelativePath(Navigation.Uri).ToLowerInvariant().TrimEnd('/');
+ _activeTab = uri switch
+ {
+ "system/worker-control" => 1,
+ "system/health" => 2,
+ _ => 0
+ };
+ }
+}
diff --git a/src/BackOffice/Pages/SystemManagement/WorkerControl.razor b/src/BackOffice/Pages/SystemManagement/WorkerControl.razor
index 59b85c7..3e1ef82 100644
--- a/src/BackOffice/Pages/SystemManagement/WorkerControl.razor
+++ b/src/BackOffice/Pages/SystemManagement/WorkerControl.razor
@@ -1,10 +1,10 @@
-@page "/system/worker-control"
+@* Merged into /system *@
@using MudBlazor
@using BackOffice.Pages.SystemManagement
@using BackOffice.Pages.AutoComplete
-
+
+
+
+ آمار فروش و وضعیت سفارشهای فروشگاه بر اساس بازه تاریخ و وضعیت ارسال
+
+
+
+
+
+
+
+
+
+
+ همه وضعیتها
+ در انتظار ارسال
+ تحویل پست
+ تحویل به مشتری
+ مرجوع شده
+ لغو شده
+
+
+
+
+ همه
+ پرداخت شده
+ پرداخت نشده
+
+
+
+
+
+
+
+ بارگذاری گزارش
+
+
+
+
+ خروجی Excel
+
+
+ خروجی PDF
+
+
+
+
+
+ @if (_loading)
+ {
+
+
+ }
+ else if (_orders.Count == 0)
+ {
+
+ هیچ سفارشی برای بازه و فیلترهای انتخابشده یافت نشد.
+
+ }
+ else
+ {
+
+
+
+ تعداد سفارشها
+ @_totalOrders.ToString("N0")
+
+
+
+
+ مجموع فروش
+ @_totalSales.ToString("N0") ریال
+
+
+
+
+ میانگین مبلغ سفارش
+ @_averageOrder.ToString("N0") ریال
+
+
+
+
+ پرداخت شده
+ @_paidCount.ToString("N0")
+
+
+
+
+
+
+
+
+ روند فروش
+
+
+ @if (_salesLabels.Length == 0)
+ {
+
+ داده کافی برای نمایش نمودار وجود ندارد.
+
+ }
+ else
+ {
+
+
+
+
+
+
+ وضعیت ارسال سفارشها
+
+
+ @if (_statusChartLabels.Length == 0)
+ {
+
+ داده کافی برای نمایش نمودار وجود ندارد.
+
+ }
+ else
+ {
+
+
+
+
+
+
+
+
+
+ محصولات پرفروش (بر اساس مبلغ)
+
+
+ @if (_topProductLabels.Length == 0)
+ {
+
+ داده کافی برای نمایش نمودار وجود ندارد.
+
+ }
+ else
+ {
+
+
+
+
+
+
+
+ لیست سفارشها
+
+
+
+
+
+
+ @(context.Item.PaymentDate != null ? context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime() : "—")
+
+
+
+
+ @if (context.Item.UserId > 0)
+ {
+
+ @(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
+
+ }
+ else
+ {
+ @(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
+ }
+
+
+
+
+ @context.Item.Amount.ToString("N0") ریال
+
+
+
+
+
+ @(context.Item.PaymentStatus == PaymentStatus.Success ? "پرداخت شده" : "پرداخت نشده")
+
+
+
+
+
+
+ @GetDeliveryStatusText(context.Item.DeliveryStatus.GetHashCode())
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+ }
+
diff --git a/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor.cs b/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor.cs
new file mode 100644
index 0000000..7864688
--- /dev/null
+++ b/src/BackOffice/Pages/UserOrder/OrderSalesReports.razor.cs
@@ -0,0 +1,360 @@
+using System.Text;
+using CMSMicroservice.Protobuf.Protos;
+using CMSMicroservice.Protobuf.Protos.UserOrder;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MudBlazor;
+using DateTimeConverterCL;
+using Google.Protobuf.WellKnownTypes;
+using DataModel = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel;
+
+namespace BackOffice.Pages.UserOrder;
+
+public partial class OrderSalesReports
+{
+ [Inject] public UserOrderContract.UserOrderContractClient UserOrderContract { get; set; } = default!;
+ [Inject] public IJSRuntime JsRuntime { get; set; } = default!;
+
+ protected readonly List
+ سفارشات فروشگاه
+
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+
+ protected override void OnInitialized()
+ {
+ var uri = Navigation.ToBaseRelativePath(Navigation.Uri).ToLowerInvariant().TrimEnd('/');
+ _activeTab = uri switch
+ {
+ "orderssalesreportspage" or "orderssalesreportspage/" => 1,
+ _ => 0
+ };
+ }
+}
diff --git a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
index cbc6602..f599c38 100644
--- a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
+++ b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
@@ -1,118 +1,68 @@
-@attribute [Route(RouteConstance.Orders)]
+@* Merged into OrdersHub — direct route only for per-user orders *@
@attribute [Route(RouteConstance.UserOrder + "{UserId:long}")]
-@using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos.UserOrder
+@using CMSMicroservice.Protobuf.Protos
@using BackOffice.Pages.UserOrder.Components
@using BackOffice.Common.BaseComponents
@using BackOffice.Pages.AutoComplete
-@using DataModel = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel
+@using DataModel = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel
+ مدیریت کیفپول کاربران
+
+
+
+ @* ── تب اول: لیست کیفپولها ── *@
+
+
+
+
+ جستجو
+
+
+
+
+
+ @context.Item.Balance.ToString("N0") ریال
+
+
+
+
+ @context.Item.NetworkBalance.ToString("N0") ریال
+
+
+
+
+
+
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+
+
+ @* ── تب دوم: تاریخچه تغییرات ── *@
+
+
+
+ همه
+ افزایش
+ کاهش
+
+ جستجو
+
+
+
+
+
+
+
+ @(context.Item.IsIncrease ? "افزایش" : "کاهش")
+
+
+
+
+
+ @context.Item.ChangeValue.ToString("N0")
+
+
+
+
+ @context.Item.CurrentBalance.ToString("N0")
+
+
+
+
+ @context.Item.ChangeNerworkValue.ToString("N0")
+
+
+
+
+ @context.Item.CurrentNetworkBalance.ToString("N0")
+
+
+
+
+ @(context.Item.RefrenceId?.ToString() ?? "—")
+
+
+
+
+ @context.Item.CreatedAt.ToDateTime().ToLocalTime().MiladiToJalaliWithTime()
+
+
+
+
+ موردی یافت نشد.
+
+
+
+
+
+
+
+
+@code {
+ private int _activeTab;
+ private MudDataGrid