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

feat : complete ordering , add version 0.17.18.25

release
Amir Hossein Khademi 2024-02-26 18:16:29 +03:30
parent 4ae2dcfb39
commit 25ade7ce1c
12 changed files with 366 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NetinaShop.AdminPanel.PWA/Dialogs/BlogActionDialogBox.razor
View File

@ -6,9 +6,6 @@
@inject IUserUtility UserUtility @inject IUserUtility UserUtility
@inject IDialogService DialogService @inject IDialogService DialogService
<head>
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
</head>
<MudDialog class="mx-auto"> <MudDialog class="mx-auto">
<DialogContent> <DialogContent>

10
NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor
View File

@ -34,10 +34,10 @@
<MudItem sm="9"> <MudItem sm="9">
<MudField Variant="Variant.Outlined" Label="آدرس">@ViewModel.PageDto.OrderDelivery.Address</MudField> <MudField Variant="Variant.Outlined" Label="آدرس">@ViewModel.PageDto?.OrderDelivery?.Address</MudField>
</MudItem> </MudItem>
<MudItem sm="3"> <MudItem sm="3">
<MudField Variant="Variant.Outlined" Label="روش ارسال">@ViewModel.PageDto.OrderDelivery.ShippingMethod</MudField> <MudField Variant="Variant.Outlined" Label="روش ارسال">@ViewModel.PageDto?.OrderDelivery?.ShippingMethod</MudField>
</MudItem> </MudItem>
</MudGrid> </MudGrid>
@ -180,18 +180,18 @@
<BaseButtonUi class="w-64 h-12 rounded-md" IsProcessing="@ViewModel.IsProcessing" <BaseButtonUi class="w-64 h-12 rounded-md" IsProcessing="@ViewModel.IsProcessing"
Icon="@Icons.Material.Outlined.AirportShuttle" Icon="@Icons.Material.Outlined.AirportShuttle"
Variant="Variant.Filled" Color="Color.Success" Variant="Variant.Filled" Color="Color.Success"
Content="ثبت ارسال سفارش" OnClickCallback="ViewModel.SubmitEditAsync" /> Content="@ViewModel.ConfirmOrderButtonText" OnClickCallback="ViewModel.SubmitConfirmAsync" />
<BaseButtonUi class="w-52 h-12 rounded-md" IsProcessing="@ViewModel.IsProcessing" <BaseButtonUi class="w-52 h-12 rounded-md" IsProcessing="@ViewModel.IsProcessing"
Icon="@Icons.Material.Outlined.RemoveCircle" Icon="@Icons.Material.Outlined.RemoveCircle"
Variant="Variant.Outlined" Color="Color.Error" Variant="Variant.Outlined" Color="Color.Error"
Content="لغو سفارش" OnClickCallback="ViewModel.SubmitEditAsync" /> Content="لغو سفارش" />
<MudSpacer /> <MudSpacer />
<BaseButtonUi class="w-52 h-12 rounded-md my-auto" IsProcessing="@ViewModel.IsProcessing" <BaseButtonUi class="w-52 h-12 rounded-md my-auto" IsProcessing="@ViewModel.IsProcessing"
Icon="@Icons.Material.Outlined.Print" Icon="@Icons.Material.Outlined.Print"
Size="Size.Small" Size="Size.Small"
Variant="Variant.Outlined" Color="Color.Info" Variant="Variant.Outlined" Color="Color.Info"
Content="چاپــ فاکتور" OnClickCallback="ViewModel.SubmitEditAsync" /> Content="چاپــ فاکتور" />
<MudButton Variant="Variant.Outlined" Size="Size.Medium" Color="Color.Error" OnClick="ViewModel.Cancel">بستن</MudButton> <MudButton Variant="Variant.Outlined" Size="Size.Medium" Color="Color.Error" OnClick="ViewModel.Cancel">بستن</MudButton>
</MudStack> </MudStack>
</DialogActions> </DialogActions>

101
NetinaShop.AdminPanel.PWA/Dialogs/OrderActionDialogBox.razor.cs
View File

@ -36,6 +36,8 @@ public class OrderActionDialogBoxViewModel : BaseViewModel<OrderLDto>
public void Cancel() => _mudDialog.Cancel(); public void Cancel() => _mudDialog.Cancel();
public string ConfirmOrderButtonText { get; set; } = string.Empty;
public bool IsEditing = false; public bool IsEditing = false;
@ -54,6 +56,23 @@ public class OrderActionDialogBoxViewModel : BaseViewModel<OrderLDto>
var order = await _restWrapper.OrderRestApi.ReadOne(PageDto.Id, token); var order = await _restWrapper.OrderRestApi.ReadOne(PageDto.Id, token);
PageDto = order; PageDto = order;
switch (PageDto.OrderStatus)
{
case OrderStatus.Submitted:
ConfirmOrderButtonText = "ثبت پرداختی سفارش";
break;
case OrderStatus.Paid:
ConfirmOrderButtonText = "ثبت سفارش";
break;
case OrderStatus.Processing:
ConfirmOrderButtonText = "ثبت ارسال سفارش";
break;
case OrderStatus.Delivered:
ConfirmOrderButtonText = "ثبت انجام سفارش";
break;
default:
throw new ArgumentOutOfRangeException();
}
} }
catch (ApiException ex) catch (ApiException ex)
{ {
@ -74,29 +93,71 @@ public class OrderActionDialogBoxViewModel : BaseViewModel<OrderLDto>
}; };
} }
public async Task SubmitEditAsync() public async Task SubmitConfirmAsync()
{ {
try var options = new DialogOptions { CloseOnEscapeKey = true };
{ var parameters = new DialogParameters<QuestionDialog>();
IsProcessing = true; parameters.Add(x => x.ContentText, "آیا از حذف دسته بندی اطمینان دارید ?");
_snackbar.Add($"ویرایش سفارش {PageDto.FactorCode} با موفقیت انجام شد", Severity.Success); var dialogReference = await _dialogService.ShowAsync<QuestionDialog>("حذف شرح حال", parameters, options);
_mudDialog.Close(); var result = await dialogReference.Result;
} if (!result.Canceled)
catch (ApiException ex)
{
var exe = await ex.GetContentAsAsync<ApiResult>();
_snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error);
_mudDialog.Cancel();
}
catch (Exception e)
{
_snackbar.Add(e.Message, Severity.Error);
_mudDialog.Cancel();
}
finally
{ {
IsProcessing = false; try
{
var token = await _userUtility.GetBearerTokenAsync();
if (token == null)
throw new Exception("Token is null");
IsProcessing = true;
OrderStatus nextOrderStatus = OrderStatus.Canceled;
switch (PageDto.OrderStatus)
{
case OrderStatus.OrderBag:
return;
break;
case OrderStatus.Submitted:
nextOrderStatus = OrderStatus.Paid;
break;
case OrderStatus.Paid:
nextOrderStatus = OrderStatus.Processing;
break;
case OrderStatus.Processing:
nextOrderStatus = OrderStatus.Delivered;
break;
case OrderStatus.Delivered:
nextOrderStatus = OrderStatus.Done;
break;
case OrderStatus.Done:
return;
break;
case OrderStatus.Canceled:
return;
break;
default:
throw new ArgumentOutOfRangeException();
}
await _restWrapper.OrderRestApi.ConfirmOrderStepAsync(PageDto.Id, nextOrderStatus, token);
_snackbar.Add($"ویرایش سفارش {PageDto.FactorCode} با موفقیت انجام شد", Severity.Success);
_mudDialog.Close();
}
catch (ApiException ex)
{
var exe = await ex.GetContentAsAsync<ApiResult>();
_snackbar.Add(exe != null ? exe.Message : ex.Content, Severity.Error);
_mudDialog.Cancel();
}
catch (Exception e)
{
_snackbar.Add(e.Message, Severity.Error);
_mudDialog.Cancel();
}
finally
{
IsProcessing = false;
}
} }
} }
} }

500
NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor
View File

@ -7,286 +7,286 @@
<MudDialog class="mx-auto"> <MudDialog class="mx-auto">
<DialogContent> <DialogContent>
<MudContainer class="h-full"> <MudContainer class="h-full">
<MudTabs Outlined="true" Elevation="0" Rounded="true" Centered="true"> <MudTabs Outlined="true" Elevation="0" Rounded="true" Centered="true">
<MudTabPanel class="h-full" Text="اطلاعات کلی" Icon="@Icons.Material.Outlined.Info"> <MudTabPanel class="h-full" Text="اطلاعات کلی" Icon="@Icons.Material.Outlined.Info">
<div class="h-full"> <div class="h-full">
<MudStack Spacing="0" class="mt-4"> <MudStack Spacing="0" class="mt-4">
<MudText Typo="Typo.h6">اطلاعات کلی</MudText> <MudText Typo="Typo.h6">اطلاعات کلی</MudText>
<MudText Typo="Typo.caption">اطلاعات کلی محصول را به دقت وارد کنید</MudText> <MudText Typo="Typo.caption">اطلاعات کلی محصول را به دقت وارد کنید</MudText>
</MudStack> </MudStack>
<MudGrid> <MudGrid>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.PersianName" T="string" Label="نام فارسی محصول" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.PersianName" T="string" Label="نام فارسی محصول" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.EnglishName" T="string" Label="نام انگلیسی محصول" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.EnglishName" T="string" Label="نام انگلیسی محصول" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudAutocomplete Required="true" ToStringFunc="dto => dto.Name" @bind-Value="@ViewModel.SelectedCategory" <MudAutocomplete Required="true" ToStringFunc="dto => dto.Name" @bind-Value="@ViewModel.SelectedCategory"
SearchFunc="ViewModel.SearchProductCategory" SearchFunc="ViewModel.SearchProductCategory"
T="ProductCategorySDto" T="ProductCategorySDto"
Label="دسته بندی" Label="دسته بندی"
Variant="Variant.Outlined"> Variant="Variant.Outlined">
<ProgressIndicatorInPopoverTemplate> <ProgressIndicatorInPopoverTemplate>
<MudList Clickable="false"> <MudList Clickable="false">
<MudListItem> <MudListItem>
<div class="flex flex-row w-full mx-auto"> <div class="flex flex-row w-full mx-auto">
<MudProgressCircular class="my-auto mr-1 -ml-4" Size="Size.Small" Indeterminate="true" /> <MudProgressCircular class="my-auto mr-1 -ml-4" Size="Size.Small" Indeterminate="true" />
<p class="font-bold my-1 mx-auto text-md">منتظر بمانید</p> <p class="font-bold my-1 mx-auto text-md">منتظر بمانید</p>
</div> </div>
</MudListItem> </MudListItem>
</MudList> </MudList>
</ProgressIndicatorInPopoverTemplate> </ProgressIndicatorInPopoverTemplate>
<ItemTemplate Context="e"> <ItemTemplate Context="e">
<p>@e.Name</p> <p>@e.Name</p>
</ItemTemplate> </ItemTemplate>
</MudAutocomplete> </MudAutocomplete>
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudAutocomplete Required="true" ToStringFunc="dto => dto.PersianName" @bind-Value="@ViewModel.SelectedBrand" <MudAutocomplete Required="true" ToStringFunc="dto => dto.PersianName" @bind-Value="@ViewModel.SelectedBrand"
SearchFunc="ViewModel.SearchBrand" SearchFunc="ViewModel.SearchBrand"
T="BrandSDto" T="BrandSDto"
Label="برند" Label="برند"
Variant="Variant.Outlined"> Variant="Variant.Outlined">
<ProgressIndicatorInPopoverTemplate> <ProgressIndicatorInPopoverTemplate>
<MudList Clickable="false"> <MudList Clickable="false">
<MudListItem> <MudListItem>
<div class="flex flex-row w-full mx-auto"> <div class="flex flex-row w-full mx-auto">
<MudProgressCircular class="my-auto mr-1 -ml-4" Size="Size.Small" Indeterminate="true" /> <MudProgressCircular class="my-auto mr-1 -ml-4" Size="Size.Small" Indeterminate="true" />
<p class="font-bold my-1 mx-auto text-md">منتظر بمانید</p> <p class="font-bold my-1 mx-auto text-md">منتظر بمانید</p>
</div> </div>
</MudListItem> </MudListItem>
</MudList> </MudList>
</ProgressIndicatorInPopoverTemplate> </ProgressIndicatorInPopoverTemplate>
<ItemTemplate Context="e"> <ItemTemplate Context="e">
<p>@e.PersianName</p> <p>@e.PersianName</p>
</ItemTemplate> </ItemTemplate>
</MudAutocomplete> </MudAutocomplete>
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.Cost" T="double" Label="قیمت محصول" Adornment="Adornment.End" Format="N0" AdornmentText="ریالــ" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.Cost" T="double" Label="قیمت محصول" Adornment="Adornment.End" Format="N0" AdornmentText="ریالــ" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.PackingCost" T="double" Label="مبلغ بسته بندی" Format="N0" Adornment="Adornment.End" AdornmentText="ریالــ" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.PackingCost" T="double" Label="مبلغ بسته بندی" Format="N0" Adornment="Adornment.End" AdornmentText="ریالــ" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.Stock" T="int" Format="N0" Label="موجودی انبار" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.Stock" T="int" Format="N0" Label="موجودی انبار" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.MaxOrderCount" T="int" Format="N0" Label="بیشترین خرید" Variant="Variant.Outlined" />
</MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.PageDto.Warranty" T="string" Label="گارانتی" Variant="Variant.Outlined" /> <MudTextField @bind-Value="@ViewModel.PageDto.MaxOrderCount" T="int" Format="N0" Label="بیشترین خرید" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6">
<MudSelect T="bool" @bind-Value="@ViewModel.PageDto.HasExpressDelivery" Label="آیا ارسال سریع دارد ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
<MudSelectItem T="bool" Value="true" />
<MudSelectItem T="bool" Value="false" />
</MudSelect>
</MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudSelect T="bool" @bind-Value="@ViewModel.PageDto.BeDisplayed" Label="آیا نمایش داده شود است ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter"> <MudTextField @bind-Value="@ViewModel.PageDto.Warranty" T="string" Label="گارانتی" Variant="Variant.Outlined" />
<MudSelectItem T="bool" Value="true" /> </MudItem>
<MudSelectItem T="bool" Value="false" /> <MudItem sm="12" lg="4" md="6">
</MudSelect> <MudSelect T="bool" @bind-Value="@ViewModel.PageDto.HasExpressDelivery" Label="آیا ارسال سریع دارد ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
</MudItem> <MudSelectItem T="bool" Value="true" />
<MudItem sm="12" lg="12" md="12"> <MudSelectItem T="bool" Value="false" />
<MudStack> </MudSelect>
<MudTextField @bind-Value="@ViewModel.PageDto.Tags" T="string" Label="تگ ها" HelperText="تگ ها را با , میتوانید جدا کنید" HelperTextOnFocus="true" Variant="Variant.Outlined" /> </MudItem>
</MudStack> <MudItem sm="12" lg="4" md="6">
</MudItem> <MudSelect T="bool" @bind-Value="@ViewModel.PageDto.BeDisplayed" Label="آیا نمایش داده شود است ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
<MudSelectItem T="bool" Value="true" />
<MudSelectItem T="bool" Value="false" />
</MudSelect>
</MudItem>
<MudItem sm="12" lg="12" md="12"> <MudItem sm="12" lg="12" md="12">
<MudTextField class="-mt-3" @bind-Value="@ViewModel.PageDto.Summery" T="string" Label="توضیحاتــ" Variant="Variant.Outlined"></MudTextField> <MudStack>
</MudItem> <MudTextField @bind-Value="@ViewModel.PageDto.Tags" T="string" Label="تگ ها" HelperText="تگ ها را با , میتوانید جدا کنید" HelperTextOnFocus="true" Variant="Variant.Outlined" />
</MudGrid>
</div>
</MudTabPanel>
<MudTabPanel Text="ویژگی های کلی" Icon="@Icons.Material.Outlined.AutoGraph">
<div class="min-h-[33rem]">
<MudStack class="mt-4" Spacing="0">
<MudText Typo="Typo.h6">ویژگی های کلی</MudText>
<MudText Typo="Typo.caption">می توانید ویگی های تکمیلی محصول را کامل وارد کنید</MudText>
</MudStack>
<MudGrid>
<MudItem lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.SpecificationTitle" T="string" Label="عنوان" Variant="Variant.Outlined"></MudTextField>
</MudItem>
<MudItem lg="4" md="6">
<MudTextField @bind-Value="@ViewModel.SpecificationValue" T="string" Label="مقدار" Variant="Variant.Outlined"></MudTextField>
</MudItem>
<MudItem lg="4" md="12">
<MudButton Variant="Variant.Filled"
Size="Size.Large"
Color="Color.Info"
class="w-full py-3 mt-2"
OnClick="ViewModel.AddSpecification"
StartIcon="@Icons.Material.Outlined.Add">افزودن</MudButton>
</MudItem>
<MudItem sm="12">
<MudDataGrid Items="@ViewModel.Specifications" Elevation="0" Outlined="true" Bordered="true" Striped="true" Filterable="false" SortMode="@SortMode.None" Groupable="false">
<Columns>
<PropertyColumn Property="x => x.Title" Title="عنوان" />
<PropertyColumn Property="x => x.Value" Title="مقدار" />
<TemplateColumn T="SpecificationSDto" CellClass="d-flex justify-end">
<CellTemplate>
<MudStack Row>
<MudButton DisableElevation="true"
Size="@Size.Small"
Variant="@Variant.Filled"
OnClick="()=>ViewModel.RemoveSpecification(context.Item)"
Color="@Color.Error"
StartIcon="@Icons.Material.Outlined.Delete">حذف</MudButton>
</MudStack> </MudStack>
</CellTemplate> </MudItem>
</TemplateColumn> <MudItem sm="12" lg="12" md="12">
</Columns> <MudTextField class="-mt-3" @bind-Value="@ViewModel.PageDto.Summery" T="string" Label="توضیحاتــ" Variant="Variant.Outlined"></MudTextField>
</MudDataGrid> </MudItem>
</MudItem> </MudGrid>
</MudGrid> </div>
</div> </MudTabPanel>
</MudTabPanel> <MudTabPanel Text="ویژگی های کلی" Icon="@Icons.Material.Outlined.AutoGraph">
<MudTabPanel Text="توضیحات تکمیلی" Icon="@Icons.Material.Outlined.Article"> <div class="min-h-[33rem]">
<div class="min-h-[33rem]"> <MudStack class="mt-4" Spacing="0">
<MudStack class="mt-4" Spacing="0">
<MudText Typo="Typo.h6">توضیحات تکمیلی</MudText> <MudText Typo="Typo.h6">ویژگی های کلی</MudText>
<MudText Typo="Typo.caption">می توانید توضیحاتــ تکمیلی محصول را کامل وارد کنید</MudText> <MudText Typo="Typo.caption">می توانید ویگی های تکمیلی محصول را کامل وارد کنید</MudText>
</MudStack> </MudStack>
<MudGrid> <MudGrid>
<MudItem sm="12">
<RichTextEditorUi @bind-Text="@ViewModel.PageDto.ExpertCheck" />
</MudItem> <MudItem lg="4" md="6">
</MudGrid> <MudTextField @bind-Value="@ViewModel.SpecificationTitle" T="string" Label="عنوان" Variant="Variant.Outlined"></MudTextField>
</div> </MudItem>
</MudTabPanel>
<MudTabPanel Text="تـــــصاویر" Icon="@Icons.Material.Outlined.ImageSearch">
<div class="min-h-[33rem]"> <MudItem lg="4" md="6">
<MudStack class="mt-4 mb-2" Spacing="0"> <MudTextField @bind-Value="@ViewModel.SpecificationValue" T="string" Label="مقدار" Variant="Variant.Outlined"></MudTextField>
</MudItem>
<MudText Typo="Typo.h6">تصاویر محصول</MudText> <MudItem lg="4" md="12">
<MudText Typo="Typo.caption">می توانید برای محصول چند تصویر اپلود کنید</MudText> <MudButton Variant="Variant.Filled"
</MudStack> Size="Size.Large"
<MudStack Row="true"> Color="Color.Info"
<MudIconButton HtmlTag="label" class="w-full py-3 mt-2"
Color="Color.Info" OnClick="ViewModel.AddSpecification"
Variant="Variant.Outlined" StartIcon="@Icons.Material.Outlined.Add">افزودن</MudButton>
class="w-28 h-28" </MudItem>
Size="Size.Large"
Icon="@Icons.Material.Outlined.Wallpaper"
OnClick="async () => await ViewModel.SelectFileAsync()">
</MudIconButton>
@foreach (var item in ViewModel.Files)
{
<div class="w-28 h-28">
<MudImage Src="@item.GetLink()" Elevation="25" Class="rounded-lg w-28 h-28 absolute" />
<MudIconButton DisableElevation="true" <MudItem sm="12">
class="absolute m-1.5" <MudDataGrid Items="@ViewModel.Specifications" Elevation="0" Outlined="true" Bordered="true" Striped="true" Filterable="false" SortMode="@SortMode.None" Groupable="false">
Size="@Size.Small" <Columns>
Variant="@Variant.Filled" <PropertyColumn Property="x => x.Title" Title="عنوان" />
OnClick="() => ViewModel.RemoveFile(item)" <PropertyColumn Property="x => x.Value" Title="مقدار" />
Color="@Color.Error" <TemplateColumn T="SpecificationSDto" CellClass="d-flex justify-end">
Icon="@Icons.Material.Outlined.Delete" /> <CellTemplate>
@if (item.IsHeader) <MudStack Row>
{ <MudButton DisableElevation="true"
<p class="bg-pink-500 px-1.5 py-0.5 absolute bottom-0 mr-2 rounded-lg text-white">هدر</p> Size="@Size.Small"
} Variant="@Variant.Filled"
@if (item.IsPrimary) OnClick="()=>ViewModel.RemoveSpecification(context.Item)"
{ Color="@Color.Error"
<p class="bg-blue-500 px-1.5 py-0.5 absolute bottom-0 mr-2 rounded-lg text-white">اصلی</p> StartIcon="@Icons.Material.Outlined.Delete">حذف</MudButton>
} </MudStack>
</div> </CellTemplate>
} </TemplateColumn>
</Columns>
</MudDataGrid>
</MudItem>
</MudGrid>
</div>
</MudTabPanel>
<MudTabPanel Text="توضیحات تکمیلی" Icon="@Icons.Material.Outlined.Article">
</MudStack> <div class="min-h-[33rem]">
</div> <MudStack class="mt-4" Spacing="0">
</MudTabPanel> <MudText Typo="Typo.h6">توضیحات تکمیلی</MudText>
<MudText Typo="Typo.caption">می توانید توضیحاتــ تکمیلی محصول را کامل وارد کنید</MudText>
</MudStack>
<MudGrid>
<MudItem sm="12">
<MudTabPanel Text="پیشنهاد ویژه" Icon="@Icons.Material.Outlined.LocalOffer"> <RichTextEditorUi @bind-Text="@ViewModel.PageDto.ExpertCheck" />
<div class="min-h-[33rem]"> </MudItem>
<MudGrid> </MudGrid>
</div>
<MudItem sm="12"> </MudTabPanel>
<MudSwitch @bind-Value="@ViewModel.IsSpecialOffer" <MudTabPanel Text="تـــــصاویر" Icon="@Icons.Material.Outlined.ImageSearch">
class="mt-2"
Size="Size.Large"
T="bool"
Label="آیا محصول در فروش ویژه میباشد ؟"
Color="Color.Info" />
</MudItem>
<MudItem md="4">
<MudSelect Disabled="@ViewModel.IsSpecialOffer.Not()" T="DiscountAmountType" ValueChanged="@ViewModel.AmountTypeChanged" Label="نوع تخفیفـــ" ToStringFunc="b=>b.ToDisplay()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter"> <div class="min-h-[33rem]">
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Percent" /> <MudStack class="mt-4 mb-2" Spacing="0">
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Amount" />
</MudSelect>
</MudItem>
<MudItem md="4"> <MudText Typo="Typo.h6">تصاویر محصول</MudText>
<MudText Typo="Typo.caption">می توانید برای محصول چند تصویر اپلود کنید</MudText>
</MudStack>
<MudStack Row="true">
<MudIconButton HtmlTag="label"
Color="Color.Info"
Variant="Variant.Outlined"
class="w-28 h-28"
Size="Size.Large"
Icon="@Icons.Material.Outlined.Wallpaper"
OnClick="async () => await ViewModel.SelectFileAsync()">
</MudIconButton>
@foreach (var item in ViewModel.Files)
{
<div class="w-28 h-28">
<MudImage Src="@item.GetLink()" Elevation="25" Class="rounded-lg w-28 h-28 absolute" />
<MudIconButton DisableElevation="true"
class="absolute m-1.5"
Size="@Size.Small"
Variant="@Variant.Filled"
OnClick="() => ViewModel.RemoveFile(item)"
Color="@Color.Error"
Icon="@Icons.Material.Outlined.Delete" />
@if (item.IsHeader)
{
<p class="bg-pink-500 px-1.5 py-0.5 absolute bottom-0 mr-2 rounded-lg text-white">هدر</p>
}
@if (item.IsPrimary)
{
<p class="bg-blue-500 px-1.5 py-0.5 absolute bottom-0 mr-2 rounded-lg text-white">اصلی</p>
}
</div>
}
</MudStack>
</div>
</MudTabPanel>
<MudTabPanel Text="پیشنهاد ویژه" Icon="@Icons.Material.Outlined.LocalOffer">
<div class="min-h-[33rem]">
<MudGrid>
<MudItem sm="12">
<MudSwitch @bind-Value="@ViewModel.IsSpecialOffer"
class="mt-2"
Size="Size.Large"
T="bool"
Label="آیا محصول در فروش ویژه میباشد ؟"
Color="Color.Info" />
</MudItem>
<MudItem md="4">
<MudSelect Disabled="@ViewModel.IsSpecialOffer.Not()" T="DiscountAmountType" ValueChanged="@ViewModel.AmountTypeChanged" Label="نوع تخفیفـــ" ToStringFunc="b=>b.ToDisplay()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Percent" />
<MudSelectItem T="DiscountAmountType" Value="DiscountAmountType.Amount" />
</MudSelect>
</MudItem>
<MudItem md="4">
<MudTextField Disabled="@ViewModel.IsPercentType.Not()" @bind-Value="@ViewModel.Discount.DiscountPercent" Format="N0" T="int" Label="درصد تخفیف" Variant="Variant.Outlined" /> <MudTextField Disabled="@ViewModel.IsPercentType.Not()" @bind-Value="@ViewModel.Discount.DiscountPercent" Format="N0" T="int" Label="درصد تخفیف" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem md="4"> <MudItem md="4">
<MudTextField Disabled="@ViewModel.IsAmountType.Not()" @bind-Value="@ViewModel.Discount.DiscountAmount" Format="N0" T="long" Label="مبلغ تخفیفــ" Adornment="Adornment.End" AdornmentText="ریالــ" Variant="Variant.Outlined" /> <MudTextField Disabled="@ViewModel.IsAmountType.Not()" @bind-Value="@ViewModel.Discount.DiscountAmount" Format="N0" T="long" Label="مبلغ تخفیفــ" Adornment="Adornment.End" AdornmentText="ریالــ" Variant="Variant.Outlined" />
</MudItem> </MudItem>
<MudItem sm="6">
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.StartDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ شروع تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
</MudItem>
<MudItem sm="6">
<MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.ExpireDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ پایان تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
</MudItem>
</MudGrid> <MudItem sm="6">
</div> <MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.StartDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ شروع تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
</MudTabPanel>
</MudTabs>
</MudContainer>
</DialogContent>
<DialogActions>
<MudStack Row="true" class="w-full h-fit mx-4 mb-3 bottom-0">
@if (ViewModel.IsEditing) </MudItem>
{ <MudItem sm="6">
<BaseButtonUi class="w-64 rounded-md" IsProcessing="@ViewModel.IsProcessing" <MudDatePicker Disabled="@ViewModel.IsSpecialOffer.Not()" @bind-Date="@ViewModel.ExpireDate" UseShortNames="false" TitleDateFormat="dddd, dd MMMM" Label="تاریخ پایان تخفیفــ" Variant="Variant.Outlined" Culture="@PersianCultureInfo.GetPersianCulture()" />
Icon="@Icons.Material.Outlined.Check"
Variant="Variant.Filled" Color="Color.Success" </MudItem>
Content="ثبت ویرایش" OnClickCallback="ViewModel.SubmitEditAsync" />
}
else </MudGrid>
{ </div>
<BaseButtonUi class="w-64 rounded-md" IsProcessing="@ViewModel.IsProcessing" </MudTabPanel>
Icon="@Icons.Material.Outlined.Check" </MudTabs>
Variant="Variant.Filled" Color="Color.Success" </MudContainer>
Content="تایید" OnClickCallback="ViewModel.SubmitCreateAsync" /> </DialogContent>
} <DialogActions>
<MudSpacer /> <MudStack Row="true" class="w-full h-fit mx-4 mb-3 bottom-0">
<MudButton Variant="Variant.Outlined" Size="Size.Large" Color="Color.Error" OnClick="ViewModel.Cancel">بستن</MudButton>
</MudStack> @if (ViewModel.IsEditing)
</DialogActions> {
<BaseButtonUi class="w-64 rounded-md" IsProcessing="@ViewModel.IsProcessing"
Icon="@Icons.Material.Outlined.Check"
Variant="Variant.Filled" Color="Color.Success"
Content="ثبت ویرایش" OnClickCallback="ViewModel.SubmitEditAsync" />
}
else
{
<BaseButtonUi class="w-64 rounded-md" IsProcessing="@ViewModel.IsProcessing"
Icon="@Icons.Material.Outlined.Check"
Variant="Variant.Filled" Color="Color.Success"
Content="تایید" OnClickCallback="ViewModel.SubmitCreateAsync" />
}
<MudSpacer />
<MudButton Variant="Variant.Outlined" Size="Size.Large" Color="Color.Error" OnClick="ViewModel.Cancel">بستن</MudButton>
</MudStack>
</DialogActions>
</MudDialog> </MudDialog>
@code { @code {

16
NetinaShop.AdminPanel.PWA/Dialogs/ProductCategoryActionDialogBox.razor
View File

@ -1,16 +1,10 @@
@using NetinaShop.Common.Models.Exception @inject ISnackbar Snackbar
@using NetinaShop.Domain.CommandQueries.Commands
@using Radzen.Blazor
@inject ISnackbar Snackbar
@inject IRestWrapper RestWrapper @inject IRestWrapper RestWrapper
@inject IUserUtility UserUtility @inject IUserUtility UserUtility
<head>
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
</head>
<MudDialog class="mx-auto" DisableSidePadding="true"> <MudDialog class="mx-auto" DisableSidePadding="true">
<DialogContent> <DialogContent>
<MudStack> <MudStack class="mx-5 overflow-x-hidden overflow-y-hidden">
<MudDivider class="-mt-3" /> <MudDivider class="-mt-3" />
<MudStack Spacing="0"> <MudStack Spacing="0">
@ -23,7 +17,7 @@
</MudItem> </MudItem>
<MudItem sm="12" lg="4" md="6"> <MudItem sm="12" lg="4" md="6">
<MudSelect T="bool" @bind-Value="@ViewModel.IsMain" Label="آیا دسته بندی اصلی است ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter"> <MudSelect T="bool" @bind-Value="@ViewModel.IsMain" Label="آیا دسته بندی اصلی است ؟" ToStringFunc="b=>b.ToPersianString()" Variant="Variant.Outlined" AnchorOrigin="Origin.BottomCenter">
<MudSelectItem T="bool" Value="true" /> <MudSelectItem T="bool" Value="true" />
<MudSelectItem T="bool" Value="false" /> <MudSelectItem T="bool" Value="false" />
</MudSelect> </MudSelect>
</MudItem> </MudItem>
@ -49,7 +43,7 @@
</MudAutocomplete> </MudAutocomplete>
</MudItem> </MudItem>
<MudItem sm="12" lg="12" md="12"> <MudItem sm="12" lg="12" md="12">
<MudContainer class="max-h-[20rem] lg:max-h-[25rem] overflow-y-scroll"> <MudContainer class="max-h-[20rem] lg:max-h-[25rem] overflow-y-scroll overflow-x-hidden">
<MudStack class="mt-4 mb-2" Spacing="0"> <MudStack class="mt-4 mb-2" Spacing="0">
<MudText Typo="Typo.h6">توضیحات تکمیلی</MudText> <MudText Typo="Typo.h6">توضیحات تکمیلی</MudText>

4
NetinaShop.AdminPanel.PWA/Models/Address.cs
View File

@ -3,8 +3,8 @@
public static class Address public static class Address
{ {
#if DEBUG #if DEBUG
//public static string BaseAddress = "http://localhost:32770/api"; public static string BaseAddress = "http://localhost:32770/api";
public static string BaseAddress = "https://api.vesmook.com/api"; //public static string BaseAddress = "https://api.vesmook.com/api";
#else #else
public static string BaseAddress = "https://api.vesmook.com/api"; public static string BaseAddress = "https://api.vesmook.com/api";
#endif #endif

2
NetinaShop.AdminPanel.PWA/Models/MainTheme.cs
View File

@ -19,7 +19,7 @@ public static class MainTheme
}, },
PaletteDark = new PaletteDark() PaletteDark = new PaletteDark()
{ {
Primary = "#001A46", Primary = "#E59F2E",
Secondary = "#E59F2E", Secondary = "#E59F2E",
} }
}; };

4
NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj
View File

@ -5,8 +5,8 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest> <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
<AssemblyVersion>0.17.16.23</AssemblyVersion> <AssemblyVersion>0.17.18.25</AssemblyVersion>
<FileVersion>0.17.16.23</FileVersion> <FileVersion>0.17.18.25</FileVersion>
<AssemblyName>$(MSBuildProjectName)</AssemblyName> <AssemblyName>$(MSBuildProjectName)</AssemblyName>
</PropertyGroup> </PropertyGroup>

3
NetinaShop.AdminPanel.PWA/Services/RestServices/IOrderRestApi.cs
View File

@ -7,4 +7,7 @@ public interface IOrderRestApi
[Get("/{id}")] [Get("/{id}")]
Task<OrderLDto> ReadOne(Guid id, [Header("Authorization")] string authorization); Task<OrderLDto> ReadOne(Guid id, [Header("Authorization")] string authorization);
[Post("/{id}/confirm")]
Task<bool> ConfirmOrderStepAsync(Guid id,[Query] OrderStatus nextOrderStatus , [Header("Authorization")] string authorization);
} }

2
NetinaShop.AdminPanel.PWA/version.json
View File

@ -1,5 +1,5 @@
{ {
"version": "0.17.16.23", "version": "0.17.18.25",
"versionNumber": 0.101623, "versionNumber": 0.101623,
"versionName": "چرتکه", "versionName": "چرتکه",
"description": "", "description": "",

7
NetinaShop.AdminPanel.PWA/wwwroot/css/app.min.css vendored
View File

@ -1076,6 +1076,10 @@ input:checked + .toggle-bg {
margin-left: 1rem; margin-left: 1rem;
margin-right: 1rem; margin-right: 1rem;
} }
.mx-5 {
margin-left: 1.25rem;
margin-right: 1.25rem;
}
.mx-auto { .mx-auto {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -1437,6 +1441,9 @@ input:checked + .toggle-bg {
.overflow-x-hidden { .overflow-x-hidden {
overflow-x: hidden; overflow-x: hidden;
} }
.overflow-y-hidden {
overflow-y: hidden;
}
.overflow-x-scroll { .overflow-x-scroll {
overflow-x: scroll; overflow-x: scroll;
} }

9
NetinaShop.AdminPanel.PWA/wwwroot/css/app.output.css
View File

@ -1155,6 +1155,11 @@ input:checked + .toggle-bg {
margin-right: 1rem; margin-right: 1rem;
} }
.mx-5 {
margin-left: 1.25rem;
margin-right: 1.25rem;
}
.mx-auto { .mx-auto {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -1628,6 +1633,10 @@ input:checked + .toggle-bg {
overflow-x: hidden; overflow-x: hidden;
} }
.overflow-y-hidden {
overflow-y: hidden;
}
.overflow-x-scroll { .overflow-x-scroll {
overflow-x: scroll; overflow-x: scroll;
} }