Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Added `Comparable` mixin to `Spree::Money` (#12037)

Damian Legawiec178658927b1e
diff --git a/core/lib/spree/money.rb b/core/lib/spree/money.rb
index d37542755a..b6fd52e381 100644
--- a/core/lib/spree/money.rb
+++ b/core/lib/spree/money.rb
@@ -5,8 +5,15 @@ Money.rounding_mode = BigDecimal::ROUND_HALF_UP
module Spree
class Money
+ include Comparable
+
class << self
attr_accessor :default_formatting_rules
+
+ def from_cents(amount_in_cents, options = {})
+ money = ::Money.from_cents(amount_in_cents, options[:currency])
+ new(money.to_d, options)
+ end
end
self.default_formatting_rules = {
@@ -17,10 +24,10 @@ module Spree
attr_reader :money
- delegate :cents, :currency, to: :money
+ delegate :cents, :currency, :to_d, :positive?, :zero?, to: :money
def initialize(amount, options = {})
- use_default_currency
+ ::Money.default_currency ||= Spree::Store.default.default_currency || 'USD'
@money = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
@options = Spree::Money.default_formatting_rules.merge(options)
end
@@ -29,10 +36,18 @@ module Spree
(cents / currency.subunit_to_unit.to_f * 100).round
end
+ def abs
+ self.class.new(money.abs, options)
+ end
+
def to_s
money&.format(options)
end
+ def inspect
+ "#{self.class}(cents: #{cents}, currency: #{currency})"
+ end
+
# 1) prevent blank, breaking spaces
# 2) prevent escaping of HTML character entities
def to_html(opts = { html: true })
@@ -65,9 +80,27 @@ module Spree
money == obj.money
end
- def use_default_currency
- currency = Spree::Store.default.default_currency
- ::Money.default_currency = currency
+ def +(other)
+ result_money = money + other.money
+ self.class.new(result_money.to_s, options)
+ end
+
+ def -(other)
+ result_money = money - other.money
+ self.class.new(result_money.to_s, options)
+ end
+
+ def *(value)
+ result_money = money * value
+ self.class.new(result_money.to_s, options)
+ end
+
+ def <=>(other)
+ money <=> other.money
+ end
+
+ def -@
+ self.class.new((-money).to_s, options)
end
private
diff --git a/core/spec/lib/spree/money_spec.rb b/core/spec/lib/spree/money_spec.rb
index 00b2a507f1..fd9dcdada6 100644
--- a/core/spec/lib/spree/money_spec.rb
+++ b/core/spec/lib/spree/money_spec.rb
@@ -1,12 +1,6 @@
require 'spec_helper'
describe Spree::Money do
- before do
- configure_spree_preferences do |config|
- config.currency = 'USD'
- end
- end
-
let(:money) { described_class.new(10) }
let(:currency) { Money::Currency.new('USD') }
@@ -78,7 +72,7 @@ describe Spree::Money do
context 'JPY' do
before do
- Spree::Store.default.update(default_currency: 'JPY')
+ Spree::Store.default.update!(default_currency: 'JPY')
end
it 'formats correctly' do
@@ -113,9 +107,7 @@ describe Spree::Money do
context 'Money formatting rules' do
before do
- configure_spree_preferences do |config|
- config.currency = 'EUR'
- end
+ Spree::Store.default.update!(default_currency: 'EUR')
end
after do