spree_core 3.1.12 → 3.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3ebbca771b182322334dbc1ac1fcf3b7c7b18d
-  data.tar.gz: 27576641885f1676dc1e22aba3d720cff12efa41
+  metadata.gz: 7568a6b4ed997ff5d99042e84358b08ec25554a4
+  data.tar.gz: f2ac9e4517f5fb96c8b8a0a0f9200c2c355ab698
 SHA512:
-  metadata.gz: c4bb4bd04f186f04ac802ae24e9e22581e4b487335d73fa82474174b6f8555cff8b5ccd5c687e7b4ddc25982119c4fc67787f0332ced653c6e75f5d77538f78e
-  data.tar.gz: 8a7abab01b4753d4e32d0524414948754890b9a2fbb8d96d0dbe3bdd63857e6d3066c13cf2c5ae4e05feb1f2a4e4cbd486a94d82354cf684ccee9905f238a26d
+  metadata.gz: 61d16c88f57a2e168618e2e1fd68fb7d498d2ccd536b08bfff9dd8c705e02dcf7f7ca2a3bf0ec98ce9381e6ca2bcb88908e2cf33047003278ee981bd829f8f5b
+  data.tar.gz: ea5ad4e14b89144564066c400e0f36f9faeafedfb6c7b8041e72ef67e460a023244b4d42471c7b95448cd974385b3fae07ac07ca12a29f90c4a409903e8593ff

data/app/models/concerns/spree/adjustment_source.rb

@@ -9,7 +9,7 @@ module Spree
 
     protected
 
-    def create_adjustment(order, adjustable, included = nil)
+    def create_adjustment(order, adjustable, included = false)
       amount = compute_amount(adjustable)
       return if amount == 0
       adjustments.new(order: order,

data/app/models/spree/payment/processing.rb

@@ -29,7 +29,7 @@ module Spree
       # a new pending payment record for the remaining amount to capture later.
       def capture!(amount = nil)
         return true if completed?
-        amount ||= money.money.cents
+        amount ||= money.amount_in_cents
         started_processing!
         protect_from_connection_error do
           # Standard ActiveMerchant capture usage
@@ -115,7 +115,7 @@ module Spree
 
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
-          response = payment_method.send(action, money.money.cents,
+          response = payment_method.send(action, money.amount_in_cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

data/app/models/spree/refund.rb

@@ -43,7 +43,7 @@ module Spree
     def perform!
       return true if transaction_id.present?
 
-      credit_cents = Spree::Money.new(amount.to_f, currency: payment.currency).money.cents
+      credit_cents = Spree::Money.new(amount.to_f, currency: payment.currency).amount_in_cents
 
       @response = process!(credit_cents)
 

data/lib/spree/core/engine.rb

@@ -115,12 +115,13 @@ module Spree
       end
 
       config.to_prepare do
-        # Load spree locales before decorators
-        I18n.load_path += Dir.glob(
+        # Ensure spree locale paths are present before decorators
+        I18n.load_path.unshift(*(Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        )
+        ) - I18n.load_path))
+
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
           Rails.configuration.cache_classes ? require(c) : load(c)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.12"
+    "3.1.13"
   end
 end

data/lib/spree/money.rb

@@ -15,13 +15,17 @@ module Spree
 
     attr_reader :money
 
-    delegate :cents, to: :money
+    delegate :cents, :currency, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
+    def amount_in_cents
+      (cents / currency.subunit_to_unit.to_f * 100).round
+    end
+
     def to_s
       @money.format(@options)
     end
@@ -40,6 +44,16 @@ module Spree
       to_s
     end
 
+    def decimal_mark
+      return @money.decimal_mark if @options[:decimal_mark].nil?
+      @options[:decimal_mark]
+    end
+
+    def thousands_separator
+      return @money.thousands_separator if @options[:thousands_separator].nil?
+      @options[:thousands_separator]
+    end
+
     def ==(obj)
       @money == obj.money
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.1.13
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -971,7 +971,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.