From 0ba956b582b5ad4d48a467648e27b21e0c716165 Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE912.europe.corp.microsoft.com>
Date: Tue, 10 Jul 2012 13:50:56 +0400
Subject: [PATCH] Added the ability to specify the PlanName and PlanDescription
 of the Add-ons in the account summary template:

<table>
	<tbody>
        <ad:if test="#not(isnull(Plans[Space.PlanId]))#">
        <ad:if test="#notequals(Addons.Count,0)#">
		    <tr>
                <td class="Label">Add-on</td>
                <td class="Label">Quantity</td>
                <td class="Label">Purchase Date</td>
		    </tr>

            <ad:foreach collection="#Addons#" var="Addon" index="j">
                <tr>
                    <td>#Addons[j].PlanName#</td>
                    <td>#Addons[j].Quantity#</td>
                    <td>#Addons[j].PurchaseDate#</td>
                </tr>
            </ad:foreach>
            </ad:if>
        </ad:if>
	</tbody>
</table>
---
 .../Packages/PackageAddonInfo.cs                  | 15 +++++++++++++++
 .../Code/Packages/PackageController.cs            | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageAddonInfo.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageAddonInfo.cs
index 5d571fbe..fd87dd84 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageAddonInfo.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageAddonInfo.cs
@@ -43,6 +43,8 @@ namespace WebsitePanel.EnterpriseServer
         int statusId;
 		DateTime purchaseDate;
 		string comments;
+        string planName;
+        string planDescription;
 
 
 		public PackageAddonInfo()
@@ -90,5 +92,18 @@ namespace WebsitePanel.EnterpriseServer
             get { return this.statusId; }
             set { this.statusId = value; }
         }
+
+        public string PlanName
+        {
+            get { return planName; }
+            set { planName = value; }
+        }
+
+        public string PlanDescription
+        {
+            get { return planDescription; }
+            set { planDescription = value; }
+        }
+
 	}
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
index baf64911..d336dfa0 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
@@ -1952,6 +1952,21 @@ namespace WebsitePanel.EnterpriseServer
             }
             items["Plans"] = plans;
 
+            //Add ons
+            Hashtable addOns = new Hashtable();
+            int i = 0;
+            foreach (PackageInfo package in packages)
+            {
+                List<PackageAddonInfo> lstAddOns = ObjectUtils.CreateListFromDataSet<PackageAddonInfo>(GetPackageAddons(package.PackageId));
+                foreach (PackageAddonInfo addOn in lstAddOns)
+                {
+                    addOns.Add(i, addOn);
+                    i++;
+                }
+
+            }
+            items["Addons"] = addOns;
+            
             // package contexts
             Hashtable cntxs = new Hashtable();
             foreach (PackageInfo package in packages)