From 503f1df0abbffcaa7bbaa8ddbaff4980870662d8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 6 Feb 2018 18:05:02 +0630
Subject: [PATCH] change order data

---
 app/controllers/origami/orders_controller.rb | 2 +-
 app/views/origami/orders/show.html.erb       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 85047ef0..22a1e802 100755
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
-    @orders = Order.all.order('status desc')
+    @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)
     if sale_order
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index b08328b6..f18365ac 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -129,7 +129,7 @@
        <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">
-              Receipt No: <span id="receipt_no">
+              Order No: <span id="receipt_no"> <%= @order.order_id %>
              </span>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
@@ -173,7 +173,7 @@
          </div>
          </div>
          <div class="card-footer ">
-           <table class="m-b--20" id="order-charges-table" border="0">
+           <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>
@@ -195,7 +195,7 @@
  <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>
+     <!-- <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>