spree_core 3.6.6 → 3.7.0.rc1

data/db/migrate/20140309024355_create_spree_stores.rb

@@ -18,7 +18,7 @@ class CreateSpreeStores < ActiveRecord::Migration[4.2]
         t.string :code
         t.boolean :default, default: false, null: false
 
-        t.timestamps null: false
+        t.timestamps null: false, precision: 6
       end
     end
   end

data/db/migrate/20140625214618_create_spree_refunds.rb

@@ -6,7 +6,7 @@ class CreateSpreeRefunds < ActiveRecord::Migration[4.2]
       t.decimal :amount, precision: 10, scale: 2, default: 0.0, null: false
       t.string :transaction_id
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
   end
 end

data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb

@@ -6,7 +6,7 @@ class CreateSpreeReturnAuthorizationInventoryUnit < ActiveRecord::Migration[4.2]
       t.integer :exchange_variant_id
       t.datetime :received_at
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
   end
 end

data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb

@@ -5,7 +5,7 @@ class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration[4.2]
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     reversible do |direction|

data/db/migrate/20140713140527_create_spree_refund_reasons.rb

@@ -5,7 +5,7 @@ class CreateSpreeRefundReasons < ActiveRecord::Migration[4.2]
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_column :spree_refunds, :refund_reason_id, :integer

data/db/migrate/20140715182625_create_spree_promotion_categories.rb

@@ -2,7 +2,7 @@ class CreateSpreePromotionCategories < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_promotion_categories do |t|
       t.string :name
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_column :spree_promotions, :promotion_category_id, :integer

data/db/migrate/20140718133010_create_spree_customer_returns.rb

@@ -3,7 +3,7 @@ class CreateSpreeCustomerReturns < ActiveRecord::Migration[4.2]
     create_table :spree_customer_returns do |t|
       t.string :number
       t.integer :stock_location_id
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
   end
 end

data/db/migrate/20140725131539_create_spree_reimbursements.rb

@@ -7,7 +7,7 @@ class CreateSpreeReimbursements < ActiveRecord::Migration[4.2]
       t.integer :order_id
       t.decimal :total, precision: 10, scale: 2
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_reimbursements, :customer_return_id

data/db/migrate/20140731150017_create_spree_reimbursement_types.rb

@@ -5,7 +5,7 @@ class CreateSpreeReimbursementTypes < ActiveRecord::Migration[4.2]
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     reversible do |direction|

data/db/migrate/20150118210639_create_spree_store_credits.rb

@@ -13,7 +13,7 @@ class CreateSpreeStoreCredits < ActiveRecord::Migration[4.2]
       t.integer :originator_id
       t.string :originator_type
       t.integer :type_id
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
 
     add_index :spree_store_credits, :deleted_at

data/db/migrate/20150118211500_create_spree_store_credit_categories.rb

@@ -2,7 +2,7 @@ class CreateSpreeStoreCreditCategories < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_store_credit_categories do |t|
       t.string :name
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
   end
 end

data/db/migrate/20150118212051_create_spree_store_credit_events.rb

@@ -9,7 +9,7 @@ class CreateSpreeStoreCreditEvents < ActiveRecord::Migration[4.2]
       t.integer  :originator_id
       t.string   :originator_type
       t.datetime :deleted_at
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index :spree_store_credit_events, :store_credit_id
     add_index :spree_store_credit_events, [:originator_id, :originator_type], name: :spree_store_credit_events_originator

data/db/migrate/20150118212101_create_spree_store_credit_types.rb

@@ -3,7 +3,7 @@ class CreateSpreeStoreCreditTypes < ActiveRecord::Migration[4.2]
     create_table :spree_store_credit_types do |t|
       t.string :name
       t.integer :priority
-      t.timestamps null: false
+      t.timestamps null: false, precision: 6
     end
     add_index :spree_store_credit_types, :priority
   end

data/db/migrate/20150309161154_ensure_payments_have_numbers.rb

@@ -2,8 +2,12 @@ class EnsurePaymentsHaveNumbers < ActiveRecord::Migration[4.2]
   def change
     add_index :spree_payments, :number unless index_exists?(:spree_payments, :number)
     Spree::Payment.where(number: nil).find_each do |payment|
-      payment.generate_number
-      payment.update_columns(number: payment.number)
+      begin
+        payment.save! # to generate a new number we need to save the record
+      rescue ActiveRecord::RecordNotSaved
+        Rails.logger.error("Payment with ID = #{payment.id} couldn't be saved")
+        Rails.logger.error(payment.errors.full_messages.to_sentence)
+      end
     end
   end
 end

data/db/migrate/20180613080857_rename_guest_token_to_token_in_orders.rb

@@ -0,0 +1,5 @@
+class RenameGuestTokenToTokenInOrders < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :spree_orders, :guest_token, :token
+  end
+end

data/db/migrate/20180915160001_add_timestamps_to_spree_prices.rb

@@ -0,0 +1,12 @@
+class AddTimestampsToSpreePrices < ActiveRecord::Migration[5.2]
+  def up
+    add_timestamps :spree_prices, default: Time.current
+    change_column_default :spree_prices, :created_at, nil
+    change_column_default :spree_prices, :updated_at, nil
+  end
+
+  def down
+    remove_column :spree_prices, :created_at
+    remove_column :spree_prices, :updated_at
+  end
+end

data/db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToSpreeCreditCards < ActiveRecord::Migration[5.2]
+  def change
+    add_column :spree_credit_cards, :deleted_at, :datetime
+    add_index :spree_credit_cards, :deleted_at
+  end
+end

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

@@ -7,17 +7,15 @@ 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
 
     def check_for_constant
-
       klass
     rescue NameError
       @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
       exit(1)
-
     end
 
     def generate

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

@@ -1,17 +1,17 @@
-require "rails/generators/rails/app/app_generator"
+require 'rails/generators/rails/app/app_generator'
 require 'active_support/core_ext/hash'
 require 'spree/core/version'
 
 module Spree
   class DummyGenerator < Rails::Generators::Base
-    desc "Creates blank Rails application, installs Spree and all sample data"
+    desc 'Creates blank Rails application, installs Spree and all sample data'
 
     class_option :lib_name, default: ''
     class_option :database, default: ''
 
     def self.source_paths
-      paths = self.superclass.source_paths
-      paths << File.expand_path('../templates', __FILE__)
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
       paths.flatten
     end
 
@@ -39,23 +39,22 @@ module Spree
       opts[:skip_test] = true
       opts[:skip_yarn] = true
 
-      puts "Generating dummy Rails application..."
+      puts 'Generating dummy Rails application...'
       invoke Rails::Generators::AppGenerator,
-        [ File.expand_path(dummy_path, destination_root) ], opts
+        [File.expand_path(dummy_path, destination_root)], opts
     end
 
     def test_dummy_config
       @lib_name = options[:lib_name]
       @database = options[:database]
 
-      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/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
-      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
-      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", force: true
+      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/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
+      template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
@@ -70,20 +69,19 @@ module Spree
 
     def test_dummy_clean
       inside dummy_path do
-        remove_file ".gitignore"
-        remove_file "doc"
-        remove_file "Gemfile"
-        remove_file "lib/tasks"
-        remove_file "app/assets/images/rails.png"
-        remove_file "app/assets/javascripts/application.js"
-        remove_file "public/index.html"
-        remove_file "public/robots.txt"
-        remove_file "README"
-        remove_file "test"
-        remove_file "vendor"
-        remove_file "spec"
+        remove_file '.gitignore'
+        remove_file 'doc'
+        remove_file 'Gemfile'
+        remove_file 'lib/tasks'
+        remove_file 'app/assets/images/rails.png'
+        remove_file 'app/assets/javascripts/application.js'
+        remove_file 'public/index.html'
+        remove_file 'public/robots.txt'
+        remove_file 'README'
+        remove_file 'test'
+        remove_file 'vendor'
+        remove_file 'spec'
       end
-
     end
 
     def inject_content_security_policy
@@ -94,8 +92,8 @@ module Spree
       end
     end
 
-    attr :lib_name
-    attr :database
+    attr_reader :lib_name
+    attr_reader :database
 
     protected
 
@@ -119,15 +117,14 @@ end
 
     def application_definition
       @application_definition ||= begin
-
         dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-        unless options[:pretend] || !File.exists?(dummy_application_path)
+        unless options[:pretend] || !File.exist?(dummy_application_path)
           contents = File.read(dummy_application_path)
           contents[(contents.index("module #{module_name}"))..-1]
         end
       end
     end
-    alias :store_application_definition! :application_definition
+    alias store_application_definition! application_definition
 
     def camelized
       @camelized ||= name.gsub(/\W/, '_').squeeze('_').camelize
@@ -138,7 +135,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
+      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -6,6 +6,7 @@ end %>
 end %>
 <% db_password = ENV['DB_PASSWORD'] %>
 <% db_username = ENV['DB_USERNAME'] %>
+<% db_host = ENV['DB_HOST'] %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
@@ -28,6 +29,11 @@ mysql: &mysql
   <% unless db_password.blank? %>
   password: <%= db_password %>
   <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
+  reconnect: true
+  pool: 5
 
 development:
   <<: *mysql
@@ -39,7 +45,6 @@ production:
   <<: *mysql
   database: <%= database_prefix %><%= lib_name %>_spree_production
 <% when 'postgres' %>
-<% db_host = ENV['DB_HOST'] %>
 postgres: &postgres
   adapter: postgresql
   <% unless db_username.blank? %>

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -33,4 +33,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_job.queue_adapter = :test
 end

data/lib/generators/spree/dummy_model/dummy_model_generator.rb

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

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

@@ -22,7 +22,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
 
@@ -44,6 +44,7 @@ module Spree
 
     def additional_tweaks
       return unless File.exist? 'public/robots.txt'
+
       append_file 'public/robots.txt', <<-ROBOTS.strip_heredoc
         User-agent: *
         Disallow: /checkout

data/lib/spree/core.rb

@@ -70,11 +70,7 @@ end
 
 require 'spree/core/version'
 
-require 'spree/core/environment_extension'
-require 'spree/core/environment/calculators'
-require 'spree/core/environment'
 require 'spree/core/number_generator'
-require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/core/engine'
 
@@ -82,8 +78,10 @@ require 'spree/i18n'
 require 'spree/localized_number'
 require 'spree/money'
 require 'spree/permitted_attributes'
+require 'spree/service_module'
 
 require 'spree/core/importer'
+require 'spree/core/query_filters'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'

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

@@ -6,7 +6,7 @@ module Spree
         include Spree::Core::TokenGenerator
 
         included do
-          before_action :set_guest_token
+          before_action :set_token
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |_exception|
@@ -24,10 +24,20 @@ module Spree
           session['spree_user_return_to'] = nil
         end
 
-        def set_guest_token
-          if cookies.signed[:guest_token].blank?
-            cookies.permanent.signed[:guest_token] = { value: generate_guest_token, httponly: true }
-          end
+        def set_token
+          cookies.permanent.signed[:token] ||= cookies.signed[:guest_token]
+          cookies.permanent.signed[:token] ||= {
+            value: generate_token,
+            httponly: true
+          }
+          cookies.permanent.signed[:guest_token] ||= cookies.permanent.signed[:token]
+        end
+
+        def current_oauth_token
+          user = try_spree_current_user
+          return unless user
+
+          @current_oauth_token ||= Doorkeeper::AccessToken.active_for(user).last || Doorkeeper::AccessToken.create!(resource_owner_id: user.id)
         end
 
         def store_location

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

@@ -40,17 +40,6 @@ module Spree
             current_store.seo_title
           end
 
-          def render_404(_exception = nil)
-            ActiveSupport::Deprecation.warn(<<-EOS, caller)
-              #render_404 will be removed in Spree 3.6
-              You should switch to 404 handled by rails
-            EOS
-            respond_to do |type|
-              type.html { render status: :not_found, file: "#{::Rails.root}/public/404", formats: [:html], layout: nil }
-              type.all  { head :not_found }
-            end
-          end
-
           private
 
           def set_user_language