updates to handle no options

Former-commit-id: a8aaf09a25c3eb670a23d616b2d0e79902ef6d53
VirtoCommerce · Jul 2, 2015 · 25626bd · 25626bd
1 parent 577ff9d
commit 25626bd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/STOREFRONT/WebModels/Convertors/ProductConverters.cs b/STOREFRONT/WebModels/Convertors/ProductConverters.cs
@@ -115,6 +115,8 @@ public static Product AsWebModel(
 
             var variant = product.AsVariantWebModel(productPrice, options, productRewards, productInventory);
 
+            variant.Title = "Default Title";
+
             productModel.Variants.Add(variant);
 
             return productModel;
@@ -148,7 +150,7 @@ public static Variant AsVariantWebModel(this Data.CatalogItem variation, Data.Pr
             variantModel.Image = variationImage != null ? variationImage.AsWebModel(variation.Name, variation.MainProductId) : null;
 
             PopulateInventory(ref variantModel, variation, inventory);
-            variantModel.AllOptions = GetOptionValues(options, variation.VariationProperties);
+            variantModel.Options = GetOptionValues(options, variation.VariationProperties);
 
             variantModel.NumericPrice = price != null ? (price.Sale.HasValue ? price.Sale.Value : price.List) : 0M;
             if (reward != null)
@@ -219,18 +221,32 @@ public static Review AsWebModel(this Data.Review review)
             return webReview;
         }
 
+        #region Option Methods
+
+        private static string DefaultOption = "Default Title";
         private static string[] GetOptions(IDictionary<string, object> itemProperties)
         {
             if (itemProperties == null || !itemProperties.Any())
             {
-                return null;
+                return new []{ "Title" };
             }
 
-            return itemProperties.Select(o => o.Key).ToArray();
+            var options = itemProperties.Select(o => o.Key).ToArray();
+            if (options == null || !options.Any())
+            {
+                options = new[] { "Title" };
+            }
+
+            return options;
         }
 
         private static string[] GetOptionValues(IEnumerable<string> options, IDictionary<string, object> itemProperties)
         {
+            if (options != null && options.Count() == 1 && options.ElementAt(0) == "Title")
+            {
+                return new[] { DefaultOption };
+            }
+
             if (itemProperties == null || !itemProperties.Any() || options == null)
             {
                 return null;
@@ -239,6 +255,7 @@ private static string[] GetOptionValues(IEnumerable<string> options, IDictionary
             var variationOptions = options.Select(option => itemProperties.ContainsKey(option) ? itemProperties[option].ToNullOrString() : null).ToList();
             return variationOptions.ToArray();
         }
+        #endregion
 
         private static UrlHelper GetUrlHelper()
         {

diff --git a/STOREFRONT/WebModels/Models/Variant.cs b/STOREFRONT/WebModels/Models/Variant.cs
@@ -70,15 +70,15 @@ public Image FeaturedImage
         public long InventoryQuantity { get; set; }
 
         [DataMember]
-        public string[] AllOptions { get; set; }
+        public string[] Options { get; set; }
 
         [DataMember]
         public string Option1
         {
             get
             {
-                if (this.AllOptions == null) return null;
-                return this.AllOptions.Length >= 1 ? this.AllOptions[0] : null;
+                if (this.Options == null) return null;
+                return this.Options.Length >= 1 ? this.Options[0] : null;
             }
         }
 
@@ -87,8 +87,8 @@ public string Option2
         {
             get
             {
-                if (this.AllOptions == null) return null;
-                return this.AllOptions.Length >= 2 ? this.AllOptions[1] : null;
+                if (this.Options == null) return null;
+                return this.Options.Length >= 2 ? this.Options[1] : null;
             }
         }
 
@@ -97,8 +97,8 @@ public string Option3
         {
             get
             {
-                if (this.AllOptions == null) return null;
-                return this.AllOptions.Length >= 3 ? this.AllOptions[2] : null;
+                if (this.Options == null) return null;
+                return this.Options.Length >= 3 ? this.Options[2] : null;
             }
         }