From b029cabeba1df3ae66da93e91ce466ce0d8f18de Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 16 Jun 2017 19:04:25 +0630
Subject: [PATCH] update show detail and order

---
 app/views/transactions/orders/show.html.erb |  9 +++++--
 app/views/transactions/sales/show.html.erb  | 27 +++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb
index e1127296..903ed0f0 100644
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -8,6 +8,11 @@
        <li class="active">
            <a href="<%= transactions_orders_path %>"><%= @order.order_id %></a>
        </li>
+       <span style="float: right">
+             <a href="<%= transactions_orders_path%>" class="btn btn-primary btn-sm">
+        <i class="fa fa-arrow-left fa-xs"></i> Back
+       </a>
+      </span>
     </ol>
   </div>
 </div>
@@ -75,11 +80,11 @@
       </div>
 
   </div>
-   <div class="col-lg-1 col-md-1 col-sm-1">
+   <!-- <div class="col-lg-1 col-md-1 col-sm-1">
       <a href="<%= transactions_orders_path%>" class="btn btn-primary">
         <i class="fa fa-arrow-left fa-xs"></i> Back
        </a>
-  </div>
+  </div> -->
 </div>
 
 
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 5f4e8f6e..1e5cc41a 100644
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -8,11 +8,24 @@
        <li class="active">
            <a href="<%= transactions_sale_path(@sale.sale_id) %>"><%= @sale.sale_id %></a>
        </li>
+       <span style="float: right">
+            <a href="<%= transactions_sales_path%>" class="btn btn-primary btn-sm">
+              <i class="fa fa-arrow-left fa-lg"></i> Back
+            </a>
+            
+            
+             <a href="<%= transactions_void_path(@sale)%>"  class="btn btn-danger  btn-sm">
+              <i class="fa fa-trash fa-lg"></i>  Void Sale
+             </a>
+            <a href="<%= transactions_manual_complete_sale_path(@sale)%>"  class="btn btn-success  btn-sm" disabled>
+              <i class="fa fa-invoice fa-lg"></i> Complete Sale
+            </a>
+      </span>
     </ol>
   </div>
 </div>
 <div class="row">
-    <div class="col-lg-10 col-md-10 col-sm-10">
+    <div class="col-lg-12 col-md-12 col-sm-12">
       <!-- Column One -->
 
         <!-- Nav tabs -->
@@ -29,7 +42,7 @@
         </ul>
         <!-- Nav tabs - End -->
 
-        <div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
+        <div class="tab-content" style="min-height:670px; max-height:670px;">
 
             <div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
                 <div class="table-responsive">
@@ -53,7 +66,7 @@
                             <td><%= @sale.receipt_no %></td>
                             <td><%= @sale.cashier_name rescue '-' %></td>
                             <td> <%= @sale.sale_status %> </td>
-                            <td> <%= @sale.requested_at.strftime("%d-%m-%Y") %> </td>
+                            <td> <%= @sale.requested_at %> </td>
                           </tr> 
                           <tr style="border-top:2px solid #000">
                             <th>Sale item name</th>
@@ -85,7 +98,7 @@
                           <% @sale.sale_taxes.each do |r|%>
                           <tr>
                             <td colspan=2 style="text-align:center"></td>
-                            <td><%= r.tax_name %>(<%= r.tax_rate %>)</td>    
+                            <td><%= r.tax_name %> </td>    
                             <td colspan="2"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                             </tr>
                           <% end %> 
@@ -226,19 +239,19 @@
 
     </div>
 
-    <div class="col-lg-2 col-md-2 col-sm-2">
+    <!-- <div class="col-lg-2 col-md-2 col-sm-2">
       <a href="<%= transactions_sales_path%>" style="margin-top: 10px " class="btn btn-primary btn-lg">
         <i class="fa fa-arrow-left fa-lg"></i> Back
       </a>
       
-      <!-- Temporary No Needs -->
+      
        <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-danger  btn-lg">
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
       <a href="<%= transactions_manual_complete_sale_path(@sale)%>"  style="margin-top: 10px " class="btn btn-success  btn-lg">
         <i class="fa fa-invoice fa-lg"></i> Complete Sale
       </a>
-    </div>
+    </div> -->
 
 </div>