diff --git a/app/controllers/spree/admin/subscriptions_controller.rb b/app/controllers/spree/admin/subscriptions_controller.rb index f285579..5d91ec1 100644 --- a/app/controllers/spree/admin/subscriptions_controller.rb +++ b/app/controllers/spree/admin/subscriptions_controller.rb @@ -1,10 +1,17 @@ -class Spree::Admin::SubscriptionsController < Spree::Admin::ResourceController +module Spree + module Admin + class SubscriptionsController < Spree::Admin::BaseController - def index - # DD: stolen from Spree::Admin::OrdersController - @search = Spree::Subscription.ransack(params[:q]) - @subscriptions = @search.result.includes([:user]). - page(params[:page]). - per(params[:per_page] || Spree::Config[:orders_per_page]) + def index + @search = Spree::Subscription.post_cart.ransack(params[:q]) + @subscriptions = @search.result.includes([:user]). + page(params[:page]). + per(params[:per_page] || Spree::Config[:orders_per_page]) + end + + def edit + + end + end end end diff --git a/app/models/spree/subscription.rb b/app/models/spree/subscription.rb index 659be0f..0f657ce 100644 --- a/app/models/spree/subscription.rb +++ b/app/models/spree/subscription.rb @@ -20,6 +20,7 @@ class Spree::Subscription < ActiveRecord::Base has_many :reorders, :class_name => "Spree::Order" scope :active, where(:state => 'active') + scope :post_cart, where("state != ?", "cart") state_machine :state, :initial => 'cart' do event :suspend do diff --git a/app/views/spree/admin/subscriptions/index.html.erb b/app/views/spree/admin/subscriptions/index.html.erb index 088f6f6..7273c2d 100644 --- a/app/views/spree/admin/subscriptions/index.html.erb +++ b/app/views/spree/admin/subscriptions/index.html.erb @@ -41,7 +41,7 @@ <%= sub.line_item.variant.name %>
<%= sub.line_item.variant.options_text %> - <%= sub.user.id %> + <%= link_to(sub.user.email, :controller => "spree/admin/users", :action => "show", :id => sub.user.id) if sub.user %> <%= money sub.line_item.price %> <%= sub.time_title %>