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

app/controllers/origami/discounts_controller.rb

@@ -1,6 +1,15 @@
 class Origami::DiscountsController < BaseOrigamiController
+
+  #discount page show from origami index with selected order
   def index
+	sale_id = params[:id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find(sale_id)
+    end
   end
+
   def create
+
   end
+
 end

app/controllers/origami/request_bills_controller.rb

@@ -1,5 +1,6 @@
 class Origami::RequestBillsController < BaseOrigamiController
 
+
   def print
     @sale = Sale.new
     sale_order=SaleOrder.new
@@ -25,4 +26,4 @@ class Origami::RequestBillsController < BaseOrigamiController
     printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer_name)
     redirect_to origami_root_path
   end
-end
+