From 45e4d86631efbbfb81eb4f4dcf71a67456160880 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Wed, 6 Jan 2021 17:16:16 +0000
Subject: [PATCH] Merge money_decorator.rb with money.rb

The #rounded method was left out, as it appears to be dead code.
---
 app/helpers/spree/reports_helper.rb |  2 +-
 lib/spree/money.rb                  | 11 ++++++++++-
 lib/spree/money_decorator.rb        | 25 -------------------------
 3 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 lib/spree/money_decorator.rb

diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb
index 3f299c8250..eb1c60cd3c 100644
--- a/app/helpers/spree/reports_helper.rb
+++ b/app/helpers/spree/reports_helper.rb
@@ -1,4 +1,4 @@
-require 'spree/money_decorator'
+require 'spree/money'
 
 module Spree
   module ReportsHelper
diff --git a/lib/spree/money.rb b/lib/spree/money.rb
index 413c2f0e8c..5994db42b5 100644
--- a/lib/spree/money.rb
+++ b/lib/spree/money.rb
@@ -21,6 +21,11 @@ module Spree
       @options[:symbol_position] = @options[:symbol_position].to_sym
     end
 
+    # Return the currency symbol (on its own) for the current default currency
+    def self.currency_symbol
+      ::Money.new(0, Spree::Config[:currency]).symbol
+    end
+
     def to_s
       @money.format(@options)
     end
@@ -30,11 +35,15 @@ module Spree
       if options[:html]
         # 1) prevent blank, breaking spaces
         # 2) prevent escaping of HTML character entities
-        output = output.gsub(" ", "&nbsp;").html_safe
+        output = output.sub(" ", "&nbsp;").html_safe
       end
       output
     end
 
+    def format(options = {})
+      @money.format(@options.merge!(options))
+    end
+
     def ==(other)
       @money == other.money
     end
diff --git a/lib/spree/money_decorator.rb b/lib/spree/money_decorator.rb
deleted file mode 100644
index 10ecce8034..0000000000
--- a/lib/spree/money_decorator.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-Spree::Money.class_eval do
-  # return the currency symbol (on its own) for the current default currency
-  def self.currency_symbol
-    Money.new(0, Spree::Config[:currency]).symbol
-  end
-
-  def rounded
-    @options[:no_cents] = true if @money.dollars % 1 == 0
-    to_s
-  end
-
-  def to_html(options = { html: true })
-    output = @money.format(@options.merge(options))
-    if options[:html]
-      # 1) prevent blank, breaking spaces
-      # 2) prevent escaping of HTML character entities
-      output = output.sub(" ", "&nbsp;").html_safe
-    end
-    output
-  end
-
-  def format(options = {})
-    @money.format(@options.merge!(options))
-  end
-end