spree_core 2.3.13 → 2.4.0.rc1

data/db/migrate/20140718133349_add_customer_return_id_to_return_item.rb

@@ -0,0 +1,6 @@
+class AddCustomerReturnIdToReturnItem < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :customer_return_id, :integer
+    add_index :spree_return_items, :customer_return_id, name: 'index_return_items_on_customer_return_id'
+  end
+end

data/db/migrate/20140718195325_create_friendly_id_slugs.rb

@@ -0,0 +1,15 @@
+class CreateFriendlyIdSlugs < ActiveRecord::Migration
+  def change
+    create_table :friendly_id_slugs do |t|
+      t.string   :slug,           :null => false
+      t.integer  :sluggable_id,   :null => false
+      t.string   :sluggable_type, :limit => 50
+      t.string   :scope
+      t.datetime :created_at
+    end
+    add_index :friendly_id_slugs, :sluggable_id
+    add_index :friendly_id_slugs, [:slug, :sluggable_type]
+    add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], :unique => true
+    add_index :friendly_id_slugs, :sluggable_type
+  end
+end

data/db/migrate/20140723004419_rename_spree_refund_return_authorization_id.rb

@@ -0,0 +1,5 @@
+class RenameSpreeRefundReturnAuthorizationId < ActiveRecord::Migration
+  def change
+    rename_column :spree_refunds, :return_authorization_id, :customer_return_id
+  end
+end

data/db/migrate/20140723152808_increase_return_item_pre_tax_amount_precision.rb

@@ -0,0 +1,13 @@
+class IncreaseReturnItemPreTaxAmountPrecision < ActiveRecord::Migration
+  def up
+    change_column :spree_return_items, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+    change_column :spree_return_items, :included_tax_total, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+    change_column :spree_return_items, :additional_tax_total, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+  end
+
+  def down
+    change_column :spree_return_items, :pre_tax_amount, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+    change_column :spree_return_items, :included_tax_total, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+    change_column :spree_return_items, :additional_tax_total, :decimal, precision: 10, scale: 2, default: 0.0, null: false
+  end
+end

data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb

@@ -0,0 +1,15 @@
+class CopyProductSlugsToSlugHistory < ActiveRecord::Migration
+  def change
+
+	# do what sql does best: copy all slugs into history table in a single query
+	# rather than load potentially millions of products into memory
+	Spree::Product.connection.execute <<-SQL
+INSERT INTO #{FriendlyId::Slug.table_name} (slug, sluggable_id, sluggable_type, created_at)
+  SELECT slug, id, '#{Spree::Product.to_s}', #{ActiveRecord::Base.send(:sanitize_sql_array, ['?', Time.current])} 
+  FROM #{Spree::Product.table_name}
+  WHERE slug IS NOT NULL
+  ORDER BY id
+SQL
+
+  end
+end

data/db/migrate/20140725131539_create_spree_reimbursements.rb

@@ -0,0 +1,21 @@
+class CreateSpreeReimbursements < ActiveRecord::Migration
+  def change
+    create_table :spree_reimbursements do |t|
+      t.string :number
+      t.string :reimbursement_status
+      t.integer :customer_return_id
+      t.integer :order_id
+      t.decimal :total, precision: 10, scale: 2
+
+      t.timestamps
+    end
+
+    add_index :spree_reimbursements, :customer_return_id
+    add_index :spree_reimbursements, :order_id
+
+    remove_column :spree_refunds, :customer_return_id, :integer
+    add_column :spree_refunds, :reimbursement_id, :integer
+
+    add_column :spree_return_items, :reimbursement_id, :integer
+  end
+end

data/db/migrate/20140728225422_add_promotionable_to_spree_products.rb

@@ -0,0 +1,5 @@
+class AddPromotionableToSpreeProducts < ActiveRecord::Migration
+  def change
+    add_column :spree_products, :promotionable, :boolean, default: true
+  end
+end

data/db/migrate/20140729133613_add_exchange_inventory_unit_foreign_keys.rb

@@ -0,0 +1,7 @@
+class AddExchangeInventoryUnitForeignKeys < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :exchange_inventory_unit_id, :integer
+
+    add_index :spree_return_items, :exchange_inventory_unit_id
+  end
+end

data/db/migrate/20140730155938_add_acceptance_status_errors_to_return_item.rb

@@ -0,0 +1,5 @@
+class AddAcceptanceStatusErrorsToReturnItem < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :acceptance_status_errors, :text
+  end
+end

data/db/migrate/20140731150017_create_spree_reimbursement_types.rb

@@ -0,0 +1,20 @@
+class CreateSpreeReimbursementTypes < ActiveRecord::Migration
+  def change
+    create_table :spree_reimbursement_types do |t|
+      t.string :name
+      t.boolean :active, default: true
+      t.boolean :mutable, default: true
+
+      t.timestamps
+    end
+
+    reversible do |direction|
+      direction.up do
+        Spree::ReimbursementType.create!(name: Spree::ReimbursementType::ORIGINAL)
+      end
+    end
+
+    add_column :spree_return_items, :preferred_reimbursement_type_id, :integer
+    add_column :spree_return_items, :override_reimbursement_type_id, :integer
+  end
+end

data/db/migrate/20140805171035_add_default_to_spree_credit_cards.rb

@@ -0,0 +1,5 @@
+class AddDefaultToSpreeCreditCards < ActiveRecord::Migration
+  def change
+    add_column :spree_credit_cards, :default, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20140805171219_make_existing_credit_cards_default.rb

@@ -0,0 +1,10 @@
+class MakeExistingCreditCardsDefault < ActiveRecord::Migration
+  def up
+    # set the newest credit card for every user to be the default; SQL technique from
+    # http://stackoverflow.com/questions/121387/fetch-the-row-which-has-the-max-value-for-a-column
+    Spree::CreditCard.where.not(user_id: nil).joins("LEFT OUTER JOIN spree_credit_cards cc2 ON cc2.user_id = spree_credit_cards.user_id AND spree_credit_cards.created_at < cc2.created_at").where("cc2.user_id IS NULL").update_all(default: true)
+  end
+  def down
+    # do nothing
+  end
+end

data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb

@@ -0,0 +1,9 @@
+class AddTypeToReimbursementType < ActiveRecord::Migration
+  def change
+    add_column :spree_reimbursement_types, :type, :string
+    add_index :spree_reimbursement_types, :type
+
+    Spree::ReimbursementType.reset_column_information
+    Spree::ReimbursementType.find_by(name: Spree::ReimbursementType::ORIGINAL).update_attributes!(type: 'Spree::ReimbursementType::OriginalPayment')
+  end
+end

data/db/migrate/20140808184039_create_spree_reimbursement_credits.rb

@@ -0,0 +1,10 @@
+class CreateSpreeReimbursementCredits < ActiveRecord::Migration
+  def change
+    create_table :spree_reimbursement_credits do |t|
+      t.decimal :amount, precision: 10, scale: 2, default: 0.0, null: false
+      t.integer :reimbursement_id
+      t.integer :creditable_id
+      t.string  :creditable_type
+    end
+  end
+end

data/db/migrate/20140827170513_add_meta_title_to_spree_products.rb

@@ -0,0 +1,7 @@
+class AddMetaTitleToSpreeProducts < ActiveRecord::Migration
+  def change
+    change_table :spree_products do |t|
+      t.string   :meta_title
+    end
+  end
+end

data/db/migrate/20140924164824_add_code_to_spree_tax_categories.rb

@@ -0,0 +1,5 @@
+class AddCodeToSpreeTaxCategories < ActiveRecord::Migration
+  def change
+    add_column :spree_tax_categories, :tax_code, :string
+  end
+end

data/db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb

@@ -0,0 +1,5 @@
+class AddCodeToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :code, :string
+  end
+end

data/db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb

@@ -0,0 +1,6 @@
+class AddCancelAuditFieldsToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :canceled_at, :datetime
+    add_column :spree_orders, :canceler_id, :integer
+  end
+end

data/db/migrate/20141009204607_add_store_id_to_orders.rb

@@ -0,0 +1,8 @@
+class AddStoreIdToOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :store_id, :integer
+    if Spree::Store.default.persisted?
+      Spree::Order.where(store_id: nil).update_all(store_id: Spree::Store.default.id)
+    end
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -53,10 +53,14 @@ User-agent: *
 Disallow: /checkout
 Disallow: /cart
 Disallow: /orders
-Disallow: /user
+Disallow: /countries
+Disallow: /line_items
+Disallow: /password_resets
+Disallow: /states
+Disallow: /user_sessions
+Disallow: /user_registrations
+Disallow: /users
 Disallow: /account
-Disallow: /api
-Disallow: /password
       ROBOTS
     end
 

data/lib/spree/core.rb

@@ -3,15 +3,16 @@ require 'active_merchant'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
+require 'friendly_id'
+require 'font-awesome-rails'
 require 'kaminari'
 require 'mail'
 require 'monetize'
 require 'paperclip'
 require 'paranoia'
+require 'premailer/rails'
 require 'ransack'
 require 'state_machine'
-require 'friendly_id'
-require 'font-awesome-rails'
 
 module Spree
 
@@ -57,24 +58,24 @@ require 'spree/migrations'
 require 'spree/core/engine'
 
 require 'spree/i18n'
-require 'spree/localized_number'
+require 'spree/instrumentation'
 require 'spree/money'
-require 'spree/permitted_attributes'
-require 'spree/core/user_address'
-require 'spree/core/user_payment_source'
 
+require 'spree/permitted_attributes'
 require 'spree/core/delegate_belongs_to'
-require 'spree/core/importer'
 require 'spree/core/permalinks'
-require 'spree/core/calculated_adjustments'
-require 'spree/core/adjustment_source'
 require 'spree/core/product_duplicator'
-require 'spree/core/controller_helpers'
+require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/order'
+require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 
+require 'spree/core/importer'
+
 # Hack waiting on https://github.com/pluginaweek/state_machine/pull/275
 module StateMachine
   module Integrations

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

@@ -14,13 +14,6 @@ module Spree
 
           protected
 
-          # Creates the hash that is sent as the payload for all notifications. Specific notifications will
-          # add additional keys as appropriate. Override this method if you need additional data when
-          # responding to a notification
-          def default_notification_payload
-            {:user => try_spree_current_user, :order => current_order}
-          end
-
           # can be used in views as well as controllers.
           # e.g. <% self.title = 'This is a custom title for this view' %>
           attr_writer :title
@@ -65,11 +58,11 @@ module Spree
           end
 
           # Returns which layout to render.
-          # 
+          #
           # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-          # 
+          #
           # Default layout is: +app/views/spree/layouts/spree_application+
-          # 
+          #
           def get_layout
             layout ||= Spree::Config[:layout]
           end

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

@@ -22,18 +22,17 @@ module Spree
           if @simple_current_order
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
-          else
-            @simple_current_order = Spree::Order.new
           end
         end
 
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
+          options[:lock] ||= false
 
           return @current_order if @current_order
 
-          @current_order = find_order_by_token_or_user(options)
+          @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(current_order_params)
@@ -57,9 +56,11 @@ module Spree
         end
 
         def set_current_order
-          if try_spree_current_user && current_order
-            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
-              current_order.merge!(order, try_spree_current_user)
+          if user = try_spree_current_user
+            if cookies.signed[:guest_token].nil? && last_incomplete_order
+              cookies.permanent.signed[:guest_token] = last_incomplete_order.guest_token
+            elsif current_order && last_incomplete_order && current_order != last_incomplete_order
+              current_order.merge!(last_incomplete_order, user)
             end
           end
         end
@@ -73,24 +74,26 @@ module Spree
         end
 
         private
-
         def last_incomplete_order
           @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order
         end
 
         def current_order_params
-          { currency: current_currency, guest_token: cookies.signed[:guest_token], user_id: try_spree_current_user.try(:id) }
+          { currency: current_currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
         end
 
-        def find_order_by_token_or_user(options={})
-          options[:lock] ||= false
+        def find_order_by_token_or_user(options={}, with_adjustments = false)
 
           # Find any incomplete orders for the guest_token
-          order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+          if with_adjustments
+            order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+          else
+            order = Spree::Order.incomplete.lock(options[:lock]).find_by(current_order_params)
+          end
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user
-            order = last_incomplete_order
+            order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
           end
 
           order

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

@@ -7,33 +7,33 @@ module Spree
         end
 
         delegate *Spree::PermittedAttributes::ATTRIBUTES,
-                 :to => :permitted_attributes,
-                 :prefix => :permitted
+                 to: :permitted_attributes,
+                 prefix: :permitted
 
         def permitted_payment_attributes
           permitted_attributes.payment_attributes + [
-            :source_attributes => permitted_source_attributes
+            source_attributes: permitted_source_attributes
           ]
         end
 
         def permitted_checkout_attributes
           permitted_attributes.checkout_attributes + [
-            :bill_address_attributes => permitted_address_attributes,
-            :ship_address_attributes => permitted_address_attributes,
-            :payments_attributes => permitted_payment_attributes,
-            :shipments_attributes => permitted_shipment_attributes
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes,
+            payments_attributes: permitted_payment_attributes,
+            shipments_attributes: permitted_shipment_attributes
           ]
         end
 
         def permitted_order_attributes
           permitted_checkout_attributes + [
-            :line_items_attributes => permitted_line_item_attributes
+            line_items_attributes: permitted_line_item_attributes
           ]
         end
 
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
-            :product_properties_attributes => permitted_product_properties_attributes
+            product_properties_attributes: permitted_product_properties_attributes
           ]
         end
       end

data/lib/spree/core/engine.rb

@@ -4,6 +4,10 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree'
 
+      rake_tasks do
+        load File.join(root, "lib", "tasks", "exchanges.rake")
+      end
+
       initializer "spree.environment", :before => :load_config_initializers do |app|
         app.config.spree = Spree::Core::Environment.new
         Spree::Config = app.config.spree.preferences #legacy access
@@ -71,7 +75,10 @@ module Spree
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,
           Spree::Promotion::Rules::FirstOrder,
-          Spree::Promotion::Rules::UserLoggedIn]
+          Spree::Promotion::Rules::UserLoggedIn,
+          Spree::Promotion::Rules::OneUsePerUser,
+          Spree::Promotion::Rules::Taxon,
+        ]
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|