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

app/controllers/api/bill_controller.rb

@@ -10,7 +10,7 @@ class Api::BillController < Api::ApiController
     if (params[:booking_id])
       @sale = Sale.new
       @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
-
+    
     elsif (params[:order_id])
       @sale = Sale.new
       @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)

app/controllers/origami/home_controller.rb

@@ -4,21 +4,23 @@ class Origami::HomeController < BaseOrigamiController
   	@booking_rooms = Order.get_booking_order_rooms()
   	@orders = Order.get_orders()
   end
+
   def show
   	str = []
-    
+
+
     if !params[:sale_id].nil?
-      @order_details = SaleItem.get_order_items_details(params[:sale_id])    
-      @order_details.each do |ord_detail| 
+      @order_details = SaleItem.get_order_items_details(params[:sale_id])
+      @order_details.each do |ord_detail|
         str.push(ord_detail)
       end
-      render :json => str.to_json  
+      render :json => str.to_json
     else
-      @order_details = OrderItem.get_order_items_details(params[:order_id])     
-      @order_details.each do |ord_detail| 
+      @order_details = OrderItem.get_order_items_details(params[:order_id])
+      @order_details.each do |ord_detail|
         str.push(ord_detail)
       end
-      render :json => str.to_json  
+      render :json => str.to_json
     end 
   end
 end

app/controllers/origami/payments_controller.rb

@@ -1,6 +1,14 @@
 class Origami::PaymentsController < BaseOrigamiController
+
+
   def index
+
   end
+
   def create
   end
+
+  def show
+
+  end
 end

app/controllers/origami/request_bills_controller.rb

@@ -1,27 +1,37 @@
 class Origami::RequestBillsController < BaseOrigamiController
-  def show
+
+  def create
     @sale = Sale.new
 
+
     booking_id = params[:id]
     check_booking = Booking.find_by_booking_id(booking_id)
     if check_booking.sale_id.nil?
-      #check if it doesn't exist 
-      @status = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name) 
+      #check if it doesn't exist
+      @status = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee.name)
       @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
       @sale_items = SaleItem.where("sale_id=?",check_booking.sale_id)
     else
       @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
       @sale_items = SaleItem.where("sale_id=?",check_booking.sale_id)
-    end  
+    end 
 
     unique_code="ReceiptBillPdf"
+
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
 
     printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
 
-     
   end
-  
+
+
+  def show
+    sale_id = params[:sale_id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find_by_id(sale_id)
+    end
+  end
+
 end