solidus_core 1.1.4 → 1.2.0.beta1

data/db/migrate/20141215235502_remove_extra_products_slug_index.rb

@@ -0,0 +1,5 @@
+class RemoveExtraProductsSlugIndex < ActiveRecord::Migration
+  def change
+    remove_index :spree_products, name: :permalink_idx_unique
+  end
+end

data/db/migrate/20141217215630_update_product_slug_index.rb

@@ -0,0 +1,6 @@
+class UpdateProductSlugIndex < ActiveRecord::Migration
+  def change
+    remove_index :spree_products, :slug
+    add_index :spree_products, :slug, unique: true
+  end
+end

data/db/migrate/20150225205344_move_promotion_code_to_promotion_code_value.rb

@@ -11,8 +11,8 @@ class MovePromotionCodeToPromotionCodeValue < ActiveRecord::Migration
         select
           spree_promotions.id,
           spree_promotions.code,
-          '#{Time.now.to_s(:db)}',
-          '#{Time.now.to_s(:db)}'
+          '#{Time.current.to_s(:db)}',
+          '#{Time.current.to_s(:db)}'
         from spree_promotions
         left join spree_promotion_codes
           on spree_promotion_codes.promotion_id = spree_promotions.id

data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb

@@ -10,6 +10,16 @@ class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration
       WHERE pre_tax_amount IS NULL;
     SQL
 
+    # set pre_tax_amount on line_items to discounted_amount - included_tax_total
+    # so that the null: false option on the line_item pre_tax_amount doesn't generate
+    # errors.
+    #
+    execute(<<-SQL)
+      UPDATE spree_line_items
+      SET pre_tax_amount = (price * quantity + promo_total) - included_tax_total
+      WHERE pre_tax_amount IS NULL;
+    SQL
+
     change_column :spree_line_items, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
     change_column :spree_shipments, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
   end

data/db/migrate/20151117063249_convert_habtm_to_hmt_for_properties_prototypes.rb

@@ -0,0 +1,17 @@
+class ConvertHabtmToHmtForPropertiesPrototypes < ActiveRecord::Migration
+  def up
+    add_column :spree_properties_prototypes, :id, :primary_key
+    add_column :spree_properties_prototypes, :created_at, :datetime
+    add_column :spree_properties_prototypes, :updated_at, :datetime
+
+    rename_table :spree_properties_prototypes, :spree_property_prototypes
+  end
+
+  def down
+    rename_table :spree_property_prototypes, :spree_properties_prototypes
+
+    remove_column :spree_properties_prototypes, :id, :primary_key
+    remove_column :spree_properties_prototypes, :created_at, :datetime
+    remove_column :spree_properties_prototypes, :updated_at, :datetime
+  end
+end

data/db/migrate/20151124062500_convert_habtm_to_hmt_for_option_type_prototypes.rb

@@ -0,0 +1,17 @@
+class ConvertHabtmToHmtForOptionTypePrototypes < ActiveRecord::Migration
+  def up
+    add_column :spree_option_types_prototypes, :id, :primary_key
+    add_column :spree_option_types_prototypes, :created_at, :datetime
+    add_column :spree_option_types_prototypes, :updated_at, :datetime
+
+    rename_table :spree_option_types_prototypes, :spree_option_type_prototypes
+  end
+
+  def down
+    remove_column :spree_option_types_prototypes, :id
+    remove_column :spree_option_types_prototypes, :created_at
+    remove_column :spree_option_types_prototypes, :updated_at
+
+    rename_table :spree_option_type_prototypes, :spree_option_types_prototypes
+  end
+end

data/db/migrate/20151126063028_convert_habtm_to_hmt_for_taxons_promotion_rules.rb

@@ -0,0 +1,15 @@
+class ConvertHabtmToHmtForTaxonsPromotionRules < ActiveRecord::Migration
+  def up
+    add_column :spree_taxons_promotion_rules, :created_at, :datetime
+    add_column :spree_taxons_promotion_rules, :updated_at, :datetime
+
+    rename_table :spree_taxons_promotion_rules, :spree_promotion_rule_taxons
+  end
+
+  def down
+    rename_table :spree_promotion_rule_taxons, :spree_taxons_promotion_rules
+
+    remove_column :spree_taxons_promotion_rules, :created_at, :datetime
+    remove_column :spree_taxons_promotion_rules, :updated_at, :datetime
+  end
+end

data/db/migrate/20151219020209_add_stock_item_unique_index.rb

@@ -0,0 +1,9 @@
+class AddStockItemUniqueIndex < ActiveRecord::Migration
+  def change
+    # Add a database-level uniqueness constraint for databases that support it
+    # (postgres & sqlite)
+    if connection.adapter_name =~ /postgres|sqlite/i
+      add_index 'spree_stock_items', ['variant_id', 'stock_location_id'], where: 'deleted_at is null', unique: true
+    end
+  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/dummy/templates/rails/database.yml

@@ -26,7 +26,7 @@ production:
   adapter: mysql2
   database: <%= database_prefix %><%= options[:lib_name] %>_spree_production
   encoding: utf8
-<% when 'postgres' %>
+<% when 'postgres', 'postgresql' %>
 <% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql

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

@@ -47,8 +47,32 @@ Spree.config do |config|
   #   secret_key: ENV['STRIPE_SECRET_KEY'],
   #   publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
   #   server: Rails.env.production? ? 'production' : 'test',
-  #   test: !Rails.env.production?
+  #   test_mode: !Rails.env.production?
   # )
 end
 
+<% if defined?(Spree::Frontend::Engine) -%>
+Spree::Frontend::Config.configure do |config|
+  config.use_static_preferences!
+
+  config.locale = 'en'
+end
+<% end -%>
+
+<% if defined?(Spree::Backend::Engine) -%>
+Spree::Backend::Config.configure do |config|
+  config.use_static_preferences!
+
+  config.locale = 'en'
+end
+<% end -%>
+
+<% if defined?(Spree::Api::Engine) -%>
+Spree::Api::Config.configure do |config|
+  config.use_static_preferences!
+
+  config.requires_authentication = true
+end
+<% end -%>
+
 Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>

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

@@ -7,4 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require spree/backend
+<% 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

@@ -7,4 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require spree/frontend
+<% 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

@@ -4,6 +4,9 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
  *= require spree/backend
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend'  %>
+ *= require spree/backend/<%= options[:lib_name].gsub("/", "_") %>
+<% end %>
  *= require_self
  *= require_tree .
 */

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

@@ -4,6 +4,9 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
  *= require spree/frontend
+<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>
+ *= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %>
+<% end %>
  *= require_self
  *= require_tree .
 */

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

@@ -53,7 +53,7 @@ module Spree
             locale = session[:locale]
             locale ||= config_locale if respond_to?(:config_locale, true)
             locale ||= Rails.application.config.i18n.default_locale
-            locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+            locale ||= I18n.default_locale
             I18n.locale = locale
           end
 

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

@@ -38,7 +38,7 @@ module Spree
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(current_order_params)
             @current_order.user ||= try_spree_current_user
-            # See issue #3346 for reasons why this line is here
+            # See issue https://github.com/spree/spree/issues/3346 for reasons why this line is here
             @current_order.created_by ||= try_spree_current_user
             @current_order.save!
           end

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

@@ -1,7 +1,7 @@
 module Spree
   module Core::ControllerHelpers::PaymentParameters
     # This method handles the awkwardness of how the html forms are currently
-    # set up for frontend and admin.
+    # set up for frontend.
     #
     # This method expects a params hash in the format of:
     #
@@ -23,7 +23,7 @@ module Spree
     #    ...other params...
     #  }
     #
-    # And this method returns a new params hash in the format of:
+    # And this method modifies the params into the format of:
     #
     #  {
     #    order: {
@@ -38,9 +38,7 @@ module Spree
     #    ...other params...
     #  }
     #
-    def move_payment_source_into_payments_attributes(original_params)
-      params = original_params.deep_dup
-
+    def move_payment_source_into_payments_attributes(params)
       # Step 1: Gather all the information and ensure all the pieces are there.
 
       return params if params[:payment_source].blank?
@@ -63,5 +61,106 @@ module Spree
 
       params
     end
+
+    # This method handles the awkwardness of how the html forms are currently
+    # set up for frontend.
+    #
+    # This method expects a params hash in the format of:
+    #
+    #  {
+    #    order: {
+    #      existing_card: '123',
+    #      ...other params...
+    #    },
+    #    cvc_confirm: '456', # optional
+    #    ...other params...
+    #  }
+    #
+    # And this method modifies the params into the format of:
+    #
+    #  {
+    #    order: {
+    #      payments_attributes: [
+    #        {
+    #          source_attributes: {
+    #            existing_card_id: '123',
+    #            verification_value: '456',
+    #          },
+    #        },
+    #      ]
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    def move_existing_card_into_payments_attributes(params)
+      return params if params[:order].blank?
+
+      card_id = params[:order][:existing_card].presence
+      cvc_confirm = params[:cvc_confirm].presence
+
+      return params if card_id.nil?
+
+      params[:order][:payments_attributes] = [
+        {
+          source_attributes: {
+            existing_card_id: card_id,
+            verification_value: cvc_confirm,
+          }
+        },
+      ]
+
+      params[:order].delete(:existing_card)
+      params.delete(:cvc_confirm)
+
+      params
+    end
+
+    # This is a strange thing to do since an order can have multiple payments
+    # but we always assume that it only has a single payment and that its
+    # amount should be the current order total.  Also, this is pretty much
+    # overridden when the order transitions to confirm by the logic inside of
+    # Order#add_store_credit_payments.
+    # We should reconsider this method and its usage at some point.
+    #
+    # This method expects a params hash in the format of:
+    #
+    #  {
+    #    order: {
+    #      # Note that only a single entry is expected/handled in this array
+    #      payments_attributes: [
+    #        {
+    #          ...params...
+    #        },
+    #      ],
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    # And this method modifies the params into the format of:
+    #
+    #  {
+    #    order: {
+    #      payments_attributes: [
+    #        {
+    #          ...params...
+    #          amount: <the order total>,
+    #        },
+    #      ],
+    #      ...other params...
+    #    },
+    #    ...other params...
+    #  }
+    #
+    def set_payment_parameters_amount(params, order)
+      return params if params[:order].blank?
+      return params if params[:order][:payments_attributes].blank?
+
+      params[:order][:payments_attributes].first[:amount] = order.total
+
+      params
+    end
+
   end
 end

data/lib/spree/core/engine.rb

@@ -69,11 +69,12 @@ module Spree
         app.config.spree.calculators.promotion_actions_create_item_adjustments = [
           Spree::Calculator::PercentOnLineItem,
           Spree::Calculator::FlatRate,
-          Spree::Calculator::FlexiRate
+          Spree::Calculator::FlexiRate,
+          Spree::Calculator::TieredPercent
         ]
 
         app.config.spree.calculators.add_class('promotion_actions_create_quantity_adjustments')
-        app.config.spree.calculators.promotion_actions_create_item_adjustments = [
+        app.config.spree.calculators.promotion_actions_create_quantity_adjustments = [
           Spree::Calculator::PercentOnLineItem,
           Spree::Calculator::FlatRate
         ]

data/lib/spree/core/stock_configuration.rb

@@ -0,0 +1,11 @@
+module Spree
+  module StockConfiguration
+    mattr_accessor :estimator_class do
+      '::Spree::Stock::Estimator'
+    end
+
+    def self.estimator_class
+      @@estimator_class.constantize
+    end
+  end
+end

data/lib/spree/core/unreturned_item_charger.rb

@@ -10,7 +10,7 @@ module Spree
 
     class_attribute :failure_handler
 
-    attr_reader :original_order
+    attr_reader :original_order, :new_order
 
     def initialize(shipment, return_items)
       @shipment = shipment
@@ -19,6 +19,8 @@ module Spree
     end
 
     def charge_for_items
+      self.new_order = Spree::Order.create!(exchange_order_attributes)
+
       new_order.associate_user!(@original_order.user) if @original_order.user
 
       add_exchange_variants_to_order
@@ -55,9 +57,7 @@ module Spree
 
     private
 
-    def new_order
-      @new_order ||= Spree::Order.create!(exchange_order_attributes)
-    end
+    attr_writer :new_order
 
     def add_exchange_variants_to_order
       @return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|

data/lib/spree/core/version.rb

@@ -1,6 +1,14 @@
 module Spree
   def self.version
-    ActiveSupport::Deprecation.warn("Spree.version does not work and will be removed from solidus")
+    ActiveSupport::Deprecation.warn("Spree.version does not work and will be removed from solidus. Use Spree.solidus_version instead to determine the solidus version")
     "2.4.6.beta"
   end
+
+  def self.solidus_version
+    "1.2.0.beta1"
+  end
+
+  def self.solidus_gem_version
+    Gem::Version.new(solidus_version)
+  end
 end

data/lib/spree/permission_sets/restricted_stock_transfer_management.rb

@@ -20,20 +20,21 @@ module Spree
       def activate!
         if user.stock_locations.any?
           can :display, Spree::StockLocation, id: user_location_ids
-          can [:admin, :create], Spree::StockTransfer
-          can :display, Spree::StockTransfer, source_location_id: source_location_ids
-          can :display, Spree::StockTransfer, destination_location_id: destination_location_ids
-          can :manage, Spree::StockTransfer,
-            source_location_id: source_location_ids,
-            destination_location_id: destination_location_ids_with_undefined_destination
 
-          can :transfer_from, Spree::StockLocation, id: source_location_ids
-          can :transfer_to, Spree::StockLocation, id: destination_location_ids
+          can :transfer_from, Spree::StockLocation, id: user_location_ids
+          can :transfer_to, Spree::StockLocation, id: user_location_ids
 
-          can :manage, Spree::TransferItem, stock_transfer: {
-            source_location_id: source_location_ids,
-            destination_location_id: destination_location_ids_with_undefined_destination
-          }
+          can :display, Spree::StockTransfer, source_location_id: user_location_ids
+          can :manage, Spree::StockTransfer, source_location_id: user_location_ids + [nil], shipped_at: nil
+          can :manage, Spree::StockTransfer, destination_location_id: user_location_ids
+          # Do not allow managing transfers to a permitted destination_location_id from an
+          # unauthorized stock location until it's been shipped to the permitted location.
+          cannot :manage, Spree::StockTransfer, source_location_id: not_permitted_location_ids, shipped_at: nil
+
+          can :display, Spree::TransferItem, stock_transfer: { source_location_id: user_location_ids }
+          can :manage, Spree::TransferItem, stock_transfer: { source_location_id: user_location_ids + [nil], shipped_at: nil }
+          can :manage, Spree::TransferItem, stock_transfer: { destination_location_id: user_location_ids }
+          cannot :manage, Spree::TransferItem, stock_transfer: { source_location_id: not_permitted_location_ids, shipped_at: nil }
         end
       end
 
@@ -43,18 +44,8 @@ module Spree
         @user_location_ids ||= user.stock_locations.pluck(:id)
       end
 
-      # @note Meant to facilitate extension - override to define custom ids
-      def source_location_ids
-        user_location_ids
-      end
-
-      # @note Meant to facilitate extension - override to define custom ids
-      def destination_location_ids
-        user_location_ids
-      end
-
-      def destination_location_ids_with_undefined_destination
-        destination_location_ids + [nil]
+      def not_permitted_location_ids
+        @not_permitted_location_ids ||= Spree::StockLocation.where.not(id: user_location_ids).pluck(:id)
       end
     end
   end