spree_core 3.3.0.rc3 → 3.3.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6668d5ee08583dde8ee30f6c7de79e62a5b6084
-  data.tar.gz: 5d31cd7cae134239c4768c9e107c129a9702ffd2
+  metadata.gz: d2f96bb3309926f006e5d609adee97043e0f1f17
+  data.tar.gz: c511abfe6a45dc6bedf0f98f8492ea6bf7cc895a
 SHA512:
-  metadata.gz: 3edae0e8a5070fe74583a4f33b45689340943661e7bb16bef1ff2d09604aa90736be587367c0bbfc8d063132dabca53aaf48f98e631e50857f2b67b4bb2570a4
-  data.tar.gz: a029305f8e34985aecf4a4f2641c8d1e5401366501d765d2f83fa5053e743ca7ea99ca27e93e0a037ae5d68b72db27c433d2950b4e0f516ce0d308a169d610fe
+  metadata.gz: f3793e4c6c614a61a11f6320c1439d3f23a9939ff44312187b67b4d20c284c05f3ff2bb42fef26bec05706a5efd76dd644b095a2469cc877aa2994fb3b4a7a99
+  data.tar.gz: 87af4d996f9b225d4fa714696812c02c5eb5c66af60693e316e0e31cfe78874341e058efe2d5cbb3fca75cfab0292506bbd184d13b299ccf9cc0552f0f60e11c

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

@@ -8,13 +8,8 @@ module Spree
         class_name: 'Spree::Price',
         dependent: :destroy
 
-      delegate_belongs_to :default_price,
-                          :display_price,
-                          :display_amount,
-                          :price,
-                          :price=,
-                          :price_including_vat_for,
-                          :currency
+      delegate :display_price, :display_amount, :price, :currency, :price=,
+               :price_including_vat_for, :currency=, to: :find_or_build_default_price
 
       after_save :save_default_price
 
@@ -26,6 +21,11 @@ module Spree
         !self.default_price.nil?
       end
 
+
+      def find_or_build_default_price
+        default_price || build_default_price
+      end
+
       private
 
       def default_price_changed?

data/app/models/spree/product.rb

@@ -73,11 +73,6 @@ module Spree
     has_many :line_items, through: :variants_including_master
     has_many :orders, through: :line_items
 
-    delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth,
-                        :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in, :cost_price, :images
-
-    alias_method :master_images, :images
-
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
 
     after_create :add_associations_from_prototype
@@ -118,6 +113,22 @@ module Spree
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
     self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
+    [
+      :sku, :price, :currency, :weight, :height, :width, :depth, :is_master,
+      :cost_currency, :price_in, :amount_in, :cost_price
+    ].each do |method_name|
+      delegate method_name, :"#{method_name}=", to: :find_or_build_master
+    end
+
+    delegate :display_amount, :display_price, :has_default_price?,
+             :images, to: :find_or_build_master
+
+    alias_method :master_images, :images
+
+    def find_or_build_master
+      master || build_master
+    end
+
     # the master variant is not a member of the variants array
     def has_variants?
       variants.any?

data/app/models/spree/refund.rb

@@ -14,7 +14,7 @@ module Spree
       validates :transaction_id, on: :update
       validates :amount, numericality: { greater_than: 0, allow_nil: true }
     end
-    validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create
+    validate :amount_is_less_than_or_equal_to_allowed_amount, on: :create, if: :amount
 
     after_create :perform!
     after_create :create_log_entry

data/app/models/spree/variant.rb

@@ -6,9 +6,8 @@ module Spree
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
-    delegate_belongs_to :product, :name, :description, :slug, :available_on,
-                        :shipping_category_id, :meta_description, :meta_keywords,
-                        :shipping_category
+    delegate :name, :name=, :description, :slug, :available_on, :shipping_category_id,
+             :meta_description, :meta_keywords, :shipping_category, to: :product
 
     # we need to have this callback before any dependent: :destroy associations
     # https://github.com/rails/rails/issues/3458
@@ -94,6 +93,7 @@ module Spree
     end
 
     def self.having_orders
+      warn "`Spree::Variant#having_orders` is deprecated and will be removed in Spree 3.4"
       joins(:line_items).distinct
     end
 
@@ -107,6 +107,7 @@ module Spree
 
     # returns number of units currently on backorder for this variant.
     def on_backorder
+      warn "`Spree::Variant#on_backorder` is deprecated and will be removed in Spree 3.4"
       inventory_units.with_state('backordered').size
     end
 

data/config/locales/en.yml

@@ -995,7 +995,7 @@ en:
     order_number: Order %{number}
     order_processed_successfully: Your order has been processed successfully
     order_resumed: Order resumed
-    order_states:
+    order_state:
       address: address
       awaiting_return: awaiting return
       canceled: canceled

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -30,7 +30,14 @@ module Spree
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
-      opts[:old_style_hash] = true
+      opts[:skip_gemfile] = true
+      opts[:skip_git] = true
+      opts[:skip_keeps] = true
+      opts[:skip_listen] = true
+      opts[:skip_rc] = true
+      opts[:skip_spring] = true
+      opts[:skip_test] = true
+      opts[:skip_yarn] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,

data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js

@@ -6,6 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require accounting.min
 //= require spree/frontend
 <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
   <% filename = "spree/frontend/#{ options[:lib_name].gsub("/", "_") }" %>

data/lib/spree/core/delegate_belongs_to.rb

@@ -32,6 +32,10 @@ module DelegateBelongsTo
     # delegate_belongs_to :contact, [:defaults, :address, :fullname], class_name: 'VCard'
     ##
     def delegate_belongs_to(association, *attrs)
+      ActiveSupport::Deprecation.warn(<<-EOS, caller)
+        DelegateBelongsTo module is deprecated and will be removed in Spree 3.4
+      EOS
+
       opts = attrs.extract_options!
       initialize_association :belongs_to, association, opts
       attrs = get_association_column_names(association) if attrs.empty?

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.0.rc3"
+    "3.3.0.rc4"
   end
 end

data/lib/spree/money.rb

@@ -40,6 +40,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.3.0.rc3
+  version: 3.3.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -984,7 +984,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.