solidus_core 1.0.7 → 1.1.0.beta1

data/db/migrate/20150825204216_drop_spree_gateways.rb

@@ -0,0 +1,20 @@
+class DropSpreeGateways < ActiveRecord::Migration
+  def up
+    drop_table :spree_gateways
+  end
+
+  def down
+    create_table "spree_gateways" do |t|
+      t.string   "type"
+      t.string   "name"
+      t.text     "description"
+      t.boolean  "active",      default: true
+      t.string   "environment", default: "development"
+      t.string   "server",      default: "test"
+      t.boolean  "test_mode",   default: true
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.text     "preferences"
+    end
+  end
+end

data/db/migrate/20150909123605_create_variant_properties_and_rules.rb

@@ -0,0 +1,28 @@
+class CreateVariantPropertiesAndRules < ActiveRecord::Migration
+  def change
+    create_table :spree_variant_property_rules do |t|
+      t.references :product
+      t.timestamps null: false
+    end
+
+    add_index :spree_variant_property_rules, :product_id
+
+    create_table :spree_variant_property_rule_conditions do |t|
+      t.references :option_value
+      t.references :variant_property_rule
+      t.timestamps null: false
+    end
+
+    add_index :spree_variant_property_rule_conditions, [:variant_property_rule_id, :option_value_id], name: "index_spree_variant_prop_rule_conditions_on_rule_and_optval"
+
+    create_table :spree_variant_property_rule_values do |t|
+      t.text       :value
+      t.integer    :position, default: 0
+      t.references :property
+      t.references :variant_property_rule
+    end
+
+    add_index :spree_variant_property_rule_values, :property_id
+    add_index :spree_variant_property_rule_values, :variant_property_rule_id, name: "index_spree_variant_property_rule_values_on_rule"
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -126,7 +126,7 @@ end
       core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
 
       if core_gems.include?(lib_name)
-        '../../../../Gemfile'
+        '../../../../../Gemfile'
       else
         '../../../../Gemfile'
       end

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -18,9 +18,10 @@ Spree.config do |config|
   # Uncomment to stop tracking inventory levels in the application
   # config.track_inventory_levels = false
 
-  # When true, product caches are only invalidated when they come in or out of
-  # stock. Default is to invalidate cache on any inventory changes.
-  # config.binary_inventory_cache = true
+  # When set, product caches are only invalidated when they fall below or rise
+  # above the inventory_cache_threshold that is set. Default is to invalidate cache on
+  # any inventory changes.
+  # config.inventory_cache_threshold = 3
 
 
   # Frontend:

data/lib/spree/core.rb

@@ -85,9 +85,13 @@ require 'spree/core/current_store'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
+require 'spree/core/controller_helpers/payment_parameters'
 require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/unreturned_item_charger'
 require 'spree/core/role_configuration'
+
+require 'spree/mailer_previews/order_preview'
+require 'spree/mailer_previews/carton_preview'

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

@@ -0,0 +1,67 @@
+module Spree
+  module Core::ControllerHelpers::PaymentParameters
+    # This method handles the awkwardness of how the html forms are currently
+    # set up for frontend and admin.
+    #
+    # This method expects a params hash in the format of:
+    #
+    #  {
+    #    payment_source: {
+    #      # The keys here are spree_payment_method.id's
+    #      '1' => {...source attributes for payment method 1...},
+    #      '2' => {...source attributes for payment method 2...},
+    #    },
+    #    order: {
+    #      # Note that only a single entry is expected/handled in this array
+    #      payments_attributes: [
+    #        {
+    #          payment_method_id: '1',
+    #        },
+    #      ],
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    # And this method returns a new params hash in the format of:
+    #
+    #  {
+    #    order: {
+    #      payments_attributes: [
+    #        {
+    #          payment_method_id: '1',
+    #          source_attributes: {...source attributes for payment method 1...}
+    #        },
+    #      ],
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    def move_payment_source_into_payments_attributes(original_params)
+      params = original_params.deep_dup
+
+      # Step 1: Gather all the information and ensure all the pieces are there.
+
+      return params if params[:payment_source].blank?
+
+      payment_params = params[:order] &&
+        params[:order][:payments_attributes] &&
+        params[:order][:payments_attributes].first
+      return params if payment_params.blank?
+
+      payment_method_id = payment_params[:payment_method_id]
+      return params if payment_method_id.blank?
+
+      source_params = params[:payment_source][payment_method_id]
+      return params if source_params.blank?
+
+      # Step 2: Perform the modifications.
+
+      payment_params[:source_attributes] = source_params
+      params.delete(:payment_source)
+
+      params
+    end
+  end
+end

data/lib/spree/core/delegate_belongs_to.rb

@@ -32,6 +32,7 @@ module DelegateBelongsTo
     # delegate_belongs_to :contact, [:defaults, :address, :fullname], :class_name => 'VCard'
     ##
     def delegate_belongs_to(association, *attrs)
+      ActiveSupport::Deprecation.warn "delegate_belongs_to is deprecated. Instead use rails built in delegates.", caller
       opts = attrs.extract_options!
       initialize_association :belongs_to, association, opts
       attrs = get_association_column_names(association) if attrs.empty?

data/lib/spree/core/engine.rb

@@ -13,6 +13,13 @@ module Spree
         Spree::Config = app.config.spree.preferences #legacy access
       end
 
+      initializer "spree.default_permissions" do |app|
+        Spree::RoleConfiguration.configure do |config|
+          config.assign_permissions :default, [Spree::PermissionSets::DefaultCustomer]
+          config.assign_permissions :admin, [Spree::PermissionSets::SuperUser]
+        end
+      end
+
       initializer "spree.register.calculators" do |app|
         app.config.spree.calculators.shipping_methods = [
             Spree::Calculator::Shipping::FlatPercentItemTotal,
@@ -85,7 +92,8 @@ module Spree
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
           Spree::Promotion::Rules::Taxon,
-          Spree::Promotion::Rules::NthOrder
+          Spree::Promotion::Rules::NthOrder,
+          Spree::Promotion::Rules::OptionValue
         ]
       end
 

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

@@ -122,7 +122,7 @@ module Spree
               label:  a[:label]
             )
             adjustment.save!
-            adjustment.close!
+            adjustment.finalize!
           end
         end
 

data/lib/spree/core/role_configuration.rb

@@ -36,7 +36,7 @@ module Spree
     # @param ability [CanCan::Ability] the ability to invoke declarations on
     # @param user [#spree_roles] the user that holds the spree_roles association.
     def activate_permissions! ability, user
-      spree_roles = user.spree_roles.pluck(:name)
+      spree_roles = ['default'] | user.spree_roles.map(&:name)
       applicable_permissions = Set.new
 
       spree_roles.each do |role_name|

data/lib/spree/core/search/variant.rb

@@ -1,6 +1,12 @@
 module Spree
   module Core
     module Search
+
+      #
+      # NOTE: Use Spree::Config.variant_search_class rather than referencing this
+      # directly.
+      #
+
       class Variant
 
         class_attribute :search_terms
@@ -28,7 +34,7 @@ module Spree
           return @scope if @query_string.blank?
 
           matches = @query_string.split.map do |word|
-            @scope.ransack(search_terms(word)).result.pluck(:id)
+            @scope.ransack(search_term_params(word)).result.pluck(:id)
           end
 
           Spree::Variant.where(id: matches.inject(:&))
@@ -36,8 +42,20 @@ module Spree
 
         private
 
+        # Returns an array of search term symbols that will be passed to Ransack
+        # to query the DB for the given word.
+        # Subclasses may override this to allow conditional filtering, etc.
+        #
+        # @api public
+        # @param word [String] One of the search words provided by the user.
+        #   e.g. a SKU
+        # @return [Array<Symbol>] the list of search terms to use for this word
         def search_terms(word)
-          terms = Hash[self.class.search_terms.map { |t| [t, word] }]
+          self.class.search_terms
+        end
+
+        def search_term_params(word)
+          terms = Hash[search_terms(word).map { |t| [t, word] }]
           terms.merge(m: 'or')
         end
       end

data/lib/spree/core/unreturned_item_charger.rb

@@ -22,18 +22,24 @@ module Spree
       new_order.associate_user!(@original_order.user) if @original_order.user
 
       add_exchange_variants_to_order
+      set_shipment_for_new_order
 
-      new_order.reload.update!
-      while new_order.state != new_order.checkout_steps[-2] && new_order.next; end
-
+      new_order.update!
       set_order_payment
 
-      # the order builds a shipment on its own on transition to delivery, but we want
-      # the original exchange shipment, not the built one
-      set_shipment_for_new_order
+      # There are several checks in the order state machine to skip
+      # certain transitions when an order is an unreturned exchange
+      if !new_order.unreturned_exchange?
+        raise ChargeFailure.new('order is not an unreturned exchange', new_order)
+      end
+
+      # Transitions will call update_totals on the order
+      until new_order.can_complete?
+        new_order.next!
+      end
 
       new_order.contents.approve(name: self.class.name)
-      new_order.reload.complete!
+      new_order.complete!
       Spree::OrderCapturing.new(new_order).capture_payments if (Spree::Config[:auto_capture_exchanges] && !Spree::Config[:auto_capture])
 
       @return_items.each(&:expired!)
@@ -62,19 +68,19 @@ module Spree
     end
 
     def set_shipment_for_new_order
-      new_order.shipments.destroy_all
       @shipment.update_attributes!(order_id: new_order.id)
-      new_order.update_attributes!(state: "confirm")
+      new_order.shipments.reset
     end
 
     def set_order_payment
       unless new_order.payments.present?
         card_to_reuse = @original_order.valid_credit_cards.first
         card_to_reuse = @original_order.user.credit_cards.default.first if !card_to_reuse && @original_order.user
-        Spree::Payment.create!(order: new_order,
-                               payment_method_id: card_to_reuse.try(:payment_method_id),
-                               source: card_to_reuse,
-                               amount: new_order.total)
+        new_order.payments.create!(
+          payment_method_id: card_to_reuse.try(:payment_method_id),
+          source: card_to_reuse,
+          amount: new_order.total
+        )
       end
     end
 
@@ -89,14 +95,13 @@ module Spree
     end
 
     def exchange_order_attributes
-      order_attributes = {
+      {
         bill_address: @original_order.bill_address,
         ship_address: @original_order.ship_address,
         email: @original_order.email,
+        store_id: @original_order.store_id,
         frontend_viewable: false
       }
-      order_attributes[:store_id] = @original_order.store_id if @original_order.respond_to?(:store_id)
-      order_attributes
     end
   end
 end

data/lib/spree/i18n.rb

@@ -1,37 +1,19 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
-require 'spree/i18n/base'
 
 module Spree
-  extend ActionView::Helpers::TranslationHelper
-  extend ActionView::Helpers::TagHelper
+  class TranslationHelperWrapper # :nodoc:
+    include ActionView::Helpers::TranslationHelper
+  end
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(*args)
-      @virtual_path = virtual_path
-
-      options = args.extract_options!
-      options[:scope] = [*options[:scope]].unshift(:spree)
-      args << options
-      super(*args)
+    def translate(key, options={})
+      options[:scope] = [:spree, *options[:scope]]
+      TranslationHelperWrapper.new.translate(key, options)
     end
 
     alias_method :t, :translate
-
-    def context
-      Spree::ViewContext.context
-    end
-
-    def virtual_path
-      if context
-        path = context.instance_variable_get("@virtual_path")
-
-        if path
-          path.gsub(/spree/, '')
-        end
-      end
-    end
   end
 end

data/lib/spree/mailer_previews/carton_preview.rb

@@ -0,0 +1,10 @@
+module Spree
+  class MailerPreviews
+    class CartonPreview < ActionMailer::Preview
+      def shipped
+        carton = Carton.first
+        CartonMailer.shipped_email(order: carton.orders.first, carton: carton)
+      end
+    end
+  end
+end

data/lib/spree/mailer_previews/order_preview.rb

@@ -0,0 +1,18 @@
+module Spree
+  class MailerPreviews
+    class OrderPreview < ActionMailer::Preview
+      def confirm
+        OrderMailer.confirm_email(Order.first)
+      end
+
+      def cancel
+        OrderMailer.cancel_email(Order.first)
+      end
+
+      def inventory_cancellation
+        order = Order.first
+        OrderMailer.inventory_cancellation_email(order, [order.inventory_units.first])
+      end
+    end
+  end
+end

data/lib/spree/permitted_attributes.rb

@@ -5,6 +5,7 @@ module Spree
   module PermittedAttributes
     ATTRIBUTES = [
       :address_attributes,
+      :address_book_attributes,
       :checkout_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
@@ -36,11 +37,13 @@ module Spree
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_id, :state_id,
-      :zipcode, :phone, :state_name, :alternative_phone, :company,
+      :zipcode, :phone, :state_name, :country_iso, :alternative_phone, :company,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
     ]
 
+    @@address_book_attributes = address_attributes + [:default]
+
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
     ]

data/lib/spree/testing_support/capybara_ext.rb

@@ -51,7 +51,8 @@ module CapybaraExt
     find("#{options[:from]}:not(.select2-container-disabled)").click
 
     within_entire_page do
-      find("input.select2-input").set(value)
+      select2input = first("#select2-drop input.select2-input") || find("input.select2-input")
+      select2input.set(value)
     end
 
     select_select2_result(value)

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

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
+  factory :address, class: Spree::Address do
     firstname 'John'
     lastname 'Doe'
     company 'Company'
@@ -19,4 +19,12 @@ FactoryGirl.define do
       end
     end
   end
+
+  factory :ship_address, parent: :address do
+    address1 'A Different Road'
+  end
+
+  factory :bill_address, parent: :address do
+    address1 'PO Box 1337'
+  end
 end