Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.80' of https://git.aycode.com/Adam/Mango.Nop.Plugins into 4.80

This commit is contained in:
Adam 2025-10-20 19:18:36 +02:00
parent 28d8c2a748 67cd7d87bb
commit 952af7a94f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Nop.Plugin.Misc.AIPlugin/Components/ProductAttributesViewComponent.cs
View File

@ -34,12 +34,15 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Components
if (model.ProductId > 0)
{
var measuringAttributeValues = await _fruitBankAttributeService.GetMeasuringAttributeValuesAsync<Product>(model.ProductId);
if (measuringAttributeValues != null)
{
model.IsMeasurable = measuringAttributeValues.IsMeasurable;
model.NetWeight = measuringAttributeValues.NetWeight;
}
//var measuringAttributeValues = await _fruitBankAttributeService.GetMeasuringAttributeValuesAsync<Product>(model.ProductId);
//if (measuringAttributeValues != null)
//{
// model.IsMeasurable = measuringAttributeValues.IsMeasurable;
// 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.IncomingQuantity = await _fruitBankAttributeService.GetGenericAttributeValueAsync<Product, int>(model.ProductId, nameof(IIncomingQuantity.IncomingQuantity));

9
Nop.Plugin.Misc.AIPlugin/Domains/EventConsumers/FruitBankEventConsumer.cs
View File

@ -19,6 +19,7 @@ using Nop.Plugin.Misc.FruitBankPlugin.Services;
using Nop.Services.Common;
using Nop.Services.Events;
using System.Globalization;
using Mango.Nop.Core.Extensions;
namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.EventConsumers;
@ -90,7 +91,9 @@ public class FruitBankEventConsumer(IHttpContextAccessor httpContextAcc, FruitBa
//IsMeasurable
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);
isMeasurableChanged = true;
@ -98,7 +101,9 @@ public class FruitBankEventConsumer(IHttpContextAccessor httpContextAcc, FruitBa
//NetWeight
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);
//Tára