spree_core 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4097b8c35f0d4c860dbaeff13518f90e790880e
-  data.tar.gz: 67e8f16ef1ebf41b7fd672a31d17ad3736439856
+  metadata.gz: 729f9d4f394bb9bbd17cf7dbb7142ae574a9183e
+  data.tar.gz: ae2d1dcd731873c1ae6523bf46a1eb6a63db882e
 SHA512:
-  metadata.gz: 83ed87a684e91dac0ce56b9d1836d0d4e1cee96cb6dd388e1d68dba07fa9d9140cabf3f77f7c50298e42ae026e1827a668aa8355256965044c0bc097157a69db
-  data.tar.gz: a6bbe1a58e61240068e92db9d3f8a2b577b939e363ff286c7ba95f0738884bc64c1f54339b4163aa51053bec6e25323f349c64fb42a08b93c852d9a19ca99901
+  metadata.gz: d3527af7dec8d2acdf7736713929387e3c099fa6776227640bd9089d2a5814da0c0f41eb54a822e5b80662f9f41126aeea5f155b82c2bfbe8d3b6ba331737b2a
+  data.tar.gz: 238f664949e01954bf25eb9cf8cb14f1a5236b615100c8961d0ee445d9e712022e1527e19ce3ce27c1082751128d2b9f99cf2d6ee8108b5b6452108fedeab6d3

data/app/models/spree/order/checkout.rb

@@ -77,11 +77,16 @@ module Spree
 
               before_transition :from => :cart, :do => :ensure_line_items_present
 
-              before_transition :to => :delivery, :do => :create_proposed_shipments
-              before_transition :to => :delivery, :do => :ensure_available_shipping_rates
+              if states[:address]
+                before_transition :from => :address, :do => :create_tax_charge!
+              end
+
+              if states[:delivery]
+                before_transition :to => :delivery, :do => :create_proposed_shipments
+                before_transition :to => :delivery, :do => :ensure_available_shipping_rates
+              end
 
               after_transition :to => :complete, :do => :finalize!
-              after_transition :to => :delivery, :do => :create_tax_charge!
               after_transition :to => :resumed,  :do => :after_resume
               after_transition :to => :canceled, :do => :after_cancel
             end

data/app/models/spree/order.rb

@@ -528,9 +528,9 @@ module Spree
 
     def is_risky?
       self.payments.where(%{
-        (avs_response IS NOT NULL and avs_response != 'D') or
+        (avs_response IS NOT NULL and avs_response != '' and avs_response != 'D' and avs_response != 'M') or
         (cvv_response_code IS NOT NULL and cvv_response_code != 'M') or
-        cvv_response_message IS NOT NULL or
+        cvv_response_message IS NOT NULL and cvv_response_message != '' or
         state = 'failed'
       }.squish!).uniq.count > 0
     end
@@ -566,7 +566,7 @@ module Spree
       end
 
       def has_available_payment
-        return unless delivery?
+        return unless has_step?("delivery") && delivery?
         # errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?
       end
 

data/app/models/spree/order_updater.rb

@@ -102,10 +102,16 @@ module Spree
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
     def update_payment_state
 
-      #line_item are empty when user empties cart
+      # line_item are empty when user empties cart
       if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
-        if payments.present? && payments.last.state == 'failed'
-          order.payment_state = 'failed'
+        if payments.present?
+          if payments.last.state == 'failed'
+            order.payment_state = 'failed'
+          elsif payments.last.state == 'completed'
+            order.payment_state = 'credit_owed'
+          else
+            order.payment_state = 'balance_due'
+          end
         else
           order.payment_state = 'balance_due'
         end

data/app/models/spree/payment.rb

@@ -119,11 +119,16 @@ module Spree
     end
 
     def is_avs_risky?
-      !(avs_response == "D" || avs_response.nil?)
+      return false if avs_response == "D"
+      return false if avs_response.blank?
+      return true
     end
 
     def is_cvv_risky?
-      !(cvv_response_code == "M" || cvv_response_code.nil?)
+      return false if cvv_response_code == "M"
+      return false if cvv_response_code.nil?
+      return false if cvv_response_message.present?
+      return true
     end
 
     private

data/app/models/spree/payment_method.rb

@@ -54,7 +54,7 @@ module Spree
     end
 
     def auto_capture?
-      Spree::Config[:auto_capture]
+      self.auto_capture.nil? ? Spree::Config[:auto_capture] : self.auto_capture
     end
 
     def supports?(source)

data/app/models/spree/price.rb

@@ -1,5 +1,6 @@
 module Spree
   class Price < ActiveRecord::Base
+    acts_as_paranoid
     belongs_to :variant, class_name: 'Spree::Variant'
 
     validate :check_price

data/app/models/spree/promotion.rb

@@ -30,21 +30,24 @@ module Spree
     end
 
     def activate(payload)
-      return unless order_activatable? payload[:order]
-
-      # make sure code is always downcased (old databases might have mixed case codes)
-      if code.present?
-        event_code = payload[:coupon_code]
-        return unless event_code == self.code.downcase.strip
-      end
-
-      if path.present?
-        return unless path == payload[:path]
-      end
-
-      actions.each do |action|
-        action.perform(payload)
+      if order_activatable?(payload[:order]) && eligible?(payload[:order])
+        # make sure code is always downcased (old databases might have mixed case codes)
+        if code.present?
+          event_code = payload[:coupon_code]
+          return unless event_code == self.code.downcase.strip
+        end
+
+        if path.present?
+          return unless path == payload[:path]
+        end
+
+        actions.each do |action|
+          action.perform(payload)
+        end
+
+        return true
       end
+      false
     end
 
     # called anytime order.update! happens

data/app/models/spree/return_authorization.rb

@@ -78,7 +78,8 @@ module Spree
       def process_return
         inventory_units.each do |iu|
           iu.return!
-          Spree::StockMovement.create!(stock_item_id: iu.find_stock_item.id, quantity: 1)
+          stock_item = Spree::StockItem.where(variant_id: iu.variant.id, stock_location_id: stock_location_id).first
+          Spree::StockMovement.create!(stock_item_id: stock_item.id, quantity: 1)
         end
 
         credit = Adjustment.new(amount: amount.abs * -1, label: Spree.t(:rma_credit))

data/app/models/spree/shipping_method.rb

@@ -6,7 +6,7 @@ module Spree
     default_scope -> { where(deleted_at: nil) }
 
     has_many :shipments
-    has_many :shipping_method_categories
+    has_many :shipping_method_categories, :dependent => :destroy
     has_many :shipping_categories, through: :shipping_method_categories
     has_many :shipping_rates, inverse_of: :shipping_method
 

data/app/models/spree/variant.rb

@@ -30,7 +30,7 @@ module Spree
       dependent: :destroy
 
     validate :check_price
-    validates :price, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: proc { Spree::Config[:require_master_price] }
+    validates :price, numericality: { greater_than_or_equal_to: 0 }
 
     validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
 
@@ -56,7 +56,9 @@ module Spree
     end
 
     def options_text
-      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
+      values = self.option_values.sort do |a, b|
+        a.option_type.position <=> b.option_type.position
+      end
 
       values.map! do |ov|
         "#{ov.option_type.presentation}: #{ov.presentation}"
@@ -76,6 +78,17 @@ module Spree
       deleted_at
     end
 
+    # Product may be created with deleted_at already set,
+    # which would make AR's default finder return nil.
+    # This is a stopgap for that little problem.
+    def product
+      Spree::Product.unscoped { super }
+    end
+
+    def default_price
+      Spree::Price.unscoped { super }
+    end
+
     def options=(options = {})
       options.each do |option|
         set_option_value(option[:name], option[:value])
@@ -136,14 +149,12 @@ module Spree
       "#{sku} #{options_text}".strip
     end
 
-    # Product may be created with deleted_at already set,
-    # which would make AR's default finder return nil.
-    # This is a stopgap for that little problem.
-    def product
-      Spree::Product.unscoped { super }
+    def in_stock?(quantity=1)
+      puts %q{[DEPRECATION] In Spree 2.2, Variant#in_stock? will no longer take a quantity. Use Variant#can_supply? instead.}
+      can_stock?(quantity)
     end
 
-    def in_stock?(quantity=1)
+    def can_stock?(quantity=1)
       Spree::Stock::Quantifier.new(self).can_supply?(quantity)
     end
 

data/config/locales/en.yml

@@ -318,13 +318,18 @@ en:
           delivery_success: Test Mail sent successfully
           error: ! 'Test Mail error: %{e}'
       tab:
-        overview: "Overview"
-        orders: "Orders"
-        products: "Products"
-        reports: "Reports"
-        configuration: "Configuration"
-        promotions: "Promotions"
-        users: "Users"
+        configuration: Configuration
+        option_types: Option Types
+        orders: Orders
+        overview: Overview
+        products: Products
+        promotions: Promotions
+        properties: Properties
+        prototypes: Prototypes
+        reports: Reports
+        taxonomies: Taxonomies
+        taxons: Taxons
+        users: Users
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -356,6 +361,7 @@ en:
     attachment_styles: Paperclip Styles
     attachment_url: Attachments URL
     authorization_failure: Authorization Failure
+    auto_capture: Auto Capture
     available_on: Available On
     avs_response: AVS Response
     back: Back
@@ -600,6 +606,7 @@ en:
     image_settings_updated: Image Settings successfully updated.
     image_settings_warning: You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this.
     images: Images
+    inactive: Inactive
     included_in_price: Included in Price
     included_price_validation: cannot be selected unless you have set a Default Tax Zone
     instructions_to_reset_password: Please enter your email on the form below
@@ -926,6 +933,7 @@ en:
     review: Review
     risk: Risk
     risk_analysis: Risk Analysis
+    risky: Risky
     rma_credit: RMA Credit
     rma_number: RMA Number
     rma_value: RMA Value
@@ -1094,6 +1102,7 @@ en:
     update: Update
     updating: Updating
     usage_limit: Usage Limit
+    use_app_default: Use App Default
     use_billing_address: Use Billing Address
     use_new_cc: Use a new card
     use_s3: Use Amazon S3 For Images

data/db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToSpreePrices < ActiveRecord::Migration
+  def change
+    add_column :spree_prices, :deleted_at, :datetime
+  end
+end

data/db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb

@@ -0,0 +1,5 @@
+class AddAutoCaptureToPaymentMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_payment_methods, :auto_capture, :boolean
+  end
+end

data/db/migrate/20140205181631_default_variant_weight_to_zero.rb

@@ -0,0 +1,11 @@
+class DefaultVariantWeightToZero < ActiveRecord::Migration
+  def up
+    Spree::Variant.unscoped.where(weight: nil).update_all("weight = 0.0")
+
+    change_column :spree_variants, :weight, :decimal, precision: 8, scale: 2, default: 0.0
+  end
+
+  def down
+    change_column :spree_variants, :weight, :decimal, precision: 8, scale: 2
+  end
+end

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

@@ -5,7 +5,6 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          before_filter :ensure_api_key
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
@@ -27,7 +26,11 @@ module Spree
             redirect_to '/unauthorized'
           else
             store_location
-            redirect_to respond_to?(:spree_login_path) ? spree_login_path : spree.root_path
+            if respond_to?(:spree_login_path)
+              redirect_to spree_login_path
+            else
+              redirect_to spree.respond_to?(:root_path) ? spree.root_path : root_path
+            end
           end
         end
 
@@ -57,16 +60,6 @@ module Spree
           redirect_to(session["spree_user_return_to"] || default)
           session["spree_user_return_to"] = nil
         end
-
-        # Need to generate an API key for a user due to some actions potentially
-        # requiring authentication to the Spree API
-        def ensure_api_key
-          if user = try_spree_current_user
-            if user.respond_to?(:spree_api_key) && user.spree_api_key.blank?
-              user.generate_spree_api_key!
-            end
-          end
-        end
       end
     end
   end

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

@@ -11,15 +11,17 @@ module Spree
         end
 
         # The current incomplete order from the session for use in cart and during checkout
-        def current_order(create_order_if_necessary = false)
+        def current_order(options = {})
+          options[:create_order_if_necessary] ||= false
+          options[:lock] ||= false
           return @current_order if @current_order
 
           if session[:order_id]
-            current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
+            current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).find_by(id: session[:order_id], currency: current_currency)
             @current_order = current_order unless current_order.try(:completed?)
           end
 
-          if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+          if options[:create_order_if_necessary] and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
             @current_order.user ||= try_spree_current_user
             # See issue #3346 for reasons why this line is here

data/lib/spree/core/product_duplicator.rb

@@ -23,12 +23,14 @@ module Spree
     def duplicate_product
       product.dup.tap do |new_product|
         new_product.name = "COPY OF #{product.name}"
+        new_product.permalink = "copy-of-#{product.permalink}"
         new_product.taxons = product.taxons
         new_product.created_at = nil
         new_product.deleted_at = nil
         new_product.updated_at = nil
         new_product.product_properties = reset_properties
         new_product.master = duplicate_master
+        new_product.variants = product.variants.map { |variant| duplicate_variant variant }
       end
     end
 
@@ -43,6 +45,14 @@ module Spree
       end
     end
 
+    def duplicate_variant(variant)
+      new_variant = variant.dup
+      new_variant.sku = "COPY OF #{new_variant.sku}"
+      new_variant.deleted_at = nil
+      new_variant.option_values = variant.option_values.map { |option_value| option_value.dup}
+      new_variant
+    end
+
     def duplicate_image(image)
       new_image = image.dup
       new_image.assign_attributes(:attachment => image.attachment.clone)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.4"
+    "2.1.5"
   end
 end

data/lib/spree/money.rb

@@ -199,7 +199,7 @@ module Spree
       if options[:html]
         # 1) prevent blank, breaking spaces
         # 2) prevent escaping of HTML character entities
-        output = output.gsub(" ", " ").html_safe
+        output = output.sub(" ", " ").html_safe
       end
       output
     end

data/lib/spree/promo/coupon_applicator.rb

@@ -32,9 +32,12 @@ module Spree
         return promotion_usage_limit_exceeded if promotion.usage_limit_exceeded?
 
         event_name = "spree.checkout.coupon_code_added"
-        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 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)
+        else
+          return { :coupon_applied? => false, :error =>  Spree.t(:coupon_code_not_eligible) }
+        end
       end
 
       def promotion_expired

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -511,6 +511,9 @@ files:
 - db/migrate/20131120234456_add_updated_at_to_variants.rb
 - db/migrate/20131211192741_unique_shipping_method_categories.rb
 - db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb
+- db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb
+- db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb
+- db/migrate/20140205181631_default_variant_weight_to_zero.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt