Merge pull request #183 from sparc-request/ac-fix-service-abbreviatio…

…n-method this method was causing an issue since abbreviation isn't required
sparc-request · Nov 6, 2015 · 16562a2 · 16562a2
2 parents 81d9848 + 86a7c71
commit 16562a2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/models/service.rb b/app/models/service.rb
@@ -163,11 +163,14 @@ def display_service_name(charge_code = false)
   end
 
   def display_service_abbreviation
-    if self.cpt_code and !self.cpt_code.blank?
+    if self.abbreviation.blank?
+      service_abbreviation = self.name
+    elsif self.cpt_code and !self.cpt_code.blank?
       service_abbreviation = self.abbreviation + " (#{self.cpt_code})"
     else
       service_abbreviation = self.abbreviation
     end
+
     return service_abbreviation
   end