From e00846776e15a4469fcfffcc7fabbef85cb3372d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 31 Aug 2016 10:11:05 +1000
Subject: [PATCH] Client-side, always show properties by their presentation,
 not their name

---
 app/helpers/injection_helper.rb            | 2 +-
 app/serializers/api/property_serializer.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index 6db2e583bc..dad9cf11f9 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -45,7 +45,7 @@ module InjectionHelper
   end
 
   def inject_properties
-    inject_json_ams "properties", Spree::Property.all, Api::IdNameSerializer
+    inject_json_ams "properties", Spree::Property.all, Api::PropertySerializer
   end
 
   def inject_currency_config
diff --git a/app/serializers/api/property_serializer.rb b/app/serializers/api/property_serializer.rb
index 7da4fce990..cdb3f2bae3 100644
--- a/app/serializers/api/property_serializer.rb
+++ b/app/serializers/api/property_serializer.rb
@@ -1,3 +1,9 @@
 class Api::PropertySerializer < ActiveModel::Serializer
   attributes :id, :name, :presentation
+
+  # Client-side we don't care about the property name. Send the presentation
+  # since this is what we want to show to the user.
+  def name
+    object.presentation
+  end
 end