diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 455cda09..3246ea44 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -4,22 +4,40 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
   end
 
+ # origami table detail
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @status_order = ""
     @dining.bookings.each do |booking|
-     if booking.sale_id.nil?
-       booking_orders = booking.booking_orders
-       booking_orders.each do |booking_order|
-         @order = booking_order.order
-       end
-       @status = 'order'
-     else
-       @status = 'sale'
-       @obj = Sale.find(booking.sale_id)
-     end
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj_order = order
+              @date = order.created_at
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status_order = 'order'
+         else
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             if @status_order == 'order'
+               @status_order = 'sale'
+             end
+             @date = sale.created_at
+             @status_sale = 'sale'
+             @obj_sale = sale
+           end
+         end
     end
   end
 
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
new file mode 100644
index 00000000..09e0c541
--- /dev/null
+++ b/app/controllers/origami/orders_controller.rb
@@ -0,0 +1,10 @@
+class Origami::OrdersController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @order = Order.find(params[:order_id])
+  end
+end
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e848366c..0e850b00 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -4,8 +4,9 @@ class Origami::RequestBillsController < BaseOrigamiController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    booking_id = params[:id]
-    check_booking = Booking.find_by_booking_id(booking_id)
+    order_id = params[:id] # order_id
+    bk_order = BookingOrder.find_by_order_id(order_id)
+    check_booking = Booking.find_by_booking_id(bk_order.booking_id)
     if check_booking.sale_id.nil?
       # Create Sale if it doesn't exist
       puts "current_login_employee"
@@ -32,6 +33,5 @@ class Origami::RequestBillsController < BaseOrigamiController
 
     printer = Printer::ReceiptPrinter.new(print_settings)
     printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total)
-    redirect_to origami_path(@sale_data.sale_id)
   end
 end
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
new file mode 100644
index 00000000..1ac7f41a
--- /dev/null
+++ b/app/controllers/origami/rooms_controller.rb
@@ -0,0 +1,32 @@
+class Origami::RoomsController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @room = DiningFacility.find(params[:room_id])
+    @room.bookings.each do |booking|
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj = order
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status = 'order'
+         else
+
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             @status = 'sale'
+             @obj = sale
+           end
+         end
+    end
+  end
+
+
+end
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
new file mode 100644
index 00000000..e9eb2edc
--- /dev/null
+++ b/app/controllers/origami/sales_controller.rb
@@ -0,0 +1,10 @@
+class Origami::SalesController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @sale = Sale.find(params[:sale_id])
+  end
+end
diff --git a/app/models/booking_order.rb b/app/models/booking_order.rb
index ddf5ed18..c9f748f0 100644
--- a/app/models/booking_order.rb
+++ b/app/models/booking_order.rb
@@ -1,5 +1,5 @@
 class BookingOrder < ApplicationRecord
-  #primary key - need to be unique  
+  #primary key - need to be unique
 
   belongs_to :booking
   belongs_to :order
diff --git a/app/models/order.rb b/app/models/order.rb
index 96382c07..7ab39a4c 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -11,7 +11,7 @@ class Order < ApplicationRecord
 
   #internal references attributes for business logic control
   attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id
-
+  scope :active, -> { where("date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
   #Main Controller method to create new order - validate all inputs and generate new order
   # order_item : {
   #     order_item_code : "",
diff --git a/app/models/room.rb b/app/models/room.rb
index 263120fd..87f232e9 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -1,4 +1,4 @@
 class Room < DiningFacility
 
-  # has_many :bookings, :foreign_key => 'dining_facility_id'
+   has_many :bookings, :foreign_key => 'dining_facility_id'
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2ffb53ef..e717717a 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -15,6 +15,7 @@ class Sale < ApplicationRecord
   has_many :bookings
 
   scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
+  scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
 
   def generate_invoice_from_booking(booking_id, requested_by)
     booking = Booking.find(booking_id)
@@ -23,7 +24,7 @@ class Sale < ApplicationRecord
     if (booking)
       Rails.logger.debug "Booking -> Booking Order Count -> " + booking.booking_orders.count.to_s
       #get all order attached to this booking and combine into 1 invoice
-      
+
       booking.booking_orders.each do |order|
         if booking.sale_id
           status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by)
@@ -281,15 +282,15 @@ class Sale < ApplicationRecord
     end
   end
 
-  def self.daily_sales_list(from,to) 
+  def self.daily_sales_list(from,to)
     payments_total = Sale.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
-     SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, 
-     SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount, 
-     SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount, 
-     SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount, 
-     SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount, 
-     SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount, 
-    SUM(case when (sale_payments.payment_method='credit') then sale_payments.payment_amount else 0 end) as credit_amount, 
+     SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
+     SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
+     SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
+     SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount,
+     SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount,
+     SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
+    SUM(case when (sale_payments.payment_method='credit') then sale_payments.payment_amount else 0 end) as credit_amount,
     SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount")
   .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id")
   .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to)
@@ -304,27 +305,27 @@ class Sale < ApplicationRecord
       from_date = sale_date.beginning_of_day.utc - diff
       to_date = sale_date.end_of_day.utc - diff
 
-      total_sale = Sale.select("IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0) as grand_total, 
-                                IFNULL(SUM(case when (sale_status='completed') then total_discount else 0 end),0) as total_discount, 
-                                IFNULL(SUM(case when (sale_status='void') then grand_total else 0 end),0) as void_amount, 
+      total_sale = Sale.select("IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0) as grand_total,
+                                IFNULL(SUM(case when (sale_status='completed') then total_discount else 0 end),0) as total_discount,
+                                IFNULL(SUM(case when (sale_status='void') then grand_total else 0 end),0) as void_amount,
                                 IFNULL(SUM(case when (sale_status='completed') then rounding_adjustment else 0 end),0) as rounding_adj")
                             .where("(sale_status = ? OR sale_status = ?) AND receipt_date between ? and ? AND total_amount != 0", 'completed', 'void', from_date, to_date)
-     
+
       total_sale.each do |sale|
         grand_total = sale.grand_total
         total_discount = sale.total_discount
-        void_amount = sale.void_amount     
-        total = {:sale_date => pay.sale_date, 
+        void_amount = sale.void_amount
+        total = {:sale_date => pay.sale_date,
                  :mpu_amount => pay.mpu_amount,
                  :master_amount => pay.master_amount,
                  :visa_amount => pay.visa_amount,
                  :jcb_amount => pay.jcb_amount,
                  :paypar_amount => pay.paypar_amount,
-                 :cash_amount => pay.cash_amount, 
-                 :credit_amount => pay.credit_amount, 
+                 :cash_amount => pay.cash_amount,
+                 :credit_amount => pay.credit_amount,
                  :foc_amount => pay.foc_amount,
-                 :total_discount => total_discount, 
-                 :grand_total => grand_total, 
+                 :total_discount => total_discount,
+                 :grand_total => grand_total,
                  :void_amount => void_amount,
                    :rounding_adj => sale.rounding_adj}
         daily_total.push(total)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 856cd054..c1743a5a 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -67,7 +67,7 @@ class SalePayment < ApplicationRecord
   end
 
   def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token)
-    # Control for Paypar Cloud 
+    # Control for Paypar Cloud
     begin
       response = HTTParty.get(url,
               :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
@@ -91,14 +91,14 @@ class SalePayment < ApplicationRecord
         campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
         sale_data = Sale.find_by_sale_id(sale_id)
         if sale_data
-          # Control for Paypar Cloud 
+          # Control for Paypar Cloud
           begin
             response = HTTParty.post(url,
                   :body => { generic_customer_id:membership_id,redeem_amount:received_amount,receipt_no:sale_data.receipt_no,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                   :headers => {
                             'Content-Type' => 'application/json',
                             'Accept' => 'application/json'
-                  }, 
+                  },
                   :timeout => 10
             )
           rescue Net::OpenTimeout
@@ -238,10 +238,17 @@ class SalePayment < ApplicationRecord
   end
 
   def table_update_status(sale_obj)
-    booking =  Booking.find_by_sale_id(sale_obj.id)
+    status = true
+    booking = Booking.find_by_sale_id(sale_obj.id)
     if booking
       table = DiningFacility.find(booking.dining_facility_id)
-      if table
+      bookings = table.bookings
+      bookings.each do |tablebooking|
+         if tablebooking.sale.sale_status != 'completed'
+            status = false
+         end
+      end
+      if status
          table.status = "available"
          table.save
       end
@@ -274,7 +281,7 @@ class SalePayment < ApplicationRecord
         auth_token       = memberaction.auth_token.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
-        # Control for Paypar Cloud 
+        # Control for Paypar Cloud
         begin
           response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,merchant_uid:merchant_uid,total_amount: total_amount,campaign_type_id: campaign_type_id,
                                                         receipt_no: receipt_no,auth_token:auth_token}.to_json,
diff --git a/app/models/table.rb b/app/models/table.rb
index 4012a40c..db953c27 100644
--- a/app/models/table.rb
+++ b/app/models/table.rb
@@ -1,4 +1,4 @@
 class Table < DiningFacility
   has_many :dining_ins
-  # has_many :bookings, :foreign_key => 'dining_facility_id'
+  has_many :bookings, :foreign_key => 'dining_facility_id'
 end
diff --git a/app/models/table_booking.rb b/app/models/table_booking.rb
index 53fde486..3f2b42d7 100644
--- a/app/models/table_booking.rb
+++ b/app/models/table_booking.rb
@@ -1,3 +1,2 @@
 class TableBooking < Booking
-  belongs_to :sale
 end
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index dd2b1b99..fd1134f9 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -2,12 +2,6 @@
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
-      <!--  <li class="active">
-           <a href="<%= crm_customers_path %>">Customer</a>
-       </li> -->
-       <!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right">
-        <i class="fa fa-plus-circle fa-lg"></i> Add Customer
-       </a> -->
     </ol>
   </div>
 </div>
@@ -15,11 +9,11 @@
 
 <div class="row">
   <div class="col-lg-7 col-md-7 col-sm-7">
-      
+
       <div class="main-box-body clearfix">
         <div class="table-responsive">
           <table class="table table-striped">
-           
+
             <thead>
 
               <tr>
@@ -43,9 +37,9 @@
             </thead>
 
             <tbody>
-              <% if @crm_customers.count > 0  %> 
+              <% if @crm_customers.count > 0  %>
                  <% @crm_customers.each do |crm_customer| %>
-                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
+                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %>
                      <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -53,8 +47,8 @@
                       <td><%= crm_customer.company rescue '-' %></td>
                       <td><%= crm_customer.contact_no %></td>
                       <td><%= crm_customer.email %></td>
-                      
-                     
+
+
                     </tr>
                     <% end %>
                   <% end %>
@@ -64,7 +58,7 @@
             </tbody>
           </table>
           <br>
-          
+
           <%= paginate @crm_customers %>
         </div>
       </div>
@@ -78,13 +72,13 @@
     <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
     <%= f.error_notification %>
     <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
-    
+
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :name, :class => "form-control col-md-6 name" %>
       <% flash.each do |name, msg| %>
          <span class="help-block"><%= msg['name'] %></span>
       <% end -%>
-     
+
     </div>
     <div class="form-group">
       <%= f.input :company, :class => "form-control col-md-6 company" %>
@@ -98,7 +92,7 @@
 
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :email, :class => "form-control col-md-6 email" %>
-   
+
       <% flash.each do |name, msg| %>
          <span class="help-block"><%= msg['email'] %></span>
       <% end -%>
@@ -116,7 +110,7 @@
       <option value="<%= member.value %>">
         <%= member.name %></option>
         <%end %>
-      </select>    
+      </select>
     </div>
 
     <div class="form-group">
@@ -156,13 +150,13 @@
               // var url = "/"+customer_id;
               update_sale(customer_id,sale_id);
             }else{
-              
+
               var url = "customers/"+customer_id;
             }
-              
-              $.ajax({      
-                type: "GET",         
-                url: url, 
+
+              $.ajax({
+                type: "GET",
+                url: url,
                 data: {},
                 dataType: "json",
                 success: function(data) {
@@ -190,7 +184,7 @@
                 }
              });
           // }else{
-            
+
           // }
   })
 
@@ -199,41 +193,36 @@
         title: 'Confirm!',
         content: 'Are You Sure to assign this customer!',
         buttons: {
-              
+
               cancel: function () {
-                
+
               },
               confirm: {
               text: 'Confirm',
               btnClass: 'btn-green',
               keys: ['enter', 'shift'],
               action: function(){
-                  $.ajax({      
-                        type: "POST",         
+                  $.ajax({
+                        type: "POST",
                         url: "update_sale" ,
                         data: {customer_id:customer_id,sale_id:sale_id},
                         dataType: "json",
                         success: function(data) {
                           if(data.status == true)
-                          { 
-                            
+                          {
+
                             window.location.href = '/origami'
                           }else{
                             alert('Record not found!');
                             location.reload();
                           }
-                          
-                        }  
+
+                        }
                 });
                }
               }
-              
-        }
+         }
       });
   }
 
 </script>
-
-
-     
-
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 4b85d839..e1e530e8 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -1,6 +1,6 @@
 <div class="row">
  <!-- Column One -->
- <div class="col-lg-6 col-md-6 col-sm-6">
+ <div class="col-lg-11 col-md-11 col-sm-11">
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs" role="tablist">
@@ -23,14 +23,13 @@
      <!--- Panel 0 - Completed Orders -->
      <div class="tab-pane" id="Completed" role="tabpanel">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-
-         <div class="card orders ">
+         <% @complete.each do |sale| %>
+         <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
-
-
+              <%= sale.receipt_no %>
            </div>
          </div>
-
+         <% end %>
        </div>
      </div>
 
@@ -39,15 +38,17 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
-         <div class="card orders red text-white" data-id="<%= table.id %>">
+         <div class="card tables red text-white" data-id="<%= table.id %>">
            <div class="card-block">
-              <%= table.name %>
+              Zone <%= table.zone_id %> <br>
+              Table <%= table.name %>  ( <%= table.seater %> Seat )
            </div>
          </div>
          <% else %>
-         <div class="card orders green text-white" data-id="<%= table.id %>">
+         <div class="card tables green text-white" data-id="<%= table.id %>">
            <div class="card-block">
-              <%= table.name %>
+             Zone <%= table.zone_id %> <br>
+             Table <%= table.name %>  ( <%= table.seater %> Seat )
            </div>
          </div>
          <% end %>
@@ -60,13 +61,13 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
          <% if room.status == 'occupied' %>
-         <div class="card orders red text-white" data-id="<%= room.id %>">
+         <div class="card rooms red text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
            </div>
          </div>
          <% else %>
-         <div class="card orders green text-white" data-id="<%= room.id %>">
+         <div class="card rooms green text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
            </div>
@@ -79,26 +80,41 @@
      <!--- Panel 3 - Orders -->
      <div class="tab-pane" id="orders" role="tabpanel">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-
-         <div class="card orders">
+         <% @orders.each do |order| %>
+         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
            <div class="card-block">
-
+              <%= order.order_id %>
            </div>
          </div>
-
+         <% end %>
        </div>
 
      </div>
    </div>
    <!-- tabs - End -->
  </div>
+ <div class="col-lg-1 col-md-1 col-sm-1">
+   <button type="button" class="btn btn-primary btn-block"> Refresh </button>
+ </div>
  </div>
  <!-- Column One -->
 <script>
 $(document).ready(function(){
-  $(".orders").on('click', function(){
+  $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
-      window.location.href = '/origami/' + dining_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(){
+      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;
   })
 });
 </script>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 32b3a85c..1e2acba0 100644
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -3,9 +3,9 @@
  <div class="col-lg-6 col-md-6 col-sm-6">
 
    <!-- Nav tabs -->
-   <ul class="nav nav-tabs" role="tablist">
+   <ul class="nav nav-tabs" role="tablist" id="mytab">
    <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#Completed" role="tab">Completed</a>
+       <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Completed</a>
      </li>
      <li class="nav-item">
        <a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Tables</a>
@@ -21,15 +21,15 @@
 
    <div class="tab-content" style="max-height:670px; overflow:auto">
      <!--- Panel 0 - Completed Orders -->
-     <div class="tab-pane" id="Completed" role="tabpanel">
+     <div class="tab-pane" id="completed" role="tabpanel">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-
-         <div class="card orders ">
+         <% @complete.each do |sale| %>
+         <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
            <div class="card-block">
-
-
+              <%= sale.receipt_no %>
            </div>
          </div>
+         <% end %>
        </div>
      </div>
 
@@ -38,13 +38,13 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @tables.each do |table| %>
          <% if table.status == 'occupied' %>
-         <div class="card orders red text-white" data-id="<%= table.id %>">
+         <div class="card tables red text-white" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
            </div>
          </div>
          <% else %>
-         <div class="card orders green text-white" data-id="<%= table.id %>">
+         <div class="card tables green text-white" data-id="<%= table.id %>">
            <div class="card-block">
               <%= table.name %>
            </div>
@@ -59,13 +59,13 @@
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
          <% @rooms.each do |room| %>
          <% if room.status == 'occupied' %>
-         <div class="card orders red text-white" data-id="<%= room.id %>">
+         <div class="card rooms red text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
            </div>
          </div>
          <% else %>
-         <div class="card orders green text-white" data-id="<%= room.id %>">
+         <div class="card rooms green text-white" data-id="<%= room.id %>">
            <div class="card-block">
               <%= room.name %>
            </div>
@@ -78,15 +78,16 @@
      <!--- Panel 3 - Orders -->
      <div class="tab-pane" id="orders" role="tabpanel">
        <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
-
-         <div class="card orders ">
+         <% @orders.each do |order| %>
+         <div class="card orders red text-white" data-id = "<%= order.order_id %>">
            <div class="card-block">
-
+              <%= order.order_id %>
            </div>
          </div>
+         <% end %>
        </div>
-
      </div>
+
    </div>
    <!-- tabs - End -->
  </div>
@@ -96,19 +97,23 @@
   <div class="col-lg-5 col-md-5 col-sm-5">
      <div class="card"  >
        <div class="card-header">
-         <div><strong id="order-title">ORDER DETAILS </strong></div>
+         <% if @status_order == 'order' %>
+            <div id="save_order_id" data-order="<%= @obj_order.order_id %>"><strong id="order-title">ORDER DETAILS </strong></div>
+         <% elsif @status_sale == 'sale' %>
+            <div><strong id="order-title">INVOICE DETAILS </strong></div>
+         <% end %>
        </div>
        <div class="card-block">
          <div class="card-title row">
            <div class="col-lg-6 col-md-6 col-sm-6">
              <p> Receipt No: <span id="receipt_no">
-               <% if @status == 'sale' %>
-                 <%= @obj.receipt_no rescue '' %>
+               <% if @status_sale == 'sale' %>
+                 <%= @obj_sale.receipt_no rescue '' %>
                <% end %>
              </span></p>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @obj.created_at.utc.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+             <p>Date:  <span id="receipt_date"><%= @date.utc.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
            </div>
          </div>
          <div class="card-title row customer_detail hide">
@@ -128,12 +133,12 @@
              </thead>
              <tbody>
                <%
-                 # For Sale Items
                  sub_total = 0
-                 if @status == "sale"
-                   @obj.sale_items.each do |sale_item|
-                   sub_total = sub_total + sale_item.price
+                 if @status_sale == "sale"
+                  @obj_sale.sale_items.each do |sale_item|
+                  sub_total = sub_total + sale_item.price
                %>
+               <input type="hidden" id="sale_id" value="<%= @obj_sale.sale_id %>">
                <% unless sale_item.price <= 0 %>
                <tr>
                  <td class='item-name'><%= sale_item.product_name %></td>
@@ -144,21 +149,21 @@
                     end
                    end
                  end
-               %>
 
-               <%
-                 # For Order Items
-                 if @status == "order"
-                   sub_total = 0
-                     @order.order_items.each do |order_item|
-                     sub_total = sub_total + (order_item.qty*order_item.price)
-               %>
+                 if @status_order == 'order'
+                    unless @order_items.nil?
+                    @order_items.each do |order_item |
+                    sub_total = sub_total + order_item.price
+
+                unless order_item.price <= 0 %>
                <tr>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
                  <td class='item-attr'><%= order_item.qty*order_item.price %></td>
                </tr>
                <%
+                     end
+                    end
                    end
                  end
                %>
@@ -173,21 +178,49 @@
              </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>
+               <td class="item-attr"><strong id="order-discount">(<%= @obj_order.total_discount rescue 0%>)</strong></td>
              </tr>
-
-             <!-- <tr>
+            <% if @status_sale == "sale" %>
+             <tr>
                <td class="charges-name"><strong>Tax:</strong></td>
-               <td class="item-attr"><strong id="order-Tax"><%=@selected_item.total_tax rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= @obj_sale.total_tax rescue 0%></strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Grand Total:</strong></td>
-               <td class="item-attr"><strong id="order-grand-total"><%=@selected_item.grand_total rescue 0%></strong></td>
-             </tr> -->
-
+               <td class="item-attr"><strong id="order-grand-total"><%= @obj_sale.grand_total rescue 0%></strong></td>
+             </tr>
+              <% end %>
               <tr class="rebate_amount"></tr>
            </table>
          </div>
+         <br>
+
+          <%
+            if @status_sale == 'sale'
+                unless @order_items.nil?
+                  %>
+                  Pending New Order
+                   <table class="table table-striped">
+                  <%
+                  @order_items.each do |order_item |
+                  %>
+
+                  <tr>
+                    <td class='item-name'><%= order_item.item_name %></td>
+                    <td class='item-attr'><%= order_item.qty %></td>
+                    <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                  </tr>
+
+                  <%
+                   end
+                   %>
+                     </table>
+                    <button class='btn btn-primary'> Add to existing invoice </button>
+                   <%
+                end
+            end
+          %>
+
        </div>
      </div>
   </div>
@@ -195,23 +228,58 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <!-- Waiter Buttons -->
-   <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Add Order</button>
-   <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
-   <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
-   <button type="button" id="customer" class="btn btn-primary btn-lg btn-block">Customer</button>
-   <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
+   <button type="button" class="btn btn-primary btn-block" >Back</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Add Order</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Edit</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Move</button>
+   <button type="button" id="customer" class="btn btn-primary btn-block" >Customer</button>
+   <% if @status == 'order' %>
+      <button type="button" id="request_bills" class="btn btn-primary btn-block">Req.Bill</button>
+        <button type="button" id="pay" class="btn btn-primary btn-block" disabled>Pay</button>
+    <% else %>
+      <button type="button" id="request_bills" class="btn btn-primary btn-block" disabled> Req.Bill</button>
+        <button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
+   <% end %>
    <!-- Cashier Buttons -->
-   <button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>
-   <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
-   <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block">Pay</button>
-   <button type="button" id="re-print" class="btn btn-primary btn-lg btn-block">Re.Print</button>
+   <button type="button" id="discount" class="btn btn-primary btn-block" >Discount</button>
+   <button type="button" id="re-print" class="btn btn-primary btn-block" >Re.Print</button>
  </div>
 </div>
 <script>
 $(document).ready(function(){
-  $(".orders").on('click', function(){
+  $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
-      window.location.href = '/origami/' + dining_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(){
+      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() {
+   var sale_id = $('#sale_id').val();
+   window.location.href = '/origami/sale/'+ sale_id + "/payment";
+});
+
+$('#request_bills').click(function() {
+    var order_id = $('#save_order_id').attr('data-order');
+    var ajax_url = "/origami/" + order_id + "/request_bills";
+    $.ajax({
+			type: "POST",
+		    url: ajax_url,
+		    data: 'order_id='+ order_id,
+		    success:function(result){
+
+          location.reload();
+        }
+		});
+});
 </script>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
new file mode 100644
index 00000000..d15870b1
--- /dev/null
+++ b/app/views/origami/orders/show.html.erb
@@ -0,0 +1,194 @@
+<div class="row">
+ <!-- Column One -->
+ <div class="col-lg-6 col-md-6 col-sm-6">
+
+   <!-- Nav tabs -->
+   <ul class="nav nav-tabs" role="tablist" id="mytab">
+   <li class="nav-item">
+       <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link active" data-toggle="tab" href="#orders" role="tab">Orders</a>
+     </li>
+   </ul>
+   <!-- Nav tabs - End -->
+
+   <div class="tab-content" style="max-height:670px; overflow:auto">
+     <!--- Panel 0 - Completed Orders -->
+     <div class="tab-pane " id="completed" role="tabpanel">
+       <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 %>
+           </div>
+         </div>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 1 - Table Orders -->
+     <div class="tab-pane " id="tables" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @tables.each do |table| %>
+         <% if table.status == 'occupied' %>
+         <div class="card tables red text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card tables green text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 2 - Room Orders -->
+     <div class="tab-pane" id="rooms" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @rooms.each do |room| %>
+         <% if room.status == 'occupied' %>
+         <div class="card rooms red text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card rooms green text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 3 - Orders -->
+     <div class="tab-pane active" id="orders" role="tabpanel">
+       <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.order_id %>
+           </div>
+         </div>
+         <% end %>
+       </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">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p> Receipt No: <span id="receipt_no">
+             </span></p>
+           </div>
+           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+             <p>Date:  <span id="receipt_date"><%= @order.created_at.utc.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+           </div>
+         </div>
+         <div class="card-title row customer_detail hide">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p>Customer : <span id="customer_name"></span></p>
+           </div>
+
+         </div>
+         <div class="card-text">
+           <table class="table table-striped" id="order-items-table">
+             <thead>
+               <tr>
+                 <th class="item-name">Items</th>
+                 <th class="item-attr">QTY</td>
+                 <th class="item-attr">Price</td>
+               </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 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 btn-primary btn-block" >Back</button>
+   <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button>
+ </div>
+</div>
+<script>
+$(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(){
+      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() {
+   var sale_id = $('#sale_id').val();
+   window.location.href = '/origami/sale/'+ sale_id + "/payment";
+});
+</script>
diff --git a/app/views/origami/request_bills/print.json.jbuilder b/app/views/origami/request_bills/print.json.jbuilder
new file mode 100644
index 00000000..08bf292c
--- /dev/null
+++ b/app/views/origami/request_bills/print.json.jbuilder
@@ -0,0 +1 @@
+json.status true
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
new file mode 100644
index 00000000..c1a03461
--- /dev/null
+++ b/app/views/origami/rooms/show.html.erb
@@ -0,0 +1,267 @@
+<div class="row">
+ <!-- Column One -->
+ <div class="col-lg-6 col-md-6 col-sm-6">
+
+   <!-- Nav tabs -->
+   <ul class="nav nav-tabs" role="tablist" id="mytab">
+   <li class="nav-item">
+       <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Completed</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link active" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
+     </li>
+   </ul>
+   <!-- Nav tabs - End -->
+
+   <div class="tab-content" style="max-height:670px; overflow:auto">
+     <!--- Panel 0 - Completed Orders -->
+     <div class="tab-pane" id="completed" role="tabpanel">
+       <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 %>
+           </div>
+         </div>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 1 - Table Orders -->
+     <div class="tab-pane " id="tables" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @tables.each do |table| %>
+         <% if table.status == 'occupied' %>
+         <div class="card tables red text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card tables green text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 2 - Room Orders -->
+     <div class="tab-pane active" id="rooms" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @rooms.each do |room| %>
+         <% if room.status == 'occupied' %>
+         <div class="card rooms red text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card rooms green text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 3 - Orders -->
+     <div class="tab-pane" id="orders" role="tabpanel">
+       <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.order_id %>
+           </div>
+         </div>
+         <% end %>
+       </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">
+         <% if @status == "order" %>
+            <div><strong id="order-title">ORDER DETAILS </strong></div>
+         <% else %>
+            <div><strong id="order-title">INVOICE DETAILS </strong></div>
+         <% end %>
+       </div>
+       <div class="card-block">
+         <div class="card-title row">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p> Receipt No: <span id="receipt_no">
+               <% if @status == 'sale' %>
+                 <%= @obj.receipt_no rescue '' %>
+               <% end %>
+             </span></p>
+           </div>
+           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+             <p>Date:  <span id="receipt_date"><%= @obj.created_at.utc.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+           </div>
+         </div>
+         <div class="card-title row customer_detail hide">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p>Customer : <span id="customer_name"></span></p>
+           </div>
+
+         </div>
+         <div class="card-text">
+           <table class="table table-striped" id="order-items-table">
+             <thead>
+               <tr>
+                 <th class="item-name">Items</th>
+                 <th class="item-attr">QTY</td>
+                 <th class="item-attr">Price</td>
+               </tr>
+             </thead>
+             <tbody>
+               <%
+                 sub_total = 0
+                 if @status == "sale"
+                  @obj.sale_items.each do |sale_item|
+                  sub_total = sub_total + sale_item.price
+               %>
+               <input type="hidden" id="sale_id" value="<%= @obj.sale_id %>">
+               <% unless sale_item.price <= 0 %>
+               <tr>
+                 <td class='item-name'><%= sale_item.product_name %></td>
+                 <td class='item-attr'><%= sale_item.qty %></td>
+                 <td class='item-attr'><%= sale_item.price %></td>
+               </tr>
+               <%
+                    end
+                   end
+                 end
+
+                 if @status == 'order'
+                    unless @order_items.nil?
+                    @order_items.each do |order_item |
+                    sub_total = sub_total + order_item.price
+
+                unless order_item.price <= 0 %>
+               <tr>
+                 <td class='item-name'><%= order_item.item_name %></td>
+                 <td class='item-attr'><%= order_item.qty %></td>
+                 <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+               </tr>
+               <%
+                     end
+                    end
+                   end
+                 end
+               %>
+             </tbody>
+           </table>
+         </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>
+            <% if @status == "sale" %>
+             <tr>
+               <td class="charges-name"><strong>Tax:</strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= @obj.total_tax rescue 0%></strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Grand Total:</strong></td>
+               <td class="item-attr"><strong id="order-grand-total"><%= @obj.grand_total rescue 0%></strong></td>
+             </tr>
+              <% end %>
+              <tr class="rebate_amount"></tr>
+           </table>
+         </div>
+         <br>
+
+          <%
+            if @status == 'sale'
+                unless @order_items.nil?
+                  %>
+                  Added New Order
+                   <table class="table table-striped">
+                  <%
+                  @order_items.each do |order_item |
+                  %>
+
+                  <tr>
+                    <td class='item-name'><%= order_item.item_name %></td>
+                    <td class='item-attr'><%= order_item.qty %></td>
+                    <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                  </tr>
+
+                  <%
+                   end
+                   %>
+                     </table>
+                    <button class='btn btn-primary'> Add to existing invoice </button>
+                   <%
+                end
+            end
+          %>
+
+       </div>
+     </div>
+  </div>
+
+ <!-- Column Three -->
+ <div class="col-lg-1 col-md-1 col-sm-1">
+   <!-- Waiter Buttons -->
+   <button type="button" class="btn btn-primary btn-block" >Back</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Add Order</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Edit</button>
+   <button type="button" class="btn btn-primary btn-block" disabled>Move</button>
+   <button type="button" id="customer" class="btn btn-primary btn-block">Customer</button>
+   <button type="button" id="request_bills" class="btn btn-primary btn-block">Req.Bill</button>
+   <!-- Cashier Buttons -->
+   <button type="button" id="discount" class="btn btn-primary btn-block">Discount</button>
+   <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
+   <button type="button" id="pay" class="btn btn-primary btn-block">Pay</button>
+   <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button>
+ </div>
+</div>
+<script>
+$(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(){
+      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() {
+   var sale_id = $('#sale_id').val();
+   window.location.href = '/origami/sale/'+ sale_id + "/payment";
+});
+</script>
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
new file mode 100644
index 00000000..626d6256
--- /dev/null
+++ b/app/views/origami/sales/show.html.erb
@@ -0,0 +1,206 @@
+<div class="row">
+ <!-- Column One -->
+ <div class="col-lg-6 col-md-6 col-sm-6">
+
+   <!-- Nav tabs -->
+   <ul class="nav nav-tabs" role="tablist" id="mytab">
+   <li class="nav-item">
+       <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Completed</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+     </li>
+     <li class="nav-item">
+       <a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
+     </li>
+   </ul>
+   <!-- Nav tabs - End -->
+
+   <div class="tab-content" style="max-height:670px; overflow:auto">
+     <!--- Panel 0 - Completed Orders -->
+     <div class="tab-pane active" id="completed" role="tabpanel">
+       <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 %>
+           </div>
+         </div>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 1 - Table Orders -->
+     <div class="tab-pane " id="tables" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @tables.each do |table| %>
+         <% if table.status == 'occupied' %>
+         <div class="card tables red text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card tables green text-white" data-id="<%= table.id %>">
+           <div class="card-block">
+              <%= table.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 2 - Room Orders -->
+     <div class="tab-pane" id="rooms" role="tabpanel">
+       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
+         <% @rooms.each do |room| %>
+         <% if room.status == 'occupied' %>
+         <div class="card rooms red text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% else %>
+         <div class="card rooms green text-white" data-id="<%= room.id %>">
+           <div class="card-block">
+              <%= room.name %>
+           </div>
+         </div>
+         <% end %>
+         <% end %>
+       </div>
+     </div>
+
+     <!--- Panel 3 - Orders -->
+     <div class="tab-pane" id="orders" role="tabpanel">
+       <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.order_id %>
+           </div>
+         </div>
+         <% end %>
+       </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">INVOICE DETAILS </strong></div>
+       </div>
+       <div class="card-block">
+         <div class="card-title row">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p> Receipt No: <span id="receipt_no">
+                 <%= @sale.receipt_no rescue '' %>
+             </span></p>
+           </div>
+           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+             <p>Date:  <span id="receipt_date"><%= @sale.created_at.utc.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+           </div>
+         </div>
+         <div class="card-title row customer_detail hide">
+           <div class="col-lg-6 col-md-6 col-sm-6">
+             <p>Customer : <span id="customer_name"></span></p>
+           </div>
+
+         </div>
+         <div class="card-text">
+           <table class="table table-striped" id="order-items-table">
+             <thead>
+               <tr>
+                 <th class="item-name">Items</th>
+                 <th class="item-attr">QTY</td>
+                 <th class="item-attr">Price</td>
+               </tr>
+             </thead>
+             <tbody>
+               <%
+                 sub_total = 0
+                  @sale.sale_items.each do |sale_item|
+                  sub_total = sub_total + sale_item.price
+               %>
+               <input type="hidden" id="sale_id" value="<%= @sale.sale_id %>">
+               <% unless sale_item.price <= 0 %>
+               <tr>
+                 <td class='item-name'><%= sale_item.product_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 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">(<%= @sale.total_discount rescue 0%>)</strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Tax:</strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
+             </tr>
+             <tr>
+               <td class="charges-name"><strong>Grand Total:</strong></td>
+               <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total 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 btn-primary btn-block" >Back</button>
+   <button type="button" id="re-print" class="btn btn-primary btn-block">VOID</button>
+   <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button>
+ </div>
+</div>
+<script>
+$(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(){
+      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() {
+   var sale_id = $('#sale_id').val();
+   window.location.href = '/origami/sale/'+ sale_id + "/payment";
+});
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index 0df21efd..de7b2a6f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,18 +72,21 @@ Rails.application.routes.draw do
   #--------- Cashier ------------#
   namespace :origami do
     root "home#index"
-    get "/:dining_id" => "home#show" do #origami/:booking_id will show
+    get "table/:dining_id" => "home#show" do #origami/:booking_id will show
 
       # resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers #add customer type
     end
+    get 'sale/:sale_id' => 'sales#show'
+    get 'room/:room_id' => 'rooms#show'
+    get 'order/:order_id' => "orders#show"
 
     post '/:booking_id' => 'home#item_show'
 
     get "/:id/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
 
-    get "/:id/request_bills" => "request_bills#print"
+    post "/:id/request_bills" => "request_bills#print"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
     #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'