fix
This commit is contained in:
parent
c8434ed10f
commit
eb62aec34a
|
|
@ -34,12 +34,15 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Components
|
||||||
|
|
||||||
if (model.ProductId > 0)
|
if (model.ProductId > 0)
|
||||||
{
|
{
|
||||||
var measuringAttributeValues = await _fruitBankAttributeService.GetMeasuringAttributeValuesAsync<Product>(model.ProductId);
|
//var measuringAttributeValues = await _fruitBankAttributeService.GetMeasuringAttributeValuesAsync<Product>(model.ProductId);
|
||||||
if (measuringAttributeValues != null)
|
//if (measuringAttributeValues != null)
|
||||||
{
|
//{
|
||||||
model.IsMeasurable = measuringAttributeValues.IsMeasurable;
|
// model.IsMeasurable = measuringAttributeValues.IsMeasurable;
|
||||||
model.NetWeight = measuringAttributeValues.NetWeight;
|
// model.NetWeight = measuringAttributeValues.NetWeight;
|
||||||
}
|
//}
|
||||||
|
|
||||||
|
model.IsMeasurable = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, bool>(model.ProductId, nameof(IMeasurable.IsMeasurable));
|
||||||
|
model.NetWeight = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, double>(model.ProductId, nameof(IMeasuringNetWeight.NetWeight));
|
||||||
|
|
||||||
model.Tare = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, double>(model.ProductId, nameof(ITare.Tare));
|
model.Tare = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, double>(model.ProductId, nameof(ITare.Tare));
|
||||||
model.IncomingQuantity = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, int>(model.ProductId, nameof(IIncomingQuantity.IncomingQuantity));
|
model.IncomingQuantity = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, int>(model.ProductId, nameof(IIncomingQuantity.IncomingQuantity));
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ using Nop.Plugin.Misc.FruitBankPlugin.Services;
|
||||||
using Nop.Services.Common;
|
using Nop.Services.Common;
|
||||||
using Nop.Services.Events;
|
using Nop.Services.Events;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using Mango.Nop.Core.Extensions;
|
||||||
|
|
||||||
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.EventConsumers;
|
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.EventConsumers;
|
||||||
|
|
||||||
|
|
@ -90,7 +91,9 @@ public class FruitBankEventConsumer(IHttpContextAccessor httpContextAcc, FruitBa
|
||||||
|
|
||||||
//IsMeasurable
|
//IsMeasurable
|
||||||
isMeasurable = form[nameof(IMeasurable.IsMeasurable)].ToString().Contains("true");
|
isMeasurable = form[nameof(IMeasurable.IsMeasurable)].ToString().Contains("true");
|
||||||
if (productDto == null || productDto.IsMeasurable != isMeasurable.Value)
|
var productDtoIsMeasurable = productDto?.GenericAttributes.GetValueOrNull<bool>(nameof(IMeasurable.IsMeasurable));
|
||||||
|
|
||||||
|
if (productDtoIsMeasurable == null || productDtoIsMeasurable.Value != isMeasurable.Value)
|
||||||
{
|
{
|
||||||
await fruitBankAttributeService.InsertOrUpdateGenericAttributeAsync<Product, bool>(product.Id, nameof(IMeasurable.IsMeasurable), isMeasurable.Value);
|
await fruitBankAttributeService.InsertOrUpdateGenericAttributeAsync<Product, bool>(product.Id, nameof(IMeasurable.IsMeasurable), isMeasurable.Value);
|
||||||
isMeasurableChanged = true;
|
isMeasurableChanged = true;
|
||||||
|
|
@ -98,7 +101,9 @@ public class FruitBankEventConsumer(IHttpContextAccessor httpContextAcc, FruitBa
|
||||||
|
|
||||||
//NetWeight
|
//NetWeight
|
||||||
var netWeight = double.Round(CommonHelper.To<double>(form[nameof(IMeasuringNetWeight.NetWeight)].ToString()), 1);
|
var netWeight = double.Round(CommonHelper.To<double>(form[nameof(IMeasuringNetWeight.NetWeight)].ToString()), 1);
|
||||||
if (productDto == null || productDto.NetWeight != netWeight)
|
var productDtoNetWeight = productDto?.GenericAttributes.GetValueOrNull<double>(nameof(IMeasuringNetWeight.NetWeight));
|
||||||
|
|
||||||
|
if (productDtoNetWeight == null || double.Round(productDtoNetWeight.Value, 1) != netWeight)
|
||||||
await fruitBankAttributeService.InsertOrUpdateGenericAttributeAsync<Product, double>(product.Id, nameof(IMeasuringNetWeight.NetWeight), netWeight);
|
await fruitBankAttributeService.InsertOrUpdateGenericAttributeAsync<Product, double>(product.Id, nameof(IMeasuringNetWeight.NetWeight), netWeight);
|
||||||
|
|
||||||
//Tára
|
//Tára
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue