...
This commit is contained in:
@@ -95,6 +95,9 @@ namespace Back.Controllers
|
|||||||
if (item.ID<0)
|
if (item.ID<0)
|
||||||
{
|
{
|
||||||
var pricing = await _servPricing.GetPricing();
|
var pricing = await _servPricing.GetPricing();
|
||||||
|
if (pricing == null)
|
||||||
|
return NotFound();
|
||||||
|
|
||||||
//permission
|
//permission
|
||||||
order.OrderItems = item.promotionDetails.Select(s => new OrderItem
|
order.OrderItems = item.promotionDetails.Select(s => new OrderItem
|
||||||
{
|
{
|
||||||
@@ -126,8 +129,19 @@ namespace Back.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
var result= await _servOrders.AddOrder(order);
|
var result= await _servOrders.AddOrder(order);
|
||||||
if (result > 0)
|
if (result !=null)
|
||||||
return Ok(result);
|
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> { "خطا در ثبت سفارش" });
|
else return BadRequest(new List<string> { "خطا در ثبت سفارش" });
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -70,16 +70,16 @@ namespace Back.Services
|
|||||||
{
|
{
|
||||||
return await _repoOrder.UpdateAsync(order);
|
return await _repoOrder.UpdateAsync(order);
|
||||||
}
|
}
|
||||||
public async Task<int> AddOrder(Order order)
|
public async Task<Order> AddOrder(Order order)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var item = await _repoOrder.AddAsync(order);
|
return await _repoOrder.AddAsync(order);
|
||||||
return item.ID;
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return -1;
|
return null;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -5,7 +5,14 @@
|
|||||||
<Preload LoadingText="در حال بارگذاری..." />
|
<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="row">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<Dropdown Color="DropdownColor.Secondary">
|
<Dropdown Color="DropdownColor.Secondary">
|
||||||
@@ -127,6 +134,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@code {
|
@code {
|
||||||
|
|
||||||
|
#region Alert
|
||||||
|
// alert
|
||||||
|
AlertColor alertColor = AlertColor.Primary;
|
||||||
|
IconName alertIconName = IconName.CheckCircleFill;
|
||||||
|
bool Hidealert = true;
|
||||||
|
string alertMessage = "";
|
||||||
|
#endregion
|
||||||
|
|
||||||
string orderSelectName = "نوع سفارش";
|
string orderSelectName = "نوع سفارش";
|
||||||
int orderSelectID = 0;
|
int orderSelectID = 0;
|
||||||
[Inject] protected PreloadService PreloadService { get; set; } = default!;
|
[Inject] protected PreloadService PreloadService { get; set; } = default!;
|
||||||
@@ -139,6 +155,20 @@
|
|||||||
decimal TotalPrice = 0;
|
decimal TotalPrice = 0;
|
||||||
}
|
}
|
||||||
@functions {
|
@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()
|
protected override async Task OnParametersSetAsync()
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -206,16 +236,17 @@
|
|||||||
var rsp = await hc.Post<PromotionDto>($"Orders/AddOrder", Selected);
|
var rsp = await hc.Post<PromotionDto>($"Orders/AddOrder", Selected);
|
||||||
if (rsp.IsSuccessStatusCode)
|
if (rsp.IsSuccessStatusCode)
|
||||||
{
|
{
|
||||||
|
var newidorder = await rsp.Content.ReadFromJsonAsync<OrderDto>();
|
||||||
|
await OnMultipleOfThree.InvokeAsync(newidorder);
|
||||||
}
|
}
|
||||||
else if (rsp.StatusCode==System.Net.HttpStatusCode.NotFound)
|
else if (rsp.StatusCode==System.Net.HttpStatusCode.NotFound)
|
||||||
{
|
{
|
||||||
// ShowDangerAlert("سفارش یافت نشد");
|
ShowDangerAlert("مرجع یافت نشد یافت نشد");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
|
var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
|
||||||
// ShowDangerAlert(request[0]);
|
ShowDangerAlert(request[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -206,13 +206,12 @@
|
|||||||
public async Task CallBackFromNewItem(OrderDto result)
|
public async Task CallBackFromNewItem(OrderDto result)
|
||||||
{
|
{
|
||||||
await Newordermodal.HideAsync();
|
await Newordermodal.HideAsync();
|
||||||
|
await ReadOrderItem(result);
|
||||||
|
|
||||||
}
|
}
|
||||||
public async Task NewOrderItem()
|
public async Task NewOrderItem()
|
||||||
{
|
{
|
||||||
var parameters = new Dictionary<string, object>();
|
var parameters = new Dictionary<string, object>();
|
||||||
|
|
||||||
|
|
||||||
parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<OrderDto>(this, CallBackFromNewItem));
|
parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<OrderDto>(this, CallBackFromNewItem));
|
||||||
await Newordermodal.ShowAsync<OrderItemNew>(title: $"سفارش جدید", parameters: parameters);
|
await Newordermodal.ShowAsync<OrderItemNew>(title: $"سفارش جدید", parameters: parameters);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user