solidus_core 2.5.2 → 2.6.0.rc1

data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSpreeWalletPaymentSources < ActiveRecord::Migration[4.2]
   def change
     return if table_exists?(:spree_wallet_payment_sources)
@@ -12,7 +14,7 @@ class CreateSpreeWalletPaymentSources < ActiveRecord::Migration[4.2]
       t.references :payment_source, polymorphic: true, null: false
       t.boolean :default, default: false, null: false
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index(

data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateCreditCardsToWalletPaymentSources < ActiveRecord::Migration[4.2]
   class CreditCard < ActiveRecord::Base
     self.table_name = 'spree_credit_cards'

data/db/migrate/20160924135758_remove_is_default_from_prices.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveIsDefaultFromPrices < ActiveRecord::Migration[5.0]
   def change
     remove_column :spree_prices, :is_default, :boolean, default: true

data/db/migrate/20161009141333_remove_currency_from_line_items.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveCurrencyFromLineItems < ActiveRecord::Migration[5.0]
   def change
     remove_column :spree_line_items, :currency, :string

data/db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAvailableToColumnsAndRemoveDisplayOnFromPaymentMethods < ActiveRecord::Migration[5.0]
   def up
     add_column(:spree_payment_methods, :available_to_users, :boolean, default: true)

data/db/migrate/20161017102621_create_spree_promotion_code_batch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSpreePromotionCodeBatch < ActiveRecord::Migration[5.0]
   def change
     create_table :spree_promotion_code_batches do |t|
@@ -7,7 +9,7 @@ class CreateSpreePromotionCodeBatch < ActiveRecord::Migration[5.0]
       t.string :email
       t.string :error
       t.string :state, default: "pending"
-      t.timestamps
+      t.timestamps precision: 6
     end
 
     add_foreign_key(

data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAvailableToUsersAndRemoveDisplayOnFromShippingMethods < ActiveRecord::Migration[5.0]
   def up
     add_column(:spree_shipping_methods, :available_to_users, :boolean, default: true)

data/db/migrate/20161129035810_add_index_to_spree_payments_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexToSpreePaymentsNumber < ActiveRecord::Migration[5.0]
   def change
     add_index 'spree_payments', ['number'], unique: true

data/db/migrate/20170223235001_remove_spree_store_credits_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveSpreeStoreCreditsColumn < ActiveRecord::Migration[5.0]
   def change
     remove_column :spree_store_credits, :spree_store_credits, :datetime

data/db/migrate/20170317035819_add_lft_and_rgt_indexes_to_taxons.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLftAndRgtIndexesToTaxons < ActiveRecord::Migration[5.0]
   def change
     add_index :spree_taxons, :lft

data/db/migrate/20170319191942_remove_order_id_from_inventory_units.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveOrderIdFromInventoryUnits < ActiveRecord::Migration[5.0]
   class InconsistentInventoryUnitError < StandardError; end
 

data/db/migrate/20170412103617_transform_tax_rate_category_relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TransformTaxRateCategoryRelation < ActiveRecord::Migration[5.0]
   class TaxRate < ActiveRecord::Base
     self.table_name = "spree_tax_rates"

data/db/migrate/20170422134804_add_roles_unique_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRolesUniqueConstraints < ActiveRecord::Migration[5.0]
   def change
     add_index :spree_roles, :name, unique: true

data/db/migrate/20170522143442_add_time_range_to_tax_rate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddTimeRangeToTaxRate < ActiveRecord::Migration[5.0]
   def change
     add_column :spree_tax_rates, :starts_at, :datetime

data/db/migrate/20170608074534_rename_bogus_gateways.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameBogusGateways < ActiveRecord::Migration[5.0]
   def up
     require 'solidus/migrations/rename_gateways'

data/db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveDefaultTaxFromSpreeZones < ActiveRecord::Migration[5.1]
   def change
     remove_column :spree_zones, :default_tax, :boolean, default: false

data/db/migrate/20180202190713_create_promotion_rule_stores.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreatePromotionRuleStores < ActiveRecord::Migration[5.1]
+  def change
+    create_table :spree_promotion_rules_stores do |t|
+      t.references :store, null: false
+      t.references :promotion_rule, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180202222641_create_store_shipping_methods.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CreateStoreShippingMethods < ActiveRecord::Migration[5.1]
+  def change
+    create_table :spree_store_shipping_methods do |t|
+      t.references :store, null: false
+      t.references :shipping_method, null: false
+
+      t.timestamps precision: 6
+    end
+  end
+end

data/db/migrate/20180313220213_add_available_locales_to_stores.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddAvailableLocalesToStores < ActiveRecord::Migration[5.1]
+  def change
+    change_table :spree_stores do |t|
+      t.column :available_locales, :string
+    end
+  end
+end

data/db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class AddAmountRemainingToStoreCreditEvents < ActiveRecord::Migration[5.0]
+  class StoreCredit < ActiveRecord::Base
+    self.table_name = 'spree_store_credits'
+    has_many :store_credit_events
+
+    VOID_ACTION       = 'void'
+    CREDIT_ACTION     = 'credit'
+    CAPTURE_ACTION    = 'capture'
+    ELIGIBLE_ACTION   = 'eligible'
+    AUTHORIZE_ACTION  = 'authorize'
+    ALLOCATION_ACTION = 'allocation'
+    ADJUSTMENT_ACTION = 'adjustment'
+    INVALIDATE_ACTION = 'invalidate'
+  end
+
+  class StoreCreditEvent < ActiveRecord::Base
+    self.table_name = "spree_store_credit_events"
+    belongs_to :store_credit
+
+    scope :chronological, -> { order(:created_at) }
+  end
+
+  def up
+    add_column :spree_store_credit_events, :amount_remaining, :decimal, precision: 8, scale: 2, default: nil, null: true
+
+    StoreCredit.includes(:store_credit_events).find_each do |credit|
+      credit_amount = credit.amount
+
+      credit.store_credit_events.chronological.each do |event|
+        case event.action
+        when StoreCredit::ALLOCATION_ACTION,
+             StoreCredit::ELIGIBLE_ACTION,
+             StoreCredit::CAPTURE_ACTION
+          # These actions do not change the amount_remaining so the previous
+          # amount available is used (either the credit's amount or the
+          # amount_remaining coming from the event right before this one).
+          credit_amount
+        when StoreCredit::AUTHORIZE_ACTION,
+             StoreCredit::INVALIDATE_ACTION
+          # These actions remove the amount from the available credit amount.
+          credit_amount -= event.amount
+        when StoreCredit::ADJUSTMENT_ACTION,
+             StoreCredit::CREDIT_ACTION,
+             StoreCredit::VOID_ACTION
+          # These actions add the amount to the available credit amount. For
+          # ADJUSTMENT_ACTION the event's amount could be negative (so it could
+          # end up subtracting the amount).
+          credit_amount += event.amount
+        end
+
+        event.update_attribute(:amount_remaining, credit_amount)
+      end
+    end
+  end
+
+  def down
+    remove_column :spree_store_credit_events, :amount_remaining
+  end
+end

data/db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddJoinCharactersToPromotionCodeBatch < ActiveRecord::Migration[5.1]
+  def change
+    add_column(:spree_promotion_code_batches,
+               :join_characters,
+               :string,
+               null: false,
+               default: '_')
+  end
+end

data/db/seeds.rb

@@ -1,5 +1,4 @@
-# Loads seed data out of default dir
-default_path = File.join(File.dirname(__FILE__), 'default')
+# frozen_string_literal: true
 
 %w(
   stores

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'rails/generators/active_record/migration'
 
 module Spree
+  # @private
   class CustomUserGenerator < Rails::Generators::NamedBase
     include ActiveRecord::Generators::Migration
 

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "rails/generators/rails/app/app_generator"
 require 'active_support/core_ext/hash'
 require 'spree/core/version'
 
 module Spree
+  # @private
   class DummyGenerator < Rails::Generators::Base
     desc "Creates blank Rails application, installs Solidus and all sample data"
 
@@ -11,7 +14,7 @@ module Spree
 
     def self.source_paths
       paths = superclass.source_paths
-      paths << File.expand_path('../templates', __FILE__)
+      paths << File.expand_path('templates', __dir__)
       paths.flatten
     end
 
@@ -51,7 +54,7 @@ module Spree
 
       template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
       template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
-      template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
+      template "rails/application.rb.tt", "#{dummy_path}/config/application.rb", force: true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
@@ -109,7 +112,6 @@ end
 
     def application_definition
       @application_definition ||= begin
-
         dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
         unless options[:pretend] || !File.exist?(dummy_application_path)
           contents = File.read(dummy_application_path)
@@ -137,9 +139,10 @@ end
       end
     end
   end
-end
 
-module Spree::DummyGeneratorHelper
-  mattr_accessor :inject_extension_requirements
-  self.inject_extension_requirements = false
+  # @private
+  module DummyGeneratorHelper
+    mattr_accessor :inject_extension_requirements
+    self.inject_extension_requirements = false
+  end
 end

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'bundler'
 require 'bundler/cli'
 
 module Spree
+  # @private
   class InstallGenerator < Rails::Generators::Base
     CORE_MOUNT_ROUTE = "mount Spree::Core::Engine"
 
@@ -20,7 +23,7 @@ module Spree
       paths = superclass.source_paths
       paths << File.expand_path('../templates', "../../#{__FILE__}")
       paths << File.expand_path('../templates', "../#{__FILE__}")
-      paths << File.expand_path('../templates', __FILE__)
+      paths << File.expand_path('templates', __dir__)
       paths.flatten
     end
 
@@ -36,20 +39,20 @@ module Spree
     end
 
     def add_files
-      template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
+      template 'config/initializers/spree.rb.tt', 'config/initializers/spree.rb'
     end
 
     def additional_tweaks
       return unless File.exist? 'public/robots.txt'
-      append_file "public/robots.txt", <<-ROBOTS
-User-agent: *
-Disallow: /checkout
-Disallow: /cart
-Disallow: /orders
-Disallow: /user
-Disallow: /account
-Disallow: /api
-Disallow: /password
+      append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
+        User-agent: *
+        Disallow: /checkout
+        Disallow: /cart
+        Disallow: /orders
+        Disallow: /user
+        Disallow: /account
+        Disallow: /api
+        Disallow: /password
       ROBOTS
     end
 
@@ -100,10 +103,10 @@ Disallow: /password
     end
 
     def include_seed_data
-      append_file "db/seeds.rb", <<-SEEDS
-\n
-Spree::Core::Engine.load_seed if defined?(Spree::Core)
-Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
+      append_file "db/seeds.rb", <<-SEEDS.strip_heredoc
+
+        Spree::Core::Engine.load_seed if defined?(Spree::Core)
+        Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
       SEEDS
     end
 

data/lib/solidus_core.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree_core'

data/lib/spree/app_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This is the primary location for defining spree preferences
 #
 # The expectation is that this is created once and stored in
@@ -102,7 +104,7 @@ module Spree
     preference :inventory_cache_threshold, :integer
 
     # @!attribute [rw] checkout_zone
-    #   @return [String] Name of a {Zone}, which limits available countries to those included in that zone. (default: +nil+)
+    #   @return [String] Name of a {Spree::Zone}, which limits available countries to those included in that zone. (default: +nil+)
     preference :checkout_zone, :string, default: nil
 
     # @!attribute [rw] company
@@ -116,7 +118,7 @@ module Spree
 
     # @!attribute [rw] default_country_id
     #   @deprecated Use the default country ISO preference instead
-    #   @return [Integer,nil] id of {Country} to be selected by default in dropdowns (default: nil)
+    #   @return [Integer,nil] id of {Spree::Country} to be selected by default in dropdowns (default: nil)
     preference :default_country_id, :integer
 
     # @!attribute [rw] default_country_iso
@@ -157,7 +159,7 @@ module Spree
     preference :max_level_in_taxons_menu, :integer, default: 1
 
     # @!attribute [rw] order_mutex_max_age
-    #   @return [Integer] Max age of {OrderMutex} in seconds (default: 2 minutes)
+    #   @return [Integer] Max age of {Spree::OrderMutex} in seconds (default: 2 minutes)
     preference :order_mutex_max_age, :integer, default: 120
 
     # @!attribute [rw] orders_per_page
@@ -242,7 +244,7 @@ module Spree
     # Store credits configurations
 
     # @!attribute [rw] credit_to_new_allocation
-    #   @return [Boolean] Creates a new allocation anytime {StoreCredit#credit} is called
+    #   @return [Boolean] Creates a new allocation anytime {Spree::StoreCredit#credit} is called
     preference :credit_to_new_allocation, :boolean, default: false
 
     # @!attribute [rw] automatic_default_address
@@ -260,7 +262,7 @@ module Spree
     # Allows restricting what currencies will be available.
     #
     # @!attribute [r] available_currencies
-    #   @returns [Array] An array of available currencies from Money::Currency.all
+    #   @return [Array] An array of available currencies from Money::Currency.all
     attr_writer :available_currencies
     def available_currencies
       @available_currencies ||= ::Money::Currency.all
@@ -444,6 +446,7 @@ module Spree
             Spree::Promotion::Rules::OptionValue
             Spree::Promotion::Rules::FirstRepeatPurchaseSince
             Spree::Promotion::Rules::UserRole
+            Spree::Promotion::Rules::Store
           ]
 
           promos.actions = %w[