From 95f500ae2489e583eac8fe5f8a1064dbaaacddd9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 14 Dec 2017 12:07:36 +0630
Subject: [PATCH] table show in complete sale

---
 app/controllers/origami/sales_controller.rb | 4 ++++
 app/views/origami/sales/show.html.erb       | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

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 @@
   <div class="col-lg-5 col-md-5 col-sm-5">
      <div class="card"  >
        <div class="card-header">
-          <div><strong id="order-title">INVOICE DETAILS </strong></div>
+          <div><strong id="order-title">INVOICE DETAILS </strong>| Table <%= @dining.name rescue "" %></div>
        </div>
        <div class="card-block">
          <div class="card-title row p-l-5 p-r-5">
@@ -146,7 +146,7 @@
                   sub_total = sub_total + sale_item.price
                %>
                <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
-               <% unless sale_item.price <= 0 %>
+               <% #unless sale_item.price <= 0 %>
                <tr>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
@@ -154,7 +154,7 @@
                </tr>
                <%
 
-                   end
+                   #end
                  end
 
                 %>