app/controllers/refunds_controller.rb in artfully_ose-1.2.0.pre.15 vs app/controllers/refunds_controller.rb in artfully_ose-1.2.0.pre.16

@@ -7,18 +7,14 @@
   def create
     @order = Order.find(params[:order_id])
     @items = params[:items].collect { |item_id| Item.find(item_id) }
 
     @refund = Refund.new(@order, @items)
-    @refund.submit(:and_return => return_items?)
+    @refund.submit(:and_return => return_items?, :send_email_confirmation => send_email_confirmation?)
 
     if @refund.successful?
-      if return_items?
-        flash[:notice] = "Successfully refunded and returned #{@refund.items.size} items."
-      else
-        flash[:notice] = "Successfully refunded #{@refund.items.size} items."
-      end
+      flash[:notice] = "Successfully refunded #{@refund.items.size} items."
     else
       if @refund.message.nil?
         flash[:error] = "Unable to refund items.  Please contact support and we'll try to help!"
       else
         flash[:error] = "Unable to refund items: " + @refund.message
@@ -28,9 +24,13 @@
     redirect_to order_url(@order)
   end
 
   private
 
+  def send_email_confirmation?
+    params[:send_email_confirmation] == "1"
+  end
+
   def return_items?
-    @return_items ||= (params[:commit] == "Issue Refund and Return" and @items.all?(&:returnable?))
+    params[:return_to_inventory] == "1"
   end
 end
\ No newline at end of file