spree_core 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b180601af90a25cab2272036e7e46087ad23181
-  data.tar.gz: 9380b234a2c586b66ca775c79d6299d9d65c5b0b
+  metadata.gz: cf31759b42f3d9c77f519a0a834197545d65fe4d
+  data.tar.gz: e2950f378e975c121125d09ffb62aec3ecd97378
 SHA512:
-  metadata.gz: b175161e97670be7b65499e3b07b105f62847bd5ee18a7f07cfb83215c0756d6ff99bb617986ffcb860dfecc440df8f63b9313048cc6e7bcdac7428e58c9c3fc
-  data.tar.gz: a3a4564276563192dc89b30e225aff9b28ccc5c1ddaeb0696403f6a8a062df67267fe152154c15f7cc0274c0cccf7408131a430c679d4ad6c7e2fbd0b8ac3ce6
+  metadata.gz: 4e41ee0be0df3a866211bc0c9b96fa1cfe803317f1c0b286d1c8d241e639eff8afd5886a78a55c5b3ee6dd38cc8601c5957898b07cf0cfd65070d66804243b60
+  data.tar.gz: 6bb17dd15d7e92b168eaba7f5d6b662a193a6739125ff3a7ee33ff08a76979924b463964b791b67e8d79e8f3c4e5de1bf694ab0e4bcaae9b9835b6da272c3f33

data/app/helpers/spree/base_helper.rb

@@ -162,9 +162,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/models/spree/adjustment.rb

@@ -22,7 +22,7 @@
 # it might be reinstated.
 module Spree
   class Adjustment < Spree::Base
-    belongs_to :adjustable, polymorphic: true
+    belongs_to :adjustable, polymorphic: true, touch: true
     belongs_to :source, polymorphic: true
     belongs_to :order, class_name: "Spree::Order"
 
@@ -40,6 +40,7 @@ module Spree
     end
 
     after_create :update_adjustable_adjustment_total
+    after_destroy :update_adjustable_adjustment_total
 
     scope :open, -> { where(state: 'open') }
     scope :closed, -> { where(state: 'closed') }

data/app/models/spree/calculator/shipping/flat_percent_item_total.rb

@@ -10,9 +10,11 @@ module Spree
       end
 
       def compute_package(package)
-        content_items = package.contents
-        item_total = total(content_items)
-        value = item_total * BigDecimal(self.preferred_flat_percent.to_s) / 100.0
+        compute_from_price(total(package.contents))
+      end
+
+      def compute_from_price(price)
+        value = price * BigDecimal(self.preferred_flat_percent.to_s) / 100.0
         (value * 100).round.to_f / 100
       end
     end

data/app/models/spree/calculator/shipping/flexi_rate.rb

@@ -13,11 +13,13 @@ module Spree
       end
 
       def compute_package(package)
-        content_items = package.contents
+        compute_from_quantity(package.contents.sum(&:quantity))
+      end
+
+      def compute_from_quantity(quantity)
         sum = 0
         max = self.preferred_max_items.to_i
-        items_count = content_items.map(&:quantity).sum
-        items_count.times do |i|
+        quantity.times do |i|
           # check max value to avoid divide by 0 errors
           if (max == 0 && i == 0) || (max > 0) && (i % max == 0)
             sum += self.preferred_first_item.to_f

data/app/models/spree/calculator/shipping/per_item.rb

@@ -11,8 +11,11 @@ module Spree
       end
 
       def compute_package(package)
-        content_items = package.contents
-        self.preferred_amount * content_items.sum { |item| item.quantity }
+        compute_from_quantity(package.contents.sum(&:quantity))
+      end
+
+      def compute_from_quantity(quantity)
+        self.preferred_amount * quantity
       end
     end
   end

data/app/models/spree/calculator/shipping/price_sack.rb

@@ -13,8 +13,11 @@ module Spree
       end
 
       def compute_package(package)
-        content_items = package.contents
-        if total(content_items) < self.preferred_minimal_amount
+        compute_from_price(total(package.contents))
+      end
+
+      def compute_from_price(price)
+        if price < self.preferred_minimal_amount
           self.preferred_normal_amount
         else
           self.preferred_discount_amount

data/app/models/spree/order.rb

@@ -150,7 +150,7 @@ module Spree
     end
 
     def display_tax_total
-      Spree::Money.new(included_tax_total + additional_tax_total, { currency: currency })
+      Spree::Money.new(tax_total, { currency: currency })
     end
 
     def display_shipment_total
@@ -381,7 +381,12 @@ module Spree
     #   which gets rescued and converted to FALSE when
     #   :allow_checkout_on_gateway_error is set to false
     #
-    def process_payments!
+    def process_payments!\
+      # Don't run if there is nothing to pay.
+      return if payment_total >= total
+      # Prevent orders from transitioning to complete without a successfully processed payment.
+      raise Core::GatewayError.new(Spree.t(:no_payment_found)) if pending_payments.empty?
+
       pending_payments.each do |payment|
         break if payment_total >= total
 

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

@@ -83,12 +83,15 @@ module Spree
       def credit!(credit_amount=nil)
         raise Core::GatewayError.new(Spree.t(:payment_processing_failed)) if processing?
 
+        # Calculate credit amount before marking as processing since it messes up the order totals not having payment in completed state.
+        credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+        credit_amount = credit_amount.to_f
+
+        # Mark as processing to avoid race condition that could send multiple credits to the gateway.
         started_processing!
         protect_from_connection_error do
           check_environment
 
-          credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
-          credit_amount = credit_amount.to_f
           credit_cents = Spree::Money.new(credit_amount, currency: currency).money.cents
 
           if payment_method.payment_profiles_supported?
@@ -98,9 +101,10 @@ module Spree
           end
 
           record_response(response)
+          # Always set back to 'completed' as initial payment record was successful.
+          self.update_column(:state, 'completed')
 
           if response.success?
-            self.update_column(:state, 'completed')
             self.class.create!(
               :order => order,
               :source => self,

data/app/models/spree/product/scopes.rb

@@ -87,7 +87,7 @@ module Spree
     #   Spree::Product.taxons_id_eq([x,y])
     add_search_scope :in_taxons do |*taxons|
       taxons = get_taxons(taxons)
-      taxons.first ? prepare_taxon_conditions(taxons) : scoped
+      taxons.first ? prepare_taxon_conditions(taxons) : where(nil)
     end
 
     # a scope that finds all products having property specified by name, object or id
@@ -214,7 +214,7 @@ module Spree
       #   "spree_variants" ON "spree_variants"."product_id" = "spree_products"."id" AND "spree_variants"."is_master" = 't'
       #   AND "spree_variants"."deleted_at" IS NULL LEFT OUTER JOIN "spree_prices" ON
       #   "spree_prices"."variant_id" = "spree_variants"."id" AND "spree_prices"."currency" = 'USD'
-      #   AND "spree_prices"."deleted_at" IS NULL WHERE "spree_products"."deleted_at" IS NULL AND ('t'='t') 
+      #   AND "spree_prices"."deleted_at" IS NULL WHERE "spree_products"."deleted_at" IS NULL AND ('t'='t')
       #   ORDER BY "spree_prices"."amount" ASC LIMIT 10 OFFSET 0
       #
       # Don't allow sort_column, a variable coming from params,

data/app/models/spree/shipment.rb

@@ -153,14 +153,14 @@ module Spree
     alias discounted_amount discounted_cost
 
     # Only one of either included_tax_total or additional_tax_total is set
-    # This method returns the total of the two. Saves having to check if 
+    # This method returns the total of the two. Saves having to check if
     # tax is included or additional.
     def tax_total
       included_tax_total + additional_tax_total
     end
 
     def final_price
-      discounted_cost + tax_total
+      cost + adjustment_total
     end
 
     def display_discounted_cost

data/app/models/spree/tax_rate.rb

@@ -75,8 +75,8 @@ module Spree
       rates = self.match(order_tax_zone)
       tax_categories = rates.map(&:tax_category)
       relevant_items, non_relevant_items = items.partition { |item| tax_categories.include?(item.tax_category) }
+      Spree::Adjustment.where(adjustable: relevant_items).tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
       relevant_items.each do |item|
-        item.adjustments.tax.delete_all
         relevant_rates = rates.select { |rate| rate.tax_category == item.tax_category }
         store_pre_tax_amount(item, relevant_rates)
         relevant_rates.each do |rate|
@@ -85,9 +85,8 @@ module Spree
       end
       non_relevant_items.each do |item|
         if item.adjustments.tax.present?
-          item.adjustments.tax.delete_all
-          item.update_column(:pre_tax_amount, nil)
-          item.send(:recalculate_adjustments)
+          item.adjustments.tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
+          item.update_columns pre_tax_amount: 0
         end
       end
     end

data/config/locales/en.yml

@@ -53,6 +53,7 @@ en:
         special_instructions: Special Instructions
         state: State
         total: Total
+        considered_risky: Risky
       spree/order/bill_address:
         address1: Billing address street
         city: Billing address city
@@ -437,6 +438,7 @@ en:
     back_to_users_list: Back To Users List
     back_to_zones_list: Back To Zones List
     backorderable: Backorderable
+    backorderable_default: Backorderable default
     backorders_allowed: backorders allowed
     balance_due: Balance Due
     base_amount: Base Amount
@@ -960,6 +962,7 @@ en:
         name: User Logged In
     promotions: Promotions
     promotion_uses: Promotion uses
+    propagate_all_variants: Propagate all variants
     properties: Properties
     property: Property
     prototype: Prototype
@@ -1067,6 +1070,7 @@ en:
     show_active: Show Active
     show_deleted: Show Deleted
     show_only_complete_orders: Only show complete orders
+    show_only_considered_risky: Only show risky orders
     show_rate_in_label: Show rate in label
     sku: SKU
     slug: Slug

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/db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb

@@ -0,0 +1,6 @@
+class DefaultPreTaxAmountShouldBeZero < ActiveRecord::Migration
+  def change
+    change_column :spree_line_items, :pre_tax_amount, :decimal, precision: 8, scale: 2, default: 0
+    change_column :spree_shipments, :pre_tax_amount, :decimal, precision: 8, scale: 2, default: 0
+  end
+end

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

@@ -6,9 +6,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
 //= require spree/backend
-<% else %>
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
 //= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
 //= require_tree .

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

@@ -6,9 +6,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
 //= require spree/frontend
-<% else %>
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
 //= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
 //= require_tree .

data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css

@@ -3,9 +3,8 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
-<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
  *= require spree/backend
-<% else %>
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend'  %>
  *= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
  *= require_self

data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css

@@ -3,9 +3,8 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
-<% if options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
  *= require spree/frontend
-<% else %>
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
  *= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>
  *= require_self

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

@@ -9,7 +9,7 @@ module Spree
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            unauthorized
+            redirect_unauthorized_access
           end
         end
 
@@ -18,7 +18,6 @@ module Spree
           @current_ability ||= Spree::Ability.new(try_spree_current_user)
         end
 
-
         def redirect_back_or_default(default)
           redirect_to(session["spree_user_return_to"] || default)
           session["spree_user_return_to"] = nil
@@ -64,7 +63,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/importer/order.rb

@@ -90,12 +90,15 @@ module Spree
           return {} unless line_items_hash
           line_items_hash.each_key do |k|
             begin
-              line_item = line_items_hash[k]
-              ensure_variant_id_from_params(line_item)
-
-              extra_params = line_item.except(:variant_id, :quantity)
+              extra_params = line_items_hash[k].except(:variant_id, :quantity, :sku)
+              line_item = ensure_variant_id_from_params(line_items_hash[k])
               line_item = order.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
-              line_item.update_attributes(extra_params) unless extra_params.empty?
+              # Raise any errors with saving to prevent import succeeding with line items failing silently.
+              if extra_params.present?
+                line_item.update_attributes!(extra_params)
+              else
+                line_item.save!
+              end
             rescue Exception => e
               raise "Order import line items: #{e.message} #{line_item}"
             end
@@ -154,10 +157,13 @@ module Spree
 
         def self.ensure_variant_id_from_params(hash)
           begin
+            sku = hash.delete(:sku)
             unless hash[:variant_id].present?
-              hash[:variant_id] = Spree::Variant.active.find_by_sku!(hash[:sku]).id
-              hash.delete(:sku)
+              hash[:variant_id] = Spree::Variant.active.find_by_sku!(sku).id
             end
+            hash
+          rescue ActiveRecord::RecordNotFound => e
+            raise "Ensure order import variant: Variant w/SKU #{sku} not found."
           rescue Exception => e
             raise "Ensure order import variant: #{e.message} #{hash}"
           end

data/lib/spree/core/product_filters.rb

@@ -143,8 +143,7 @@ module Spree
         brand_property = Spree::Property.find_by(name: 'brand')
         scope = Spree::ProductProperty.where(property: brand_property).
           joins(product: :taxons).
-          where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants).
-          scoped
+          where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants)
         brands = scope.pluck(:value).uniq
         {
           name:   'Applicable Brands',

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.3'
+    '2.3.4'
   end
 end

data/lib/spree/testing_support/factories/product_factory.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
     description { generate(:random_description) }
     price 19.99
     cost_price 17.00
-    sku { "ABC-#{Kernel.rand(9999)}" }
+    sku { generate(:sku) }
     available_on { 1.year.ago }
     deleted_at nil
     shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -1,6 +1,5 @@
 FactoryGirl.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
-    number '100'
     amount 100.00
     association(:order, factory: :shipped_order)
     reason 'no particular reason'

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
-    number '100'
     cost 100.00
     state 'pending'
     order

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -4,7 +4,7 @@ FactoryGirl.define do
   factory :base_variant, class: Spree::Variant do
     price 19.99
     cost_price 17.00
-    sku    { SecureRandom.hex }
+    sku    { generate(:sku)          }
     weight { generate(:random_float) }
     height { generate(:random_float) }
     width  { generate(:random_float) }

data/lib/spree/testing_support/factories.rb

@@ -14,4 +14,6 @@ FactoryGirl.define do
   sequence(:random_string)      { Faker::Lorem.sentence }
   sequence(:random_description) { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
   sequence(:random_email)       { Faker::Internet.email }
+
+  sequence(:sku) { |n| "SKU-#{n}" }
 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.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +240,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -611,6 +611,7 @@ files:
 - db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb
 - db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb
 - db/migrate/20140804185157_add_default_to_shipment_cost.rb
+- db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt