This commit is contained in:
mmrbnjd
2024-07-28 17:42:40 +03:30
parent acab592172
commit e153e9126f
4 changed files with 56 additions and 12 deletions

View File

@@ -95,6 +95,9 @@ namespace Back.Controllers
if (item.ID<0)
{
var pricing = await _servPricing.GetPricing();
if (pricing == null)
return NotFound();
//permission
order.OrderItems = item.promotionDetails.Select(s => new OrderItem
{
@@ -126,8 +129,19 @@ namespace Back.Controllers
}
var result= await _servOrders.AddOrder(order);
if (result > 0)
return Ok(result);
if (result !=null)
return Ok(new OrderDto
{
ApprovalDate = result.ApprovalDate.ShamciToFormatShamci(),
DateCreate = result.DateCreate.ShamciToFormatShamci(),
ID = result.ID,
PreDiscount = result.PreDiscount,
Status = result.Status,
TDiscount = result.TDiscount,
TPrice = result.TPrice,
TTax = result.TPrice,
lstDiscount = result.lstDiscount,
});
else return BadRequest(new List<string> { "خطا در ثبت سفارش" });
}

View File

@@ -70,16 +70,16 @@ namespace Back.Services
{
return await _repoOrder.UpdateAsync(order);
}
public async Task<int> AddOrder(Order order)
public async Task<Order> AddOrder(Order order)
{
try
{
var item = await _repoOrder.AddAsync(order);
return item.ID;
return await _repoOrder.AddAsync(order);
}
catch (Exception ex)
{
return -1;
return null;
}
}

View File

@@ -5,7 +5,14 @@
<Preload LoadingText="در حال بارگذاری..." />
@* alert *@
<div class="row">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="row">
<div class="col-md-6">
<Dropdown Color="DropdownColor.Secondary">
@@ -127,6 +134,15 @@
</div>
</div>
@code {
#region Alert
// alert
AlertColor alertColor = AlertColor.Primary;
IconName alertIconName = IconName.CheckCircleFill;
bool Hidealert = true;
string alertMessage = "";
#endregion
string orderSelectName = "نوع سفارش";
int orderSelectID = 0;
[Inject] protected PreloadService PreloadService { get; set; } = default!;
@@ -139,6 +155,20 @@
decimal TotalPrice = 0;
}
@functions {
private void ShowSuccessAlert(string msg)
{
Hidealert = false;
alertColor = AlertColor.Success;
alertIconName = IconName.CheckCircleFill;
alertMessage = msg;
}
private void ShowDangerAlert(string msg)
{
Hidealert = false;
alertColor = AlertColor.Danger;
alertIconName = IconName.ExclamationTriangleFill;
alertMessage = msg;
}
protected override async Task OnParametersSetAsync()
{
@@ -206,16 +236,17 @@
var rsp = await hc.Post<PromotionDto>($"Orders/AddOrder", Selected);
if (rsp.IsSuccessStatusCode)
{
var newidorder = await rsp.Content.ReadFromJsonAsync<OrderDto>();
await OnMultipleOfThree.InvokeAsync(newidorder);
}
else if (rsp.StatusCode==System.Net.HttpStatusCode.NotFound)
{
// ShowDangerAlert("سفارش یافت نشد");
ShowDangerAlert("مرجع یافت نشد یافت نشد");
}
else
{
// var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
// ShowDangerAlert(request[0]);
var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
ShowDangerAlert(request[0]);
}
}

View File

@@ -206,13 +206,12 @@
public async Task CallBackFromNewItem(OrderDto result)
{
await Newordermodal.HideAsync();
await ReadOrderItem(result);
}
public async Task NewOrderItem()
{
var parameters = new Dictionary<string, object>();
parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<OrderDto>(this, CallBackFromNewItem));
await Newordermodal.ShowAsync<OrderItemNew>(title: $"سفارش جدید", parameters: parameters);