Browse Source

Fix to Product unit of measure not being pulled when not default instance.

Kenric Nugteren 7 months ago
parent
commit
267ba9314d

+ 2 - 0
prs.classes/Entities/Product/ProductLink.cs

@@ -35,6 +35,8 @@ namespace Comal.Classes
         [NullEditor]
         [RequiredColumn]
         public ProductInstanceLink DefaultInstance { get; set; }
+        
+        public ProductDimensionUnitLink UnitOfMeasure { get; set; }
 
         [NullEditor]
         [RequiredColumn]

+ 10 - 21
prs.classes/Entities/Stock/StockEntity.cs

@@ -10,27 +10,16 @@ namespace Comal.Classes
 
         public static void LinkStockDimensions<TStock>() where TStock : StockEntity
         {
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, Guid>(x => x.Product.Dimensions.Unit, x => x.ID, x => x.Dimensions.Unit.ID);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.Dimensions.Unit, x => x.Code, x => x.Dimensions.Unit.Code);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.Dimensions.Unit, x => x.Description, x => x.Dimensions.Unit.Description);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.Dimensions.Unit, x => x.HasLength, x => x.Dimensions.Unit.HasLength);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.Dimensions.Unit, x => x.HasHeight, x => x.Dimensions.Unit.HasHeight);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.Dimensions.Unit, x => x.HasQuantity, x => x.Dimensions.Unit.HasQuantity);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.Dimensions.Unit, x => x.HasWeight, x => x.Dimensions.Unit.HasWeight);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.Dimensions.Unit, x => x.HasWidth, x => x.Dimensions.Unit.HasWidth);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.Dimensions.Unit, x => x.Formula, x => x.Dimensions.Unit.Formula);
-            // LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.Dimensions.Unit, x => x.Format, x => x.Dimensions.Unit.Format);
-            
-            LinkedProperties.Register<TStock, StockDimensions, Guid>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.ID, x => x.Dimensions.Unit.ID);
-            LinkedProperties.Register<TStock, StockDimensions, String>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.Code, x => x.Dimensions.Unit.Code);
-            LinkedProperties.Register<TStock, StockDimensions, String>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.Description, x => x.Dimensions.Unit.Description);
-            LinkedProperties.Register<TStock, StockDimensions, bool>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.HasLength, x => x.Dimensions.Unit.HasLength);
-            LinkedProperties.Register<TStock, StockDimensions, bool>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.HasHeight, x => x.Dimensions.Unit.HasHeight);
-            LinkedProperties.Register<TStock, StockDimensions, bool>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.HasQuantity, x => x.Dimensions.Unit.HasQuantity);
-            LinkedProperties.Register<TStock, StockDimensions, bool>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.HasWeight, x => x.Dimensions.Unit.HasWeight);
-            LinkedProperties.Register<TStock, StockDimensions, bool>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.HasWidth, x => x.Dimensions.Unit.HasWidth);
-            LinkedProperties.Register<TStock, StockDimensions, String>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.Formula, x => x.Dimensions.Unit.Formula);
-            LinkedProperties.Register<TStock, StockDimensions, String>(x => x.Product.DefaultInstance.Dimensions, x => x.Unit.Format, x => x.Dimensions.Unit.Format);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, Guid>(x => x.Product.UnitOfMeasure, x => x.ID, x => x.Dimensions.Unit.ID);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.UnitOfMeasure, x => x.Code, x => x.Dimensions.Unit.Code);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.UnitOfMeasure, x => x.Description, x => x.Dimensions.Unit.Description);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.UnitOfMeasure, x => x.HasLength, x => x.Dimensions.Unit.HasLength);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.UnitOfMeasure, x => x.HasHeight, x => x.Dimensions.Unit.HasHeight);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.UnitOfMeasure, x => x.HasQuantity, x => x.Dimensions.Unit.HasQuantity);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.UnitOfMeasure, x => x.HasWeight, x => x.Dimensions.Unit.HasWeight);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, bool>(x => x.Product.UnitOfMeasure, x => x.HasWidth, x => x.Dimensions.Unit.HasWidth);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.UnitOfMeasure, x => x.Formula, x => x.Dimensions.Unit.Formula);
+            LinkedProperties.Register<TStock, ProductDimensionUnitLink, String>(x => x.Product.UnitOfMeasure, x => x.Format, x => x.Dimensions.Unit.Format);
             
             LinkedProperties.Register<TStock, StockDimensions, double>(x => x.Product.DefaultInstance.Dimensions, x => x.Height, x => x.Dimensions.Height);
             LinkedProperties.Register<TStock, StockDimensions, double>(x => x.Product.DefaultInstance.Dimensions, x => x.Length, x => x.Dimensions.Length);