From e0d33b44bd600eee5253d458a84c0cb74347800d Mon Sep 17 00:00:00 2001
From: Erwin Yulianto <erw13n@gmail.com>
Date: Fri, 3 Jun 2022 00:59:18 +0700
Subject: [PATCH 1/2] Fix for duplicate Product option

---
 .../Catalog/CatalogImport.cs                  | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/Libraries/Hotcakes.Commerce/Catalog/CatalogImport.cs b/Libraries/Hotcakes.Commerce/Catalog/CatalogImport.cs
index b80dc2828..98dbf174a 100644
--- a/Libraries/Hotcakes.Commerce/Catalog/CatalogImport.cs
+++ b/Libraries/Hotcakes.Commerce/Catalog/CatalogImport.cs
@@ -839,7 +839,7 @@ protected override string SheetName
         [Serializable]
         internal class ChoicesSheetImport : WorksheetImport
 		{
-            private readonly List<Option> options;
+            private List<Option> options;
             private string _previousSlug;
 
 			internal ChoicesSheetImport(ExcelReader reader, HotcakesApplication hccApp, Action<double, string> log)
@@ -897,7 +897,7 @@ protected override bool ProcessRow(Row row)
 				{
 					p.Options.RemoveAll(e => e.Bvin == opt.Bvin);
 					opt = options.Where(y => y.Bvin == opt.Bvin).FirstOrDefault();
-				}
+                }
 
 				var shared = GetCellBool(row, "D");
 				if (shared && opt == null)
@@ -911,39 +911,42 @@ protected override bool ProcessRow(Row row)
 				}
 
 				var isNew = opt == null;
+                var processedOptionItems = new List<string>();
 
-				if (isNew)
+                if (isNew)
 				{
                     opt = new Option {Name = choiceName, IsShared = shared};
-				}
-
-				opt.SetProcessor(optionType);
-				var processedOptionItems = new List<string>();
-                var column = "E";
-				while (column.Length < 10)
-				{
-                    var choiceItem = GetCell(row, column);
-
-					if (string.IsNullOrWhiteSpace(choiceItem))
-					{
-						break;
-					}
-
-					if (opt.OptionType == OptionTypes.Html)
-					{
-						opt.TextSettings.AddOrUpdate("html", choiceItem);
-					}
-					else
-					{
-						if (opt.Items.All(e => e.Name != choiceItem))
-						{
-							opt.AddItem(choiceItem);
-						}
-						processedOptionItems.Add(choiceItem);
-					}
-
-					column = GetNextColumn(column);
-				}
+                
+				    opt.SetProcessor(optionType);
+                    var column = "E";
+				    while (column.Length < 10)
+				    {
+                        var choiceItem = GetCell(row, column);
+
+					    if (string.IsNullOrWhiteSpace(choiceItem))
+					    {
+						    break;
+					    }
+
+					    if (opt.OptionType == OptionTypes.Html)
+					    {
+						    opt.TextSettings.AddOrUpdate("html", choiceItem);
+					    }
+					    else
+					    {
+						    if (opt.Items.All(e => e.Name != choiceItem))
+						    {
+							    opt.AddItem(choiceItem);
+						    }
+						    processedOptionItems.Add(choiceItem);
+					    }
+
+					    column = GetNextColumn(column);
+				    }
+
+                    _hccApp.CatalogServices.ProductOptions.Create(opt);
+                    options = _hccApp.CatalogServices.ProductOptions.FindAll(0, int.MaxValue);
+                }
 
 				if (!isNew && !opt.IsShared)
 				{
@@ -952,7 +955,7 @@ protected override bool ProcessRow(Row row)
 
 
 				p.Options.Add(opt);
-				_hccApp.CatalogServices.Products.Update(p);
+				//_hccApp.CatalogServices.Products.Update(p);
 
 				if (opt.IsShared)
 				{

From f5594a668346cdc68c36035ad73cd7a9b532bc59 Mon Sep 17 00:00:00 2001
From: Erwin Yulianto <erw13n@gmail.com>
Date: Fri, 3 Jun 2022 01:13:08 +0700
Subject: [PATCH 2/2] a Fix for missing icon on Shared Options.

---
 .../Core/Admin/Catalog/ProductSharedChoices.aspx.cs       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Website/DesktopModules/Hotcakes/Core/Admin/Catalog/ProductSharedChoices.aspx.cs b/Website/DesktopModules/Hotcakes/Core/Admin/Catalog/ProductSharedChoices.aspx.cs
index f83fcc6d4..bf87eebd3 100644
--- a/Website/DesktopModules/Hotcakes/Core/Admin/Catalog/ProductSharedChoices.aspx.cs
+++ b/Website/DesktopModules/Hotcakes/Core/Admin/Catalog/ProductSharedChoices.aspx.cs
@@ -104,15 +104,15 @@ private void RenderSingleItem(StringBuilder sb, Option o, bool isAlternate)
             sb.Append("<td class=\"hcProductEditChoice\">");
             sb.Append(o.Render());
             sb.Append("</td>");
-            sb.Append("<td width='5%'><a href=\"" + destinationLink + "\">");
-            sb.Append("<img class=\"hcIconEdit\" alt=\"Edit\" />");
+            sb.Append("<td width='5%'><a class='hcIconEdit' href =\"" + destinationLink + "\">");
+            //sb.Append("<img class=\"hcIconEdit\" alt=\"Edit\" />");
             sb.Append("</a></td>");
             sb.Append("<td width='5%'>");
             sb.Append("<a id=\"rem" + o.Bvin +
-                      "\"  class=\"trash\" href=\"ProductSharedChoices_Delete.aspx?redirect=y&id=");
+                      "\"  class=\"hcIconDelete hcDeleteColumn trash\" href=\"ProductSharedChoices_Delete.aspx?redirect=y&id=");
             sb.Append(o.Bvin);
             sb.Append("\" >");
-            sb.Append("<img alt=\"delete\" class=\"hcIconDelete\" />");
+            //sb.Append("<img alt=\"delete\" class=\"hcIconDelete\" />");
             sb.Append("</a></td>");
             sb.Append("</tr>");
         }