Removed r_c traces

sbounmy · Jul 6, 2011 · cf5ada1 · cf5ada1
1 parent 850ba4a
commit cf5ada1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/app/controllers/admin/store_credits_controller.rb b/app/controllers/admin/store_credits_controller.rb
@@ -1,23 +1,12 @@
-class Admin::StoreCreditsController < Admin::BaseController
-  resource_controller
+class Admin::StoreCreditsController < Admin::ResourceController
   before_filter :check_amounts, :only => [:edit, :update]
-  before_filter :set_remaining_amount, :only => [:create, :update]
-
-  create.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  update.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
+  prepend_before_filter :set_remaining_amount, :only => [:create, :update]
 
   private
   def check_amounts
-    if (object.remaining_amount < object.amount)
+    if (@store_credit.remaining_amount < @store_credit.amount)
       flash[:error] = "Can't be edit, b/c already was used."
-      redirect_to collection_url
+      redirect_to admin_store_credits_path
     end
   end
 

diff --git a/app/controllers/users_controller_decorator.rb b/app/controllers/users_controller_decorator.rb
@@ -4,6 +4,6 @@
   private
 
   def find_orders_with_store_credit
-    @orders_with_store_credit = object.orders.joins(:adjustments).where(:adjustments => {:source_type => 'StoreCredit'})
+    @orders_with_store_credit = @user.orders.joins(:adjustments).where(:adjustments => {:source_type => 'StoreCredit'})
   end
 end