From 89f5241680f8d239a0ffeb47508beb11718505fb Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Thu, 26 Feb 2026 17:44:53 +0330
Subject: [PATCH] Phase 8b: Expand Package CRUD with all package-based fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- CreateDialog: Add 12 new fields (SortOrder, ActivationFee, DiscountMultiplier,
  MagicWalletMultiplier, MagicWalletMaxDeposit, MagicWalletMaxCredit,
  MaxBalancesPerLeg, MaxNetworkLevel, IsActive, IsBasePackage,
  SupportsDirectPurchase, SupportsDayaPurchase)
- UpdateDialog: Same 12 new fields added
- PackageMainPage grid: Add Price, SortOrder, IsActive, IsBasePackage columns
- Dialog size: Small → Medium for expanded forms
- CreateNew defaults: IsActive=true, DiscountMultiplier=2.0, etc.
- Fix HasPurchasedGoldenPackage → HasPurchasedPackage in UserNetworkInfo
- NuGet: 0.0.184 → 0.0.185 + local feed source
---
 src/BackOffice/BackOffice.csproj              |  2 +-
 src/BackOffice/NuGet.config                   |  2 +
 .../Pages/Network/UserNetworkInfo.razor       |  2 +-
 .../Package/Components/CreateDialog.razor     | 53 ++++++++++++++++++-
 .../Package/Components/UpdateDialog.razor     | 53 ++++++++++++++++++-
 .../Pages/Package/PackageMainPage.razor       | 45 ++++++++++------
 .../Pages/Package/PackageMainPage.razor.cs    |  4 +-
 7 files changed, 138 insertions(+), 23 deletions(-)

diff --git a/src/BackOffice/BackOffice.csproj b/src/BackOffice/BackOffice.csproj
index b2be996..91395aa 100644
--- a/src/BackOffice/BackOffice.csproj
+++ b/src/BackOffice/BackOffice.csproj
@@ -138,7 +138,7 @@
     
     <!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
     <ItemGroup>
-        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.184" />
+        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.185" />
     </ItemGroup>
     
     <!-- ============================================================ -->
diff --git a/src/BackOffice/NuGet.config b/src/BackOffice/NuGet.config
index c53f59f..6402f43 100644
--- a/src/BackOffice/NuGet.config
+++ b/src/BackOffice/NuGet.config
@@ -2,6 +2,8 @@
 <configuration>
   <packageSources>
     <clear />
+    <!-- Local packages (dev builds) -->
+    <add key="Local" value="/home/masoud/Apps/project/FourSat/nupkg" />
     <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
     <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
   </packageSources>
diff --git a/src/BackOffice/Pages/Network/UserNetworkInfo.razor b/src/BackOffice/Pages/Network/UserNetworkInfo.razor
index 76ded87..78e1d93 100644
--- a/src/BackOffice/Pages/Network/UserNetworkInfo.razor
+++ b/src/BackOffice/Pages/Network/UserNetworkInfo.razor
@@ -302,7 +302,7 @@
                                 <tr>
                                     <td><strong>خرید پکیج:</strong></td>
                                     <td>
-                                        @if (_userInfo.HasPurchasedGoldenPackage)
+                                        @if (_userInfo.HasPurchasedPackage)
                                         {
                                             <MudChip T="string" Color="Color.Success" Size="Size.Small" Icon="@Icons.Material.Filled.CheckCircle">
                                                 خریداری شده
diff --git a/src/BackOffice/Pages/Package/Components/CreateDialog.razor b/src/BackOffice/Pages/Package/Components/CreateDialog.razor
index cf628ab..898cfc1 100644
--- a/src/BackOffice/Pages/Package/Components/CreateDialog.razor
+++ b/src/BackOffice/Pages/Package/Components/CreateDialog.razor
@@ -41,12 +41,61 @@
                     <MudTextField T="string" @bind-Value="Model.Title" Disabled="_isLoading" Label="عنوان" Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="6">
-                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Format="N0" Immediate="true"  Disabled="_isLoading" Label="قیمت" Variant="Variant.Outlined" />
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Format="N0" Immediate="true" Disabled="_isLoading" Label="قیمت (ریال)" Variant="Variant.Outlined" />
                 </MudItem>
             </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.SortOrder" Disabled="_isLoading" Label="ترتیب نمایش" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.ActivationFee" Format="N0" Immediate="true" Disabled="_isLoading" Label="هزینه فعال‌سازی (ریال)" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.DiscountMultiplier" Disabled="_isLoading" Label="ضریب تخفیف" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.MagicWalletMultiplier" Disabled="_isLoading" Label="ضریب کیف پول جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxDeposit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف واریز جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxCredit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف اعتبار جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxBalancesPerLeg" Disabled="_isLoading" Label="حداکثر تعادل هر پا" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxNetworkLevel" Disabled="_isLoading" Label="حداکثر سطح شبکه" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsActive" Disabled="_isLoading" Label="فعال" Color="Color.Success" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsBasePackage" Disabled="_isLoading" Label="پکیج پایه" Color="Color.Primary" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDirectPurchase" Disabled="_isLoading" Label="پرداخت مستقیم" Color="Color.Info" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDayaPurchase" Disabled="_isLoading" Label="اعتبار دایا" Color="Color.Warning" />
+                </MudItem>
+            </MudStack>
+
             <MudItem xs="12">
                 <MudHtmlEditor @bind-Html="Model.Description" MinHeight="300px">
-                    <MudHtmlToolbarOptions InsertImage="false" /> <!-- This will exclude the "insert image" toolbar option -->
+                    <MudHtmlToolbarOptions InsertImage="false" />
                 </MudHtmlEditor>
             </MudItem>
 
diff --git a/src/BackOffice/Pages/Package/Components/UpdateDialog.razor b/src/BackOffice/Pages/Package/Components/UpdateDialog.razor
index 17adb8c..c335706 100644
--- a/src/BackOffice/Pages/Package/Components/UpdateDialog.razor
+++ b/src/BackOffice/Pages/Package/Components/UpdateDialog.razor
@@ -42,12 +42,61 @@
                     <MudTextField T="string" @bind-Value="Model.Title" Disabled="_isLoading" Label="عنوان" Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="6">
-                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Disabled="_isLoading" Label="قیمت" Variant="Variant.Outlined" />
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Disabled="_isLoading" Label="قیمت (ریال)" Variant="Variant.Outlined" />
                 </MudItem>
             </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.SortOrder" Disabled="_isLoading" Label="ترتیب نمایش" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.ActivationFee" Format="N0" Immediate="true" Disabled="_isLoading" Label="هزینه فعال‌سازی (ریال)" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.DiscountMultiplier" Disabled="_isLoading" Label="ضریب تخفیف" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.MagicWalletMultiplier" Disabled="_isLoading" Label="ضریب کیف پول جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxDeposit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف واریز جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxCredit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف اعتبار جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxBalancesPerLeg" Disabled="_isLoading" Label="حداکثر تعادل هر پا" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxNetworkLevel" Disabled="_isLoading" Label="حداکثر سطح شبکه" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsActive" Disabled="_isLoading" Label="فعال" Color="Color.Success" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsBasePackage" Disabled="_isLoading" Label="پکیج پایه" Color="Color.Primary" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDirectPurchase" Disabled="_isLoading" Label="پرداخت مستقیم" Color="Color.Info" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDayaPurchase" Disabled="_isLoading" Label="اعتبار دایا" Color="Color.Warning" />
+                </MudItem>
+            </MudStack>
+
             <MudItem xs="12">
                 <MudHtmlEditor @bind-Html="Model.Description" MinHeight="300px">
-                    <MudHtmlToolbarOptions InsertImage="false" /> <!-- This will exclude the "insert image" toolbar option -->
+                    <MudHtmlToolbarOptions InsertImage="false" />
                 </MudHtmlEditor>
             </MudItem>
         </MudStack>
diff --git a/src/BackOffice/Pages/Package/PackageMainPage.razor b/src/BackOffice/Pages/Package/PackageMainPage.razor
index 952a11d..f026081 100644
--- a/src/BackOffice/Pages/Package/PackageMainPage.razor
+++ b/src/BackOffice/Pages/Package/PackageMainPage.razor
@@ -18,7 +18,11 @@
                 <col />
                 <col />
                 <col />
-                <col style="width: 58px;" />
+                <col />
+                <col />
+                <col />
+                <col />
+                <col style="width: 80px;" />
             </ColGroup>
             <ToolBarContent>
                 <MudText>مدیریت پکیج</MudText>
@@ -51,31 +55,42 @@
 
                     </CellTemplate>
                 </PropertyColumn>
-                <PropertyColumn Property="x => x.Description" Title="توضیحات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                <PropertyColumn Property="x => x.Price" Title="قیمت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
                     <CellTemplate>
-                        @if (string.IsNullOrWhiteSpace(context.Item.Description))
+                        <MudText Typo="Typo.inherit">@context.Item.Price.ToString("N0")</MudText>
+                    </CellTemplate>
+                </PropertyColumn>
+                <PropertyColumn Property="x => x.SortOrder" Title="ترتیب" />
+                <PropertyColumn Property="x => x.IsActive" Title="وضعیت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                    <CellTemplate>
+                        @if (context.Item.IsActive)
                         {
-                            <MudText Typo="Typo.inherit">-</MudText>
+                            <MudChip T="string" Color="Color.Success" Variant="Variant.Filled" Size="Size.Small">فعال</MudChip>
                         }
                         else
                         {
-
-                            <MudTooltip Text="@(context.Item.Description.HtmlToText())" Arrow="true" Style="@($"{(context.Item.Description.Length < 70 ? string.Empty : "width:600px;")}")">
-                                <MudText Typo="Typo.inherit" Style="text-wrap: nowrap;">
-                                    @(context.Item.Description.HtmlToText().Truncate(20, true))
-                                </MudText>
-                            </MudTooltip>
+                            <MudChip T="string" Color="Color.Default" Variant="Variant.Filled" Size="Size.Small">غیرفعال</MudChip>
                         }
                     </CellTemplate>
                 </PropertyColumn>
-
-                <TemplateColumn StickyLeft="true" Title="عملیات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                <PropertyColumn Property="x => x.IsBasePackage" Title="نوع" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
                     <CellTemplate>
-                        <MudStack Row="true" AlignItems="AlignItems.Center">
+                        @if (context.Item.IsBasePackage)
+                        {
+                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Filled" Size="Size.Small">پایه</MudChip>
+                        }
+                        else
+                        {
+                            <MudChip T="string" Color="Color.Info" Variant="Variant.Outlined" Size="Size.Small">عادی</MudChip>
+                        }
+                    </CellTemplate>
+                </PropertyColumn>
+                <TemplateColumn Title="">
+                    <CellTemplate>
+                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
                             <MudTooltip Text="ویرایش">
-                                <MudIconButton Icon="@Icons.Material.Filled.EditNote" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => Update(context.Item.Adapt<DataModel>()))" />
+                                <MudIconButton Icon="@Icons.Material.Filled.Edit" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => Update(context.Item))" />
                             </MudTooltip>
-
                             <MudTooltip Text="آرشیو">
                                 <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => OnDelete(context.Item))" />
                             </MudTooltip>
diff --git a/src/BackOffice/Pages/Package/PackageMainPage.razor.cs b/src/BackOffice/Pages/Package/PackageMainPage.razor.cs
index ff5f7e7..25bf46c 100644
--- a/src/BackOffice/Pages/Package/PackageMainPage.razor.cs
+++ b/src/BackOffice/Pages/Package/PackageMainPage.razor.cs
@@ -33,7 +33,7 @@ public partial class PackageMainPage
     {
         var parameters = new DialogParameters<UpdateDialog> { { x => x.Model, model.Adapt<UpdatePackageRequest>() } };
 
-        var dialog = await DialogService.ShowAsync<UpdateDialog>($"ویرایش پکیج", parameters, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Small });
+        var dialog = await DialogService.ShowAsync<UpdateDialog>($"ویرایش پکیج", parameters, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Medium });
         var result = await dialog.Result;
 
         if (!result.Canceled)
@@ -70,7 +70,7 @@ public partial class PackageMainPage
 
     public async Task CreateNew()
     {
-        var dialog = await DialogService.ShowAsync<CreateDialog>($"افزودن پکیج", new DialogParameters<CreateDialog>() { { x => x.Model, new CreateNewPackageRequest() } }, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Small });
+        var dialog = await DialogService.ShowAsync<CreateDialog>($"افزودن پکیج", new DialogParameters<CreateDialog>() { { x => x.Model, new CreateNewPackageRequest() { IsActive = true, SupportsDirectPurchase = true, DiscountMultiplier = 2.0, MagicWalletMultiplier = 2.5, MaxBalancesPerLeg = 300, MaxNetworkLevel = 15, MagicWalletMaxDeposit = 1_000_000_000, MagicWalletMaxCredit = 2_500_000_000 } } }, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Medium });
         var result = await dialog.Result;
         if (!result.Canceled)
         {