From d7942450cec8d17d2b9f6ddf931bd9e1a448a7f3 Mon Sep 17 00:00:00 2001 From: "J.Fukaya" Date: Thu, 28 Jul 2016 18:39:03 +0900 Subject: [PATCH 1/5] Change rails version --- core/spree_core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec index 396f791df9f..ace3fb79d53 100644 --- a/core/spree_core.gemspec +++ b/core/spree_core.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |s| s.add_dependency 'aws-sdk', '~> 1.3.4' s.add_dependency 'ransack', '~> 0.7.0' s.add_dependency 'activemerchant', '= 1.28.0' - s.add_dependency 'rails', '~> 3.2.9' + s.add_dependency 'rails', '~> 4.0.0' s.add_dependency 'kaminari', '0.13.0' s.add_dependency 'deface', '>= 0.9.0' s.add_dependency 'stringex', '~> 1.3.2' From 0637a0a73116ddfa58fd7f774d3e3fa0f886debf Mon Sep 17 00:00:00 2001 From: Satoshi Hashimoto <8xx4xx8xx4@gmail.com> Date: Fri, 29 Jul 2016 19:10:02 +0900 Subject: [PATCH 2/5] =?UTF-8?q?ransack=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E6=8C=87=E5=AE=9A=E3=82=92=E5=A4=96=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/spree_core.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec index ace3fb79d53..eac38082df0 100644 --- a/core/spree_core.gemspec +++ b/core/spree_core.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| s.add_dependency 'ffaker', '~> 1.12.0' s.add_dependency 'paperclip', '~> 2.8' s.add_dependency 'aws-sdk', '~> 1.3.4' - s.add_dependency 'ransack', '~> 0.7.0' + s.add_dependency 'ransack' s.add_dependency 'activemerchant', '= 1.28.0' s.add_dependency 'rails', '~> 4.0.0' s.add_dependency 'kaminari', '0.13.0' From 725ce1e7e09bd3fb1aab4ba2e866750f55479af4 Mon Sep 17 00:00:00 2001 From: "J.Fukaya" Date: Thu, 18 Aug 2016 19:31:02 +0900 Subject: [PATCH 3/5] =?UTF-8?q?jquery-rails,=20paperclip=20kaminari?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E7=B7=A9=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/spree_core.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec index eac38082df0..fc9365da0f3 100644 --- a/core/spree_core.gemspec +++ b/core/spree_core.gemspec @@ -21,18 +21,18 @@ Gem::Specification.new do |s| s.add_dependency 'acts_as_list', '= 0.1.4' s.add_dependency 'awesome_nested_set', '2.1.4' - s.add_dependency 'jquery-rails', '~> 2.0' + s.add_dependency 'jquery-rails', '>= 2.0.0' s.add_dependency 'select2-rails', '~> 3.0' s.add_dependency 'highline', '= 1.6.11' s.add_dependency 'state_machine', '= 1.1.2' s.add_dependency 'ffaker', '~> 1.12.0' - s.add_dependency 'paperclip', '~> 2.8' + s.add_dependency 'paperclip' s.add_dependency 'aws-sdk', '~> 1.3.4' s.add_dependency 'ransack' s.add_dependency 'activemerchant', '= 1.28.0' s.add_dependency 'rails', '~> 4.0.0' - s.add_dependency 'kaminari', '0.13.0' + s.add_dependency 'kaminari', '>= 0.13.0' s.add_dependency 'deface', '>= 0.9.0' s.add_dependency 'stringex', '~> 1.3.2' s.add_dependency 'cancan', '1.6.7' From 28a12ef194be12b1553d1ed81b8076caf8288cf4 Mon Sep 17 00:00:00 2001 From: "J.Fukaya" Date: Thu, 18 Aug 2016 20:19:28 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B5=B7=E5=8B=95=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=83=AB=E3=83=BC=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/config/routes.rb | 10 ++++++---- dash/config/routes.rb | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/config/routes.rb b/core/config/routes.rb index 48ff4c500bc..8f30ea42b0f 100755 --- a/core/config/routes.rb +++ b/core/config/routes.rb @@ -4,7 +4,7 @@ resources :products - match '/locale/set', :to => 'locale#set' + match '/locale/set', :to => 'locale#set', via: [:get] resources :tax_categories @@ -46,7 +46,7 @@ end # route globbing for pretty nested taxon and product paths - match '/t/*id', :to => 'taxons#show', :as => :nested_taxons + match '/t/*id', :to => 'taxons#show', :as => :nested_taxons, via: [:get] namespace :admin do get '/search/users', :to => "search#users", :as => :search_users @@ -178,8 +178,10 @@ end end - match '/admin', :to => 'admin/orders#index', :as => :admin + # RAILSUPDATE_FIXME: spree_dash内のルーティングと重複している + # 今使っているかどうかが不明なので確認して対応する + #match '/admin', :to => 'admin/orders#index', :as => :admin, via: [:get] - match '/content/cvv', :to => 'content#cvv', :as => :cvv + match '/content/cvv', :to => 'content#cvv', :as => :cvv, via: [:get] match '/content/*path', :to => 'content#show', :via => :get, :as => :content end diff --git a/dash/config/routes.rb b/dash/config/routes.rb index 21a83850289..61899521a06 100644 --- a/dash/config/routes.rb +++ b/dash/config/routes.rb @@ -1,5 +1,5 @@ Spree::Core::Engine.routes.prepend do - match '/admin' => 'admin/overview#index', :as => :admin + match '/admin' => 'admin/overview#index', :as => :admin, via: [:get] get '/admin/analytics/sign_up' => 'admin/analytics#sign_up', :as => :admin_analytics_sign_up post '/admin/analytics/register' => 'admin/analytics#register', :as => :admin_analytics_register From 7aa69af941008bc5af865b1ab363b10c5589e219 Mon Sep 17 00:00:00 2001 From: "J.Fukaya" Date: Fri, 2 Sep 2016 19:29:37 +0900 Subject: [PATCH 5/5] =?UTF-8?q?scope=E3=81=AFlabmda=E3=81=A7=E5=9B=B2?= =?UTF-8?q?=E3=82=80=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=20at=20p?= =?UTF-8?q?ayment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/app/models/spree/payment.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/app/models/spree/payment.rb b/core/app/models/spree/payment.rb index 5d2b818465c..da2bb503eff 100644 --- a/core/app/models/spree/payment.rb +++ b/core/app/models/spree/payment.rb @@ -20,9 +20,9 @@ class Payment < ActiveRecord::Base scope :from_credit_card, lambda { where(:source_type => 'Spree::CreditCard') } scope :with_state, lambda { |s| where(:state => s) } - scope :completed, with_state('completed') - scope :pending, with_state('pending') - scope :failed, with_state('failed') + scope :completed, -> { with_state('completed') } + scope :pending, -> { with_state('pending') } + scope :failed, -> { with_state('failed') } # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details) state_machine :initial => 'checkout' do