Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

app/controllers/origami/commissions_controller.rb

@@ -76,6 +76,11 @@ class Origami::CommissionsController < BaseOrigamiController
     sale_item_id = params[:sale_item_id]
     @sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
     @commissioners = Commissioner.active.all
+
+    respond_to do |format|
+      format.json {render json: @commissioners}
+      # format.html {render @commissioners}
+    end
   end
 
   private