spree_core 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef9bb6cb651e122c3dd179632b3cd03db25db5c
-  data.tar.gz: 847f17d74a32fd42dc00d455663908d9a7b161d7
+  metadata.gz: 2b54721ddb8bf665a1a369727a7a8d626ab9d250
+  data.tar.gz: 074680d373e2db813366a98a052ffbdef555a5cf
 SHA512:
-  metadata.gz: 466fb2ea2e0628e982dfbced5a7f6ceac9b3c8889ce10b65f63b92c5804636731eb69c0a728cc096d47d4d1e8d16a32914605d131d71746ed8a1f80558cca279
-  data.tar.gz: e30d22e469863e8eac638e5700dc094aed9db9f5e518ac976b6607d7feee5a3b74fddb30e26586d9e4213b6cec4246ba0f1b1602a8d307fc7506a0b2bacc76a4
+  metadata.gz: 15f8c6df2efafb71d4a96a08a49ce73e46ad0fe447bea094017ca8d07ba3828d442cb0d4b1caaf1a365f99a6b200ffec2c106961e4bc690499bb34875476d857
+  data.tar.gz: 587f314371b7e1b0dd636412fd36b504913dd9d8153c69bdaa7061c2d59f639823e6badd4d7ed70845fae0286f36123e47e1d0648b1f3807487ef829ac3bcf1c

data/app/helpers/spree/base_helper.rb

@@ -164,9 +164,10 @@ module Spree
     end
 
     private
+
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
-      if style = method_name.to_s.sub(/_image$/, '')
+      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
         possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
         style if style.in? possible_styles.with_indifferent_access
       end

data/app/helpers/spree/products_helper.rb

@@ -12,14 +12,13 @@ module Spree
 
     # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
-      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
-      return nil if diff == 0
-      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
-      if diff > 0
-        "(#{Spree.t(:add)}: #{amount})".html_safe
-      else
-        "(#{Spree.t(:subtract)}: #{amount})".html_safe
-      end
+      variant_amount = variant.amount_in(current_currency)
+      product_amount = variant.product.amount_in(current_currency)
+      return if variant_amount == product_amount || product_amount.nil?
+      diff   = variant.amount_in(current_currency) - product_amount
+      amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
+      label  = diff > 0 ? :add : :subtract
+      "(#{Spree.t(label)}: #{amount})".html_safe
     end
 
     # returns the formatted full price for the variant, if at least one variant price differs from product price

data/app/models/spree/payment_method/check.rb

@@ -18,6 +18,8 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
+    def cancel(response); end
+
     def void(*args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,5 +1,10 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
+    # If Spree::ShippingMethod zones association was patched in
+    # CreateShippingMethodZone migrations, it needs to be patched back
+    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
+                                                          :class_name => 'Spree::Zone',
+                                                          :foreign_key => 'shipping_method_id'
   end
 end

data/lib/spree/core/controller_helpers/auth.rb

@@ -8,7 +8,7 @@ module Spree
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            unauthorized
+            redirect_unauthorized_access
           end
         end
 
@@ -20,7 +20,7 @@ module Spree
         # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
         # Override this method in your controllers if you want to have special behavior in case the user is not authorized
         # to access the requested action.  For example, a popup window might simply close itself.
-        def unauthorized
+        def redirect_unauthorized_access
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to '/unauthorized'

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.9"
+    "2.1.10"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -27,7 +27,7 @@ module Spree
     mattr_reader *ATTRIBUTES
 
     @@address_attributes = [
-      :firstname, :lastname, :address1, :address2,
+      :id, :firstname, :lastname, :address1, :address2,
       :city, :country_id, :state_id, :zipcode, :phone,
       :state_name, :alternative_phone, :company,
       :country => [:iso, :name, :iso3, :iso_name],
@@ -68,7 +68,7 @@ module Spree
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
-      :first_name, :last_name, :cc_type, :gateway_customer_profile_id, 
+      :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]

data/lib/spree/promo/coupon_applicator.rb

@@ -34,7 +34,12 @@ module Spree
         event_name = "spree.checkout.coupon_code_added"
         if promotion.activate(:coupon_code => @order.coupon_code, :order => @order)
           promo = @order.adjustments.includes(:originator).promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
-          determine_promotion_application_result(promo)
+          if promo.present?
+            determine_promotion_application_result(promo)
+          else
+            # if action is create line items
+            return { :coupon_applied? => true, :success =>  Spree.t(:coupon_code_applied) }
+          end
         else
           return { :coupon_applied? => false, :error =>  Spree.t(:coupon_code_not_eligible) }
         end

data/lib/tasks/core.rake

@@ -86,8 +86,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     end
 
     if load_sample
-      #prevent errors for missing attributes (since rails 3.1 upgrade)
-
+      # Reload models' attributes in case they were loaded in old migrations with wrong attributes
+      ActiveRecord::Base.descendants.each(&:reset_column_information)
       Rake::Task["spree_sample:load"].invoke
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.12
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement