Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trackers from Solidus #1438

Merged
merged 10 commits into from
Sep 19, 2016
Merged

Remove trackers from Solidus #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32fe23f
Remove tracker model, specs, factory
swively Sep 7, 2016
fe3c705
Remove trackers controller from backend
swively Sep 7, 2016
fb3d899
Remove routes
swively Sep 7, 2016
1966d35
Remove references to Spree::Tracker
swively Sep 7, 2016
1953dbe
Remove analytics spec
swively Sep 7, 2016
22874b6
Remove tracker views
swively Sep 7, 2016
bd3b975
Remove tracker migrations
swively Sep 7, 2016
1abc6d2
Remove tracker permission sets
swively Sep 7, 2016
ad0ac50
Remove google analytics partial from application erb
swively Sep 7, 2016
3d7e747
Solidus 2.1.0 changelog message
swively Sep 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Solidus 2.1.0 (unreleased)

* Analytics trackers were removed from the admin panel; the extension
`solidus_trackers` provides the same functionality

## Solidus 2.0.0 (unreleased)

* Upgrade to rails 5.0
Expand Down
6 changes: 0 additions & 6 deletions backend/app/controllers/spree/admin/trackers_controller.rb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion backend/app/models/spree/backend_configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class BackendConfiguration < Preferences::Configuration
CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
:tax_rates, :zones, :countries, :states,
:payment_methods, :shipping_methods,
:shipping_categories, :stock_locations, :trackers,
:shipping_categories, :stock_locations,
:refund_reasons, :reimbursement_types, :return_authorization_reasons]
PROMOTION_TABS ||= [:promotions, :promotion_categories]
STOCK_TABS ||= [:stock_items, :stock_transfers]
Expand Down
4 changes: 0 additions & 4 deletions backend/app/views/spree/admin/shared/_configuration_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<% if can?(:edit, :general_settings) %>
<%= settings_tab_item Spree.t(:settings), edit_admin_general_settings_path %>
<% end %>

<% if can?(:display, Spree::Tracker) %>
<%= settings_tab_item plural_resource_name(Spree::Tracker), admin_trackers_path %>
<% end %>
</ul>
</nav>
<% end %>
4 changes: 2 additions & 2 deletions backend/app/views/spree/admin/shared/_settings_sub_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ul class="admin-subnav" data-hook="admin_settings_sub_tabs">
<% if can?(:edit, :general_settings) || can?(:display, Spree::Tracker) %>
<%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings|\/trackers/ %>
<% if can?(:edit, :general_settings) %>
<%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings/ %>
<% end %>

<% if can?(:display, Spree::PaymentMethod) %>
Expand Down
28 changes: 0 additions & 28 deletions backend/app/views/spree/admin/trackers/_form.html.erb
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions backend/app/views/spree/admin/trackers/edit.html.erb
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions backend/app/views/spree/admin/trackers/index.html.erb
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions backend/app/views/spree/admin/trackers/new.html.erb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion backend/config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@
resources :stock_items, except: [:show, :new, :edit]
resources :tax_rates

resources :trackers
resources :payment_methods do
collection do
post :update_positions
Expand Down
50 changes: 0 additions & 50 deletions backend/spec/features/admin/configuration/analytics_tracker_spec.rb
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions core/app/models/spree/tracker.rb
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions core/db/migrate/20120831092320_spree_one_two.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,13 +413,6 @@ def up

add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], name: 'index_tokenized_name_and_type'

create_table :spree_trackers do |t|
t.string :environment
t.string :analytics_id
t.boolean :active, default: true
t.timestamps null: true
end

create_table :spree_users do |t|
t.string :encrypted_password, limit: 128
t.string :password_salt, limit: 128
Expand Down
6 changes: 0 additions & 6 deletions core/db/migrate/20150128032538_remove_environment_from_tracker.rb
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions core/db/migrate/20150723224133_remove_unnecessary_indexes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def up
safe_remove_index :spree_tax_categories, :deleted_at
safe_remove_index :spree_tax_rates, :show_rate_in_label
safe_remove_index :spree_tax_rates, :included_in_price
safe_remove_index :spree_trackers, :active
safe_remove_index :spree_variants, :is_master
safe_remove_index :spree_variants, :deleted_at
safe_remove_index :spree_zones, :default_tax
Expand Down Expand Up @@ -56,7 +55,6 @@ def down
safe_add_index :spree_tax_categories, :deleted_at
safe_add_index :spree_tax_rates, :show_rate_in_label
safe_add_index :spree_tax_rates, :included_in_price
safe_add_index :spree_trackers, :active
safe_add_index :spree_variants, :is_master
safe_add_index :spree_variants, :deleted_at
safe_add_index :spree_zones, :default_tax
Expand Down
1 change: 0 additions & 1 deletion core/lib/spree/permission_sets/configuration_display.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def activate!
can [:display, :admin], Spree::ShippingCategory
can [:display, :admin], Spree::StockLocation
can [:display, :admin], Spree::StockMovement
can [:display, :admin], Spree::Tracker
can [:display, :admin], Spree::RefundReason
can [:display, :admin], Spree::ReimbursementType
can [:display, :admin], Spree::ReturnReason
Expand Down
1 change: 0 additions & 1 deletion core/lib/spree/permission_sets/configuration_management.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def activate!
can :manage, Spree::ShippingCategory
can :manage, Spree::StockLocation
can :manage, Spree::StockMovement
can :manage, Spree::Tracker
can :manage, Spree::RefundReason
can :manage, Spree::ReimbursementType
can :manage, Spree::ReturnReason
Expand Down
6 changes: 0 additions & 6 deletions core/lib/spree/testing_support/factories/tracker_factory.rb
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions core/spec/lib/spree/core/testing_support/factories/tracker_factory_spec.rb
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions core/spec/models/spree/permission_sets/configuration_display.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
it { is_expected.to be_able_to(:display, Spree::ShippingCategory) }
it { is_expected.to be_able_to(:display, Spree::StockLocation) }
it { is_expected.to be_able_to(:display, Spree::StockMovement) }
it { is_expected.to be_able_to(:display, Spree::Tracker) }
it { is_expected.to be_able_to(:display, Spree::RefundReason) }
it { is_expected.to be_able_to(:display, Spree::ReimbursementType) }
it { is_expected.to be_able_to(:display, Spree::ReturnReason) }
Expand All @@ -38,7 +37,6 @@
it { is_expected.to be_able_to(:admin, Spree::ShippingCategory) }
it { is_expected.to be_able_to(:admin, Spree::StockLocation) }
it { is_expected.to be_able_to(:admin, Spree::StockMovement) }
it { is_expected.to be_able_to(:admin, Spree::Tracker) }
it { is_expected.to be_able_to(:admin, Spree::RefundReason) }
it { is_expected.to be_able_to(:admin, Spree::ReimbursementType) }
it { is_expected.to be_able_to(:admin, Spree::ReturnReason) }
Expand All @@ -57,7 +55,6 @@
it { is_expected.not_to be_able_to(:display, Spree::ShippingCategory) }
it { is_expected.not_to be_able_to(:display, Spree::StockLocation) }
it { is_expected.not_to be_able_to(:display, Spree::StockMovement) }
it { is_expected.not_to be_able_to(:display, Spree::Tracker) }
it { is_expected.not_to be_able_to(:display, Spree::RefundReason) }
it { is_expected.not_to be_able_to(:display, Spree::ReimbursementType) }
it { is_expected.not_to be_able_to(:display, Spree::ReturnReason) }
Expand All @@ -73,7 +70,6 @@
it { is_expected.not_to be_able_to(:admin, Spree::ShippingCategory) }
it { is_expected.not_to be_able_to(:admin, Spree::StockLocation) }
it { is_expected.not_to be_able_to(:admin, Spree::StockMovement) }
it { is_expected.not_to be_able_to(:admin, Spree::Tracker) }
it { is_expected.not_to be_able_to(:admin, Spree::RefundReason) }
it { is_expected.not_to be_able_to(:admin, Spree::ReimbursementType) }
it { is_expected.not_to be_able_to(:admin, Spree::ReturnReason) }
Expand Down
2 changes: 0 additions & 2 deletions core/spec/models/spree/permission_sets/configuration_management_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
it { is_expected.to be_able_to(:manage, Spree::ShippingCategory) }
it { is_expected.to be_able_to(:manage, Spree::StockLocation) }
it { is_expected.to be_able_to(:manage, Spree::StockMovement) }
it { is_expected.to be_able_to(:manage, Spree::Tracker) }
it { is_expected.to be_able_to(:manage, Spree::RefundReason) }
it { is_expected.to be_able_to(:manage, Spree::ReimbursementType) }
it { is_expected.to be_able_to(:manage, Spree::ReturnReason) }
Expand All @@ -41,7 +40,6 @@
it { is_expected.not_to be_able_to(:manage, Spree::ShippingCategory) }
it { is_expected.not_to be_able_to(:manage, Spree::StockLocation) }
it { is_expected.not_to be_able_to(:manage, Spree::StockMovement) }
it { is_expected.not_to be_able_to(:manage, Spree::Tracker) }
it { is_expected.not_to be_able_to(:manage, Spree::RefundReason) }
it { is_expected.not_to be_able_to(:manage, Spree::ReimbursementType) }
it { is_expected.not_to be_able_to(:manage, Spree::ReturnReason) }
Expand Down
21 changes: 0 additions & 21 deletions core/spec/models/spree/tracker_spec.rb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/app/views/spree/layouts/spree_application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@

</div>

<%= render :partial => 'spree/shared/google_analytics' %>
</body>
</html>
Loading