Merge pull request #16 from Ali-YousefiTelori/develop

Add support for AmountType
EasyMicroservices · Dec 1, 2023 · 1fc689a · 1fc689a
2 parents edfef3e + b3c59aa
commit 1fc689a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/...p/Blazor/EasyMicroservices.UI.Ordering.Blazor/EasyMicroservices.UI.Ordering.Blazor.csproj b/...p/Blazor/EasyMicroservices.UI.Ordering.Blazor/EasyMicroservices.UI.Ordering.Blazor.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.11</Version>
+    <Version>0.0.0.12</Version>
     <Description>ordering UI compoents.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>component,microcomponent,ui,core,order,ordering</PackageTags>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MudBlazor" Version="6.11.0" />
+    <PackageReference Include="MudBlazor" Version="6.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Sharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor b/...Sharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor
@@ -9,6 +9,14 @@
         <MudStack Spacing="4">
             <MudTextField @bind-Value="viewModel.Name" Label="Name" Variant="Variant.Text"></MudTextField>
             <MudTextField @bind-Value="viewModel.PriceAmount" Label="Value Added Tax" Variant="Variant.Text"></MudTextField>
+            <MudSelect @bind-Value="viewModel.AmountType" Label="Amount Type" OpenIcon="@Icons.Material.Filled.LocalDrink" AdornmentColor="Color.Secondary">
+                @foreach (AmountType item in Enum.GetValues<AmountType>())
+                {
+                    if ((int)item < 6)
+                        continue;
+                    <MudSelectItem Value="@item">@item.ToString()</MudSelectItem>
+                }
+            </MudSelect>
             @if (viewModel.CountingUnits is not null)
             {
                 <MudSelect T="long" @bind-Value="viewModel.SelectedCountingUnitId" Label="Counting Unit Type" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">

diff --git a/.../EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj b/.../EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.11</Version>
+    <Version>0.0.0.12</Version>
     <Description>ordering view model.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>mvvm,viewmodel,viewmodels,modelviewviewmodel,ui,core,order,ordering</PackageTags>

diff --git a/...syMicroservices.UI.Ordering.ViewModels/ViewModels/Products/AddOrUpdateProductViewModel.cs b/...syMicroservices.UI.Ordering.ViewModels/ViewModels/Products/AddOrUpdateProductViewModel.cs
@@ -66,6 +66,17 @@ public decimal PriceAmount
             }
         }
 
+        AmountType _AmountType = AmountType.Percent;
+        public AmountType AmountType
+        {
+            get => _AmountType;
+            set
+            {
+                _AmountType = value;
+                OnPropertyChanged(nameof(AmountType));
+            }
+        }
+
         ICollection<CountingUnitContract> _CountingUnits;
         public ICollection<CountingUnitContract> CountingUnits
         {
@@ -132,7 +143,7 @@ List<ProductPriceContract> GetPrices()
                     UniqueIdentity = GetCurrentProperty(x => x.Prices.Select(x=> x.UniqueIdentity).DefaultIfEmpty(null).FirstOrDefault()),
                     Amount = PriceAmount,
                     CurrencyCode = CurrencyCodeType.IRR,
-                    AmountType = AmountType.Decimal,
+                    AmountType = AmountType,
                     Type = PriceType.ValueAddedTax
                 }
             };
@@ -160,14 +171,15 @@ public async Task LoadConfig()
             var items = await _countingUnitClient.GetAllByLanguageAsync(new GetByLanguageRequestContract()
             {
                 Language = "fa-IR"
-            }).AsCheckedResult(x=>x.Result);
+            }).AsCheckedResult(x => x.Result);
             CountingUnits = items;
         }
 
         public void Clear()
         {
             Name = "";
             PriceAmount = 0;
+            AmountType = AmountType.Percent;
             UpdateProductContract = default;
             CountingUnits = null;
         }