diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index 3c895b91..e5350706 100755 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -5,6 +5,10 @@ class Origami::SalesController < BaseOrigamiController @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @orders = Order.all.order('date desc') @sale = Sale.find(params[:sale_id]) + @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id + @booking = BookingOrder.find_by_order_id(@order).booking_id + @table_id = Booking.find(@booking).dining_facility_id + @dining = DiningFacility.find(@table_id) end def add_to_existing_invoice diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 7c008977..0eaabce1 100755 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -109,7 +109,7 @@
-
INVOICE DETAILS
+
INVOICE DETAILS | Table <%= @dining.name rescue "" %>
@@ -146,7 +146,7 @@ sub_total = sub_total + sale_item.price %> - <% unless sale_item.price <= 0 %> + <% #unless sale_item.price <= 0 %> <%= sale_item.product_name %> <%= sale_item.qty %> @@ -154,7 +154,7 @@ <% - end + #end end %>