NetinaShop
/
AdminPanel
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(AmountSpecialOffer)

subProduct
Amir Hossein Khademi 2024-08-05 23:23:32 +03:30
parent 59dad6f038
commit 80abffa292
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor
View File

@ -235,7 +235,12 @@
<MudItem xs="12" md="4">
<MudSelect Disabled="@ViewModel.IsSpecialOffer.Not()" T="DiscountAmountType" ValueChanged="@ViewModel.AmountTypeChanged" Label="نوع تخفیفـــ" ToStringFunc="b=>b.ToDisplay()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
<MudSelect Disabled="@ViewModel.IsSpecialOffer.Not()" T="DiscountAmountType"
ValueChanged="@ViewModel.AmountTypeChanged"
Label="نوع تخفیفـــ" ToStringFunc="b=>b.ToDisplay()"
Variant="Variant.Outlined"
Value="@ViewModel.Discount.AmountType"
AnchorOrigin="Origin.BottomCenter">
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Percent" />
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Amount" />
</MudSelect>
@ -251,11 +256,11 @@
<MudItem xs="12" sm="6">
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.StartDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ شروع تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.StartDate" DisableToolbar="true" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ شروع تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
</MudItem>
<MudItem xs="12" sm="6">
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.ExpireDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ پایان تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.ExpireDate" DisableToolbar="true" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ پایان تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
</MudItem>

7
Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs
View File

@ -61,11 +61,13 @@ public class ProductActionDialogBoxViewModel : BaseViewModel<ProductLDto>
{
_isSpecialOffer = value;
PageDto.IsSpecialOffer = value;
if(!value)
if (!value)
{
IsAmountType = value;
IsPercentType = value;
}
else if(!IsAmountType)
IsPercentType = true;
}
}
@ -108,6 +110,7 @@ public class ProductActionDialogBoxViewModel : BaseViewModel<ProductLDto>
ExpireDate = Discount.ExpireDate;
StartDate = Discount.StartDate;
IsSpecialOffer = true;
}
}
catch (ApiException ex)
@ -236,10 +239,12 @@ public class ProductActionDialogBoxViewModel : BaseViewModel<ProductLDto>
case DiscountAmountType.Amount:
IsAmountType = true;
IsPercentType = false;
Discount.AmountType = DiscountAmountType.Amount;
break;
case DiscountAmountType.Percent:
IsAmountType = false;
IsPercentType = true;
Discount.AmountType = DiscountAmountType.Percent;
break;
}
}

2
Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj
View File

@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Netina\Netina.Domain\Netina.Domain.csproj" />
<ProjectReference Include="..\..\Api\Netina.Domain\Netina.Domain.csproj" />
</ItemGroup>
<ItemGroup>

1
Netina.AdminPanel.PWA/tailwind.config.js
View File

@ -29,7 +29,6 @@ module.exports = {
}
},
plugins: [
require('@tailwindcss/typography'),
require('flowbite/plugin')
],
}

14
Netina.AdminPanel.PWA/wwwroot/appsettings.Development.json
View File

@ -8,10 +8,16 @@
"Microsoft.AspNetCore.Http.Connections": "Debug"
}
},
"WebSiteUrl": "https://bonsaigallery.shop",
"AdminPanelBaseUrl": "https://admin.bonsaigallery.shop",
"StorageBaseUrl": "https://storage.bonsaigallery.shop",
"ApiUrl": "https://api.bonsaigallery.shop/api",
"WebSiteUrl": "https://vesmeh.com",
"AdminPanelBaseUrl": "https://admin.vesmeh.com",
"StorageBaseUrl": "https://storage.vesmeh.com",
//"ApiUrl": "https://api.vesmeh.com/api",
"ApiUrl": "http://localhost:32770/api",
//"WebSiteUrl": "https://bonsaigallery.shop",
//"AdminPanelBaseUrl": "https://admin.bonsaigallery.shop",
//"StorageBaseUrl": "https://storage.bonsaigallery.shop",
//"ApiUrl": "https://api.bonsaigallery.shop/api",
"IsShop": true
//"ApiUrl": "http://localhost:32770/api"

2
Netina.AdminPanel.PWA/wwwroot/index.html
View File

@ -43,7 +43,7 @@
</div>
</div>
<div dir="rtl" id="blazor-error-ui" class="!text-black !z-[9999]">
<div id="blazor-error-ui" class="!text-black !z-[9999]">
<b>مشکلی رخ داده است</b>
<a href="" class="reload">بارگزاری مجدد</a>
<a class="dismiss">بستن</a>

4
Netina.AdminPanel.sln
View File

@ -5,9 +5,9 @@ VisualStudioVersion = 17.8.34316.72
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.AdminPanel.PWA", "Netina.AdminPanel.PWA\Netina.AdminPanel.PWA.csproj", "{EB154E26-A392-4521-B26D-1B82C8597201}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Domain", "..\Netina\Netina.Domain\Netina.Domain.csproj", "{FD9AD662-66FB-431A-A2C1-8D6262402FCE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Domain", "..\Api\Netina.Domain\Netina.Domain.csproj", "{FD9AD662-66FB-431A-A2C1-8D6262402FCE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Common", "..\Netina\Netina.Common\Netina.Common.csproj", "{CE60F736-C3F2-4D81-862E-48135E5FFC9C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Common", "..\Api\Netina.Common\Netina.Common.csproj", "{CE60F736-C3F2-4D81-862E-48135E5FFC9C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution