spree_core 3.5.0.rc1 → 3.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2114cd601e774d50896839767298308294adc60e
-  data.tar.gz: be32dd8365af3332edbf8b878493bb6787b66f8f
+  metadata.gz: a4fca3de896bb0591ba9d103ab1e82973337e93e
+  data.tar.gz: 1d2234919358861241bb21957271dbc1dfc18794
 SHA512:
-  metadata.gz: e95baff0a25bbff9bd76cb6952303234735a063f32f6c1df521fe75f7eb8cea28b5fff67bc92da889051b70530798051afaa08c4bfdbea025fa659b2024d0149
-  data.tar.gz: 44cdda9fbf073099a0b588170ccaa2f49e35065d58c582826657d74d4e1b4b65a7fc3df4b2d6e650da5669bc9790e57b836766b91e73ee3b5f3c10daf6b5d1db
+  metadata.gz: d877f0cd38820656f8a3765d1632c77d08a4b028bc87c7ea965553228cdf9d3e7a06c6cb95acdebd425d66f317db9b6dd1f1c80ce132ec8d2c0ed9c51020473a
+  data.tar.gz: dfa66a216e64df35df31c725b3703c5de810d0450427e4832212270e361b4cf224ce618d42be628a02417f355c639da164b7d11dfa9bde40d731218b5f2da1cf

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
@@ -114,7 +114,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/app/models/spree/variant.rb

@@ -276,8 +276,8 @@ module Spree
     # Ensures a new variant takes the product master price when price is not supplied
     def check_price
       if price.nil? && Spree::Config[:require_master_price]
-        raise 'No master variant found to infer price' unless product && product.master
-        raise 'Must supply price for variant or master.price for product.' if self == product.master
+        return errors.add(:base, :no_master_variant_found_to_infer_price)  unless product && product.master
+        return errors.add(:base, :must_supply_price_for_variant_or_master) if self == product.master
         self.price = product.master.price
       end
       if price.present? && currency.nil?

data/config/locales/en.yml

@@ -359,6 +359,8 @@ en:
           attributes:
             base:
               cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
+              no_master_variant_found_to_infer_price: No master variant found to infer price
+              must_supply_price_for_variant_or_master: Must supply price for variant or master price for product.
 
   devise:
     confirmations:

data/db/migrate/20171004223836_remove_icon_from_taxons.rb

@@ -1,8 +1,8 @@
 class RemoveIconFromTaxons < ActiveRecord::Migration[5.1]
   def change
-    remove_column :spree_taxons, :icon_file_name
-    remove_column :spree_taxons, :icon_content_type
-    remove_column :spree_taxons, :icon_file_size
-    remove_column :spree_taxons, :icon_updated_at
+    remove_column :spree_taxons, :icon_file_name if column_exists? :spree_taxons, :icon_file_name
+    remove_column :spree_taxons, :icon_content_type if column_exists? :spree_taxons, :icon_content_type
+    remove_column :spree_taxons, :icon_file_size if column_exists? :spree_taxons, :icon_file_size
+    remove_column :spree_taxons, :icon_updated_at if column_exists? :spree_taxons, :icon_updated_at
   end
 end

data/lib/generators/spree/install/install_generator.rb

@@ -86,9 +86,6 @@ module Spree
       if @copy_views && Spree::Core::Engine.frontend_available?
         generate 'spree:frontend:copy_views'
       end
-      if @copy_views && Spree::Core::Engine.backend_available?
-        generate 'spree:backend:copy_views'
-      end
     end
 
     def configure_application

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.5.0.rc1'
+    '3.5.0.rc2'
   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.5.0.rc1
+  version: 3.5.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant