spree_core 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ac66f9e7ddcb8372dfead29fd08ba8153910c2
-  data.tar.gz: 08206ae70c25c4689dddd12fbab62c82e360fbd0
+  metadata.gz: 8221f56f22472a62ce9ca4606e761fd718fcc448
+  data.tar.gz: 2846b0e62b638dd5ae2071b3cf873dce9d7bd7a5
 SHA512:
-  metadata.gz: 6aa9dadaa97ec4cd19384d095b92f3bad8e6b0378906c1fa2de65dc3423837a066c09bc602aafe532e0ba11a9cfae36ef8d8887f44f1ebede67d5f922c77fa34
-  data.tar.gz: 4d405953434dafed6a819848cc601c2b718d971cb89ff3e9e4413a7692b1f99902f4502a9d56ee870020fa6f61328ac41980d3087f8f793fc67467137d9119a4
+  metadata.gz: d39dfb9985e2425eab9de5697248c3cf4d2640dca0b4a3d3d3bfeddfb6b25c27f265e78e397588a6a4ee1f9bbc8713520acf67fae100faa7dd2a3fb3b6a5e4ed
+  data.tar.gz: cb69f470e36ebc6b0cb24e1f047763b14e7574fd4a25ac462d7705e82b15e3724e361b84f813018b09ff01163747a7fc1f07d3b6dcb8b20106e9f6ebbc0e8377

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

@@ -71,11 +71,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

@@ -592,7 +592,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

@@ -103,8 +103,12 @@ module Spree
 
       #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'
+          end
         else
           order.payment_state = 'balance_due'
         end

data/app/models/spree/promotion.rb

@@ -35,21 +35,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

@@ -83,7 +83,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/variant.rb

@@ -36,7 +36,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 } if self.table_exists? && self.column_names.include?('cost_price')
 
     before_validation :set_cost_currency

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -0,0 +1,17 @@
+<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
+    <div class="date-range-filter field align-center">
+        <%= label_tag nil, t(:start), :class => 'inline' %>
+        <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
+        
+        <span class="range-divider">
+          <i class="icon-arrow-right"></i>
+        </span>
+
+        <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
+        <%= label_tag nil, t(:end), :class => 'inline' %>
+    </div>
+
+    <div class="actions filter-actions">
+      <%= button t(:search), 'icon-search'  %>
+    </div>
+<% 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

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/generators/spree/dummy/dummy_generator.rb

@@ -53,9 +53,9 @@ module Spree
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
         inside dummy_path do
-          inject_require_for('spree_frontend') if Object.const_defined?("Spree::Frontend")
-          inject_require_for('spree_backend') if Object.const_defined?("Spree::Backend")
-          inject_require_for('spree_api') if Object.const_defined?("Spree::Api")
+          inject_require_for('spree_frontend')
+          inject_require_for('spree_backend')
+          inject_require_for('spree_api')
         end
       end
     end
@@ -84,7 +84,13 @@ module Spree
     protected
 
     def inject_require_for(requirement)
-      inject_into_file 'config/application.rb', "require '#{requirement}'\n", :before => /require '#{@lib_name}'/, :verbose => true
+      inject_into_file 'config/application.rb', %Q[
+begin
+  require '#{requirement}'
+rescue LoadError
+  # #{requirement} is not available.
+end
+      ], :before => /require '#{@lib_name}'/, :verbose => true
     end
 
     def dummy_path

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

@@ -11,14 +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.find_by_id_and_currency(session[:order_id], current_currency, :include => :adjustments)
+            current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).where(id: session[:order_id], currency: current_currency).first
             @current_order = current_order unless current_order.try(:completed?)
           end
-          if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
-            @current_order = Spree::Order.new(:currency => current_currency)
+
+          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
             @current_order.created_by ||= try_spree_current_user
@@ -60,7 +63,7 @@ module Spree
             last_incomplete_order = user.last_incomplete_spree_order
             if session[:order_id].nil? && last_incomplete_order
               session[:order_id] = last_incomplete_order.id
-            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
+            elsif current_order(create_order_if_necessary: true) && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order, user)
             end
           end

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.0.8"
+    "2.0.9"
   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.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -399,6 +399,7 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
+- app/views/spree/admin/shared/_report_order_criteria.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
 - app/views/spree/payments/_payment.html.erb
@@ -503,6 +504,7 @@ files:
 - db/migrate/20131026154747_add_track_inventory_to_variant.rb
 - db/migrate/20131113035136_add_channel_to_spree_orders.rb
 - db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.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