From 8dbe4accaf8c6ec78ca4e58cd03ed68be7a603b3 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Wed, 27 Feb 2019 16:27:34 +0000 Subject: [PATCH] Upgrade to the spree branch 2-1-0-stable and rails 4.0.0 --- Gemfile | 46 +-- Gemfile.lock | 347 +++++++++--------- .../spree/paypal_controller_decorator.rb | 45 --- app/helpers/application_helper.rb | 2 +- app/models/enterprise.rb | 2 +- config/initializers/rack_rewrite.rb | 4 +- config/initializers/simple_form.rb | 138 ------- 7 files changed, 197 insertions(+), 387 deletions(-) delete mode 100644 app/controllers/spree/paypal_controller_decorator.rb delete mode 100644 config/initializers/simple_form.rb diff --git a/Gemfile b/Gemfile index aa468612b3..322c12ea3c 100644 --- a/Gemfile +++ b/Gemfile @@ -4,13 +4,12 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } gem 'i18n', '~> 0.6.11' gem 'i18n-js', '~> 3.6.0' -gem 'rails', '~> 3.2.22' -gem 'rails-i18n', '~> 3.0.0' +gem 'rails', '~> 4.0.0' +# gem 'rails-i18n', '~> 4.0' gem 'rails_safe_tasks', '~> 1.0' gem "activerecord-import" -# Patched version. See http://rubysec.com/advisories/CVE-2015-5312/. -gem 'nokogiri', '>= 1.6.7.1' +gem 'nokogiri', '~> 1.6.8.1' gem "order_management", path: "./engines/order_management" gem 'web', path: './engines/web' @@ -21,22 +20,23 @@ gem 'pg', '~> 0.21.0' # OFN-maintained and patched version of Spree v2.0.4. See # https://github.com/openfoodfoundation/openfoodnetwork/wiki/Tech-Doc:-OFN's-Spree-fork%F0%9F%8D%B4 # for details. -gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-0-4-stable' +gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-1-0-stable' gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable' +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable', ref: '1c436c738d0f086b2ca0f75a977ac16bc6cb98b9' # Our branch contains two changes # - Pass customer email and phone number to PayPal (merged to upstream master) # - Change type of password from string to password to hide it in the form -gem 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "2-0-stable" +# gem 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "2-0-stable" gem 'stripe' # We need at least this version to have Digicert's root certificate # which is needed for Pin Payments (and possibly others). -gem 'activemerchant', '~> 1.78' +gem 'activemerchant', '~> 1.78.0' -gem 'devise', '~> 2.2.5' -gem 'devise-encryptable', '0.2.0' +gem 'devise', '~> 3.0.1' +gem 'devise-encryptable' gem 'jwt', '~> 2.2' gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect @@ -46,7 +46,7 @@ gem 'delayed_job_web' # Fix bug in simple_form preventing collection_check_boxes usage within form_for block # When merged, revert to upstream gem -gem 'simple_form', github: 'RohanM/simple_form' +# gem 'simple_form', github: 'RohanM/simple_form' # Spree's default pagination gem (locked to the current version used by Spree) # We use it's methods in OFN code as well, so this is a direct dependency @@ -60,20 +60,21 @@ gem 'db2fog' gem 'haml' gem 'rabl' gem 'redcarpet' -gem 'sass', "~> 3.3" -gem 'sass-rails', '~> 3.2.3', groups: [:default, :assets] +#gem 'sass', "~> 3.3" +gem 'sass-rails', groups: [:default, :assets] gem 'truncate_html' gem 'unicorn' # AMS is pinned to 0.8.4 because 0.9.x is a complete re-write, as is 0.10.x # Once Rails is updated to 5.x we should bump directly to 0.10.x gem "active_model_serializers", "0.8.4" +gem 'activerecord-session_store' gem 'acts-as-taggable-on', '~> 3.4' gem 'angularjs-file-upload-rails', '~> 2.4.1' gem 'blockenspiel' gem 'custom_error_message', github: 'jeremydurham/custom-err-msg' gem 'dalli' -gem 'deface', '1.0.2' +gem 'deface' gem 'diffy' gem 'figaro' gem 'geocoder' @@ -81,6 +82,7 @@ gem 'gmaps4rails' gem 'oj' gem 'paper_trail', '~> 5.2.3' gem 'paperclip', '~> 3.4.1' +gem 'protected_attributes' gem 'rack-rewrite' gem 'rack-ssl', require: 'rack/ssl' gem 'roadie-rails', '~> 1.3.0' @@ -101,7 +103,7 @@ gem 'test-unit', '~> 3.3' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'coffee-rails', '~> 3.2.1' + gem 'coffee-rails', '~> 4.0.0' gem 'compass-rails' gem 'mini_racer', '0.2.9' @@ -111,18 +113,18 @@ group :assets do gem 'angular-rails-templates', '~> 0.3.0' gem 'foundation-icons-sass-rails' gem 'momentjs-rails' - gem 'turbo-sprockets-rails3' + # gem 'turbo-sprockets-rails3' end -gem "foundation-rails" -gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3" +gem 'foundation-rails', '= 5.5.2.1' +gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: 'rails3' gem 'jquery-migrate-rails' gem 'jquery-rails', '3.0.4' gem 'jquery-ui-rails', '~> 4.0.0' gem 'select2-rails', '~> 3.4.7' -gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c' +# gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c' group :production, :staging do gem 'ddtrace' @@ -134,8 +136,8 @@ group :test, :development do gem 'awesome_print' gem 'capybara', '>= 2.18.0' # 3.0 requires nokogiri 1.8 gem 'database_cleaner', '0.7.1', require: false - gem "factory_bot_rails", require: false - gem 'fuubar', '~> 2.5.0' + gem "factory_bot_rails", '4.8.2', require: false + gem 'fuubar', '~> 2.4.1' gem 'json_spec', '~> 1.1.4' gem 'knapsack' gem 'letter_opener', '>= 1.4.1' @@ -162,8 +164,8 @@ group :development do gem 'pry-byebug', '>= 3.4.3' gem 'rubocop' gem 'rubocop-rails' - gem 'spring', '1.7.2' - gem 'spring-commands-rspec' + #gem 'spring' + #gem 'spring-commands-rspec' # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602 # While we don't require this gem directly, no dependents forced the upgrade to a version diff --git a/Gemfile.lock b/Gemfile.lock index 7a0d3c5f64..79f00de2e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,54 @@ -GIT - remote: https://github.com/RohanM/simple_form.git - revision: 45f08a213b40f3d4bda5f5398db841137587160a - specs: - simple_form (2.0.2) - actionpack (~> 3.0) - activemodel (~> 3.0) - GIT remote: https://github.com/jeremydurham/custom-err-msg.git revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4 specs: custom_error_message (1.1.1) -GIT - remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git - revision: 27ad7165ea4c6e8c5f120b42b676cb9c2c272100 - branch: 2-0-stable - specs: - spree_paypal_express (2.0.3) - paypal-sdk-merchant (= 1.106.1) - spree_core (~> 2.0.3) - -GIT - remote: https://github.com/openfoodfoundation/ofn-qz.git - revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c - ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c - specs: - ofn-qz (0.1.0) - railties (~> 3.1) - GIT remote: https://github.com/openfoodfoundation/spree.git - revision: 8a8585a43cd04d1a50dc65227f337a91b18d66d5 - branch: 2-0-4-stable + revision: 95d3ccb32f2e4016d0fc73f39446d1739da56c50 + branch: 2-1-0-stable specs: - spree_core (2.0.4) - activemerchant (~> 1.34) + spree_core (2.1.0) + activemerchant (= 1.78.0) acts_as_list (= 0.2.0) - awesome_nested_set (= 2.1.5) - aws-sdk (~> 1.11.1) + awesome_nested_set (~> 3.0.0.rc.1) + aws-sdk (= 1.11.1) cancan (~> 1.6.10) - deface (>= 0.9.1) + deface (>= 1.0.0.rc3) ffaker (~> 1.16) highline (= 1.6.18) httparty (~> 0.11) json (>= 1.7.7) kaminari (~> 0.14.1) money (= 5.1.1) - paperclip (~> 3.0) - paranoia (~> 1.3) - rails (~> 3.2.14) - ransack (= 0.7.2) + paperclip (~> 3.4.1) + paranoia (~> 2.0) + rails (~> 4.0.0) + ransack (= 1.0.0) state_machine (= 1.2.0) stringex (~> 1.5.1) truncate_html (= 0.9.2) + spree_frontend (2.1.0) + canonical-rails + jquery-rails (~> 3.0.0) + spree_api (= 2.1.0) + spree_core (= 2.1.0) + stringex (~> 1.5.1) + +GIT + remote: https://github.com/spree/spree_auth_devise.git + revision: 1c436c738d0f086b2ca0f75a977ac16bc6cb98b9 + ref: 1c436c738d0f086b2ca0f75a977ac16bc6cb98b9 + branch: 2-1-stable + specs: + spree_auth_devise (2.1.0) + cancan (~> 1.6.7) + devise (~> 3.0.1) + devise-encryptable (= 0.1.2) + spree_backend (~> 2.1.0.beta) + spree_core (~> 2.1.0.beta) + spree_frontend (~> 2.1.0.beta) GIT remote: https://github.com/spree/spree_i18n.git @@ -89,19 +84,15 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (2.3.6) - actionmailer (3.2.22.5) - actionpack (= 3.2.22.5) - mail (~> 2.5.4) - actionpack (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - builder (~> 3.0.0) + actionmailer (4.0.13) + actionpack (= 4.0.13) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.13) + activesupport (= 4.0.13) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) active_model_serializers (0.8.4) activemodel (>= 3.0) activemerchant (1.78.0) @@ -109,24 +100,31 @@ GEM builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activemodel (3.2.22.5) - activesupport (= 3.2.22.5) - builder (~> 3.0.0) - activerecord (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activerecord-import (1.0.4) + activemodel (4.0.13) + activesupport (= 4.0.13) + builder (~> 3.1.0) + activerecord (4.0.13) + activemodel (= 4.0.13) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.13) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.4) + activerecord-import (1.0.3) activerecord (>= 3.2) activerecord-postgresql-adapter (0.0.1) pg - activeresource (3.2.22.5) - activemodel (= 3.2.22.5) - activesupport (= 3.2.22.5) - activesupport (3.2.22.5) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activerecord-session_store (1.1.3) + actionpack (>= 4.0) + activerecord (>= 4.0) + multi_json (~> 1.11, >= 1.11.2) + rack (>= 1.5.2, < 3) + railties (>= 4.0) + activesupport (4.0.13) + i18n (~> 0.6, >= 0.6.9) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) acts-as-taggable-on (3.5.0) activerecord (>= 3.2, < 5) acts_as_list (0.2.0) @@ -140,11 +138,11 @@ GEM tilt angularjs-file-upload-rails (2.4.1) angularjs-rails (1.5.5) - arel (3.0.3) + arel (4.0.2) ast (2.4.0) atomic (1.1.101) - awesome_nested_set (2.1.5) - activerecord (>= 3.0.0) + awesome_nested_set (3.0.3) + activerecord (>= 4.0.0, < 5) awesome_print (1.8.0) aws-sdk (1.11.1) json (~> 1.4) @@ -156,9 +154,11 @@ GEM blockenspiel (0.5.0) bugsnag (6.13.0) concurrent-ruby (~> 1.0) - builder (3.0.4) + builder (3.1.4) byebug (9.0.6) cancan (1.6.10) + canonical-rails (0.1.0) + rails (>= 3.1, < 5.1) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -168,18 +168,18 @@ GEM xpath (>= 2.0, < 4.0) childprocess (3.0.0) chronic (0.10.2) - chunky_png (1.3.10) + chunky_png (1.3.11) climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.2) - coffee-rails (3.2.2) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) colorize (0.8.1) combine_pdf (1.0.16) ruby-rc4 (>= 0.1.5) @@ -202,7 +202,7 @@ GEM concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) - css_parser (1.7.0) + css_parser (1.7.1) addressable daemons (1.3.1) dalli (2.7.10) @@ -229,12 +229,12 @@ GEM delayed_job (> 2.0.3) rack-protection (>= 1.5.5) sinatra (>= 1.4.4) - devise (2.2.8) + devise (3.0.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) - devise-encryptable (0.2.0) + railties (>= 3.2.6, < 5) + warden (~> 1.2.3) + devise-encryptable (0.1.2) devise (>= 2.1.0) diff-lcs (1.3) diffy (3.3.0) @@ -244,14 +244,14 @@ GEM eventmachine (1.2.7) excon (0.71.1) execjs (2.7.0) - factory_bot (4.10.0) + factory_bot (4.8.2) activesupport (>= 3.0.0) - factory_bot_rails (4.10.0) - factory_bot (~> 4.10.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) faraday (1.0.0) multipart-post (>= 1.2, < 3) - ffaker (1.22.1) + ffaker (1.32.1) ffi (1.11.3) figaro (1.1.1) thor (~> 0.14) @@ -291,7 +291,7 @@ GEM fog-xml (~> 0.1.1) ipaddress (~> 0.5) json (>= 1.8, < 2.0) - fog-aliyun (0.3.2) + fog-aliyun (0.3.5) fog-core fog-json ipaddress (~> 0.8) @@ -349,8 +349,8 @@ GEM multi_json (~> 1.10) fog-local (0.6.0) fog-core (>= 1.27, < 3.0) - fog-openstack (0.1.25) - fog-core (~> 1.40) + fog-openstack (0.3.10) + fog-core (>= 1.45, <= 2.1.0) fog-json (>= 1.0) ipaddress (>= 0.8) fog-powerdns (0.2.0) @@ -394,12 +394,13 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (2.3.0) + fog-vsphere (3.2.1) fog-core - rbvmomi (~> 1.9) - fog-xenserver (0.3.0) + rbvmomi (>= 1.9, < 3) + fog-xenserver (1.0.0) fog-core fog-xml + xmlrpc fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -412,17 +413,19 @@ GEM foundation-rails (5.5.2.1) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) - fuubar (2.5.0) + fuubar (2.4.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - geocoder (1.1.8) - gmaps4rails (1.5.6) - haml (4.0.7) + geocoder (1.5.2) + gmaps4rails (2.1.2) + haml (5.1.2) + temple (>= 0.8.0) tilt hashdiff (1.0.0) highline (1.6.18) hike (1.2.3) - httparty (0.16.2) + httparty (0.17.3) + mime-types (~> 3.0) multi_xml (>= 0.5.2) i18n (0.6.11) i18n-js (3.6.0) @@ -431,7 +434,6 @@ GEM activerecord (>= 3.0) ipaddress (0.8.3) jaro_winkler (1.5.4) - journey (1.0.4) jquery-migrate-rails (1.2.1) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -454,15 +456,17 @@ GEM letter_opener (1.7.0) launchy (~> 2.2) libv8 (7.3.492.27.1) - mail (2.5.5) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.7.1) + mini_mime (>= 0.1.1) method_source (0.9.2) - mime-types (1.25.1) - mini_mime (1.0.1) + mime-types (3.3) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.1009) + mini_mime (1.0.2) mini_portile2 (2.1.0) mini_racer (0.2.9) libv8 (>= 6.9.411) + minitest (4.7.5) momentjs-rails (2.20.1) railties (>= 3.1) money (5.1.1) @@ -481,6 +485,7 @@ GEM multi_xml (~> 0.5) rack (>= 1.2, < 3) oj (3.10.2) + optimist (3.0.0) orm_adapter (0.5.0) paper_trail (5.2.3) activerecord (>= 3.0, < 6.0) @@ -492,20 +497,17 @@ GEM cocaine (~> 0.5.0) mime-types parallel (1.19.1) - paranoia (1.3.4) - activerecord (~> 3.1) + paranoia (2.4.2) + activerecord (>= 4.0, < 6.1) parser (2.7.0.2) ast (~> 2.4.0) - paypal-sdk-core (0.2.10) - multi_json (~> 1.0) - xml-simple - paypal-sdk-merchant (1.106.1) - paypal-sdk-core (~> 0.2.3) pg (0.21.0) - polyamorous (0.5.0) - activerecord (~> 3.0) + polyamorous (0.6.4) + activerecord (>= 3.0) polyglot (0.3.5) power_assert (1.1.5) + protected_attributes (1.1.4) + activemodel (>= 4.0.1, < 5.0) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -515,54 +517,48 @@ GEM public_suffix (4.0.3) rabl (0.8.4) activesupport (>= 2.3.14) - rack (1.4.7) - rack-cache (1.9.0) - rack (>= 0.4) + rack (1.5.5) rack-mini-profiler (1.1.6) rack (>= 1.2.0) rack-protection (1.5.5) rack rack-rewrite (1.5.1) - rack-ssl (1.3.4) + rack-ssl (1.4.1) rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.22.5) - actionmailer (= 3.2.22.5) - actionpack (= 3.2.22.5) - activerecord (= 3.2.22.5) - activeresource (= 3.2.22.5) - activesupport (= 3.2.22.5) - bundler (~> 1.0) - railties (= 3.2.22.5) - rails-i18n (3.0.1) - i18n (~> 0.5) - rails (>= 3.0.0, < 4.0.0) + rails (4.0.13) + actionmailer (= 4.0.13) + actionpack (= 4.0.13) + activerecord (= 4.0.13) + activesupport (= 4.0.13) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.13) + sprockets-rails (~> 2.0) + rails-i18n (4.0.5) + i18n (~> 0.6) + railties (~> 4.0) rails_safe_tasks (1.0.0) - railties (3.2.22.5) - actionpack (= 3.2.22.5) - activesupport (= 3.2.22.5) - rack-ssl (~> 1.3.2) + railties (4.0.13) + actionpack (= 4.0.13) + activesupport (= 4.0.13) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) + thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.0) - ransack (0.7.2) - actionpack (~> 3.0) - activerecord (~> 3.0) - polyamorous (~> 0.5.0) + rake (13.0.1) + ransack (1.0.0) + actionpack (>= 3.0) + activerecord (>= 3.0) + polyamorous (~> 0.6.0) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rbvmomi (1.13.0) + rb-inotify (0.10.0) + ffi (~> 1.0) + rbvmomi (2.2.0) builder (~> 3.0) json (>= 1.8) nokogiri (~> 1.5) - trollop (~> 2.1) - rdoc (3.12.2) - json (~> 1.4) + optimist (~> 3.0) redcarpet (3.5.0) request_store (1.4.1) rack (>= 1.4) @@ -610,58 +606,57 @@ GEM rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) + ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) rubyzip (1.3.0) safe_yaml (1.0.5) - sass (3.3.14) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) + sass (3.4.25) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) select2-rails (3.4.9) sass-rails thor (~> 0.14) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sinatra (1.4.6) - rack (~> 1.4) + sinatra (1.4.8) + rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) spinjs-rails (1.4) rails (>= 3.1) - spring (1.7.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - sprockets (2.2.3) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.3.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) state_machine (1.2.0) stringex (1.5.1) stripe (5.11.0) test-unit (3.3.5) + temple (0.8.2) power_assert thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) timecop (0.9.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - trollop (2.9.9) truncate_html (0.9.2) - turbo-sprockets-rails3 (0.3.14) - railties (> 3.2.8, < 4.0.0) - sprockets (>= 2.2.0) tzinfo (0.3.56) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -683,11 +678,13 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - whenever (0.11.0) + whenever (1.0.0) chronic (>= 0.6.3) - wicked_pdf (1.1.0) + wicked_pdf (1.4.0) + activesupport wkhtmltopdf-binary (0.12.5) xml-simple (1.1.5) + xmlrpc (0.3.0) xpath (2.1.0) nokogiri (~> 1.3) @@ -696,9 +693,10 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.8.4) - activemerchant (~> 1.78) + activemerchant (~> 1.78.0) activerecord-import activerecord-postgresql-adapter + activerecord-session_store acts-as-taggable-on (~> 3.4) andand angular-rails-templates (~> 0.3.0) @@ -711,7 +709,7 @@ DEPENDENCIES bugsnag byebug (~> 9.0.0) capybara (>= 2.18.0) - coffee-rails (~> 3.2.1) + coffee-rails (~> 4.0.0) combine_pdf compass-rails custom_error_message! @@ -721,20 +719,20 @@ DEPENDENCIES db2fog ddtrace debugger-linecache - deface (= 1.0.2) + deface delayed_job_active_record delayed_job_web - devise (~> 2.2.5) - devise-encryptable (= 0.2.0) + devise (~> 3.0.1) + devise-encryptable diffy eventmachine (>= 1.2.3) - factory_bot_rails + factory_bot_rails (= 4.8.2) figaro foreigner foundation-icons-sass-rails - foundation-rails + foundation-rails (= 5.5.2.1) foundation_rails_helper! - fuubar (~> 2.5.0) + fuubar (~> 2.4.1) geocoder gmaps4rails haml @@ -752,21 +750,20 @@ DEPENDENCIES mini_racer (= 0.2.9) momentjs-rails newrelic_rpm (~> 3.0) - nokogiri (>= 1.6.7.1) + nokogiri (~> 1.6.8.1) oauth2 (~> 1.4.4) - ofn-qz! oj order_management! paper_trail (~> 5.2.3) paperclip (~> 3.4.1) pg (~> 0.21.0) + protected_attributes pry-byebug (>= 3.4.3) rabl rack-mini-profiler (< 2.0.0) rack-rewrite rack-ssl - rails (~> 3.2.22) - rails-i18n (~> 3.0.0) + rails (~> 4.0.0) rails_safe_tasks (~> 1.0) redcarpet roadie-rails (~> 1.3.0) @@ -775,24 +772,18 @@ DEPENDENCIES rspec-retry rubocop rubocop-rails - sass (~> 3.3) sass-rails (~> 3.2.3) select2-rails (~> 3.4.7) selenium-webdriver shoulda-matchers - simple_form! simplecov spinjs-rails spree_core! spree_i18n! - spree_paypal_express! - spring (= 1.7.2) - spring-commands-rspec stripe test-unit (~> 3.3) timecop truncate_html - turbo-sprockets-rails3 uglifier (>= 1.0.3) unicorn unicorn-rails diff --git a/app/controllers/spree/paypal_controller_decorator.rb b/app/controllers/spree/paypal_controller_decorator.rb deleted file mode 100644 index 1512299198..0000000000 --- a/app/controllers/spree/paypal_controller_decorator.rb +++ /dev/null @@ -1,45 +0,0 @@ -Spree::PaypalController.class_eval do - before_filter :enable_embedded_shopfront - before_filter :destroy_orphaned_paypal_payments, only: :confirm - after_filter :reset_order_when_complete, only: :confirm - - def cancel - flash[:notice] = Spree.t('flash.cancel', scope: 'paypal') - redirect_to main_app.checkout_path - end - - # Clears the cached order. Required for #current_order to return a new order - # to serve as cart. See https://github.com/spree/spree/blob/1-3-stable/core/lib/spree/core/controller_helpers/order.rb#L14 - # for details. - def expire_current_order - session[:order_id] = nil - @current_order = nil - end - - private - - def reset_order_when_complete - if current_order.complete? - flash[:notice] = t(:order_processed_successfully) - - ResetOrderService.new(self, current_order).call - session[:access_token] = current_order.token - end - end - - # See #1074 and #1837 for more detail on why we need this - # An 'orphaned' Spree::Payment is created for every call to CheckoutController#update - # for orders that are processed using a Spree::Gateway::PayPalExpress payment method - # These payments are 'orphaned' because they are never used by the spree_paypal_express gem - # which creates a brand new Spree::Payment from scratch in PayPalController#confirm - # However, the 'orphaned' payments are useful when applying a transaction fee, because the fees - # need to be calculated before the order details are sent to PayPal for confirmation - # This is our best hook for removing the orphaned payments at an appropriate time. ie. after - # the payment details have been confirmed, but before any payments have been processed - def destroy_orphaned_paypal_payments - return unless payment_method.is_a?(Spree::Gateway::PayPalExpress) - - orphaned_payments = current_order.payments.where(payment_method_id: payment_method.id, source_id: nil) - orphaned_payments.each(&:destroy) - end -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0142825667..0e66cde722 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,5 @@ module ApplicationHelper - include FoundationRailsHelper::FlashHelper + #include FoundationRailsHelper::FlashHelper def feature?(feature) OpenFoodNetwork::FeatureToggle.enabled? feature diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 1deee05a40..a5de267e7e 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -17,7 +17,7 @@ class Enterprise < ActiveRecord::Base self.inheritance_column = nil - acts_as_gmappable process_geocoding: false + # acts_as_gmappable process_geocoding: false has_many :relationships_as_parent, class_name: 'EnterpriseRelationship', foreign_key: 'parent_id', diff --git a/config/initializers/rack_rewrite.rb b/config/initializers/rack_rewrite.rb index 98c93a79f3..251330f9d4 100644 --- a/config/initializers/rack_rewrite.rb +++ b/config/initializers/rack_rewrite.rb @@ -1,7 +1,7 @@ module Openfoodnetwork class Application < Rails::Application - config.middleware.insert_before(Rack::Lock, Rack::Rewrite) do - r301 '/admin/products/bulk_edit', '/admin/products' # TODO: Date added 15/06/2018 + config.middleware.insert_before(Rack::Runtime, Rack::Rewrite) do + r301 '/admin/products/bulk_edit', '/admin/products' end end end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb deleted file mode 100644 index 59c7d2528b..0000000000 --- a/config/initializers/simple_form.rb +++ /dev/null @@ -1,138 +0,0 @@ -# Use this setup block to configure all options available in SimpleForm. -SimpleForm.setup do |config| - # Wrappers are used by the form builder to generate a - # complete input. You can remove any component from the - # wrapper, change the order or even add your own to the - # stack. The options given below are used to wrap the - # whole input. - config.wrappers :default, :class => :input, - :hint_class => :field_with_hint, :error_class => :field_with_errors do |b| - ## Extensions enabled by default - # Any of these extensions can be disabled for a - # given input by passing: `f.input EXTENSION_NAME => false`. - # You can make any of these extensions optional by - # renaming `b.use` to `b.optional`. - - # Determines whether to use HTML5 (:email, :url, ...) - # and required attributes - b.use :html5 - - # Calculates placeholders automatically from I18n - # You can also pass a string as f.input :placeholder => "Placeholder" - b.use :placeholder - - ## Optional extensions - # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup` - # to the input. If so, they will retrieve the values from the model - # if any exists. If you want to enable the lookup for any of those - # extensions by default, you can change `b.optional` to `b.use`. - - # Calculates maxlength from length validations for string inputs - b.optional :maxlength - - # Calculates pattern from format validations for string inputs - b.optional :pattern - - # Calculates min and max from length validations for numeric inputs - b.optional :min_max - - # Calculates readonly automatically from readonly attributes - b.optional :readonly - - ## Inputs - b.use :label_input - b.use :hint, :wrap_with => { :tag => :span, :class => :hint } - b.use :error, :wrap_with => { :tag => :span, :class => :error } - end - - # The default wrapper to be used by the FormBuilder. - config.default_wrapper = :default - - # Define the way to render check boxes / radio buttons with labels. - # Defaults to :nested for bootstrap config. - # :inline => input + label - # :nested => label > input - config.boolean_style = :nested - - # Default class for buttons - config.button_class = 'btn' - - # Method used to tidy up errors. Specify any Rails Array method. - # :first lists the first message for each field. - # Use :to_sentence to list all errors for each field. - # config.error_method = :first - - # Default tag used for error notification helper. - config.error_notification_tag = :div - - # CSS class to add for error notification helper. - config.error_notification_class = 'alert alert-error' - - # ID to add for error notification helper. - # config.error_notification_id = nil - - # Series of attempts to detect a default label method for collection. - # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] - - # Series of attempts to detect a default value method for collection. - # config.collection_value_methods = [ :id, :to_s ] - - # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. - # config.collection_wrapper_tag = nil - - # You can define the class to use on all collection wrappers. Defaulting to none. - # config.collection_wrapper_class = nil - - # You can wrap each item in a collection of radio/check boxes with a tag, - # defaulting to :span. Please note that when using :boolean_style = :nested, - # SimpleForm will force this option to be a label. - # config.item_wrapper_tag = :span - - # You can define a class to use in all item wrappers. Defaulting to none. - # config.item_wrapper_class = nil - - # How the label text should be generated altogether with the required text. - # config.label_text = lambda { |label, required| "#{required} #{label}" } - - # You can define the class to use on all labels. Default is nil. - config.label_class = 'control-label' - - # You can define the class to use on all forms. Default is simple_form. - # config.form_class = :simple_form - - # You can define which elements should obtain additional classes - # config.generate_additional_classes_for = [:wrapper, :label, :input] - - # Whether attributes are required by default (or not). Default is true. - # config.required_by_default = true - - # Tell browsers whether to use default HTML5 validations (novalidate option). - # Default is enabled. - config.browser_validations = false - - # Collection of methods to detect if a file type was given. - # config.file_methods = [ :mounted_as, :file?, :public_filename ] - - # Custom mappings for input types. This should be a hash containing a regexp - # to match as key, and the input type that will be used when the field name - # matches the regexp as value. - # config.input_mappings = { /count/ => :integer } - - # Default priority for time_zone inputs. - # config.time_zone_priority = nil - - # Default priority for country inputs. - # config.country_priority = nil - - # Default size for text inputs. - # config.default_input_size = 50 - - # When false, do not use translations for labels. - # config.translate_labels = true - - # Automatically discover new inputs in Rails' autoload path. - # config.inputs_discovery = true - - # Cache SimpleForm inputs discovery - # config.cache_discovery = !Rails.env.development? -end