More quantity unit changes

mgesing · mgesing · commit 82149576fa15 · 2015-02-06T21:00:21.000+01:00
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
@@ -699,7 +699,7 @@ public int? DeliveryTimeId
 		public virtual DeliveryTime DeliveryTime { get; set; }
 
         /// <summary>
-        /// Gets or sets the delivery time identifier
+        /// Gets or sets the quantity unit identifier
         /// </summary>
         [DataMember]
         public int? QuantityUnitId
diff --git a/src/Libraries/SmartStore.Data/Migrations/201501291135374_QuantityUnits.cs b/src/Libraries/SmartStore.Data/Migrations/201501291135374_QuantityUnits.cs
@@ -97,7 +97,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 
             builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.ShowDefaultQuantityUnit",
                 "Show default quantity unit",
-                "Zeige die Standard-Verpackungseinheit");
+                "Zeige die Standard-Verpackungseinheit",
+				"Show default quantity unit if the product has no quantity unit set.",
+				"Zeige die Standard-Verpackungseinheit, falls f�r das Produkt keine Verpackungseinheit festgelegt ist.");
             
         }
     }
diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/ProductExtensions.cs
@@ -71,6 +71,9 @@ public static void MergeWithCombination(this Product product, ProductVariantAttr
 			if (combination.DeliveryTimeId.HasValue && combination.DeliveryTimeId.Value > 0)
 				product.MergedDataValues.Add("DeliveryTimeId", combination.DeliveryTimeId);
 
+			if (combination.QuantityUnitId.HasValue && combination.QuantityUnitId.Value > 0)
+				product.MergedDataValues.Add("QuantityUnitId", combination.QuantityUnitId);
+
 			if (combination.Length.HasValue)
 				product.MergedDataValues.Add("Length", combination.Length.Value);
 			if (combination.Width.HasValue)
diff --git a/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs b/src/Libraries/SmartStore.Services/Directory/QuantityUnitService.cs
@@ -108,7 +108,7 @@ from p in _productRepository.Table
         /// <returns>QuantityUnit</returns>
         public virtual QuantityUnit GetQuantityUnitById(int? quantityUnitId)
         {
-            if (quantityUnitId == 0 || quantityUnitId == null)
+			if (quantityUnitId == null || quantityUnitId == 0)
             {
                 if(_catalogSettings.ShowDefaultQuantityUnit)
                 {
diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
@@ -151,7 +151,7 @@
     <Compile Include="..\..\AssemblyVersionInfo.cs">
       <Link>Properties\AssemblyVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Directory\QuantityService.cs" />
+    <Compile Include="Directory\QuantityUnitService.cs" />
     <Compile Include="Directory\IQuantityUnitService.cs" />
     <Compile Include="Hooks\StoreMappingEntityPostDeleteHook.cs" />
     <Compile Include="Pdf\Content\PdfHtmlContent.cs" />

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)`
`97`	`97`
`98`	`98`	`builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.ShowDefaultQuantityUnit",`
`99`	`99`	`"Show default quantity unit",`
`100`		`- "Zeige die Standard-Verpackungseinheit");`
	`100`	`+ "Zeige die Standard-Verpackungseinheit",`
	`101`	`+ "Show default quantity unit if the product has no quantity unit set.",`
	`102`	`+ "Zeige die Standard-Verpackungseinheit, falls für das Produkt keine Verpackungseinheit festgelegt ist.");`
`101`	`103`
`102`	`104`	`}`
`103`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ from p in _productRepository.Table`
`108`	`108`	`/// <returns>QuantityUnit</returns>`
`109`	`109`	`public virtual QuantityUnit GetQuantityUnitById(int? quantityUnitId)`
`110`	`110`	`{`
`111`		`- if (quantityUnitId == 0 \|\| quantityUnitId == null)`
	`111`	`+ if (quantityUnitId == null \|\| quantityUnitId == 0)`
`112`	`112`	`{`
`113`	`113`	`if(_catalogSettings.ShowDefaultQuantityUnit)`
`114`	`114`	`{`