From b679c2b2dbb0629a978ebd9d1f275c3548fcc5a3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 6 Feb 2020 16:28:44 -0500
Subject: [PATCH] fixes for freshdesk endpoint

---
 src/Billing/Controllers/FreshdeskController.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Billing/Controllers/FreshdeskController.cs b/src/Billing/Controllers/FreshdeskController.cs
index 5b520aa9ae..1905aef9a2 100644
--- a/src/Billing/Controllers/FreshdeskController.cs
+++ b/src/Billing/Controllers/FreshdeskController.cs
@@ -1,5 +1,4 @@
-using Bit.Core;
-using Bit.Core.Repositories;
+using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -90,10 +89,12 @@ namespace Bit.Billing.Controllers
                     {
                         foreach(var org in orgs)
                         {
-                            tags.Add("Org:" + GetAttribute<DisplayAttribute>(org.PlanType).Name);
+                            tags.Add(string.Format("Org: {0}",
+                                GetAttribute<DisplayAttribute>(org.PlanType).Name.Split(" ").FirstOrDefault()));
                         }
                     }
-                    var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free);
+                    var hasPaidOrg = orgs.Any(o => o.PlanType != Core.Enums.PlanType.Free &&
+                        o.PlanType != Core.Enums.PlanType.Custom);
                     if(user.Premium || hasPaidOrg)
                     {
                         updateBody.Add("priority", 3);
@@ -138,7 +139,7 @@ namespace Bit.Billing.Controllers
                     throw;
                 }
             }
-            await Task.Delay(60000 * (retriedCount + 1));
+            await Task.Delay(30000 * (retriedCount + 1));
             return await CallFreshdeskApiAsync(request, retriedCount++);
         }