spree_core 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a2abd18d0a6f4ead4edb367efe9f60ea1cf3098
-  data.tar.gz: e1291c816e63476c91880dd5a5d1d4b02dc69f6d
+  metadata.gz: 73e2d20d2e94ec8108511604d21d42356cc17e6f
+  data.tar.gz: 15a87566816c184d635ab8dfa37832206e7b5dd9
 SHA512:
-  metadata.gz: 864321fd229b5100cf8871d6b69868f8de7ee488928ce881e02acb3b7c014e6f904303731e6677f5acf65e635ee297c034c342993e2699f06b1eb53b00693b66
-  data.tar.gz: 90a6e8778a862a3d3ec7e773cced3015737b7a5969e707f2b9b06b06bedcf4772ac64d749e28fd2519ad3fab0d56d5ccbfb1d6509b0e175f4a7e473cbf7929a9
+  metadata.gz: 114e9c29ef8f116cd2998cc3e8e008a8a369f35f5927f78067d153b31e02987e19d076099c302500d6245a27de76d281577dd4121f258086dd65e6566c4ba577
+  data.tar.gz: c1a0a77381b644cd78822fd7d34518cf304e0d7ccd9e81a9f9e424aec589ce3b6df47da707b061de156a7f28fddcec44a967143f11aa8be01c8bb1f7b31667ec

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/promotion/rules/option_value.rb

@@ -31,20 +31,12 @@ module Spree
         end
 
         def actionable?(line_item)
-          pid = line_item.product.id
-          ovids = line_item.variant.option_values.pluck(:id)
+          product_id = line_item.product.id
+          option_values_ids = line_item.variant.option_value_ids
+          eligible_product_ids = preferred_eligible_values.keys
+          eligible_value_ids = preferred_eligible_values[product_id]
 
-          product_ids.include?(pid) && (value_ids(pid) - ovids).empty?
-        end
-
-        private
-
-        def product_ids
-          preferred_eligible_values.keys
-        end
-
-        def value_ids(product_id)
-          preferred_eligible_values[product_id]
+          eligible_product_ids.include?(product_id) && (eligible_value_ids & option_values_ids).present?
         end
       end
     end

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

@@ -116,12 +116,12 @@ 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|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.5"
+    "3.3.6"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -986,7 +986,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.