From fb25ddd2194227d65d8d810816f2707c066d898a Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 28 Dec 2019 18:13:04 +0000 Subject: [PATCH 1/2] Remove reference to user banners, this code is not used in OFN. --- app/models/spree/user.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb index 17d4dc2978..135e54d306 100644 --- a/app/models/spree/user.rb +++ b/app/models/spree/user.rb @@ -1,7 +1,5 @@ module Spree class User < ActiveRecord::Base - include Core::UserBanners - devise :database_authenticatable, :token_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :encryptable, encryptor: 'authlogic_sha512' From 093edb66d359e270fab45964f36f10a4200c09ca Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sat, 28 Dec 2019 18:25:23 +0000 Subject: [PATCH 2/2] Remove unused view This was introduced in 2013 and removed in 2014, see log below: git log -Saddress_form_simple commit 510333288ce2d7d3f35a5c8462da632b348deaa4 Author: Maikel Linke Date: Sun Mar 2 13:05:15 2014 +1100 first steps of new design commit 2e1de9a6d37b59f3a28353391a7fbeb3e60fe07e Author: Rohan Mitchell Date: Fri Aug 23 13:12:36 2013 +1000 Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error --- .../shared/_address_form_simple.html.haml | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 app/views/spree/admin/shared/_address_form_simple.html.haml diff --git a/app/views/spree/admin/shared/_address_form_simple.html.haml b/app/views/spree/admin/shared/_address_form_simple.html.haml deleted file mode 100644 index 36f49bf384..0000000000 --- a/app/views/spree/admin/shared/_address_form_simple.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -%tr{"data-hook" => "address1"} - %td - = t(:admin_shared_address_1): - %td= f.text_field :address1 -%tr{"data-hook" => "address2" } - %td - = t(:admin_shared_address_2): - %td= f.text_field :address2 -%tr{"data-hook" => "city" } - %td - = t(:admin_share_city): - %td= f.text_field :city -%tr{"data-hook" => "zipcode" } - %td - = t(:admin_share_zipcode): - %td= f.text_field :zipcode -%tr{"data-hook" => "country" } - %td - = t(:admin_share_country): - %td= f.collection_select(:country_id, available_countries, :id, :name) -%tr{"data-hook" => "state" } - %td - = t(:admin_share_state): - %td= f.collection_select(:state_id, f.object.country.states, :id, :name)