diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 90c96f65..e0148deb 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -26,7 +26,33 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-    
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -65,7 +91,6 @@ class Origami::HomeController < BaseOrigamiController
        else
         sale = Sale.find(booking.sale_id)
          if sale.sale_status != "completed" && sale.sale_status != 'void'
-
            @sale_array.push(sale)
            if @status_order == 'order'
              @status_order = 'sale'
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 22a1e802..f4b11fc5 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -12,5 +12,31 @@ class Origami::OrdersController < BaseOrigamiController
         @sale_status = sale.sale_status
       end
     end
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
   end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 701d0c2f..a0f23cb2 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -22,6 +22,32 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
+
+    @order_items_count = Hash.new
+    bookings = Booking.all
+    if !bookings.nil?
+      bookings.each do |booking|
+        if booking.sale_id.nil? && booking.booking_status != 'moved'
+          if !booking.booking_orders.empty?
+            booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              if !order.order_items.empty?
+                if !@order_items_count.key?(booking.dining_facility_id)
+                  @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                end
+              end
+            end
+          end
+        else
+          sale = Sale.find(booking.sale_id)
+          if sale.sale_status !='completed'
+            if !@order_items_count.key?(booking.dining_facility_id)
+              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+            end
+          end
+        end
+      end
+    end
     
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 04ad5896..4a8b1653 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -52,7 +52,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
    # Query for per order
-  def print_order_summary(print_settings,oqs, order_id, order_items, print_status)
+  def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="")
     #Use CUPS service
     #Generate PDF
     #Print 
@@ -76,20 +76,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
                 end
               end
             end
@@ -109,20 +109,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
@@ -143,7 +143,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   end
 
   # Print for orders in booking
-  def print_booking_summary(print_settings,oqs, booking_id, print_status)
+  def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
     # Must be one print  
     if print_settings.print_copies == 0
       print_settings.print_copies = 1
@@ -162,20 +162,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
           if !order_slim_pdf.empty?
             order_slim_pdf.each do |order_item_slim|
               if order_item_slim[0] == 'OrderSlimPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               elsif order_item_slim[0] == 'OrderSetPdf'
                 if order_item_slim[1] == '1'
-                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 else
-                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)             
                 end
               end
             end
@@ -198,20 +198,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
       if !order_slim_pdf.empty?
         order_slim_pdf.each do |order_summary_slim|
           if order_summary_slim[0] == 'OrderSlimPdf'
             if order_summary_slim[1] == '1'   
-              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           elsif order_summary_slim[0] == 'OrderSetPdf'
             if order_summary_slim[1] == '1'
-              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             else
-              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
             end
           end
         end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index eb1bdecd..104c4c67 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -155,7 +155,7 @@
                 <% if !(@total_payment_methods.nil?) %>
                   <% @total_payment_methods.each do |payment| %>
                     <% if !@sale_data[0].empty? %>
-                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' %>
+                      <% if payment.payment_method != 'mpu' && payment.payment_method != 'visa' && payment.payment_method != 'master' && payment.payment_method != 'jcb' && payment.payment_method != 'unionpay' %>
                         <tr>
                           <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
                           <td align="right">
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 48da04e3..d4a897e2 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -40,7 +40,7 @@
               <!--- Panel 1 - Table Orders -->
               <div class="tab-pane dining active " id="tables" role="tabpanel">
                 <div class="card-columns">
-                  <% @tables.each do |table| %>       
+                  <% @tables.each do |table| %>  
                       <% if table.status == 'occupied' %>
                           <% if table.get_booking.nil? %>
                             <% if table.get_checkout_booking.nil? %>
@@ -50,6 +50,11 @@
                             <% end %>                         
                                 <div class="card-block">
                                   <%= table.name %>
+                                  <% if !@order_items_count.nil? %>
+                                    <% if @order_items_count.key?(table.id) %>
+                                      (Orders : <%= @order_items_count[table.id] %>)
+                                    <% end %>
+                                  <% end %>
                                   <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                                   <div style="font-size:12px;"></div>
                                 </div>
@@ -61,7 +66,12 @@
                               <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
                             <% end %>                   
                             <div class="card-block">
-                                <%= table.name %>
+                                <%= table.name %> 
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(table.id) %>
+                                    (Orders : <%= @order_items_count[table.id] %>)
+                                  <% end %>
+                                <% end %>
                                 <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                               </div>
                             </div>
@@ -87,6 +97,11 @@
                           <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                             <div class="card-block">
                               <%= room.name %>
+                              <% if !@order_items_count.nil? %>
+                                <% if @order_items_count.key?(room.id) %>
+                                  (Orders : <%= @order_items_count[room.id] %>)
+                                <% end %>
+                              <% end %>
                                   <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                             </div>
                           </div>
@@ -94,6 +109,11 @@
                             <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                               <div class="card-block">
                                 <%= room.name %>
+                                <% if !@order_items_count.nil? %>
+                                  <% if @order_items_count.key?(room.id) %>
+                                    (Orders : <%= @order_items_count[room.id] %>)
+                                  <% end %>
+                                <% end %>
                                     <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                               </div>
                             </div>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 00cfe727..d98e9bc2 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -5,7 +5,7 @@
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
-   <li class="nav-item">
+     <li class="nav-item">
        <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
      </li>
      <li class="nav-item">
@@ -20,25 +20,25 @@
    </ul>
    <!-- Nav tabs - End -->
    <div id="custom-slimscroll">
-      <div class="tab-content">
+    <div class="tab-content">
      <!--- Panel 0 - Completed Orders -->
      <div class="tab-pane " id="completed" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @complete.each do |sale| %>
          <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
-              <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
+            <%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
+          </div>
+        </div>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 1 - Table Orders -->
-     <div class="tab-pane " id="tables" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @tables.each do |table| %>
-         <% if table.status == 'occupied' %>
+    <!--- Panel 1 - Table Orders -->
+    <div class="tab-pane " id="tables" role="tabpanel" style="">
+      <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+        <% @tables.each do |table| %>
+          <% if table.status == 'occupied' %>
             <% if table.get_booking.nil? %>
               <% if table.get_checkout_booking.nil? %>
                 <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
@@ -47,6 +47,11 @@
               <% end %>                         
                   <div class="card-block">
                     <%= table.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(table.id) %>
+                        (Orders : <%= @order_items_count[table.id] %>)
+                      <% end %>
+                    <% end %>
                     <span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
                     <div style="font-size:12px;"></div>
                   </div>
@@ -58,25 +63,30 @@
                 <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
               <% end %>                   
               <div class="card-block">
-                  <%= table.name %>
+                  <%= table.name %> 
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(table.id) %>
+                      (Orders : <%= @order_items_count[table.id] %>)
+                    <% end %>
+                  <% end %>
                   <span class="float-right font-12 new_text_<%= table.id %>"> new</span>
                 </div>
               </div>
             <% end %>
-         <% else %>
-         <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
-            <div class="card-block">
-              <%= table.name %>
-              <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+        <% else %>
+            <div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
+              <div class="card-block">
+                <%= table.name %>
+                <span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
+              </div>
             </div>
-          </div>
-         <% end %>
-         <% end %>
-       </div>
-     </div>
+        <% end %>
+        <% end %>
+      </div>
+    </div>
 
-     <!--- Panel 2 - Room Orders -->
-     <div class="tab-pane" id="rooms" role="tabpanel" style="">
+      <!--- Panel 2 - Room Orders -->
+      <div class="tab-pane" id="rooms" role="tabpanel" style="">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
           <% if room.status == 'occupied' %>
@@ -84,6 +94,11 @@
               <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                 <div class="card-block">
                   <%= room.name %>
+                  <% if !@order_items_count.nil? %>
+                    <% if @order_items_count.key?(room.id) %>
+                      (Orders : <%= @order_items_count[room.id] %>)
+                    <% end %>
+                  <% end %>
                       <span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
                 </div>
               </div>
@@ -91,6 +106,11 @@
                 <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                   <div class="card-block">
                     <%= room.name %>
+                    <% if !@order_items_count.nil? %>
+                      <% if @order_items_count.key?(room.id) %>
+                        (Orders : <%= @order_items_count[room.id] %>)
+                      <% end %>
+                    <% end %>
                         <span class="float-right font-12 new_text_<%= room.id %>"> new</span>
                   </div>
                 </div>
@@ -103,159 +123,160 @@
                 </div>
               </div>
           <% end %>
-         <% end %>
-       </div>
-     </div>
-
-     <!--- Panel 3 - Orders -->
-     <div class="tab-pane active" id="orders" role="tabpanel" style="">
-       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-         <% @orders.each do |order| %>
-         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
-           <div class="card-block">
-              <%
-                order_status = ""
-                sale_order = SaleOrder.find_by_order_id(order)
-                if sale_order
-                  unless sale_order.sale_id.nil?
-                    sale = Sale.find(sale_order.sale_id)
-                    order_status = sale.sale_status
-                    if order_status == 'new'
-                      order_status  = order.status
-                    end
-                  end
-                else
-                  order_status = order.status
-                end
-              %>
-              <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
-           </div>
-         </div>
-         <% end %>
-       </div>
-     </div>
-
-      </div>
-   </div>
-   <!-- tabs - End -->
- </div>
- <!-- Column One -->
-
- <!-- Column Two -->
-  <div class="col-lg-5 col-md-5 col-sm-5">
-     <div class="card"  >
-       <div class="card-header">
-          <div><strong id="order-title">ORDERS DETAILS </strong></div>
-       </div>
-       <div class="card-block">
-         <div class="card-title row p-l-5 p-r-5">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-              Order No: <span id="receipt_no"> <%= @order.order_id %>
-             </span>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
-           </div>
-         </div>
-         <div class="card-title row customer_detail hide">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             Customer : <span id="customer_name"></span>
-           </div>
-
-         </div>
-         <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
-         <div class="card-text" style="">
-           <table class="table table-striped" id="order-items-table">
-             <thead>
-               <tr>
-                 <th class="item-name">Items</th>
-                 <th class="item-attr">QTY</th>
-                 <th class="item-attr">Price</th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-                 sub_total = 0
-                  @order.order_items.each do |sale_item|
-                  sub_total = sub_total + sale_item.price
-               %>
-               <% unless sale_item.price <= 0 %>
-               <tr>
-                 <td class='item-name'><%= sale_item.item_name %></td>
-                 <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= sale_item.price %></td>
-               </tr>
-               <%
-                   end
-                 end
-                %>
-             </tbody>
-           </table>
-         </div>
-         </div>
-         <div class="card-footer ">
-           <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td colspan="2" class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-             <tr>
-                <td colspan="2" class="charges-name"><strong>Discount:</strong></td>
-                <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
-           </table>
-         </div>
-       </div>
-     </div>
+      <% end %>
+    </div>
   </div>
 
- <!-- Column Three -->
- <div class="col-lg-1 col-md-1 col-sm-1">
-   <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
-   <% if @sale_status != 'completed' %>
-     <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
-   <% end %>
-   <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+  <!--- Panel 3 - Orders -->
+  <div class="tab-pane active" id="orders" role="tabpanel" style="">
+   <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+     <% @orders.each do |order| %>
+     <div class="card orders red text-white" data-id = "<%= order.order_id %>">
+       <div class="card-block">
+        <%
+        order_status = ""
+        sale_order = SaleOrder.find_by_order_id(order)
+        if sale_order
+          unless sale_order.sale_id.nil?
+            sale = Sale.find(sale_order.sale_id)
+            order_status = sale.sale_status
+            if order_status == 'new'
+              order_status  = order.status
+            end
+          end
+        else
+          order_status = order.status
+        end
+        %>
+        <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>
+
+</div>
+</div>
+<!-- tabs - End -->
+</div>
+<!-- Column One -->
+<!-- Column Two -->
+<div class="col-lg-5 col-md-5 col-sm-5">
+ <div class="card"  >
+   <div class="card-header">
+    <div><strong id="order-title">ORDERS DETAILS </strong></div>
+  </div>
+  <div class="card-block">
+   <div class="card-title row p-l-5 p-r-5">
+     <div class="col-lg-6 col-md-6 col-sm-6">
+      Order No: <span id="receipt_no"> <%= @order.order_id %>
+    </span>
+  </div>
+  <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+    Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
+  </div>
+</div>
+<div class="card-title row customer_detail hide">
+ <div class="col-lg-6 col-md-6 col-sm-6">
+   Customer : <span id="customer_name"></span>
  </div>
+
+</div>
+<div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 200 : 160%>">
+ <div class="card-text" style="">
+   <table class="table table-striped" id="order-items-table">
+     <thead>
+       <tr>
+         <th class="item-name">Items</th>
+         <th class="item-attr">QTY</th>
+         <th class="item-attr">Price</th>
+       </tr>
+     </thead>
+     <tbody>
+       <%
+       sub_total = 0
+       @order.order_items.each do |sale_item|
+        sub_total = sub_total + sale_item.price
+        %>
+        <% unless sale_item.price <= 0 %>
+        <tr>
+         <td class='item-name'><%= sale_item.item_name %></td>
+         <td class='item-attr'><%= sale_item.qty %></td>
+         <td class='item-attr'><%= sale_item.price %></td>
+       </tr>
+       <%
+     end
+   end
+   %>
+ </tbody>
+</table>
+</div>
+</div>
+<div class="card-footer ">
+ <table class="table" id="order-charges-table" border="0">
+   <tr>
+     <td class="charges-name"><strong>Sub Total:</strong></td>
+     <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+   </tr>
+   <tr>
+
+    <td class="charges-name"><strong>Discount:</strong></td>
+
+    <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
+  </tr>
+  <tr class="rebate_amount"></tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+
+<!-- Column Three -->
+<div class="col-lg-1 col-md-1 col-sm-1">
+ <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
+ <% if @sale_status != 'completed' %>
+ <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
+ <% end %>
+ <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
+</div>
 </div>
 </div>
 <script>
-$(document).ready(function(){
-  $(".tables").on('click', function(){
+  $(document).ready(function(){
+    $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
-  })
-  $(".sales").on('click',function(){
-    var sale_id = $(this).attr("data-id");
-    window.location.href = '/origami/sale/' + sale_id;
-  })
-  $(".rooms").on('click', function(){
+    })
+    $(".sales").on('click',function(){
+      var sale_id = $(this).attr("data-id");
+      window.location.href = '/origami/sale/' + sale_id;
+    })
+    $(".rooms").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/room/' + dining_id;
-  })
-  $(".orders").on('click',function(){
-    var order_id = $(this).attr("data-id");
-    window.location.href = '/origami/order/' + order_id;
-  })
-});
-$('#pay').on('click',function() {
+    })
+    $(".orders").on('click',function(){
+      var order_id = $(this).attr("data-id");
+      window.location.href = '/origami/order/' + order_id;
+    })
+  });
+  $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
    alert(url)
    $.ajax({
-      type: "POST",
-        url: '/origami/sale/'+ sale_id + "/rounding_adj",
-        success:function(result){          
-          window.location.href = '/origami/sale/'+ sale_id + "/payment";
-        }
-    });
+    type: "POST",
+    url: '/origami/sale/'+ sale_id + "/rounding_adj",
+    success:function(result){          
+      window.location.href = '/origami/sale/'+ sale_id + "/payment";
+    }
+  });
    
-});
-$('#back').on('click',function(){
-  window.location.href = '/origami/';
-})
-$('#move').on('click',function(){
+ });
+  $('#back').on('click',function(){
+    window.location.href = '/origami/';
+  })
+  $('#move').on('click',function(){
 
-})
+  })
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index c32bfe86..9c32b914 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -50,6 +50,11 @@
                 <% end %>              
                     <div class="card-block">
                        <%= table.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
                     </div>
                   </div>
@@ -61,6 +66,11 @@
                   <% end %>           
                     <div class="card-block">
                        <%= table.name %>
+                       <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(table.id) %>
+                          (Orders : <%= @order_items_count[table.id] %>)
+                        <% end %>
+                      <% end %>
                          <span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
                     </div>
                   </div>
@@ -87,6 +97,11 @@
                  <div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
                       <div  style="font-size:12px;"></div>
                    </div>
@@ -95,6 +110,11 @@
                  <div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
                    <div class="card-block">
                       <%= room.name %>
+                      <% if !@order_items_count.nil? %>
+                        <% if @order_items_count.key?(room.id) %>
+                          (Orders : <%= @order_items_count[room.id] %>)
+                        <% end %>
+                      <% end %>
                       <span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
                    </div>
                  </div>