From 0e354f8fc10913900debabab83dc81dd2820ab67 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 8 Jun 2016 14:56:30 +1000 Subject: [PATCH] Remove unused currency config vars: decimal_mark, thousands_separator --- app/serializers/api/currency_config_serializer.rb | 14 +++----------- .../filters/localize_currency_spec.js.coffee | 5 ----- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/serializers/api/currency_config_serializer.rb b/app/serializers/api/currency_config_serializer.rb index ab17af8715..100a4a0b84 100644 --- a/app/serializers/api/currency_config_serializer.rb +++ b/app/serializers/api/currency_config_serializer.rb @@ -1,5 +1,5 @@ class Api::CurrencyConfigSerializer < ActiveModel::Serializer - attributes :currency, :display_currency, :symbol, :symbol_position, :hide_cents, :decimal_mark, :thousands_separator + attributes :currency, :display_currency, :symbol, :symbol_position, :hide_cents def currency Spree::Config[:currency] @@ -13,20 +13,12 @@ class Api::CurrencyConfigSerializer < ActiveModel::Serializer ::Money.new(1, Spree::Config[:currency]).symbol end - def symbol_position + def symbol_position Spree::Config[:currency_symbol_position] end - def hide_cents + def hide_cents Spree::Config[:hide_cents] end - def decimal_mark - Spree::Config[:currency_decimal_mark] - end - - def thousands_separator - Spree::Config[:currency_thousands_separator] - end - end diff --git a/spec/javascripts/unit/darkswarm/filters/localize_currency_spec.js.coffee b/spec/javascripts/unit/darkswarm/filters/localize_currency_spec.js.coffee index 0d21c7de6c..2a690ed0a7 100644 --- a/spec/javascripts/unit/darkswarm/filters/localize_currency_spec.js.coffee +++ b/spec/javascripts/unit/darkswarm/filters/localize_currency_spec.js.coffee @@ -7,9 +7,6 @@ describe 'convert number to localised currency ', -> symbol_position: "before" currency: "D" hide_cents: "false" - # Not used yet... - # decimal_mark: "." - # thousands_separator: "," module 'Darkswarm' module ($provide)-> $provide.value "currencyConfig", currencyconfig @@ -38,5 +35,3 @@ describe 'convert number to localised currency ', -> it "can hide cents", -> currencyconfig.hide_cents = "true" expect(filter(5)).toEqual "$5" - -