diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/orgiami.scss
index 327c5897..afefe4c7 100644
--- a/app/assets/stylesheets/orgiami.scss
+++ b/app/assets/stylesheets/orgiami.scss
@@ -29,3 +29,11 @@
 .purple {
 	background-color:#7a62d3;
 }
+
+.red {
+	background-color:#ff0000;
+}
+
+.green{
+	background-color: #009900
+}
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 4897407d..7a955a8d 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -190,13 +190,13 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
    <!--  <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button> -->
-    <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">
+    <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>
       Req.Bill
     </button>
     <!-- Cashier Buttons -->
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>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-lg btn-block" >Pay</button>
+    <button type="button" id="pay" class="btn btn-primary btn-lg btn-block" disabled >Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
@@ -217,12 +217,14 @@ function callOrderDetails(sale_order_id){
     sale_id = sale_order_id.split("_")[1]
     url =  "origami/"+sale_order_id.split("_")[1]
     data_val =   { sale_id: sale_order_id.split("_")[1]}
-
+    $("#pay").prop('disabled',false);
+    $("#request_bills").prop('disabled',true);
   }else{
     order_id = sale_order_id.split("_")[1]
     url =  "origami/"+order_id
     data_val =  { order_id: sale_order_id.split("_")[1]}
-
+    $("#request_bills").prop('disabled',false);
+    $("#pay").prop('disabled',true);
   }
   table_or_order_id = order_id
   pay_sale_id = sale_id
diff --git a/app/views/origami/request_bills/show.html.erb b/app/views/origami/request_bills/show.html.erb
index 573a63f4..6de89ab8 100644
--- a/app/views/origami/request_bills/show.html.erb
+++ b/app/views/origami/request_bills/show.html.erb
@@ -4,12 +4,10 @@
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
-
-
         	<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
-          <span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
+          <span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
         	<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
-          <span><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
+          <span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
         </div>
       </div>
       <div class="card-block">
@@ -152,8 +150,8 @@
              <div class="col-md-7">
                <div class="row">
                  <div class="col-md-3 cashier_number"></div>
-                 <div class="col-md-3 cashier_number">DEL</div>
-                 <div class="col-md-3 cashier_number">CLR</div>
+                 <div class="col-md-3 cashier_number red">DEL</div>
+                 <div class="col-md-3 cashier_number green">CLR</div>
                </div>
              </div>
              <div class="col-md-5">